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;
 
-static void* skia_alloc_func(void*, size_t items, size_t size) {
-    return sk_calloc_throw(items * size);
+template <typename T> void* skia_alloc_func(void*, T items, T size) {

[mtklein, 2015/02/27 19:36:16]

Shall we add // Different zlib implementations use different T.  We've seen
size_t and unsigned.  ?

[hal.canary, 2015/02/27 19:40:40]

Done.

+    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 = &skia_alloc_func;
     flateData.zfree = &skia_free_func;
@@ skipping 181 matching lines @@
     return true;
 }
 
 size_t SkDeflateWStream::bytesWritten() const {
     return fImpl->fZStream.total_in + fImpl->fInBufferIndex;
 }
 
 
 #endif  // SK_NO_FLATE