Flate: skia_alloc_func works on both miniz and zlib

src/core/SkFlate.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 "SkFlate.h"
 #include "SkStream.h"
 
 #ifndef SK_NO_FLATE
 
 namespace {
 
 #ifdef ZLIB_INCLUDE
     #include ZLIB_INCLUDE
 #else
     #include "zlib.h"
 #endif
 
 // static
 const size_t kBufferSize = 1024;
 
+// 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) {
     uint8_t inputBuffer[kBufferSize];
     uint8_t outputBuffer[kBufferSize];
     z_stream flateData;
-    flateData.zalloc = NULL;
-    flateData.zfree = NULL;
+    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);
     if (rc != Z_OK)
@@ skipping 120 matching lines @@
     z_stream fZStream;
 };
 
 SkDeflateWStream::SkDeflateWStream(SkWStream* out)
     : fImpl(SkNEW(SkDeflateWStream::Impl)) {
     fImpl->fOut = out;
     fImpl->fInBufferIndex = 0;
     if (!fImpl->fOut) {
         return;
     }
-    fImpl->fZStream.zalloc = Z_NULL;
-    fImpl->fZStream.zfree = Z_NULL;
-    fImpl->fZStream.opaque = Z_NULL;
+    fImpl->fZStream.zalloc = &skia_alloc_func;
+    fImpl->fZStream.zfree = &skia_free_func;
+    fImpl->fZStream.opaque = NULL;
     SkDEBUGCODE(int r =) deflateInit(&fImpl->fZStream, Z_DEFAULT_COMPRESSION);
     SkASSERT(Z_OK == r);
 }
 
 SkDeflateWStream::~SkDeflateWStream() { this->finalize(); }
 
 void SkDeflateWStream::finalize() {
     if (!fImpl->fOut) {
         return;
     }
@@ skipping 27 matching lines @@
     return true;
 }
 
 size_t SkDeflateWStream::bytesWritten() const {
     return fImpl->fZStream.total_in + fImpl->fInBufferIndex;
 }
 
 
 #endif  // SK_NO_FLATE