tga methods now take filename instead of FILE *

include/utils/tga.h

@@ -10,33 +10,33 @@
 
 /*!
  * \brief Check if a file is a valid TGA image
- * \param f file to be checked
+ * \param filename path to file
  * \returns 0 if valid, else error condition
  */
-int tgaCheck(FILE *f);
+int tgaCheck(const char *filename);
 
 /*!
  * \brief Load a TGA image from file
- * \param f valid image file
+ * \param filename path to file
  * \param image Where the pixmap will be stored (or NULL)
  * \param width where the width will be stored
  * \param height where the height will be stored
  * \param type where the type will be stored (tga_type_t)
  * \returns 0 on success, else error condition
  */
-int tgaLoad(FILE *f, unsigned char **image,
+int tgaLoad(const char *filename, unsigned char **image,
                 unsigned int *width, unsigned int *height, char *type);
 
 /*!
  * \brief Save a pixel buffer into a file on disk
- * \param f file in which image will be saved
+ * \param filename path to file
  * \param image pixmap to be stored
  * \param width width of pixmap/image
  * \param height height of pixmap/image
  * \param type tga type to use
  * \returns 0 on success, else error condition
  */
-int tgaSave(FILE *f, unsigned char *image,
+int tgaSave(const char *filename, unsigned char *image,
                 unsigned int width, unsigned int height, char type);
 
 #endif

src/Render.cpp

@@ -65,11 +65,8 @@ void Render::screenShot(char *filenameBase)
     // Capture frame buffer
     glReadPixels(0, 0, getWindow().getWidth(), getWindow().getHeight(), GL_BGR_EXT, GL_UNSIGNED_BYTE, image);
 
-    FILE *f = fopen(filename, "wb");
-    if (f) {
-        tgaSave(f, image, getWindow().getWidth(), getWindow().getHeight(), 0);
-        printf("Took screenshot '%s'.\n", filename);
-    }
+    tgaSave(filename, image, getWindow().getWidth(), getWindow().getHeight(), 0);
+    printf("Took screenshot '%s'.\n", filename);
 
     delete [] filename;
     delete [] image;

src/TextureManager.cpp

@@ -301,7 +301,6 @@ int TextureManager::loadPCX(const char *filename) {
 }
 
 int TextureManager::loadTGA(const char *filename) {
-    FILE *f;
     unsigned char *image = NULL;
     unsigned char *image2 = NULL;
     unsigned int w, h;
@@ -311,12 +310,8 @@ int TextureManager::loadTGA(const char *filename) {
     assert(filename != NULL);
     assert(filename[0] != '\0');
 
-    f = fopen(filename, "rb");
-
-    if (!f) {
-        perror("Couldn't load file");
-    } else if (!tgaCheck(f)) {
-        tgaLoad(f, &image, &w, &h, &type);
+    if (!tgaCheck(filename)) {
+        tgaLoad(filename, &image, &w, &h, &type);
 
         image2 = scaleBuffer(image, &w, &h, (type == 2) ? 32 : 24);
 
@@ -332,8 +327,6 @@ int TextureManager::loadTGA(const char *filename) {
 
             delete [] image;
         }
-
-        fclose(f);
     }
 
     if (id == -1) {

src/utils/tga.cpp

@@ -39,10 +39,17 @@ typedef struct {
     unsigned char desc_flags;       //!< Various magic bits
 } tga_t;
 
-int tgaCheck(FILE *f) {
+int tgaCheck(const char *filename) {
     char buffer[10];
 
-    assert(f != NULL);
+    assert(filename != NULL);
+    assert(filename[0] != '\0');
+
+    FILE *f = fopen(filename, "rb");
+    if (!f) {
+        printf("tgaCheck> File not found\n");
+        return -1;
+    }
 
     /* Read the header */
     fseek(f, 0, SEEK_SET);
@@ -53,12 +60,15 @@ int tgaCheck(FILE *f) {
                     //buffer[2] == TGA_TYPE__GREYSCALE ||
                     buffer[2] == TGA_TYPE__COLOR_RLE))) {
         printf("tgaCheck> Inavlid or unknown TGA format.\n");
+        fclose(f);
         return -2;
     }
+
+    fclose(f);
     return 0;
 }
 
-int tgaLoad(FILE *f, unsigned char **image, unsigned int *width, unsigned int *height, char *type) {
+int tgaLoad(const char *filename, unsigned char **image, unsigned int *width, unsigned int *height, char *type) {
     tga_t header;
     char comment[256];
     unsigned char pixel[4];
@@ -68,12 +78,19 @@ int tgaLoad(FILE *f, unsigned char **image, unsigned int *width, unsigned int *h
     unsigned int size;
     unsigned int i, j;
 
-    assert(f != NULL);
+    assert(filename != NULL);
+    assert(filename[0] != '\0');
     assert(image != NULL);
     assert(width != NULL);
     assert(height != NULL);
     assert(type != NULL);
 
+    FILE *f = fopen(filename, "rb");
+    if (!f) {
+        printf("tgaLoad> File not found\n");
+        return -1;
+    }
+
     fseek(f, 0, SEEK_SET);
 
     // Read TGA header
@@ -146,6 +163,7 @@ int tgaLoad(FILE *f, unsigned char **image, unsigned int *width, unsigned int *h
 
     if (!size || (!(header.colormap_type == 0 && (header.image_type == 2 || header.image_type == 10)))) {
         fprintf(stderr, "tgaLoad> Unknown image format.\n");
+        fclose(f);
         return -2;
     }
 
@@ -187,6 +205,7 @@ int tgaLoad(FILE *f, unsigned char **image, unsigned int *width, unsigned int *h
                     if (fread((*image), size, 1, f) < 1) {
                         fprintf(stderr, "tgaLoad> Image fread failed.\n");
                         delete [] *image;
+                        fclose(f);
                         return -4;
                     }
                     for (i = 0; i < size; i += 4) {
@@ -239,6 +258,7 @@ int tgaLoad(FILE *f, unsigned char **image, unsigned int *width, unsigned int *h
                     if (fread((*image), size, 1, f) < 1) {
                         fprintf(stderr, "tgaLoad> Image fread failed.\n");
                         delete [] *image;
+                        fclose(f);
                         return -4;
                     }
                     for (i = 0; i < size; i += 3) {
@@ -277,21 +297,29 @@ int tgaLoad(FILE *f, unsigned char **image, unsigned int *width, unsigned int *h
     printf("\n");
 #endif
 
+    fclose(f);
     return 0;
 }
 
-int tgaSave(FILE *f, unsigned char *image, unsigned int width, unsigned int height, char type) {
+int tgaSave(const char *filename, unsigned char *image, unsigned int width, unsigned int height, char type) {
     tga_t header;
     unsigned int size;
     char comment[64];
     //unsigned int i;
     //unsigned char tmp;
 
-    assert(f != NULL);
+    assert(filename != NULL);
+    assert(filename[0] != '\0');
     assert(image != NULL);
     assert(width > 0);
     assert(height > 0);
 
+    FILE *f = fopen(filename, "wb");
+    if (!f) {
+        printf("tgaSave> File not found\n");
+        return -1;
+    }
+
     strncpy(comment, "OpenRaider TGA", 63);
     comment[63] = 0;
 
@@ -374,8 +402,11 @@ int tgaSave(FILE *f, unsigned char *image, unsigned int width, unsigned int heig
     // Write image data
     if (fwrite(image, size, 1, f) < 1) {
         perror("tgaSave> Disk write failed.\n");
+        fclose(f);
         return -2;
     }
+
+    fclose(f);
     return 0;
 }