Documented PCX reader

include/utils/pcx.h

@@ -11,7 +11,14 @@
 #ifndef _UTILS_PCX_H_
 #define _UTILS_PCX_H_
 
-// Returns 0 on success
+/*!
+ * \brief Load a PCX image file into a RGBA buffer
+ * \param filename path of file to read
+ * \param image place where allocated buffer of size (width * height * 4) will be allocated
+ * \param width place where image width will be stored
+ * \param height place where image height will be stored
+ * \returns 0 on success
+ */
 int pcxLoad(const char *filename, unsigned char **image, unsigned int *width, unsigned int *height);
 
 #endif

src/utils/pcx.cpp

@@ -154,9 +154,9 @@ int pcxLoad(const char *filename, unsigned char **image, unsigned int *width, un
                 } else {
                     pcxPrint("Unsupported number of planes (%d)", nPlanes);
                     delete [] buffer;
+                    delete [] palette;
                     delete [] *image;
-                    if (palette != NULL)
-                        delete [] palette;
+                    *image = NULL;
                     return -10;
                 }
             } else {
@@ -171,9 +171,9 @@ int pcxLoad(const char *filename, unsigned char **image, unsigned int *width, un
                 } else {
                     pcxPrint("Unsupported number of planes (%d)", nPlanes);
                     delete [] buffer;
+                    delete [] palette;
                     delete [] *image;
-                    if (palette != NULL)
-                        delete [] palette;
+                    *image = NULL;
                     return -11;
                 }
             }
@@ -186,9 +186,7 @@ int pcxLoad(const char *filename, unsigned char **image, unsigned int *width, un
     }
 
     delete [] buffer;
-
-    if (palette != NULL)
-        delete [] palette;
+    delete [] palette;
 
     return 0;
 }