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 ePicLoad::startThread(int what, const char *file, int x, int y)
+int ePicLoad::startThread(int what, const char *file, int x, int y, bool async)
{
- if(threadrunning && m_filepara != NULL)
+ if(async && threadrunning && m_filepara != NULL)
{
eDebug("[Picload] thread running");
m_filepara->callback = false;
return 1;
}
- if(what==1)
- msg_thread.send(Message(Message::decode_Pic));
+ if (async) {
+ if(what==1)
+ msg_thread.send(Message(Message::decode_Pic));
+ else
+ msg_thread.send(Message(Message::decode_Thumb));
+ run();
+ }
+ else if (what == 1)
+ decodePic();
else
- msg_thread.send(Message(Message::decode_Thumb));
- run();
+ decodeThumb();
return 0;
}
-RESULT ePicLoad::startDecode(const char *file, int x, int y)
+RESULT ePicLoad::startDecode(const char *file, int x, int y, bool async)
{
- return startThread(1, file, x, y);
+ return startThread(1, file, x, y, async);
}
-RESULT ePicLoad::getThumbnail(const char *file, int x, int y)
+RESULT ePicLoad::getThumbnail(const char *file, int x, int y, bool async)
{
- return startThread(0, file, x, y);
+ return startThread(0, file, x, y, async);
}
PyObject *ePicLoad::getInfo(const char *filename)
RESULT ePicLoad::setPara(PyObject *val)
{
- if (!PyList_Check(val))
+ if (!PySequence_Check(val))
return 0;
- if (PyList_Size(val) < 6)
+ if (PySequence_Size(val) < 7)
return 0;
-
- m_conf.max_x = PyInt_AsLong( PyList_GET_ITEM(val, 0));
- m_conf.max_y = PyInt_AsLong( PyList_GET_ITEM(val, 1));
- m_conf.aspect_ratio = PyFloat_AsDouble( PyList_GET_ITEM(val, 2));
- m_conf.usecache = PyInt_AsLong( PyList_GET_ITEM(val, 3));
- m_conf.resizetype = PyInt_AsLong( PyList_GET_ITEM(val, 4));
- const char *bg_str = PyString_AsString( PyList_GET_ITEM(val, 5));
+ else {
+ ePyObject fast = PySequence_Fast(val, "");
+ 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)
- {
- int bg = strtoul(bg_str+1, NULL, 16);
- m_conf.background[0] = bg&0xFF; //BB
- m_conf.background[1] = (bg>>8)&0xFF; //GG
- m_conf.background[2] = (bg>>16)&0xFF; //RR
- m_conf.background[3] = bg>>24; //AA
+ if(bg_str[0] == '#' && strlen(bg_str)==9)
+ {
+ int bg = strtoul(bg_str+1, NULL, 16);
+ m_conf.background[0] = bg&0xFF; //BB
+ m_conf.background[1] = (bg>>8)&0xFF; //GG
+ m_conf.background[2] = (bg>>16)&0xFF; //RR
+ m_conf.background[3] = bg>>24; //AA
+ }
+ eDebug("[Picload] setPara max-X=%d max-Y=%d aspect_ratio=%lf cache=%d resize=%d bg=#%02X%02X%02X%02X", m_conf.max_x, m_conf.max_y, m_conf.aspect_ratio, (int)m_conf.usecache, (int)m_conf.resizetype, m_conf.background[3], m_conf.background[2], m_conf.background[1], m_conf.background[0]);
}
-
- eDebug("[Picload] setPara max-X=%d max-Y=%d aspect_ratio=%lf cache=%d resize=%d bg=#%02X%02X%02X%02X", m_conf.max_x, m_conf.max_y, m_conf.aspect_ratio, (int)m_conf.usecache, (int)m_conf.resizetype, m_conf.background[3], m_conf.background[2], m_conf.background[1], m_conf.background[0]);
return 1;
}
//for old plugins
SWIG_VOID(int) loadPic(ePtr<gPixmap> &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 list = PyList_New(6);
- PyList_SET_ITEM(list, 0, PyLong_FromLong(x));
- PyList_SET_ITEM(list, 1, PyLong_FromLong(y));
- PyList_SET_ITEM(list, 2, PyFloat_FromDouble(aspect_ratio));
- PyList_SET_ITEM(list, 3, PyLong_FromLong(0));
- PyList_SET_ITEM(list, 4, PyLong_FromLong(resize_mode));
+
+ 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, 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)
- PyList_SET_ITEM(list, 5, PyString_FromString("#ff000000"));
+ PyTuple_SET_ITEM(tuple, 6, PyString_FromString("#ff000000"));
else
- PyList_SET_ITEM(list, 5, PyString_FromString("#00000000"));
+ PyTuple_SET_ITEM(tuple, 6, PyString_FromString("#00000000"));
- mPL.setPara(list);
+ mPL.setPara(tuple);
- if(!mPL.startDecode(filename.c_str()))
- {
- mPL.waitFinished(); // this blocks until the thread is finished
+ if(!mPL.startDecode(filename.c_str(), 0, 0, false))
mPL.getData(result);
- }
return 0;
}
git.cweiske.de / enigma2.git / blobdiff