X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/645bd7f925f41626282f6f9f72e6fd71eaa45c2e..2a7b743b84bd9ef380af30b0f9f260bf386eed9a:/lib/gdi/picload.cpp diff --git a/lib/gdi/picload.cpp b/lib/gdi/picload.cpp index a94341db..1f9bed48 100644 --- a/lib/gdi/picload.cpp +++ b/lib/gdi/picload.cpp @@ -8,6 +8,10 @@ #include #include +#include // savePNG need it + +#define JDCT_DEFAULT JDCT_IFAST + extern "C" { #include #include @@ -16,11 +20,35 @@ extern "C" { 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"); @@ -28,15 +56,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; @@ -47,8 +76,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"); @@ -58,7 +87,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; @@ -68,15 +97,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; @@ -136,6 +165,151 @@ static int jpeg_save(unsigned char *image_buffer, const char * filename, int qua return 0; } +/* Expanded data source object for memory buffer input */ +typedef struct +{ + struct jpeg_source_mgr pub; /* public fields */ + FILE *infile; /* source stream */ + JOCTET *buffer; /* start of buffer */ + boolean start_of_file; /* have we gotten any data yet? */ +} mem_source_mgr; + +typedef mem_source_mgr *mem_src_ptr; + +static void init_source (j_decompress_ptr cinfo) +{ + mem_src_ptr src = (mem_src_ptr) cinfo->src; + src->start_of_file = TRUE; +} + +static boolean fill_input_buffer (j_decompress_ptr cinfo) +{ + /* no-op */ (void)cinfo; + return TRUE; + } + +static void skip_input_data (j_decompress_ptr cinfo, long num_bytes) +{ + mem_src_ptr src = (mem_src_ptr) cinfo->src; + + if (num_bytes > 0) + { + src->pub.next_input_byte += (size_t) num_bytes; + src->pub.bytes_in_buffer -= (size_t) num_bytes; + } +} + +static void term_source (j_decompress_ptr cinfo) +{ + /* no-op */ (void)cinfo; +} + +static void jpeg_memory_src (j_decompress_ptr cinfo, unsigned char *inbfr, int len) +{ + mem_src_ptr src; + if (cinfo->src == NULL) + { + cinfo->src = (struct jpeg_source_mgr *) + (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, (size_t)sizeof(mem_source_mgr)); + src = (mem_src_ptr) cinfo->src; + src->buffer = (JOCTET *) inbfr; + } + src = (mem_src_ptr) cinfo->src; + src->pub.init_source = init_source; + src->pub.fill_input_buffer = fill_input_buffer; + src->pub.skip_input_data = skip_input_data; + src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */ + src->pub.term_source = term_source; + src->infile = 0L; + src->pub.bytes_in_buffer = len; /* sets to entire file len */ + src->pub.next_input_byte = (JOCTET *)inbfr; /* at start of buffer */ +} + +static int jpeg_load_thumb(const char *filename, int *x, int *y) +{ + struct jpeg_decompress_struct cinfo; + struct jpeg_decompress_struct *ciptr = &cinfo; + struct r_jpeg_error_mgr emgr; + FILE *fh; + + if (!(fh = fopen(filename, "rb"))) + return 0; + + ciptr->err = jpeg_std_error(&emgr.pub); + emgr.pub.error_exit = jpeg_cb_error_exit; + if (setjmp(emgr.envbuffer) == 1) + { + jpeg_destroy_decompress(ciptr); + fclose(fh); + return 0; + } + + jpeg_create_decompress(ciptr); + jpeg_stdio_src(ciptr, fh); + + jpeg_save_markers (ciptr, JPEG_APP0 + 1, 0xffff); + + jpeg_read_header(ciptr, TRUE); + + struct jpeg_marker_struct *m = cinfo.marker_list; + + unsigned char *thumb_buf = NULL; + size_t bufsize; + + if ( m ) + { + unsigned char *p_data = m->data; + while ( p_data < m->data+m->data_length ) + { + if ( p_data[0] == 0xFF && p_data[1] == 0xD8 ) + { + bufsize = (size_t) m->data_length - (size_t) (p_data-m->data); + thumb_buf = new unsigned char[bufsize]; + bufsize = 0; + do { + thumb_buf[bufsize++] = *p_data; + } while ( !(*p_data++ == 0xFF && *p_data == 0xD9) && p_data < m->data+m->data_length ); + thumb_buf[bufsize++] = *p_data; + } + p_data++; + } + } + + if ( thumb_buf != NULL ) + { + jpeg_create_decompress(ciptr); + jpeg_memory_src(ciptr, thumb_buf, bufsize-2); + jpeg_read_header(ciptr, TRUE); + } + else + eDebug("no exif thumbnail found! loading actual image instead"); + + ciptr->out_color_space = JCS_RGB; + ciptr->scale_denom = 1; + + jpeg_start_decompress(ciptr); + + *x=ciptr->output_width; + *y=ciptr->output_height; + + if(ciptr->output_components == 3) + { + JSAMPLE *lb = (JSAMPLE *)(*ciptr->mem->alloc_small)((j_common_ptr) ciptr, JPOOL_PERMANENT, ciptr->output_width * ciptr->output_components); + pic_buffer = new unsigned char[ciptr->output_height * ciptr->output_width * ciptr->output_components]; + unsigned char *bp = pic_buffer; + + while (ciptr->output_scanline < ciptr->output_height) + { + jpeg_read_scanlines(ciptr, &lb, 1); + memcpy(bp, lb, ciptr->output_width * ciptr->output_components); + bp += ciptr->output_width * ciptr->output_components; + } + } + jpeg_finish_decompress(ciptr); + jpeg_destroy_decompress(ciptr); + fclose(fh); + return 1; +} static int jpeg_load(const char *filename, int *x, int *y) { @@ -326,7 +500,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}; @@ -365,28 +538,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; @@ -394,26 +557,28 @@ static int png_load(const char *filename, int *x, int *y) if (width * height > 1000000) // 1000x1000 or equiv. { - eDebug("[png_load] image size is %u x %u, which is \"too large\".", (unsigned int)width, (unsigned int)height); + eDebug("[png_load] image size is %d x %d, which is \"too large\".", (int)width, (int)height); png_read_end(png_ptr, info_ptr); png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); fclose(fh); 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; } @@ -614,7 +779,7 @@ static int pic_id(const char *name) return F_NONE; } -int loadPic(ePtr &result, std::string filename, int w, int h, int aspect, int resize_mode, int rotate, int background, std::string cachefile) +int loadPic(ePtr &result, std::string filename, int w, int h, int aspect, int resize_mode, int rotate, int background, std::string cachefile, int thumbnail) { result = 0; int ox=0, oy=0, imx, imy; @@ -623,8 +788,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); } @@ -632,17 +796,21 @@ 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: { + if (thumbnail) + jpeg_load_thumb(filename.c_str(), &ox, &oy); + else + 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; @@ -671,15 +839,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; @@ -704,12 +865,12 @@ 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) { tmp_buffer=((unsigned char *)(surface->data)) + nc; memcpy(tmp_buffer, clear, sizeof(clear)); } - + for(a=0; a &result, std::string filename, int w, int h, int aspec 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=((unsigned char *)(surface->data)) + nc; - tmp_buffer[3]=0xFF; tmp_buffer[2]=pic_buffer[oc++]; tmp_buffer[1]=pic_buffer[oc++]; tmp_buffer[0]=pic_buffer[oc++]; + tmp_buffer[3]=pic_buffer[oc++]; } @@ -738,7 +899,7 @@ int loadPic(ePtr &result, std::string filename, int w, int h, int aspec } if(oy < h) - for(a=0; a<(u_y*ox)+1; a++, nc+=4) + for(a=0; a<(u_y*ox); a++, nc+=4) { tmp_buffer=((unsigned char *)(surface->data)) + nc; memcpy(tmp_buffer, clear, sizeof(clear)); @@ -752,5 +913,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; }