Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1284)

Unified Diff: src/pdf/SkPDFImage.cpp

Issue 933523007: zlib/pdf: remove HaveFlate(), depend on preprocessor defines (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-02-17 (Tuesday) 17:35:15 EST Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkFlate.cpp ('k') | src/pdf/SkPDFStream.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/pdf/SkPDFImage.cpp
diff --git a/src/pdf/SkPDFImage.cpp b/src/pdf/SkPDFImage.cpp
index 3c0d850fda9d1d0273e280d13452c3a239aa521a..0b6c81f77a382a6cded9bdc61db3b27f8f623e76 100644
--- a/src/pdf/SkPDFImage.cpp
+++ b/src/pdf/SkPDFImage.cpp
@@ -630,9 +630,14 @@ bool SkPDFImage::populate(SkPDFCatalog* catalog) {
fStreamValid = true;
}
return INHERITED::populate(catalog);
- } else if (getState() == kNoCompression_State &&
- !skip_compression(catalog) &&
- (SkFlate::HaveFlate() || fEncoder)) {
+ }
+#ifndef SK_NO_FLATE
+ else if (getState() == kNoCompression_State && !skip_compression(catalog)) {
+#else // SK_NO_FLATE
+ else if (getState() == kNoCompression_State &&
+ !skip_compression(catalog) &&
+ fEncoder) {
+#endif // SK_NO_FLATE
// Compression has not been requested when the stream was first created,
// but the new catalog wants it compressed.
if (!getSubstitute()) {
« no previous file with comments | « src/core/SkFlate.cpp ('k') | src/pdf/SkPDFStream.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698