Removed duplicated TGA writing code

ChangeLog

@@ -7,6 +7,7 @@
 
 	[ 20140307 ]
 	* Removed duplicated GL initialization code
+	* Removed duplicated TGA writing code from Texture
 
 	[ 20140306 ]
 	* Created utility library

include/utils/tga.h

@@ -46,7 +46,7 @@ typedef struct {
  * \param f file to be checked
  * \returns 0 if valid, else error condition
  */
-int tga_check(FILE *f);
+int tgaCheck(FILE *f);
 
 /*!
  * \brief Load a TGA image from file
@@ -57,7 +57,7 @@ int tga_check(FILE *f);
  * \param type where the type will be stored (tga_type_t)
  * \returns 0 on success, else error condition
  */
-int tga_load(FILE *f, unsigned char **image,
+int tgaLoad(FILE *f, unsigned char **image,
                 unsigned int *width, unsigned int *height, char *type);
 
 /*!
@@ -66,10 +66,10 @@ int tga_load(FILE *f, unsigned char **image,
  * \param image pixmap to be stored
  * \param width width of pixmap/image
  * \param height height of pixmap/image
- * \param type tga_type_t to use
+ * \param type tga type to use
  * \returns 0 on success, else error condition
  */
-int tga_save(FILE *f, unsigned char *image,
+int tgaSave(FILE *f, unsigned char *image,
                 unsigned int width, unsigned int height, char type);
 
 /*!
@@ -77,13 +77,13 @@ int tga_save(FILE *f, unsigned char *image,
  * \param image pixmap to be stored
  * \param width width of pixmap/image
  * \param height height of pixmap/image
- * \param type tga_type_t to use
+ * \param type tga type to use
  * \param s format string for file path/name
  * \returns 0 on success, else error condition
  */
-int tga_save_filename(unsigned char *image,
+int tgaSaveFilename(unsigned char *image,
                         unsigned int width, unsigned int height,
-                        char type, char *s, ...)
+                        char type, const char *s, ...)
     __attribute__((format(printf, 5, 6)));
 
 #endif

src/OpenRaider.cpp

@@ -3218,7 +3218,7 @@ void OpenRaider::consoleCommand(char *cmd)
         m_render.screenShot(sfilename);
         delete [] tmp;
         delete [] sfilename;
-        print(true, "Took screenshot");
+        print(false, "Took screenshot");
     }
     else if (rc_command("fullscreen", cmd))
     {

src/Texture.cpp

@@ -232,16 +232,7 @@ int Texture::loadFontTTF(const char *filename,
     if (texture)
     {
 #ifdef DUMP_TTF_TGA
-        FILE *f = fopen("ttf_font.tga", "wb");
-        if (f)
-        {
-            tga_save(f, texture->texture, 256, 256, 4);
-            fclose(f);
-        }
-        else
-        {
-            perror("ttf_font.tga");
-        }
+        tgaSaveFilename(texture->texture, 256, 256, 4, "ttf_font.tga");
 #endif
 
         gFontTest = generateFont(texture);
@@ -792,37 +783,17 @@ void Texture::bindTextureId(unsigned int n)
 }
 
 
-void Texture::glScreenShot(char *base, unsigned int width, unsigned int height)
-{
+void Texture::glScreenShot(char *base, unsigned int width, unsigned int height) {
     FILE *f;
-    int sz = width*height;
-    unsigned char *image = new unsigned char[sz*3];
-    unsigned char *swap_row = new unsigned char[width*3];
+    int sz = width * height;
+    unsigned char *image = new unsigned char[sz * 3];
     char filename[1024];
     static int count = 0;
     bool done = false;
-    int i, j, size;
-    unsigned char comment_lenght;
-    unsigned char colormap_type;
-    unsigned char image_type;
-    unsigned short colormap_index;
-    unsigned short colormap_lenght;
-    unsigned char colormap_bbp;
-    unsigned short origin_x;
-    unsigned short origin_y;
-    unsigned short swidth;
-    unsigned short sheight;
-    char comment[32] = "Mongoose TGA 0.0.1\0";
-    unsigned char tmp, bpp, desc_flags;
-
 
-    if (!image || !width || !height)
-    {
+    if (!image || !width || !height) {
         if (image)
-        {
             delete [] image;
-        }
-        delete [] swap_row;
 
         printf("glScreenShot> ERROR: Couldn't allocate image!\n");
         return;
@@ -841,82 +812,13 @@ void Texture::glScreenShot(char *base, unsigned int width, unsigned int height)
             done = true;
     }
 
-    f = fopen(filename, "wb");
-
-    if (!f)
-    {
-        printf("glScreenShot> ERROR: Couldn't write screenshot.\n");
-        perror("glScreenShot> ERROR: ");
-        delete [] image;
-        delete [] swap_row;
-        return;
-    }
-
     // Capture frame buffer
-    glReadPixels(0, 0, width, height, GL_RGB, GL_UNSIGNED_BYTE, image);
-
-    // Flip vertical
-    for (i = 0, j = (int)height-1; i < (int)height/2; ++i, --j)
-    {
-        memcpy(swap_row, &image[i*width*3], width*3);
-        memcpy(&image[i*width*3], &image[j*width*3], width*3);
-        memcpy(&image[j*width*3], swap_row, width*3);
-    }
+    glReadPixels(0, 0, width, height, GL_BGR, GL_UNSIGNED_BYTE, image);
 
-    delete [] swap_row;
-
-    comment_lenght = (unsigned char)strlen(comment);
-    colormap_type = 0;
-    image_type = 2;
-    colormap_index = 0;
-    colormap_lenght = 0;
-    colormap_bbp = 0;
-    origin_x = origin_y = 0;
-    swidth = (unsigned short)width;
-    sheight = (unsigned short)height;
-    bpp = 24;
-    desc_flags = 32;
-
-    // Write TGA header
-    fwrite(&comment_lenght, 1, 1, f);
-    fwrite(&colormap_type, 1, 1, f);
-    fwrite(&image_type, 1, 1, f);
-    fwrite(&colormap_index, 2, 1, f);
-    fwrite(&colormap_lenght, 2, 1, f);
-    fwrite(&colormap_bbp, 1, 1, f);
-    fwrite(&origin_x, 2, 1, f);
-    fwrite(&origin_y, 2, 1, f);
-    fwrite(&swidth, 2, 1, f);
-    fwrite(&sheight, 2, 1, f);
-    fwrite(&bpp, 1, 1, f);
-    fwrite(&desc_flags, 1, 1, f);
-
-    // Write comment
-    fwrite(&comment, 1, comment_lenght, f);
-
-    size = width * height * 3;
-
-    for (i = 0; i < size; i += 3)
-    {
-        tmp = image[i];
-        image[i] = image[i + 2];
-        image[i + 2] = tmp;
-    }
-
-    // Write image data
-    if (fwrite(image, size, 1, f) < 1)
-    {
-        perror("glScreenShot> Disk write failed.\n");
-        fclose(f);
-        delete [] image;
-        return;
-    }
-
-    fclose(f);
+    tgaSaveFilename(image, width, height, 0, "%s", filename);
+    printf("Took screenshot '%s'.\n", filename);
 
     delete [] image;
-
-    printf("Took screenshot '%s'.\n", filename);
 }
 
 
@@ -936,9 +838,9 @@ int Texture::loadTGA(const char *filename)
     {
         perror("Couldn't load file");
     }
-    else if (!tga_check(f))
+    else if (!tgaCheck(f))
     {
-        tga_load(f, &image, &w, &h, &type);
+        tgaLoad(f, &image, &w, &h, &type);
 
         type += 2;
 

src/utils/tga.cpp

@@ -14,11 +14,11 @@
 
 #include "utils/tga.h"
 
-int tga_check(FILE *f) {
+int tgaCheck(FILE *f) {
     char buffer[10];
 
     if (!f) {
-        perror("tga_check> Passed invalid file.\n");
+        perror("tgaCheck> Passed invalid file.\n");
         return -1;
     }
 
@@ -30,13 +30,13 @@ int tga_check(FILE *f) {
     if (!(buffer[1] == 0 && (buffer[2] == TGA_TYPE__COLOR ||
                     //buffer[2] == TGA_TYPE__GREYSCALE ||
                     buffer[2] == TGA_TYPE__COLOR_RLE))) {
-        printf("tga_check> Inavlid or unknown TGA format.\n");
+        printf("tgaCheck> Inavlid or unknown TGA format.\n");
         return -2;
     }
     return 0;
 }
 
-int tga_load(FILE *f, unsigned char **image, unsigned int *width, unsigned int *height, char *type) {
+int tgaLoad(FILE *f, unsigned char **image, unsigned int *width, unsigned int *height, char *type) {
     tga_t header;
     char comment[256];
     unsigned char pixel[4];
@@ -47,7 +47,7 @@ int tga_load(FILE *f, unsigned char **image, unsigned int *width, unsigned int *
     unsigned int i, j;
 
     if (!f) {
-        fprintf(stderr, "tga_load> Invalid parameters.\n");
+        fprintf(stderr, "tgaLoad> Invalid parameters.\n");
         return -1;
     }
 
@@ -122,7 +122,7 @@ int tga_load(FILE *f, unsigned char **image, unsigned int *width, unsigned int *
     size = header.width * header.height;
 
     if (!size || (!(header.colormap_type == 0 && (header.image_type == 2 || header.image_type == 10)))) {
-        fprintf(stderr, "tga_load> Unknown image format.\n");
+        fprintf(stderr, "tgaLoad> Unknown image format.\n");
         return -2;
     }
 
@@ -162,7 +162,7 @@ int tga_load(FILE *f, unsigned char **image, unsigned int *width, unsigned int *
                     break;
                 case TGA_TYPE__COLOR:
                     if (fread((*image), size, 1, f) < 1) {
-                        fprintf(stderr, "tga_load> Image fread failed.\n");
+                        fprintf(stderr, "tgaLoad> Image fread failed.\n");
                         delete [] *image;
                         return -4;
                     }
@@ -214,7 +214,7 @@ int tga_load(FILE *f, unsigned char **image, unsigned int *width, unsigned int *
                     break;
                 case TGA_TYPE__COLOR:
                     if (fread((*image), size, 1, f) < 1) {
-                        fprintf(stderr, "tga_load> Image fread failed.\n");
+                        fprintf(stderr, "tgaLoad> Image fread failed.\n");
                         delete [] *image;
                         return -4;
                     }
@@ -239,7 +239,7 @@ int tga_load(FILE *f, unsigned char **image, unsigned int *width, unsigned int *
             }
             break;
         case 8:
-            printf("tga_load> 8bpp Not implemented\n");
+            printf("tgaLoad> 8bpp Not implemented\n");
             break;
         default:
             ;
@@ -257,7 +257,7 @@ int tga_load(FILE *f, unsigned char **image, unsigned int *width, unsigned int *
     return 0;
 }
 
-int tga_save(FILE *f, unsigned char *image, unsigned int width, unsigned int height, char type) {
+int tgaSave(FILE *f, unsigned char *image, unsigned int width, unsigned int height, char type) {
     tga_t header;
     unsigned int size;
     char comment[64];
@@ -265,7 +265,7 @@ int tga_save(FILE *f, unsigned char *image, unsigned int width, unsigned int hei
     //unsigned char tmp;
 
     if (!f || !image || !width || !height) {
-        fprintf(stderr, "tga_save> Invalid parameters.\n");
+        fprintf(stderr, "tgaSave> Invalid parameters.\n");
         return -1;
     }
 
@@ -350,13 +350,13 @@ int tga_save(FILE *f, unsigned char *image, unsigned int width, unsigned int hei
 
     // Write image data
     if (fwrite(image, size, 1, f) < 1) {
-        perror("tga_save> Disk write failed.\n");
+        perror("tgaSave> Disk write failed.\n");
         return -2;
     }
     return 0;
 }
 
-int tga_save_filename(unsigned char *image, unsigned int width, unsigned int height, char type, char *s, ...) {
+int tgaSaveFilename(unsigned char *image, unsigned int width, unsigned int height, char type, const char *s, ...) {
     char buffer[1024];
     FILE *f;
     int v;
@@ -369,7 +369,7 @@ int tga_save_filename(unsigned char *image, unsigned int width, unsigned int hei
         perror(buffer);
         return -1;
     }
-    v = tga_save(f, image, width, height, type);
+    v = tgaSave(f, image, width, height, type);
     fclose(f);
     return v;
 }