diff options
| author |  edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-08 12:54:01 +0000 |
|---|---|---|
| committer | edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-08 12:54:01 +0000 |
| commit | 53766103b5b156a8d2df150ce230d829a8a88540 (patch) | |
| tree | 8e7805f4b675bbb947d6cf4edcb04d5c4bd0d613 /experimental | |
| parent | 768bc6a920427d749fbd5060f33edc866613815c (diff) | |
pdfviewer: remove text save/restore (not needed) and verify that colorspace dictionary exists before using it
Review URL: https://codereview.chromium.org/22436003
git-svn-id: http://skia.googlecode.com/svn/trunk@10639 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'experimental')
| -rw-r--r-- | experimental/PdfViewer/SkPdfRenderer.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/experimental/PdfViewer/SkPdfRenderer.cpp b/experimental/PdfViewer/SkPdfRenderer.cpp index 85e3b6e365..cd2d7d6073 100644 --- a/experimental/PdfViewer/SkPdfRenderer.cpp +++ b/experimental/PdfViewer/SkPdfRenderer.cpp @@ -388,10 +388,7 @@ static PdfResult DrawText(PdfContext* pdfContext, pdfContext->fGraphicsState.applyGraphicsState(&paint, false); - canvas->save(); - skfont->drawText(decoded, &paint, pdfContext, canvas); - canvas->restore(); return kOK_PdfResult; } @@ -1581,7 +1578,7 @@ static PdfResult PdfOp_CS_cs(PdfContext* pdfContext, SkCanvas* canvas, SkPdfColo //Next, get the ColorSpace Dictionary from the Resource Dictionary: SkPdfDictionary* colorSpaceResource = pdfContext->fGraphicsState.fResources->ColorSpace(pdfContext->fPdfDoc); - SkPdfObject* colorSpace = pdfContext->fPdfDoc->resolveReference(colorSpaceResource->get(name)); + SkPdfObject* colorSpace = colorSpaceResource ? pdfContext->fPdfDoc->resolveReference(colorSpaceResource->get(name)) : name; if (colorSpace == NULL) { colorOperator->fColorSpace = name->strRef(); |