diff options
| -rw-r--r-- | experimental/PdfViewer/generate_code.py | 2 | ||||
| -rw-r--r-- | experimental/PdfViewer/pdf_viewer_main.cpp | 2 | ||||
| -rw-r--r-- | experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/experimental/PdfViewer/generate_code.py b/experimental/PdfViewer/generate_code.py index 75d3022825..23a8360006 100644 --- a/experimental/PdfViewer/generate_code.py +++ b/experimental/PdfViewer/generate_code.py @@ -518,7 +518,7 @@ class PdfClassManager: cntMust = cntMust + 1 fileMapperNativeCpp.write(' if (!nativeObj->isDictionary()) return false;\n') fileMapperNativeCpp.write(' ret = nativeObj->get(\"' + prop.fName + '\", \"' + prop.fAbr + '\");\n') - fileMapperNativeCpp.write(' if (ret == NULL) return false;\n') + fileMapperNativeCpp.write(' if (ret == NULL || !' + knowTypes[prop.fTypes.strip()][3] + ') return false;\n') eval = ''; # TODO(edisonn): this could get out of hand, and could have poor performance if continued on this path diff --git a/experimental/PdfViewer/pdf_viewer_main.cpp b/experimental/PdfViewer/pdf_viewer_main.cpp index f3176b9940..194fcdd61b 100644 --- a/experimental/PdfViewer/pdf_viewer_main.cpp +++ b/experimental/PdfViewer/pdf_viewer_main.cpp @@ -139,7 +139,7 @@ static bool make_output_filepath(SkString* path, const SkString& dir, PNG_FILE_EXTENSION); } -static void setup_bitmap(SkBitmap* bitmap, int width, int height, SkColor color = SK_ColorTRANSPARENT) { +static void setup_bitmap(SkBitmap* bitmap, int width, int height, SkColor color = SK_ColorWHITE) { bitmap->setConfig(SkBitmap::kARGB_8888_Config, width, height); bitmap->allocPixels(); diff --git a/experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp b/experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp index e54ba825bc..9e89b84424 100644 --- a/experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp +++ b/experimental/PdfViewer/pdfparser/native/SkNativeParsedPDF.cpp @@ -504,12 +504,12 @@ SkPdfObject* SkNativeParsedPDF::resolveReference(const SkPdfObject* ref) { SkASSERT(!(id < 0 || id > fObjects.count())); - if (id < 0 || id > fObjects.count()) { + // TODO(edisonn): verify id and gen expected + if (id < 0 || id >= fObjects.count()) { + // TODO(edisonn): report error/warning return NULL; } - // TODO(edisonn): verify id and gen expected - if (fObjects[id].fResolvedReference != NULL) { return fObjects[id].fResolvedReference; } |