Add RawData request in preparation for manual loading of...

core/cross/bitmap.cc

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 201 matching lines @@
   DLOG(ERROR) << "Failed to load image \"" << filename
               << "\": unknown file type";
   return false;
 }
 
 // Given an arbitrary bitmap file, load it all into memory and then call our
 // stream loader
 bool Bitmap::LoadFromFile(const FilePath &filepath,
                           ImageFileType file_type,
                           bool generate_mipmaps) {
-  // Open the file
+  // Open the file.
+  bool result = false;
   String filename = FilePathToUTF8(filepath);
   FILE *file = OpenFile(filepath, "rb");
 
   if (!file) {
     DLOG(ERROR) << "bitmap file not found \"" << filename << "\"";
-    return false;
+  } else {
+    // Determine the file's length
+    int64 file_size64;
+    if (!GetFileSize(filepath, &file_size64)) {
+      DLOG(ERROR) << "error getting bitmap file size \"" << filename << "\"";
+    } else {
+      if (file_size64 > 0xffffffffLL) {
+        DLOG(ERROR) << "bitmap file is too large \"" << filename << "\"";
+      } else {
+        size_t file_length = static_cast<size_t>(file_size64);
+
+        // Load the compressed image data into memory
+        MemoryBuffer<uint8> file_contents(file_length);
+        uint8 *p = file_contents;
+        if (fread(p, file_length, 1, file) != 1) {
+          DLOG(ERROR) << "error reading bitmap file \"" << filename << "\"";
+        } else {
+          // And create the bitmap from a memory stream
+          MemoryReadStream stream(file_contents, file_length);
+          result = LoadFromStream(&stream, filename, file_type,
+                                  generate_mipmaps);
+        }
+      }
+    }
+    CloseFile(file);
   }
 
-  // Determine the file's length
-  int64 file_size64;
-  if (!GetFileSize(filepath, &file_size64)) {
-    DLOG(ERROR) << "error getting bitmap file size \"" << filename << "\"";
-    CloseFile(file);
-    return false;
-  }
-  if (file_size64 > 0xffffffffLL) {
-    DLOG(ERROR) << "bitmap file is too large \"" << filename << "\"";
-    return false;
-  }
-  size_t file_length = static_cast<size_t>(file_size64);
-
-  // Load the compressed image data into memory
-  MemoryBuffer<uint8> file_contents(file_length);
-  uint8 *p = file_contents;
-  if (fread(p, file_length, 1, file) != 1) {
-    DLOG(ERROR) << "error reading bitmap file \"" << filename << "\"";
-    return false;
-  }
-
-  // And create the bitmap from a memory stream
-  MemoryReadStream stream(file_contents, file_length);
-  bool result = LoadFromStream(&stream, filename, file_type, generate_mipmaps);
-  CloseFile(file);
-
   return result;
 }
 
 // Given a RawData object containing image data in one of our known formats,
 // decide which image format it is and call the correct loading function.
 bool Bitmap::LoadFromRawData(RawData *raw_data,
                              ImageFileType file_type,
                              bool generate_mipmaps) {
   String filename = raw_data->uri();
 
@@ skipping 700 matching lines @@
       return false;
   }
   return true;
 }
 
 ObjectBase::Ref Bitmap::Create(ServiceLocator* service_locator) {
   return ObjectBase::Ref(new Bitmap(service_locator));
 }
 
 }  // namespace o3d