diff options
Diffstat (limited to 'experimental/PdfViewer/pdfparser/native')
-rw-r--r-- | experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp | 11 | ||||
-rw-r--r-- | experimental/PdfViewer/pdfparser/native/SkPdfObject.h | 7 |
2 files changed, 16 insertions, 2 deletions
diff --git a/experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp b/experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp index 597dfcdb6c..306bf0716b 100644 --- a/experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp +++ b/experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp @@ -519,6 +519,11 @@ SkPdfObject* SkNativeParsedPDF::resolveReference(const SkPdfObject* ref) { } if (fObjects[id].fResolvedReference != NULL) { + +#ifdef PDF_TRACE + printf("\nresolve(%s) = %s\n", ref->toString(0).c_str(), fObjects[id].fResolvedReference->toString(0, ref->toString().size() + 13).c_str()); +#endif + return fObjects[id].fResolvedReference; } @@ -534,8 +539,14 @@ SkPdfObject* SkNativeParsedPDF::resolveReference(const SkPdfObject* ref) { } } +#ifdef PDF_TRACE + printf("\nresolve(%s) = %s\n", ref->toString(0).c_str(), fObjects[id].fResolvedReference->toString(0, ref->toString().size() + 13).c_str()); +#endif return fObjects[id].fResolvedReference; } + + + // TODO(edisonn): fix the mess with const, probably we need to remove it pretty much everywhere return (SkPdfObject*)ref; } diff --git a/experimental/PdfViewer/pdfparser/native/SkPdfObject.h b/experimental/PdfViewer/pdfparser/native/SkPdfObject.h index f3832b2854..5e3bcdbe1d 100644 --- a/experimental/PdfViewer/pdfparser/native/SkPdfObject.h +++ b/experimental/PdfViewer/pdfparser/native/SkPdfObject.h @@ -123,6 +123,7 @@ public: case kString_PdfObjectType: case kHexString_PdfObjectType: case kKeyword_PdfObjectType: + case kName_PdfObjectType: return (const char*)fStr.fBuffer; default: @@ -136,6 +137,7 @@ public: case kString_PdfObjectType: case kHexString_PdfObjectType: case kKeyword_PdfObjectType: + case kName_PdfObjectType: return fStr.fBytes; default: @@ -682,6 +684,7 @@ public: case kString_PdfObjectType: case kHexString_PdfObjectType: case kKeyword_PdfObjectType: + case kName_PdfObjectType: return fStr; default: @@ -830,13 +833,13 @@ public: return true; } - void appendSpaces(SkString* str, int level) { + static void appendSpaces(SkString* str, int level) { for (int i = 0 ; i < level; i++) { str->append(" "); } } - SkString toString(int firstRowLevel = 0, int level = 0) { + SkString toString(int firstRowLevel = 0, int level = 0) const { SkString str; appendSpaces(&str, firstRowLevel); switch (fObjectType) { |