SkPDF/Deflate: clean up old SkFlate code

src/pdf/SkDeflate.cpp

 
 /*
  * Copyright 2010 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkData.h"
 #include "SkDeflate.h"
 #include "SkStream.h"
 
 namespace {
 
 #ifdef ZLIB_INCLUDE
     #include ZLIB_INCLUDE
 #else
     #include "zlib.h"
 #endif
 
 // static
 const size_t kBufferSize = 1024;

[mtklein_C, 2015/08/18 19:33:09]

Make this and skia_alloc_func() actually static, then remove the namespace {}? 
It's sort of stuttery to mix namespace {} and static together.

[hal.canary, 2015/08/18 20:06:23]

Acknowledged.

 
 // Different zlib implementations use different T.
 // We've seen size_t and unsigned.
 template <typename T> void* skia_alloc_func(void*, T items, T size) {
     return sk_calloc_throw(SkToSizeT(items) * SkToSizeT(size));
 }
 
 static void skia_free_func(void*, void* address) { sk_free(address); }
 
-bool doFlate(bool compress, SkStream* src, SkWStream* dst) {
+static bool do_inflate(SkStream* src, SkWStream* dst) {
     uint8_t inputBuffer[kBufferSize];
     uint8_t outputBuffer[kBufferSize];
     z_stream flateData;
     flateData.zalloc = &skia_alloc_func;
     flateData.zfree = &skia_free_func;
     flateData.opaque = NULL;
     flateData.next_in = NULL;
     flateData.avail_in = 0;
     flateData.next_out = outputBuffer;
     flateData.avail_out = kBufferSize;
     int rc;
-    if (compress)
-        rc = deflateInit(&flateData, Z_DEFAULT_COMPRESSION);
-    else
-        rc = inflateInit(&flateData);
+    rc = inflateInit(&flateData);
     if (rc != Z_OK)
         return false;
 
     uint8_t* input = (uint8_t*)src->getMemoryBase();
     size_t inputLength = src->getLength();
     if (input == NULL || inputLength == 0) {
         input = NULL;
         flateData.next_in = inputBuffer;
         flateData.avail_in = 0;
     } else {
@@ skipping 15 matching lines @@
             break;
         if (flateData.avail_in == 0) {
             if (input != NULL)
                 break;
             size_t read = src->read(&inputBuffer, kBufferSize);
             if (read == 0)
                 break;
             flateData.next_in = inputBuffer;
             flateData.avail_in = SkToUInt(read);
         }
-        if (compress)
-            rc = deflate(&flateData, Z_NO_FLUSH);
-        else
-            rc = inflate(&flateData, Z_NO_FLUSH);
+        rc = inflate(&flateData, Z_NO_FLUSH);
     }
     while (rc == Z_OK) {
-        if (compress)
-            rc = deflate(&flateData, Z_FINISH);
-        else
-            rc = inflate(&flateData, Z_FINISH);
+        rc = inflate(&flateData, Z_FINISH);
         if (flateData.avail_out < kBufferSize) {
             if (!dst->write(outputBuffer, kBufferSize - flateData.avail_out))
                 return false;
             flateData.next_out = outputBuffer;
             flateData.avail_out = kBufferSize;
         }
     }
 
-    if (compress)
-        deflateEnd(&flateData);
-    else
-        inflateEnd(&flateData);
-    if (rc == Z_STREAM_END)
-        return true;
-    return false;
+    inflateEnd(&flateData);
+    return rc == Z_STREAM_END;
 }
+}  // namespace
 
+SkStreamAsset* SkInflate(SkStream* src) {
+    SkDynamicMemoryWStream decompressedDynamicMemoryWStream;
+    if (!do_inflate(src, &decompressedDynamicMemoryWStream)) {
+        return nullptr;
+    }
+    return decompressedDynamicMemoryWStream.detachAsStream();
 }
 
-// static
-bool SkFlate::Deflate(SkStream* src, SkWStream* dst) {
-    return doFlate(true, src, dst);
-}
-
-bool SkFlate::Deflate(const void* ptr, size_t len, SkWStream* dst) {
-    SkMemoryStream stream(ptr, len);
-    return doFlate(true, &stream, dst);
-}
-
-bool SkFlate::Deflate(const SkData* data, SkWStream* dst) {
-    if (data) {
-        SkMemoryStream stream(data->data(), data->size());
-        return doFlate(true, &stream, dst);
-    }
-    return false;
-}
-
-// static
-bool SkFlate::Inflate(SkStream* src, SkWStream* dst) {
-    return doFlate(false, src, dst);
-}
-
-
 #define SKDEFLATEWSTREAM_INPUT_BUFFER_SIZE 4096
 #define SKDEFLATEWSTREAM_OUTPUT_BUFFER_SIZE 4224  // 4096 + 128, usually big
                                                   // enough to always do a
                                                   // single loop.
 
 // called by both write() and finalize()
 static void do_deflate(int flush,
                        z_stream* zStream,
                        SkWStream* out,
                        unsigned char* inBuffer,
@@ skipping 69 matching lines @@
                        fImpl->fInBuffer, fImpl->fInBufferIndex);
             fImpl->fInBufferIndex = 0;
         }
     }
     return true;
 }
 
 size_t SkDeflateWStream::bytesWritten() const {
     return fImpl->fZStream.total_in + fImpl->fInBufferIndex;
 }