zlib/pdf: remove HaveFlate(), depend on preprocessor defines

experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPdfNativeObject.h"
 
 #include "SkBitmap.h"
 #include "SkFlate.h"
 #include "SkPdfFont.h"
 #include "SkPdfNativeTokenizer.h"
 #include "SkPdfReporter.h"
 #include "SkStream.h"
 
 // TODO(edisonn): mac builder does not find the header ... but from headers is ok
 //#include "SkPdfStreamCommonDictionary_autogen.h"
 #include "SkPdfHeaders_autogen.h"
 
 
 SkPdfNativeObject SkPdfNativeObject::kNull = SkPdfNativeObject::makeNull();
 
 bool SkPdfNativeObject::applyFlateDecodeFilter() {
-    if (!SkFlate::HaveFlate()) {
-        SkPdfReport(kIgnoreError_SkPdfIssueSeverity, kNoFlateLibrary_SkPdfIssue,
-                    "forgot to link with flate library?", NULL, NULL);
-        return false;
-    }
-
+#ifdef SK_NO_FLATE

[mtklein, 2015/02/17 22:15:15]

Just remove this?  The code will fail to compile if SkFlate::Inflate isn't
defined.

[hal.canary, 2015/02/17 22:35:44]

Done.

+    SkPdfReport(kIgnoreError_SkPdfIssueSeverity, kNoFlateLibrary_SkPdfIssue,
+                "forgot to link with flate library?", NULL, NULL);
+    return false;
+#else  // !SK_NO_FLATE
     const unsigned char* old = fStr.fBuffer;
     bool deleteOld = isStreamOwned();
 
     SkMemoryStream skstream(fStr.fBuffer, fStr.fBytes >> 2, false);
     SkDynamicMemoryWStream uncompressedData;
 
     if (SkFlate::Inflate(&skstream, &uncompressedData)) {
         fStr.fBytes = (uncompressedData.bytesWritten() << 2) + kOwnedStreamBit +
                       kUnfilteredStreamBit;
         fStr.fBuffer = (const unsigned char*)new unsigned char[uncompressedData.bytesWritten()];
         uncompressedData.copyTo((void*)fStr.fBuffer);
 
         if (deleteOld) {
             delete[] old;
         }
 
         return true;
     } else {
         SkPdfReport(kIgnoreError_SkPdfIssueSeverity, kBadStream_SkPdfIssue, "inflate failed", this, NULL);
         return false;
     }
+#endif  // !SK_NO_FLATE
 }
 
 bool SkPdfNativeObject::applyDCTDecodeFilter() {
     // applyDCTDecodeFilter will fail, and it won't allow any more filters.
     // technically, it would be possible, but not a real world scenario.
     // in this way we create the image from the DCT stream directly.
     return false;
 }
 
 bool SkPdfNativeObject::applyFilter(const char* name) {
@@ skipping 63 matching lines @@
                 delete (SkBitmap*)fData;
                 break;
             default:
                 SkASSERT(false);
                 break;
         }
     }
     fData = NULL;
     fDataType = kEmpty_Data;
 }