In SkPDFDocumentToBitmap, use SkCreateDataProviderFromStream
authorhalcanary <halcanary@google.com>
Mon, 27 Oct 2014 14:06:47 +0000 (07:06 -0700)
committerCommit bot <commit-bot@chromium.org>
Mon, 27 Oct 2014 14:06:47 +0000 (07:06 -0700)
CGDataProviderCreateWithData to SkCreateDataProviderFromStream in
SkPDFDocumentToBitmap

Review URL: https://codereview.chromium.org/678763003

src/utils/mac/SkCreateCGImageRef.cpp

index 14a24d8..51a5ed9 100644 (file)
@@ -188,17 +188,8 @@ private:
 };
 #define SkAutoPDFRelease(...) SK_REQUIRE_LOCAL_VAR(SkAutoPDFRelease)
 
-static void CGDataProviderReleaseData_FromMalloc(void*, const void* data,
-                                                 size_t size) {
-    sk_free((void*)data);
-}
-
 bool SkPDFDocumentToBitmap(SkStream* stream, SkBitmap* output) {
-    size_t size = stream->getLength();
-    void* ptr = sk_malloc_throw(size);
-    stream->read(ptr, size);
-    CGDataProviderRef data = CGDataProviderCreateWithData(NULL, ptr, size,
-                                          CGDataProviderReleaseData_FromMalloc);
+    CGDataProviderRef data = SkCreateDataProviderFromStream(stream);
     if (NULL == data) {
         return false;
     }