Update lcd4linux

[vuplus_openvuplus] / meta-openvuplus / recipes-vuplus / png-util / files / png_util.cpp

diff --git a/meta-openvuplus/recipes-vuplus/png-util/files/png_util.cpp b/meta-openvuplus/recipes-vuplus/png-util/files/png_util.cpp
index e166205..82747cb 100755 (executable)
--- a/meta-openvuplus/recipes-vuplus/png-util/files/png_util.cpp
+++ b/meta-openvuplus/recipes-vuplus/png-util/files/png_util.cpp
@@ -13,87 +13,97 @@ static png_bytep * row_pointers = 0;
 static png_bytep row_pointers_bit_shift = 0;
 static int row_byte_len = 0;
 
-//#define UNIT_TEST 1
-#ifdef UNIT_TEST
-int fd = open("/tmp/dump.txt", O_WRONLY|O_CREAT|O_LARGEFILE, 0644);
-#endif
-
 static int read_png_file(char* file_name)
 {
        /* 8 is the maximum size that can be checked */
-        char header[8] = {0,};
+       char header[8] = {0,};
 
-        /* open file and test for it being a png */
-        FILE *fp = fopen(file_name, "rb");
-        if (!fp) 
+       /* open file and test for it being a png */
+       FILE *fp = fopen(file_name, "rb");
+       if (!fp)
        {
-                fprintf(stderr, "[read_png_file] File %s could not be opened for reading\n", file_name);
+               fprintf(stderr, "[read_png_file] File %s could not be opened for reading\n", file_name);
                return 0;
        }
 
-        fread(header, 1, 8, fp);
-        if (png_sig_cmp((png_byte*)header, 0, 8)) 
+       fread(header, 1, 8, fp);
+       if (png_sig_cmp((png_byte*)header, 0, 8))
        {
-                fprintf(stderr, "[read_png_file] File %s is not recognized as a PNG file\n", file_name);
+               fclose(fp);
+               fprintf(stderr, "[read_png_file] File %s is not recognized as a PNG file\n", file_name);
                return 0;
        }
 
-        /* initialize stuff */
-        png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
+       /* initialize stuff */
+       png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
 
-        if (!png_ptr) 
+       if (!png_ptr) 
        {
-                fprintf(stderr, "[read_png_file] png_create_read_struct failed\n");
+               fclose(fp);
+               fprintf(stderr, "[read_png_file] png_create_read_struct failed\n");
                return 0;
        }
 
-        info_ptr = png_create_info_struct(png_ptr);
-        if (!info_ptr) 
+       info_ptr = png_create_info_struct(png_ptr);
+       if (!info_ptr)
        {
-                fprintf(stderr, "[read_png_file] png_create_info_struct failed\n");
+               png_destroy_read_struct(&png_ptr, NULL, NULL);
+               fclose(fp);
+               fprintf(stderr, "[read_png_file] png_create_info_struct failed\n");
                return 0;
        }
 
-        if (setjmp(png_jmpbuf(png_ptr))) 
+       if (setjmp(png_jmpbuf(png_ptr)))
        {
-                fprintf(stderr, "[read_png_file] Error during init_io\n");
+               png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+               fclose(fp);
+               fprintf(stderr, "[read_png_file] Error during init_io\n");
                return 0;
        }
 
-        png_init_io(png_ptr, fp);
-        png_set_sig_bytes(png_ptr, 8);
+       png_init_io(png_ptr, fp);
+       png_set_sig_bytes(png_ptr, 8);
 
-        png_read_info(png_ptr, info_ptr);
+       png_read_info(png_ptr, info_ptr);
 
-        width = png_get_image_width(png_ptr, info_ptr);
-        height = png_get_image_height(png_ptr, info_ptr);
-        color_type = png_get_color_type(png_ptr, info_ptr);
-        bit_depth = png_get_bit_depth(png_ptr, info_ptr);
+       width = png_get_image_width(png_ptr, info_ptr);
+       height = png_get_image_height(png_ptr, info_ptr);
+       if (width != 400 || height != 240)
+       {
+               png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+               fclose(fp);
+               fprintf(stderr, "[read_png_file] Error invalid image size\n");
+               return 0;
+       }
+       color_type = png_get_color_type(png_ptr, info_ptr);
+       bit_depth = png_get_bit_depth(png_ptr, info_ptr);
 
-        number_of_passes = png_set_interlace_handling(png_ptr);
-        png_read_update_info(png_ptr, info_ptr);
+       number_of_passes = png_set_interlace_handling(png_ptr);
+       png_read_update_info(png_ptr, info_ptr);
 
         /* read file */
-        if (setjmp(png_jmpbuf(png_ptr))) 
+       if (setjmp(png_jmpbuf(png_ptr)))
        {
-                fprintf(stderr, "[read_png_file] Error during read_image\n");
+               png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+               fclose(fp);
+               fprintf(stderr, "[read_png_file] Error during read_image\n");
                return 0;
        }
 
-       if(row_pointers == 0) 
+       if(row_pointers == 0)
        {
                row_pointers = (png_bytep*) malloc(sizeof(png_bytep) * height);
                row_byte_len = png_get_rowbytes(png_ptr,info_ptr);
-               for (y=0; y<height; y++) 
+               for (y=0; y<height; y++)
                {
-                       row_pointers[y] = (png_byte*) malloc(row_byte_len);
+                       row_pointers[y] = (png_byte*) malloc(row_byte_len);
                }
                row_pointers_bit_shift = (unsigned char*) malloc(sizeof(unsigned char) * height * width * 2);
        }
 
-        png_read_image(png_ptr, row_pointers);
+       png_read_image(png_ptr, row_pointers);
        png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-        fclose(fp);
+       fclose(fp);
        return 1;
 }
 
@@ -160,13 +170,6 @@ int PNGUtil::send(char* png_file_name)
                        }
                }
        }
-#ifdef UNIT_TEST
-       {
-               int w = write(fd, row_pointers_bit_shift , height * width * 2);
-               printf("write to dst_fd : %d\n",w);
-       }
-#endif
-#ifndef UNIT_TEST
        {
                int w=-1;
                w = write(device_fd, row_pointers_bit_shift, height * width * 2);
@@ -174,7 +177,6 @@ int PNGUtil::send(char* png_file_name)
 //             ret = ioctl(device_fd, 0);
                printf("write to /dev/lcd2 : %d\n",w);
        }
-#endif
        return 1;
 }