Fixed some warnings in bitmap_png.cc

Switched to using the latest nacl and using their gyp files.
Added a copy/rename step so that o3dConverter gets the dll
it needs for other build steps.

BUG=None
TEST=None
TBR=gspencer

Review URL: http://codereview.chromium.org/164238

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22891 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 23 insertions, 5 deletions

diff --git a/o3d/DEPS_gyp b/o3d/DEPS_gyp
index 55c3708..5bb03b2 100644
--- a/o3d/DEPS_gyp
+++ b/o3d/DEPS_gyp
@@ -89,8 +89,8 @@ deps = {
 
   # NACL has to be in this weird directory because it looks for
   # googleclient two levels above it.
-  "third_party/native_client/googleclient/native_client":
-    "http://nativeclient.googlecode.com/svn/trunk/nacl/googleclient/native_client@188",
+  "native_client":
+    "http://nativeclient.googlecode.com/svn/trunk/src/native_client@492",
 
   "breakpad/src":
     "http://google-breakpad.googlecode.com/svn/trunk/src@" + Var("breakpad_rev"),
diff --git a/o3d/converter/converter.gyp b/o3d/converter/converter.gyp
index dfd85b0..6535778 100644
--- a/o3d/converter/converter.gyp
+++ b/o3d/converter/converter.gyp
@@ -73,6 +73,23 @@
         ],
         ['OS == "win"',
           {
+            'actions': [
+              {
+                'action_name': 'd3dx9_36_dll_copy',
+                'inputs': [
+                  '$(DXSDK_DIR)/runtime/x86/d3dx9d_36.dll',
+                ],
+                'outputs': [
+                  '<(PRODUCT_DIR)/d3dx9_36.dll',
+                ],
+                'action': [
+                  'cp',
+                  '-f',
+                  '<@(_inputs)',
+                  '<@(_outputs)',
+                ],
+              },
+            ],
             'msvs_settings': {
               'VCLinkerTool': {
                 'AdditionalDependencies': [
diff --git a/o3d/core/cross/bitmap_png.cc b/o3d/core/cross/bitmap_png.cc
index 047f585..843bd83 100644
--- a/o3d/core/cross/bitmap_png.cc
+++ b/o3d/core/cross/bitmap_png.cc
@@ -304,7 +304,7 @@ bool CreatePNGInUInt8Vector(const Bitmap& bitmap, std::vector<uint8>* buffer) {
   unsigned width = bitmap.width();
   unsigned height = bitmap.height();
   scoped_array<png_bytep> row_pointers(new png_bytep[height]);
-  for (int i = 0; i < height; ++i) {
+  for (unsigned int i = 0; i < height; ++i) {
     row_pointers[height - 1 - i] = bitmap.GetMipData(0) + i * width * 4;
   }
 
@@ -326,6 +326,7 @@ bool CreatePNGInUInt8Vector(const Bitmap& bitmap, std::vector<uint8>* buffer) {
   png_write_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, png_voidp_NULL);
 
   png_destroy_write_struct(&png_ptr, &info_ptr);
+  return true;
 }
 
 }  // anonymous namespace
diff --git a/o3d/plugin/plugin.gyp b/o3d/plugin/plugin.gyp
index abf00b8..e0065ae 100644
--- a/o3d/plugin/plugin.gyp
+++ b/o3d/plugin/plugin.gyp
@@ -38,7 +38,7 @@
         '../import/archive.gyp:o3dArchive',
         '../serializer/serializer.gyp:o3dSerializer',
         '../utils/utils.gyp:o3dUtils',
-        '../build/nacl.gyp:build_nacl',
+        '../../native_client/src/shared/imc/imc.gyp:google_nacl_imc',
         'idl/idl.gyp:o3dPluginIdl',
       ],
       'sources': [
diff --git a/o3d/tests/tests.gyp b/o3d/tests/tests.gyp
index 6557b0e..34a6d30 100644
--- a/o3d/tests/tests.gyp
+++ b/o3d/tests/tests.gyp
@@ -28,7 +28,7 @@
         '../../base/base.gyp:base',
         '../../skia/skia.gyp:skia',
         '../../testing/gtest.gyp:gtest',
-        '../build/nacl.gyp:build_nacl',
+        '../../native_client/src/shared/imc/imc.gyp:google_nacl_imc',
         '../compiler/technique/technique.gyp:o3dTechnique',
         '../compiler/technique/technique.gyp:o3dTechniqueTest',
         '../core/core.gyp:o3dCore',