expose bitmap in js.

core/cross/pack.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 117 matching lines @@
     return NULL;
   }
 
   String filename = FilePathToUTF8(filepath);
 
   DLOG(INFO) << "CreateTextureFromFile(uri='" << uri
              << "', filename='" << filename << "')";
 
   // TODO: Add support for volume texture when we have code to load
   //                  them
-  Bitmap bitmap;
-  if (!bitmap.LoadFromFile(filepath, file_type, generate_mipmaps)) {
+  Bitmap::Ref bitmap(new Bitmap(service_locator()));
+  if (!bitmap->LoadFromFile(filepath, file_type, generate_mipmaps)) {
     O3D_ERROR(service_locator())
         << "Failed to load bitmap file \"" << uri << "\"";
     return NULL;
   }
 
-  return CreateTextureFromBitmap(&bitmap, uri);
+  return CreateTextureFromBitmap(bitmap, uri);
 }
 
 // Creates a Texture object from a file in the current render context format.
 // This version takes a String |filename| argument instead of the preferred
 // FilePath argument.  The use of this method should be phased out
 Texture* Pack::CreateTextureFromFile(const String& uri,
                                      const String& filename,
                                      Bitmap::ImageFileType file_type,
                                      bool generate_mipmaps) {
   FilePath filepath = UTF8ToFilePath(filename);
@@ skipping 35 matching lines @@
   } else {
     O3D_ERROR(service_locator())
         << "Unable to create texture (uri='" << uri
         << "', size="  << bitmap->width() << "x" << bitmap->height()
         << ", mips=" << bitmap->num_mipmaps()<< ")";
   }
 
   return texture.Get();
 }
 
-
 // Creates a Texture object from RawData and allocates
 // the necessary resources for it.
 Texture* Pack::CreateTextureFromRawData(RawData *raw_data,
                                         bool generate_mips) {
   if (!renderer_) {
     O3D_ERROR(service_locator()) << "No Render Device Available";
     return NULL;
   }
 
   const String uri = raw_data->uri();
 
   DLOG(INFO) << "CreateTextureFromRawData(uri='" << uri << "')";
 
 
-  Bitmap bitmap;
-  if (!bitmap.LoadFromRawData(raw_data, Bitmap::UNKNOWN, generate_mips)) {
+  Bitmap::Ref bitmap(new Bitmap(service_locator()));
+  if (!bitmap->LoadFromRawData(raw_data, Bitmap::UNKNOWN, generate_mips)) {
     O3D_ERROR(service_locator())
         << "Failed to load bitmap from raw data \"" << uri << "\"";
     return NULL;
   }
 
-  return CreateTextureFromBitmap(&bitmap, uri);
+  return CreateTextureFromBitmap(bitmap, uri);
+}
+
+// Create a bitmap object.
+Bitmap* Pack::CreateBitmap(int width, int height,
+                           Texture::Format format) {
+  DCHECK(Bitmap::CheckImageDimensions(width, height));
+
+  Bitmap::Ref bitmap(new Bitmap(service_locator()));
+  if (bitmap.IsNull()) {
+    O3D_ERROR(service_locator())
+        << "Failed to create bitmap object.";
+    return NULL;
+  }
+  bitmap->Allocate(format, width, height, 1, false);
+  if (!bitmap->image_data()) {
+    O3D_ERROR(service_locator())
+        << "Failed to allocate memory for bitmap.";
+    return NULL;
+  }
+  RegisterObject(bitmap);
+  return bitmap.Get();
+}
+
+// Create a new bitmap object from rawdata.
+Bitmap* Pack::CreateBitmapFromRawData(RawData* raw_data) {
+  Bitmap::Ref bitmap(new Bitmap(service_locator()));
+  if (bitmap.IsNull()) {
+    O3D_ERROR(service_locator())
+        << "Failed to create bitmap object.";
+    return NULL;
+  }
+  if (!bitmap->LoadFromRawData(raw_data, Bitmap::UNKNOWN,
+                               false)) {
+    O3D_ERROR(service_locator())
+        << "Failed to load bitmap from raw data.";
+    return NULL;
+  }
+  RegisterObject(bitmap);
+  return bitmap.Get();
 }
 
 // Creates a Texture2D object and allocates the necessary resources for it.
 Texture2D* Pack::CreateTexture2D(int width,
                                  int height,
                                  Texture::Format format,
                                  int levels,
                                  bool enable_render_surfaces) {
   if (!renderer_) {
     O3D_ERROR(service_locator()) << "No Render Device Available";
@@ skipping 154 matching lines @@
 
 bool Pack::UnregisterObject(ObjectBase *object) {
   ObjectSet::iterator find(owned_objects_.find(ObjectBase::Ref(object)));
   if (find == owned_objects_.end())
     return false;
 
   owned_objects_.erase(find);
   return true;
 }
 }  // namespace o3d