X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fgdi%2Fpicload.cpp;h=ab7a0b5d35870a3f59a5f235e63969d504a5a304;hp=f67507ca3da91a03958d48abdcc1e713b68ad3b2;hb=HEAD;hpb=9ca172f45cc02fe5cb693e7d35aade7d2233d448 diff --git a/lib/gdi/picload.cpp b/lib/gdi/picload.cpp index f67507c..ab7a0b5 100644 --- a/lib/gdi/picload.cpp +++ b/lib/gdi/picload.cpp @@ -1,4 +1,5 @@ -#include // must be included before Python.h because of setjmp +#define PNG_SKIP_SETJMP_CHECK +#include #include #include @@ -44,11 +45,11 @@ static unsigned char *conv24to32(unsigned char *orgin, int size, unsigned char a return(cr); } -static unsigned char *simple_resize(unsigned char *orgin, int ox, int oy, int dx, int dy) +static unsigned char *simple_resize(unsigned char *orgin, int ox, int oy, int dx, int dy, int bypp) { unsigned char *cr, *p, *l; int i, j, k, ip; - cr = new unsigned char[dx * dy * 3]; + cr = new unsigned char[dx * dy * bypp]; if (cr == NULL) { eDebug("[Picload] Error malloc"); @@ -56,27 +57,28 @@ static unsigned char *simple_resize(unsigned char *orgin, int ox, int oy, int dx } l = cr; - for (j = 0; j < dy; j++,l += dx * 3) + for (j = 0; j < dy; j++,l += dx * bypp) { - p = orgin + (j * oy / dy * ox * 3); - for (i = 0, k = 0; i < dx; i++, k += 3) + p = orgin + (j * oy / dy * ox * bypp); + for (i = 0, k = 0; i < dx; i++, k += bypp) { - ip = i * ox / dx * 3; + ip = i * ox / dx * bypp; l[k] = p[ip]; l[k+1] = p[ip + 1]; l[k+2] = p[ip + 2]; + if(bypp == 4) l[k+3] = p[ip + 3]; } } delete [] orgin; return(cr); } -static unsigned char *color_resize(unsigned char * orgin, int ox, int oy, int dx, int dy) +static unsigned char *color_resize(unsigned char * orgin, int ox, int oy, int dx, int dy, int bypp) { 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 * bypp]; if (cr == NULL) { eDebug("[Picload] Error malloc"); @@ -86,7 +88,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 += bypp) { xa = i * ox / dx; ya = j * oy / dy; @@ -96,15 +98,17 @@ 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) * bypp); + for (k = xa; k <= xb; k++, q += bypp, sq++) { r += q[0]; g += q[1]; b += q[2]; + if(bypp == 4) a += q[3]; } } p[0] = r / sq; p[1] = g / sq; p[2] = b / sq; + if(bypp == 4) p[3] = a / sq; } } delete [] orgin; @@ -252,7 +256,7 @@ static unsigned char *bmp_load(const char *file, int *x, int *y) //--------------------------------------------------------------------- -static unsigned char *png_load(const char *file, int *ox, int *oy) +static unsigned char *png_load(const char *file, int *ox, int *oy, int *_bypp) { static const png_color_16 my_background = {0, 0, 0, 0, 0}; @@ -276,7 +280,7 @@ static unsigned char *png_load(const char *file, int *ox, int *oy) return NULL; } - if (setjmp(png_ptr->jmpbuf)) + if (setjmp(png_jmpbuf(png_ptr))) { png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); fclose(fh); @@ -288,29 +292,18 @@ static unsigned char *png_load(const char *file, int *ox, int *oy) 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_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 ((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); int number_passes = png_set_interlace_handling(png_ptr); png_read_update_info(png_ptr, info_ptr); + int bypp = png_get_rowbytes(png_ptr, info_ptr) / width; - if (width * 3 != png_get_rowbytes(png_ptr, info_ptr)) + if(bypp != 4 && bypp != 3) { eDebug("[Picload] Error processing"); png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); @@ -318,14 +311,15 @@ static unsigned char *png_load(const char *file, int *ox, int *oy) return NULL; } - unsigned char *pic_buffer = new unsigned char[height * width * 3]; + unsigned char *pic_buffer = new unsigned char[height * width * bypp]; *ox=width; *oy=height; + *_bypp = bypp; for(int 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 * bypp) png_read_row(png_ptr, fbptr, NULL); } png_read_end(png_ptr, info_ptr); @@ -605,7 +599,7 @@ void ePicLoad::decodePic() switch(m_filepara->id) { - case F_PNG: m_filepara->pic_buffer = png_load(m_filepara->file, &m_filepara->ox, &m_filepara->oy); break; + case F_PNG: m_filepara->pic_buffer = png_load(m_filepara->file, &m_filepara->ox, &m_filepara->oy, &m_filepara->bypp); break; case F_JPEG: m_filepara->pic_buffer = jpeg_load(m_filepara->file, &m_filepara->ox, &m_filepara->oy); break; case F_BMP: m_filepara->pic_buffer = bmp_load(m_filepara->file, &m_filepara->ox, &m_filepara->oy); break; case F_GIF: m_filepara->pic_buffer = gif_load(m_filepara->file, &m_filepara->ox, &m_filepara->oy); break; @@ -688,7 +682,7 @@ void ePicLoad::decodeThumb() switch(m_filepara->id) { - case F_PNG: m_filepara->pic_buffer = png_load(m_filepara->file, &m_filepara->ox, &m_filepara->oy); break; + case F_PNG: m_filepara->pic_buffer = png_load(m_filepara->file, &m_filepara->ox, &m_filepara->oy, &m_filepara->bypp); break; case F_JPEG: m_filepara->pic_buffer = jpeg_load(m_filepara->file, &m_filepara->ox, &m_filepara->oy); break; case F_BMP: m_filepara->pic_buffer = bmp_load(m_filepara->file, &m_filepara->ox, &m_filepara->oy); break; case F_GIF: m_filepara->pic_buffer = gif_load(m_filepara->file, &m_filepara->ox, &m_filepara->oy); break; @@ -718,7 +712,7 @@ void ePicLoad::decodeThumb() imy = (int)( (m_conf.thumbnailsize * ((double)m_filepara->oy)) / ((double)m_filepara->ox) ); } - m_filepara->pic_buffer = color_resize(m_filepara->pic_buffer, m_filepara->ox, m_filepara->oy, imx, imy); + m_filepara->pic_buffer = color_resize(m_filepara->pic_buffer, m_filepara->ox, m_filepara->oy, imx, imy, m_filepara->bypp); m_filepara->ox = imx; m_filepara->oy = imy; @@ -746,9 +740,9 @@ void ePicLoad::resizePic() } if(m_conf.resizetype) - m_filepara->pic_buffer = color_resize(m_filepara->pic_buffer, m_filepara->ox, m_filepara->oy, imx, imy); + m_filepara->pic_buffer = color_resize(m_filepara->pic_buffer, m_filepara->ox, m_filepara->oy, imx, imy, m_filepara->bypp); else - m_filepara->pic_buffer = simple_resize(m_filepara->pic_buffer, m_filepara->ox, m_filepara->oy, imx, imy); + m_filepara->pic_buffer = simple_resize(m_filepara->pic_buffer, m_filepara->ox, m_filepara->oy, imx, imy, m_filepara->bypp); m_filepara->ox = imx; m_filepara->oy = imy; @@ -928,8 +922,11 @@ int ePicLoad::getData(ePtr &result) result = 0; if(m_filepara->pic_buffer == NULL) return 0; - m_filepara->pic_buffer = conv24to32(m_filepara->pic_buffer, m_filepara->ox * m_filepara->oy); - + if(m_filepara->bypp == 3) + { + m_filepara->pic_buffer = conv24to32(m_filepara->pic_buffer, m_filepara->ox * m_filepara->oy); + } + result=new gPixmap(eSize(m_filepara->max_x, m_filepara->max_y), 32); gSurface *surface = result->surface; int a=0, b=0; @@ -1011,16 +1008,16 @@ RESULT ePicLoad::setPara(PyObject *val) { if (!PySequence_Check(val)) return 0; - if (PySequence_Size(val) < 6) + if (PySequence_Size(val) < 7) return 0; else { ePyObject fast = PySequence_Fast(val, ""); - m_conf.max_x = PyInt_AsLong( PySequence_Fast_GET_ITEM(val, 0)); - m_conf.max_y = PyInt_AsLong( PySequence_Fast_GET_ITEM(val, 1)); - m_conf.aspect_ratio = PyFloat_AsDouble( PySequence_Fast_GET_ITEM(val, 2)); - m_conf.usecache = PyInt_AsLong( PySequence_Fast_GET_ITEM(val, 3)); - m_conf.resizetype = PyInt_AsLong( PySequence_Fast_GET_ITEM(val, 4)); - const char *bg_str = PyString_AsString( PySequence_Fast_GET_ITEM(val, 5)); + m_conf.max_x = PyInt_AsLong( PySequence_Fast_GET_ITEM(fast, 0)); + m_conf.max_y = PyInt_AsLong( PySequence_Fast_GET_ITEM(fast, 1)); + m_conf.aspect_ratio = (double)PyInt_AsLong( PySequence_Fast_GET_ITEM(fast, 2)) / PyInt_AsLong(PySequence_Fast_GET_ITEM(fast, 3)); + m_conf.usecache = PyInt_AsLong( PySequence_Fast_GET_ITEM(fast, 4)); + m_conf.resizetype = PyInt_AsLong( PySequence_Fast_GET_ITEM(fast, 5)); + const char *bg_str = PyString_AsString( PySequence_Fast_GET_ITEM(fast, 6)); if(bg_str[0] == '#' && strlen(bg_str)==9) { @@ -1040,29 +1037,30 @@ RESULT ePicLoad::setPara(PyObject *val) //for old plugins SWIG_VOID(int) loadPic(ePtr &result, std::string filename, int x, int y, int aspect, int resize_mode, int rotate, int background, std::string cachefile) { + long asp1, asp2; result = 0; eDebug("deprecated loadPic function used!!! please use the non blocking version! you can see demo code in Pictureplayer plugin... this function is removed in the near future!"); ePicLoad mPL; - double aspect_ratio; switch(aspect) { - 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 - default: aspect_ratio = 1.333 / ((double)720/576); //4:3 + case 1: asp1 = 16*576, asp2 = 9*720; break; //16:9 + case 2: asp1 = 16*576, asp2 = 10*720; break; //16:10 + case 3: asp1 = 5*576, asp2 = 4*720; break; //5:4 + default: asp1 = 4*576, asp2 = 3*720; break; //4:3 } - - ePyObject tuple = PyTuple_New(6); + + ePyObject tuple = PyTuple_New(7); PyTuple_SET_ITEM(tuple, 0, PyLong_FromLong(x)); PyTuple_SET_ITEM(tuple, 1, PyLong_FromLong(y)); - PyTuple_SET_ITEM(tuple, 2, PyFloat_FromDouble(aspect_ratio)); - PyTuple_SET_ITEM(tuple, 3, PyLong_FromLong(0)); - PyTuple_SET_ITEM(tuple, 4, PyLong_FromLong(resize_mode)); + PyTuple_SET_ITEM(tuple, 2, PyLong_FromLong(asp1)); + PyTuple_SET_ITEM(tuple, 3, PyLong_FromLong(asp2)); + PyTuple_SET_ITEM(tuple, 4, PyLong_FromLong(0)); + PyTuple_SET_ITEM(tuple, 5, PyLong_FromLong(resize_mode)); if(background) - PyTuple_SET_ITEM(tuple, 5, PyString_FromString("#ff000000")); + PyTuple_SET_ITEM(tuple, 6, PyString_FromString("#ff000000")); else - PyTuple_SET_ITEM(tuple, 5, PyString_FromString("#00000000")); + PyTuple_SET_ITEM(tuple, 6, PyString_FromString("#00000000")); mPL.setPara(tuple);