X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d446efa1839f0a15d858081c0dab58d23312c2bd..73e179bb7dfd67800dce39a383a269b2d871d180:/lib/gdi/picload.cpp diff --git a/lib/gdi/picload.cpp b/lib/gdi/picload.cpp index 50289a64..94cb35b1 100644 --- a/lib/gdi/picload.cpp +++ b/lib/gdi/picload.cpp @@ -1,28 +1,52 @@ +#include // must be included before Python.h because of setjmp #include #include "picexif.h" #include -#include - #include #include #include #include +#include // savePNG need it + extern "C" { #include #include //#include "transupp.h" } -#include unsigned char *pic_buffer=NULL; +static unsigned char *conv24to32(unsigned char * orgin, int size, int background = 0) +{ + int s, d; + unsigned char *cr = new unsigned char[size * 4]; + if (cr == NULL) + { + printf("[CONV32] Error: malloc\n"); + return(orgin); + } + + unsigned char alpha = 0x00; + if(background) alpha = 0xFF; + + for (s = 0, d = 0 ; s < (size * 3); s += 3, d += 4 ) + { + cr[d] = orgin[s]; + cr[d+1] = orgin[s + 1]; + cr[d+2] = orgin[s + 2]; + cr[d+3] = alpha; + } + delete [] orgin; + return(cr); +} + static unsigned char *simple_resize(unsigned char * orgin, int ox, int oy, int dx, int dy) { unsigned char *cr, *p, *l; int i, j, k, ip; - cr = new unsigned char[dx * dy * 3]; + cr = new unsigned char[dx * dy * 4]; if (cr == NULL) { printf("[RESIZE] Error: malloc\n"); @@ -30,15 +54,16 @@ static unsigned char *simple_resize(unsigned char * orgin, int ox, int oy, int d } l = cr; - for (j = 0; j < dy; j++,l += dx * 3) + for (j = 0; j < dy; j++,l += dx * 4) { - p = orgin + (j * oy / dy * ox * 3); - for (i = 0, k = 0; i < dx; i++, k += 3) + p = orgin + (j * oy / dy * ox * 4); + for (i = 0, k = 0; i < dx; i++, k += 4) { - ip = i * ox / dx * 3; + ip = i * ox / dx * 4; l[k] = p[ip]; l[k+1] = p[ip + 1]; l[k+2] = p[ip + 2]; + l[k+3] = p[ip + 3]; } } delete [] orgin; @@ -49,8 +74,8 @@ static unsigned char *color_resize(unsigned char * orgin, int ox, int oy, int dx { unsigned char *cr, *p, *q; int i, j, k, l, xa, xb, ya, yb; - int sq, r, g, b; - cr = new unsigned char[dx * dy * 3]; + int sq, r, g, b, a; + cr = new unsigned char[dx * dy * 4]; if (cr == NULL) { printf("[RESIZE] Error: malloc\n"); @@ -60,7 +85,7 @@ static unsigned char *color_resize(unsigned char * orgin, int ox, int oy, int dx for (j = 0; j < dy; j++) { - for (i = 0; i < dx; i++, p += 3) + for (i = 0; i < dx; i++, p += 4) { xa = i * ox / dx; ya = j * oy / dy; @@ -70,15 +95,15 @@ static unsigned char *color_resize(unsigned char * orgin, int ox, int oy, int dx yb = (j + 1) * oy / dy; if (yb >= oy) yb = oy - 1; - for (l = ya, r = 0, g = 0, b = 0, sq = 0; l <= yb; l++) + for (l = ya, r = 0, g = 0, b = 0, a = 0, sq = 0; l <= yb; l++) { - q = orgin + ((l * ox + xa) * 3); - for (k = xa; k <= xb; k++, q += 3, sq++) + q = orgin + ((l * ox + xa) * 4); + for (k = xa; k <= xb; k++, q += 4, sq++) { - r += q[0]; g += q[1]; b += q[2]; + r += q[0]; g += q[1]; b += q[2]; a += q[3]; } } - p[0] = r / sq; p[1] = g / sq; p[2] = b / sq; + p[0] = r / sq; p[1] = g / sq; p[2] = b / sq; p[3] = a / sq; } } delete [] orgin; @@ -328,7 +353,6 @@ static int bmp_load(const char *filename, int *x, int *y) } //--------------------------------------------------------------------------------------------- - static int png_load(const char *filename, int *x, int *y) { static const png_color_16 my_background = {0, 0, 0, 0, 0}; @@ -367,28 +391,18 @@ static int png_load(const char *filename, int *x, int *y) png_read_info(png_ptr, info_ptr); png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, &interlace_type, NULL, NULL); - if (color_type == PNG_COLOR_TYPE_PALETTE) - { - png_set_palette_to_rgb(png_ptr); - png_set_background(png_ptr, (png_color_16 *)&my_background, PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0); - } - + if ((color_type == PNG_COLOR_TYPE_PALETTE)||(color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)||(png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))) + png_set_expand(png_ptr); + if (bit_depth == 16) + png_set_strip_16(png_ptr); if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) - { png_set_gray_to_rgb(png_ptr); - png_set_background(png_ptr, (png_color_16 *)&my_background, PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0); - } - - if (color_type & PNG_COLOR_MASK_ALPHA) - png_set_strip_alpha(png_ptr); - - if (bit_depth < 8) png_set_packing(png_ptr); - if (bit_depth == 16) png_set_strip_16(png_ptr); number_passes = png_set_interlace_handling(png_ptr); png_read_update_info(png_ptr, info_ptr); - if (width * 3 != png_get_rowbytes(png_ptr, info_ptr)) + int bpp = png_get_rowbytes(png_ptr, info_ptr)/width; + if ((bpp !=4) && (bpp !=3)) { eDebug("[PNG] Error processing"); return 0; @@ -403,19 +417,21 @@ static int png_load(const char *filename, int *x, int *y) return 0; } - pic_buffer = new unsigned char[width * height * 3]; + pic_buffer = new unsigned char[width * height * bpp]; *x=width; *y=height; for(pass = 0; pass < number_passes; pass++) { fbptr = (png_byte *)pic_buffer; - for (i = 0; i < height; i++, fbptr += width * 3) + for (i = 0; i < height; i++, fbptr += width * bpp) png_read_row(png_ptr, fbptr, NULL); } png_read_end(png_ptr, info_ptr); png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); fclose(fh); + if (bpp == 3) + pic_buffer = conv24to32(pic_buffer, width * height, 1); return 1; } @@ -625,8 +641,7 @@ int loadPic(ePtr &result, std::string filename, int w, int h, int aspec if(cachefile.length()) { - cache = true; - if(jpeg_load(cachefile.c_str(), &ox, &oy)) + if(png_load(cachefile.c_str(), &ox, &oy)) eDebug("[CACHEPIC] x-size=%d, y-size=%d", ox, oy); } @@ -634,17 +649,15 @@ int loadPic(ePtr &result, std::string filename, int w, int h, int aspec { switch(pic_id(filename.c_str())) { - case F_PNG: png_load(filename.c_str(), &ox, &oy); break; - case F_JPEG: jpeg_load(filename.c_str(), &ox, &oy); break; - case F_BMP: bmp_load(filename.c_str(), &ox, &oy); break; - case F_GIF: gif_load(filename.c_str(), &ox, &oy); break; + case F_PNG: png_load(filename.c_str(), &ox, &oy);break; + case F_JPEG: jpeg_load(filename.c_str(), &ox, &oy);pic_buffer = conv24to32(pic_buffer, ox*oy, 1); break; + case F_BMP: bmp_load(filename.c_str(), &ox, &oy);pic_buffer = conv24to32(pic_buffer, ox*oy, 1); break; + case F_GIF: gif_load(filename.c_str(), &ox, &oy);pic_buffer = conv24to32(pic_buffer, ox*oy, 1); break; default: eDebug("[PIC] "); return 0; } - eDebug("[FULLPIC] x-size=%d, y-size=%d", ox, oy); - if(pic_buffer==NULL) return 0; @@ -653,7 +666,7 @@ int loadPic(ePtr &result, std::string filename, int w, int h, int aspec { case 1: aspect_ratio = 1.778 / ((double)720/576); break; //16:9 case 2: aspect_ratio = 1.600 / ((double)720/576); break; //16:10 - //case 3: aspect_ratio = 1.250 / ((double)720/576); break; //5:4 + case 3: aspect_ratio = 1.250 / ((double)720/576); break; //5:4 default: aspect_ratio = 1.333 / ((double)720/576); //4:3 } @@ -673,15 +686,8 @@ int loadPic(ePtr &result, std::string filename, int w, int h, int aspec ox = imx; oy = imy; - - if(cache) - { - jpeg_save(pic_buffer, cachefile.c_str(), 50, oy, ox); - eDebug("[SAVEPIC] x-size=%d, y-size=%d", ox, oy); - } - } - + else cache = true; result=new gPixmap(eSize(w, h), 32); gSurface *surface = result->surface; @@ -690,7 +696,7 @@ int loadPic(ePtr &result, std::string filename, int w, int h, int aspec int o_y=0, u_y=0, v_x=0, h_x=0; unsigned char clear[4] = {0x00,0x00,0x00,0x00}; if(background) clear[3]=0xFF; - unsigned char *tmp_buffer = new unsigned char[4]; + unsigned char *tmp_buffer=((unsigned char *)(surface->data)); if(oy < h) { @@ -706,44 +712,44 @@ int loadPic(ePtr &result, std::string filename, int w, int h, int aspec //eDebug("o_y=%d u_y=%d v_x=%d h_x=%d", o_y, u_y, v_x, h_x); if(oy < h) - for(a=0; a<(o_y*ox)+1; a++, nc+=4) + for(a=0; a<(o_y*ox); a++, nc+=4) { - memcpy(tmp_buffer, clear, sizeof(clear)); tmp_buffer=((unsigned char *)(surface->data)) + nc; + memcpy(tmp_buffer, clear, sizeof(clear)); } - + for(a=0; adata)) + nc; + memcpy(tmp_buffer, clear, sizeof(clear)); } - for(b=0; b<(ox*3); b+=3, nc+=4) + for(b=0; b<(ox*4); b+=4, nc+=4) { - tmp_buffer[3]=0xFF; + tmp_buffer=((unsigned char *)(surface->data)) + nc; tmp_buffer[2]=pic_buffer[oc++]; tmp_buffer[1]=pic_buffer[oc++]; tmp_buffer[0]=pic_buffer[oc++]; + tmp_buffer[3]=pic_buffer[oc++]; - tmp_buffer=((unsigned char *)(surface->data)) + nc; } if(ox < w) for(b=0; bdata)) + nc; + memcpy(tmp_buffer, clear, sizeof(clear)); } } if(oy < h) - for(a=0; a<(u_y*ox)+1; a++, nc+=4) + for(a=0; a<(u_y*ox); a++, nc+=4) { - memcpy(tmp_buffer, clear, sizeof(clear)); tmp_buffer=((unsigned char *)(surface->data)) + nc; + memcpy(tmp_buffer, clear, sizeof(clear)); } //eDebug("[PIC] buffer=%d, nc=%d oc=%d ox=%d, oy=%d",w*h*4, nc, oc, ox, oy); @@ -754,5 +760,11 @@ int loadPic(ePtr &result, std::string filename, int w, int h, int aspec delete [] pic_buffer; + if(cachefile.length() && !cache) + { + savePNG( cachefile.c_str(), result); + eDebug("[SAVEPIC] x-size=%d, y-size=%d", ox, oy); + } + return 0; }