Changeset 2512Tweet

Timestamp:

Feb 26, 2013, 7:18:11 PM (10 years ago)

Author:

sam

Message:

ps3: fix a bug and add better error reporting in the image loader.

File:

• trunk/src/image/codec/ps3-image.cpp (modified) (9 diffs)

trunk/src/image/codec/ps3-image.cpp

@@ -58 +58 @@
     if (err != CELL_OK)
     {
-#if !LOL_RELEASE
-        Log::Error("could not open Fs sysmodule\n");
-#endif
+        Log::Error("could not open Fs sysmodule (0x%08x)\n", err);
         return false;
     }
@@ -67 +65 @@
     if (err != CELL_OK)
     {
-#if !LOL_RELEASE
-        Log::Error("could not open PngDec sysmodule\n");
-#endif
+        Log::Error("could not open PngDec sysmodule (0x%08x)\n", err);
         return false;
     }
@@ -85 +81 @@
     if (err != CELL_OK)
     {
-#if !LOL_RELEASE
-        Log::Error("could not create PngDec library\n");
-#endif
+        Log::Error("could not create PngDec library (0x%08x)\n", err);
         return false;
     }
@@ -105 +99 @@
     for (int i = 0; i < pathlist.Count(); ++i)
     {
-        dec_src.fileName = (String("/app_home") + pathlist[i]).C();
+        String name = String("/app_home/") + pathlist[i];
+        dec_src.fileName = name.C();
         err = cellPngDecOpen(hmain, &hsub, &dec_src, &open_info);
         if (err == CELL_OK)
             break;
+        cellPngDecClose(hmain, hsub);
     }
 
     if (err != CELL_OK)
     {
-#if !LOL_RELEASE
-        Log::Error("could not open %s for decoding\n", path);
-#endif
+        Log::Error("could not open %s for decoding (0x%08x)\n", path, err);
         return false;
     }
@@ -123 +117 @@
     if (err != CELL_OK)
     {
-#if !LOL_RELEASE
-        Log::Error("could not read image header in %s\n", path);
-#endif
+        Log::Error("could not read image header in %s (0x%08x)\n", path, err);
         return false;
     }
@@ -141 +133 @@
     if (err != CELL_OK)
     {
-#if !LOL_RELEASE
-        Log::Error("could not configure PngDec decoder\n");
-#endif
+        Log::Error("could not configure PngDec decoder (0x%08x)\n", err);
         return false;
     }
@@ -158 +148 @@
     if (err != CELL_OK)
     {
-#if !LOL_RELEASE
-        Log::Error("could not run PngDec decoder on %s\n", path);
-#endif
+        Log::Error("could not run PngDec decoder on %s (0x%08x)\n", path, err);
         return false;
     }
@@ -168 +156 @@
     if (err != CELL_OK)
     {
-#if !LOL_RELEASE
-        Log::Error("could not close PngDec decoder\n");
-#endif
+        Log::Error("could not close PngDec decoder (0x%08x)\n", err);
         return false;
     }
@@ -178 +164 @@
     if (err != CELL_OK)
     {
-#if !LOL_RELEASE
-        Log::Error("could not destroy PngDec decoder\n");
-#endif
+        Log::Error("could not destroy PngDec decoder (0x%08x)\n", err);
         return false;
     }