| Index: experimental/PdfViewer/SkPdfRenderer.cpp
|
| ===================================================================
|
| --- experimental/PdfViewer/SkPdfRenderer.cpp (revision 10636)
|
| +++ experimental/PdfViewer/SkPdfRenderer.cpp (working copy)
|
| @@ -388,10 +388,7 @@
|
|
|
| pdfContext->fGraphicsState.applyGraphicsState(&paint, false);
|
|
|
| - canvas->save();
|
| -
|
| skfont->drawText(decoded, &paint, pdfContext, canvas);
|
| - canvas->restore();
|
|
|
| return kOK_PdfResult;
|
| }
|
| @@ -1581,7 +1578,7 @@
|
| //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();
|
|
|