use SkData::NewUninitialized

tools/skdiff_utils.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "skdiff.h"
 #include "skdiff_utils.h"
 #include "SkBitmap.h"
 #include "SkData.h"
 #include "SkImageDecoder.h"
 #include "SkImageEncoder.h"
 #include "SkStream.h"
 #include "SkTemplates.h"
 #include "SkTypes.h"
 
 bool are_buffers_equal(SkData* skdata1, SkData* skdata2) {
     if ((NULL == skdata1) || (NULL == skdata2)) {
         return false;
     }
     if (skdata1->size() != skdata2->size()) {
         return false;
     }
     return (0 == memcmp(skdata1->data(), skdata2->data(), skdata1->size()));
 }
 
 SkData* read_file(const char* file_path) {
-    SkFILEStream fileStream(file_path);
-    if (!fileStream.isValid()) {
+    SkData* data = SkData::NewFromFileName(file_path);
+    if (!data) {
         SkDebugf("WARNING: could not open file <%s> for reading\n", file_path);
-        return NULL;
     }
-    size_t bytesInFile = fileStream.getLength();
-    size_t bytesLeftToRead = bytesInFile;
-
-    void* bufferStart = sk_malloc_throw(bytesInFile);
-    char* bufferPointer = (char*)bufferStart;
-    while (bytesLeftToRead > 0) {
-        size_t bytesReadThisTime = fileStream.read(bufferPointer, bytesLeftToRead);
-        if (0 == bytesReadThisTime) {
-            SkDebugf("WARNING: error reading from <%s>\n", file_path);
-            sk_free(bufferStart);
-            return NULL;
-        }
-        bytesLeftToRead -= bytesReadThisTime;
-        bufferPointer += bytesReadThisTime;
-    }
-    return SkData::NewFromMalloc(bufferStart, bytesInFile);
+    return data;
 }
 
 bool get_bitmap(SkData* fileBits, DiffResource& resource, SkImageDecoder::Mode mode) {
     SkMemoryStream stream(fileBits->data(), fileBits->size());
 
     SkImageDecoder* codec = SkImageDecoder::Factory(&stream);
     if (NULL == codec) {
         SkDebugf("ERROR: no codec found for <%s>\n", resource.fFullPath.c_str());
         resource.fStatus = DiffResource::kCouldNotDecode_Status;
         return false;
@@ skipping 116 matching lines @@
                 drp->fDifference.fStatus = DiffResource::kDoesNotExist_Status;
             }
             if (write_bitmap(drp->fWhite.fFullPath, drp->fWhite.fBitmap)) {
                 drp->fWhite.fStatus = DiffResource::kExists_Status;
             } else {
                 drp->fWhite.fStatus = DiffResource::kDoesNotExist_Status;
             }
         }
     }
 }