X-Git-Url: https://git.jsancho.org/?p=lugaru.git;a=blobdiff_plain;f=Source%2FUtils%2FImageIO.cpp;h=c19a63e5f6e65878b15b95e54477787a11196c26;hp=778492c93fef8f3033e97d184a5f7ebdef7137d3;hb=bb543993bb6f1eb76519a395d9a0a10ee777d160;hpb=ed3662c0852c4312a612b4fc35bd03aba8d13db7

diff --git a/Source/Utils/ImageIO.cpp b/Source/Utils/ImageIO.cpp
index 778492c..c19a63e 100644
--- a/Source/Utils/ImageIO.cpp
+++ b/Source/Utils/ImageIO.cpp
@@ -1,6 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
-Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
+Copyright (C) 2010-2017 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
@@ -28,19 +28,17 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdio.h>
 #include <zlib.h>
 
-extern bool visibleloading;
-
 /* These two are needed for screenshot */
 extern int kContextWidth;
 extern int kContextHeight;
 
-static bool load_png(const char * fname, ImageRec & tex);
-static bool load_jpg(const char * fname, ImageRec & tex);
-static bool save_screenshot_png(const char * fname);
+static bool load_png(const char* fname, ImageRec& tex);
+static bool load_jpg(const char* fname, ImageRec& tex);
+static bool save_screenshot_png(const char* fname);
 
 ImageRec::ImageRec()
 {
-    data = ( GLubyte* )malloc( 1024 * 1024 * 4 );
+    data = (GLubyte*)malloc(1024 * 1024 * 4);
 }
 
 ImageRec::~ImageRec()
@@ -49,61 +47,67 @@ ImageRec::~ImageRec()
     data = NULL;
 }
 
-bool load_image(const char *file_name, ImageRec &tex)
+bool load_image(const char* file_name, ImageRec& tex)
 {
-    if (visibleloading)
-        Game::LoadingScreen();
+    Game::LoadingScreen();
 
-    if ( tex.data == NULL )
+    if (tex.data == NULL) {
         return false;
+    }
 
-    const char *ptr = strrchr((char *)file_name, '.');
+    const char* ptr = strrchr((char*)file_name, '.');
     if (ptr) {
-        if (strcasecmp(ptr + 1, "png") == 0)
+        if (strcasecmp(ptr + 1, "png") == 0) {
             return load_png(file_name, tex);
-        else if (strcasecmp(ptr + 1, "jpg") == 0)
+        } else if (strcasecmp(ptr + 1, "jpg") == 0) {
             return load_jpg(file_name, tex);
+        }
     }
 
-    STUBBED("Unsupported image type");
+    std::cerr << "Unsupported image type" << std::endl;
     return false;
 }
 
-bool save_screenshot(const char *file_name)
+bool save_screenshot(const char* file_name)
 {
-    const char *ptr = strrchr((char *)file_name, '.');
+    const char* ptr = strrchr((char*)file_name, '.');
     if (ptr) {
-        if (strcasecmp(ptr + 1, "png") == 0)
+        if (strcasecmp(ptr + 1, "png") == 0) {
             return save_screenshot_png((Folders::getScreenshotDir() + '/' + file_name).c_str());
+        }
     }
 
-    STUBBED("Unsupported image type");
+    std::cerr << "Unsupported image type" << std::endl;
     return false;
 }
 
