pdf viewer: refactor, add -w parameter to pdfviewer, add -n to remove extenassion page when there is a single page (so skdiff can be run easily) and fix a bug (SkPdfobject should not reset on destruct)
Review URL: https://codereview.chromium.org/18435007
git-svn-id: http://skia.googlecode.com/svn/trunk@9983 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp b/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp
index 53987fa..fc3e0b9 100644
--- a/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp
+++ b/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp
@@ -656,8 +656,14 @@
free(fHandles[i]);
}
for (int i = 0 ; i < fHistory.count(); i++) {
+ for (int j = 0 ; j < BUFFER_SIZE; j++) {
+ fHistory[i][j].reset();
+ }
delete[] fHistory[i];
}
+ for (int j = 0 ; j < BUFFER_SIZE; j++) {
+ fCurrent[j].reset();
+ }
delete[] fCurrent;
}
@@ -667,7 +673,6 @@
fCurrent = allocBlock();
fCurrentUsed = 0;
}
-
fCurrentUsed++;
return &fCurrent[fCurrentUsed - 1];
}
@@ -677,26 +682,28 @@
unsigned char* buffer = NULL;
size_t len = 0;
objWithStream->GetFilteredStreamRef(&buffer, &len, fAllocator);
+ // TODO(edisonn): hack, find end of object
+ char* endobj = strstr((char*)buffer, "endobj");
+ if (endobj) {
+ len = endobj - (char*)buffer + strlen("endobj");
+ }
fUncompressedStreamStart = fUncompressedStream = (unsigned char*)fAllocator->alloc(len);
fUncompressedStreamEnd = fUncompressedStream + len;
- memcpy(fUncompressedStream, buffer, len);}
+ memcpy(fUncompressedStream, buffer, len);
+}
SkPdfNativeTokenizer::SkPdfNativeTokenizer(unsigned char* buffer, int len, const SkPdfMapper* mapper, SkPdfAllocator* allocator) : fMapper(mapper), fAllocator(allocator), fEmpty(false), fHasPutBack(false) {
+ // TODO(edisonn): hack, find end of object
+ char* endobj = strstr((char*)buffer, "endobj");
+ if (endobj) {
+ len = endobj - (char*)buffer + strlen("endobj");
+ }
fUncompressedStreamStart = fUncompressedStream = (unsigned char*)fAllocator->alloc(len);
fUncompressedStreamEnd = fUncompressedStream + len;
memcpy(fUncompressedStream, buffer, len);
}
SkPdfNativeTokenizer::~SkPdfNativeTokenizer() {
- // free the unparsed stream, we don't need it.
- // the parsed one is locked as it contains the strings and keywords referenced in objects
- if (fUncompressedStream) {
- void* dummy = realloc(fUncompressedStreamStart, fUncompressedStream - fUncompressedStreamStart);
- //SkASSERT(dummy == fUncompressedStreamStart);
- fUncompressedStreamStart = (unsigned char*)dummy; // suppress compiler warning
- } else {
- SkASSERT(false);
- }
}
bool SkPdfNativeTokenizer::readTokenCore(PdfToken* token) {
@@ -726,7 +733,7 @@
#ifdef PDF_TRACE
static int read_op = 0;
read_op++;
- if (182749 == read_op) {
+ if (548 == read_op) {
printf("break;\n");
}
printf("%i READ %s %s\n", read_op, token->fType == kKeyword_TokenType ? "Keyword" : "Object", token->fKeyword ? std::string(token->fKeyword, token->fKeywordLength).c_str() : token->fObject->toString().c_str());
@@ -763,3 +770,4 @@
return readTokenCore(token);
}
+