| commit | f111a4b6855277bba8dac84cce7ccfa1b3f25d7c | [log] [tgz] |
|---|---|---|
| author | edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Wed Jul 31 18:22:36 2013 +0000 |
| committer | edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Wed Jul 31 18:22:36 2013 +0000 |
| tree | 4fbd544fa072c6efbcc2423082b005fbb47664e5 | |
| parent | b14d5bc0912699c770d81ce284a236b1f1088b21 [diff] |
pdfviewer: transparency groups - implementation of non-isolated and non-knockout flags Review URL: https://codereview.chromium.org/21288002 git-svn-id: http://skia.googlecode.com/svn/trunk@10467 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp b/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp index 09b7a0b..9ec5cc0 100644 --- a/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp +++ b/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp
@@ -855,7 +855,7 @@ return current; } - if (tokenLen == 5 && start[0] == 'f' && start[1] == 'a' && start[2] == 'l' && start[3] == 's' && start[3] == 'e') { + if (tokenLen == 5 && start[0] == 'f' && start[1] == 'a' && start[2] == 'l' && start[3] == 's' && start[4] == 'e') { SkPdfObject::makeBoolean(false, token); return current; }
diff --git a/experimental/PdfViewer/pdfparser/native/SkPdfObject.h b/experimental/PdfViewer/pdfparser/native/SkPdfObject.h index 9ac9a12..5d86d9b 100644 --- a/experimental/PdfViewer/pdfparser/native/SkPdfObject.h +++ b/experimental/PdfViewer/pdfparser/native/SkPdfObject.h
@@ -169,7 +169,6 @@ return nyi; } - static void makeBoolean(bool value, SkPdfObject* obj) { SkASSERT(obj->fObjectType == kInvalid_PdfObjectType); @@ -703,7 +702,7 @@ inline bool boolValue() const { SkASSERT(fObjectType == kBoolean_PdfObjectType); - if (fObjectType == kBoolean_PdfObjectType) { + if (fObjectType != kBoolean_PdfObjectType) { // TODO(edisonn): log err return false; }