-struct my_error_mgr {
+struct my_error_mgr
+{
     struct jpeg_error_mgr pub; /* "public" fields */
-    jmp_buf setjmp_buffer; /* for return to caller */
+    jmp_buf setjmp_buffer;     /* for return to caller */
 };
-typedef struct my_error_mgr * my_error_ptr;
+typedef struct my_error_mgr* my_error_ptr;
 
 static void my_error_exit(j_common_ptr cinfo)
 {
-    struct my_error_mgr *err = (struct my_error_mgr *)cinfo->err;
+    struct my_error_mgr* err = (struct my_error_mgr*)cinfo->err;
     longjmp(err->setjmp_buffer, 1);
 }
 
 /* stolen from public domain example.c code in libjpg distribution. */
-static bool load_jpg(const char *file_name, ImageRec &tex)
+static bool load_jpg(const char* file_name, ImageRec& tex)
 {
     struct jpeg_decompress_struct cinfo;
     struct my_error_mgr jerr;
     JSAMPROW buffer[1]; /* Output row buffer */
-    int row_stride; /* physical row width in output buffer */
-    FILE *infile = fopen(file_name, "rb");
+    int row_stride;     /* physical row width in output buffer */
+    errno = 0;
+    FILE* infile = fopen(file_name, "rb");
 
-    if (infile == NULL)
+    if (infile == NULL) {
+        perror((std::string("Couldn't open file ") + file_name).c_str());
         return false;
+    }
 
     cinfo.err = jpeg_std_error(&jerr.pub);
     jerr.pub.error_exit = my_error_exit;
@@ -115,12 +119,12 @@ static bool load_jpg(const char *file_name, ImageRec &tex)
 
     jpeg_create_decompress(&cinfo);
     jpeg_stdio_src(&cinfo, infile);
-    (void) jpeg_read_header(&cinfo, TRUE);
+    (void)jpeg_read_header(&cinfo, TRUE);
 
     cinfo.out_color_space = JCS_RGB;
-    cinfo.quantize_colors = 0;
-    (void) jpeg_calc_output_dimensions(&cinfo);
-    (void) jpeg_start_decompress(&cinfo);
+    cinfo.quantize_colors = FALSE;
+    (void)jpeg_calc_output_dimensions(&cinfo);
+    (void)jpeg_start_decompress(&cinfo);
 
     row_stride = cinfo.output_width * cinfo.output_components;
     tex.sizeX = cinfo.output_width;
@@ -128,12 +132,12 @@ static bool load_jpg(const char *file_name, ImageRec &tex)
     tex.bpp = 24;
 
     while (cinfo.output_scanline < cinfo.output_height) {
-        buffer[0] = (JSAMPROW)(char *)tex.data +
+        buffer[0] = (JSAMPROW)(char*)tex.data +
                     ((cinfo.output_height - 1) - cinfo.output_scanline) * row_stride;
-        (void) jpeg_read_scanlines(&cinfo, buffer, 1);
+        (void)jpeg_read_scanlines(&cinfo, buffer, 1);
     }
 
-    (void) jpeg_finish_decompress(&cinfo);
+    (void)jpeg_finish_decompress(&cinfo);
     jpeg_destroy_decompress(&cinfo);
     fclose(infile);
 
@@ -141,7 +145,7 @@ static bool load_jpg(const char *file_name, ImageRec &tex)
 }
 
 /* stolen from public domain example.c code in libpng distribution. */
-static bool load_png(const char *file_name, ImageRec &tex)
+static bool load_png(const char* file_name, ImageRec& tex)
 {
     bool hasalpha = false;
     png_structp png_ptr = NULL;
@@ -149,24 +153,28 @@ static bool load_png(const char *file_name, ImageRec &tex)
     png_uint_32 width, height;
     int bit_depth, color_type, interlace_type;
     bool retval = false;
-    png_byte **row_pointers = NULL;
-    FILE *fp = fopen(file_name, "rb");
+    png_byte** row_pointers = NULL;
+    errno = 0;
+    FILE* fp = fopen(file_name, "rb");
 
     if (fp == NULL) {
-        cerr << file_name << " not found" << endl;
+        perror((std::string("Couldn't open file ") + file_name).c_str());
         return false;
     }
 
     png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-    if (png_ptr == NULL)
+    if (png_ptr == NULL) {
         goto png_done;
+    }
 
     info_ptr = png_create_info_struct(png_ptr);
-    if (info_ptr == NULL)
+    if (info_ptr == NULL) {
         goto png_done;
+    }
 
-    if (setjmp(png_jmpbuf(png_ptr)))
+    if (setjmp(png_jmpbuf(png_ptr))) {
         goto png_done;
+    }
 
     png_init_io(png_ptr, fp);
     png_read_png(png_ptr, info_ptr,
@@ -175,24 +183,28 @@ static bool load_png(const char *file_name, ImageRec &tex)
     png_get_IHDR(png_ptr, info_ptr, &width, &height,
                  &bit_depth, &color_type, &interlace_type, NULL, NULL);
 
-    if (bit_depth != 8)  // transform SHOULD handle this...
+    if (bit_depth != 8) { // transform SHOULD handle this...
         goto png_done;
+    }
 
-    if (color_type & PNG_COLOR_MASK_PALETTE)  // !!! FIXME?
+    if (color_type & PNG_COLOR_MASK_PALETTE) { // !!! FIXME?
         goto png_done;
+    }
 
-    if ((color_type & PNG_COLOR_MASK_COLOR) == 0)  // !!! FIXME?
+    if ((color_type & PNG_COLOR_MASK_COLOR) == 0) { // !!! FIXME?
         goto png_done;
+    }
 
     hasalpha = ((color_type & PNG_COLOR_MASK_ALPHA) != 0);
     row_pointers = png_get_rows(png_ptr, info_ptr);
-    if (!row_pointers)
+    if (!row_pointers) {
         goto png_done;
+    }
 
     if (!hasalpha) {
-        png_byte *dst = tex.data;
+        png_byte* dst = tex.data;
         for (int i = height - 1; i >= 0; i--) {
-            png_byte *src = row_pointers[i];
+            png_byte* src = row_pointers[i];
             for (unsigned j = 0; j < width; j++) {
                 dst[0] = src[0];
                 dst[1] = src[1];
@@ -205,10 +217,11 @@ static bool load_png(const char *file_name, ImageRec &tex)
     }
 
     else {
-        png_byte *dst = tex.data;
+        png_byte* dst = tex.data;
         int pitch = width * 4;
-        for (int i = height - 1; i >= 0; i--, dst += pitch)
+        for (int i = height - 1; i >= 0; i--, dst += pitch) {
             memcpy(dst, row_pointers[i], pitch);
+        }
     }
 
     tex.sizeX = width;
@@ -221,51 +234,62 @@ png_done:
         cerr << "There was a problem loading " << file_name << endl;
     }
     png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-    if (fp)
+    if (fp) {
         fclose(fp);
+    }
     return (retval);
 }
 
-static bool save_screenshot_png(const char *file_name)
+static bool save_screenshot_png(const char* file_name)
 {
-    FILE *fp = NULL;
+    FILE* fp = NULL;
     png_structp png_ptr = NULL;
     png_infop info_ptr = NULL;
     bool retval = false;
 
+    errno = 0;
     fp = fopen(file_name, "wb");
-    if (fp == NULL)
+    if (fp == NULL) {
+        perror((std::string("Couldn't open file ") + file_name).c_str());
         return false;
+    }
 
-    png_bytep *row_pointers = new png_bytep[kContextHeight];
+    png_bytep* row_pointers = new png_bytep[kContextHeight];
     png_bytep screenshot = new png_byte[kContextWidth * kContextHeight * 3];
-    if ((!screenshot) || (!row_pointers))
+    if ((!screenshot) || (!row_pointers)) {
         goto save_png_done;
+    }
 
     glGetError();
     glReadPixels(0, 0, kContextWidth, kContextHeight,
                  GL_RGB, GL_UNSIGNED_BYTE, screenshot);
-    if (glGetError() != GL_NO_ERROR)
+    if (glGetError() != GL_NO_ERROR) {
         goto save_png_done;
+    }
 
-    for (int i = 0; i < kContextHeight; i++)
+    for (int i = 0; i < kContextHeight; i++) {
         row_pointers[i] = screenshot + ((kContextWidth * ((kContextHeight - 1) - i)) * 3);
+    }
 
     png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
-    if (png_ptr == NULL)
+    if (png_ptr == NULL) {
         goto save_png_done;
+    }
 
     info_ptr = png_create_info_struct(png_ptr);
-    if (info_ptr == NULL)
+    if (info_ptr == NULL) {
         goto save_png_done;
+    }
 
-    if (setjmp(png_jmpbuf(png_ptr)))
+    if (setjmp(png_jmpbuf(png_ptr))) {
         goto save_png_done;
+    }
 
     png_init_io(png_ptr, fp);
 
-    if (setjmp(png_jmpbuf(png_ptr)))
+    if (setjmp(png_jmpbuf(png_ptr))) {
         goto save_png_done;
+    }
 
     png_set_IHDR(png_ptr, info_ptr, kContextWidth, kContextHeight,
                  8, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE,
@@ -273,13 +297,15 @@ static bool save_screenshot_png(const char *file_name)
 
     png_write_info(png_ptr, info_ptr);
 
-    if (setjmp(png_jmpbuf(png_ptr)))
+    if (setjmp(png_jmpbuf(png_ptr))) {
         goto save_png_done;
+    }
 
     png_write_image(png_ptr, row_pointers);
 
-    if (setjmp(png_jmpbuf(png_ptr)))
+    if (setjmp(png_jmpbuf(png_ptr))) {
         goto save_png_done;
+    }
 
     png_write_end(png_ptr, NULL);
     retval = true;
@@ -288,9 +314,11 @@ save_png_done:
     png_destroy_write_struct(&png_ptr, &info_ptr);
     delete[] screenshot;
     delete[] row_pointers;
-    if (fp)
+    if (fp) {
         fclose(fp);
-    if (!retval)
+    }
+    if (!retval) {
         unlink(file_name);
+    }
     return retval;
 }