razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

fixed aborting on png-level loading

Browse source
This commit is contained in:
fukasawa 2016-03-24 03:07:46 +09:00
parent 9c02f65f6e
commit 13abb65b48
1 changed files with 29 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
toonz/sources/image/png/tiio_png.cpp
View file

@ -17,6 +17,11 @@ using namespace std;
//------------------------------------------------------------ //------------------------------------------------------------
extern "C" { extern "C" {
void tnz_abort(jmp_buf, int)
{
}
void tnz_error_fun(png_structp pngPtr, png_const_charp error_message) void tnz_error_fun(png_structp pngPtr, png_const_charp error_message)
{ {
*(int*)png_get_error_ptr(pngPtr) = 0; *(int*)png_get_error_ptr(pngPtr) = 0;
@ -29,8 +34,7 @@ TNZ_LITTLE_ENDIAN undefined !!
//========================================================= //=========================================================
inline USHORT inline USHORT mySwap(USHORT val)
mySwap(USHORT val)
{ {
#if TNZ_LITTLE_ENDIAN #if TNZ_LITTLE_ENDIAN
return ((val) | ((val & 0xff) << 8)); //((val>>8)|((val&0xff)<<8)); (vecchio codice) return ((val) | ((val & 0xff) << 8)); //((val>>8)|((val&0xff)<<8)); (vecchio codice)
@ -56,23 +60,15 @@ class PngReader : public Tiio::Reader
int m_canDelete; int m_canDelete;
public: public:
PngReader() PngReader()
: m_chan(0), m_png_ptr(0), m_info_ptr(0), m_end_info_ptr(0), m_bit_depth(0), m_color_type(0), m_interlace_type(0), m_compression_type(0), m_filter_type(0), m_sig_read(0), m_y(0), m_is16bitEnabled(true), m_rowBuffer(0), m_tempBuffer(0), m_canDelete(1) : m_chan(0), m_png_ptr(0), m_info_ptr(0), m_end_info_ptr(0), m_bit_depth(0), m_color_type(0), m_interlace_type(0), m_compression_type(0), m_filter_type(0), m_sig_read(0), m_y(0), m_is16bitEnabled(true), m_rowBuffer(0), m_tempBuffer(0), m_canDelete(0)
{ {
} }
~PngReader() ~PngReader()
{ {
if (m_canDelete == 1) { if (m_canDelete == 1) {
try { png_destroy_read_struct(&m_png_ptr, &m_info_ptr, &m_end_info_ptr);
png_read_end(m_png_ptr, m_end_info_ptr);
} catch (...) {
} }
try {
png_destroy_read_struct(&m_png_ptr, &m_info_ptr,
&m_end_info_ptr);
} catch (...) {
}
} //da quando leggiamo solo le info ho errori di tutti i tipi
delete[] m_rowBuffer; delete[] m_rowBuffer;
delete[] m_tempBuffer; delete[] m_tempBuffer;
} }
@ -102,6 +98,10 @@ public:
PNG_LIBPNG_VER_STRING, &m_canDelete, tnz_error_fun, 0); PNG_LIBPNG_VER_STRING, &m_canDelete, tnz_error_fun, 0);
if (!m_png_ptr) if (!m_png_ptr)
return; return;
png_set_longjmp_fn(m_png_ptr, tnz_abort, sizeof(jmp_buf)); /* ignore all fatal errors */
m_canDelete = 1;
m_info_ptr = png_create_info_struct(m_png_ptr); m_info_ptr = png_create_info_struct(m_png_ptr);
if (!m_info_ptr) { if (!m_info_ptr) {
png_destroy_read_struct(&m_png_ptr, png_destroy_read_struct(&m_png_ptr,
@ -115,11 +115,6 @@ public:
return; return;
} }
if (setjmp(png_jmpbuf(m_png_ptr))) {
/* don't abort() even if an error has occured */
return;
}
png_init_io(m_png_ptr, m_chan); png_init_io(m_png_ptr, m_chan);
png_set_sig_bytes(m_png_ptr, sizeof signature); png_set_sig_bytes(m_png_ptr, sizeof signature);
@ -140,13 +135,11 @@ public:
if (png_get_valid(m_png_ptr, m_info_ptr, PNG_INFO_pHYs)) { if (png_get_valid(m_png_ptr, m_info_ptr, PNG_INFO_pHYs)) {
png_uint_32 xdpi = png_get_x_pixels_per_meter(m_png_ptr, m_info_ptr); png_uint_32 xdpi = png_get_x_pixels_per_meter(m_png_ptr, m_info_ptr);
png_uint_32 ydpi = png_get_y_pixels_per_meter(m_png_ptr, m_info_ptr); png_uint_32 ydpi = png_get_y_pixels_per_meter(m_png_ptr, m_info_ptr);
m_info.m_dpix = tround(xdpi * 0.0254); m_info.m_dpix = tround(xdpi * 0.0254);
m_info.m_dpiy = tround(ydpi * 0.0254); m_info.m_dpiy = tround(ydpi * 0.0254);
} }
int rowBytes = png_get_rowbytes(m_png_ptr, m_info_ptr); int rowBytes = png_get_rowbytes(m_png_ptr, m_info_ptr);
if (m_rowBuffer) if (m_rowBuffer)
delete[] m_rowBuffer; delete[] m_rowBuffer;
//m_rowBuffer = new unsigned char[rowBytes]; //m_rowBuffer = new unsigned char[rowBytes];
@ -171,62 +164,42 @@ public:
m_rowBuffer = new unsigned char[rowBytes]; m_rowBuffer = new unsigned char[rowBytes];
} }
//if (m_interlace_type==1)
// m_tempBuffer = new unsigned char[ly*rowBytes];
/* if (m_interlace_type==1)
{
if (channels==1 || channels==2)
{
if (m_bit_depth < 8) // (m_bit_depth == 1 || m_bit_depth == 2 || m_bit_depth == 4)
m_tempBuffer = new unsigned char[ly*lx*3];
else
m_tempBuffer = new unsigned char[ly*rowBytes*4];
}
else
{
m_tempBuffer = new unsigned char[ly*rowBytes];
}
}*/
/*if (m_color_type == PNG_COLOR_TYPE_PALETTE)
{
png_destroy_read_struct(&m_png_ptr,
&m_info_ptr, (png_infopp)0);
return;
}*/
if (m_color_type == PNG_COLOR_TYPE_PALETTE) { if (m_color_type == PNG_COLOR_TYPE_PALETTE) {
m_info.m_valid = true; m_info.m_valid = true;
png_set_palette_to_rgb(m_png_ptr); png_set_palette_to_rgb(m_png_ptr);
} }
if (m_color_type == PNG_COLOR_TYPE_GRAY && if (m_color_type == PNG_COLOR_TYPE_GRAY &&
m_bit_depth < 8) m_bit_depth < 8) {
png_set_expand_gray_1_2_4_to_8(m_png_ptr); png_set_expand_gray_1_2_4_to_8(m_png_ptr);
}
if (png_get_valid(m_png_ptr, m_info_ptr, if (png_get_valid(m_png_ptr, m_info_ptr, PNG_INFO_tRNS)) {
PNG_INFO_tRNS))
png_set_tRNS_to_alpha(m_png_ptr); png_set_tRNS_to_alpha(m_png_ptr);
}
if (m_bit_depth == 16 && !m_is16bitEnabled) if (m_bit_depth == 16 && !m_is16bitEnabled) {
png_set_strip_16(m_png_ptr); png_set_strip_16(m_png_ptr);
}
#if defined(TNZ_MACHINE_CHANNEL_ORDER_BGRM) #if defined(TNZ_MACHINE_CHANNEL_ORDER_BGRM)
if (m_color_type == PNG_COLOR_TYPE_RGB || if (m_color_type == PNG_COLOR_TYPE_RGB ||
m_color_type == PNG_COLOR_TYPE_RGB_ALPHA) m_color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
png_set_bgr(m_png_ptr); png_set_bgr(m_png_ptr);
}
#elif defined(TNZ_MACHINE_CHANNEL_ORDER_MBGR) #elif defined(TNZ_MACHINE_CHANNEL_ORDER_MBGR)
if (m_color_type == PNG_COLOR_TYPE_RGB_ALPHA) if (m_color_type == PNG_COLOR_TYPE_RGB_ALPHA) {
png_set_swap_alpha(m_png_ptr); png_set_swap_alpha(m_png_ptr);
}
#elif !defined(TNZ_MACHINE_CHANNEL_ORDER_RGBM) && !defined(TNZ_MACHINE_CHANNEL_ORDER_MRGB) #elif !defined(TNZ_MACHINE_CHANNEL_ORDER_RGBM) && !defined(TNZ_MACHINE_CHANNEL_ORDER_MRGB)
@unknow channel order @unknow channel order
#endif #endif
if (m_color_type == PNG_COLOR_TYPE_GRAY || if (m_color_type == PNG_COLOR_TYPE_GRAY ||
m_color_type == PNG_COLOR_TYPE_GRAY_ALPHA) m_color_type == PNG_COLOR_TYPE_GRAY_ALPHA) {
png_set_gray_to_rgb(m_png_ptr); png_set_gray_to_rgb(m_png_ptr);
} }
}
void readLine(char *buffer, int x0, int x1, int shrink) void readLine(char *buffer, int x0, int x1, int shrink)
{ {
@ -488,7 +461,6 @@ public:
void copyPixel(int count, int dstX, int dstDx, int dstY) void copyPixel(int count, int dstX, int dstDx, int dstY)
{ {
int channels = png_get_channels(m_png_ptr, m_info_ptr); int channels = png_get_channels(m_png_ptr, m_info_ptr);
int rowBytes = png_get_rowbytes(m_png_ptr, m_info_ptr); int rowBytes = png_get_rowbytes(m_png_ptr, m_info_ptr);
int lx = m_info.m_lx; int lx = m_info.m_lx;
@ -540,7 +512,6 @@ public:
void readLineInterlace(char *buffer, int x0, int x1, int shrink) void readLineInterlace(char *buffer, int x0, int x1, int shrink)
{ {
//m_png_ptr->row_number è l'indice di riga che scorre quando chiamo la png_read_row //m_png_ptr->row_number è l'indice di riga che scorre quando chiamo la png_read_row
int rowNumber = png_get_current_row_number(m_png_ptr); int rowNumber = png_get_current_row_number(m_png_ptr);
//numRows è il numero di righe processate in ogni passo //numRows è il numero di righe processate in ogni passo
@ -627,7 +598,6 @@ public:
void readLineInterlace(short *buffer, int x0, int x1, int shrink) void readLineInterlace(short *buffer, int x0, int x1, int shrink)
{ {
//m_png_ptr->row_number è l'indice di riga che scorre quando chiamo la png_read_row //m_png_ptr->row_number è l'indice di riga che scorre quando chiamo la png_read_row
int rowNumber = png_get_current_row_number(m_png_ptr); int rowNumber = png_get_current_row_number(m_png_ptr);
//numRows è il numero di righe processate in ogni passo //numRows è il numero di righe processate in ogni passo
@ -698,6 +668,7 @@ public:
//========================================================= //=========================================================
Tiio::PngWriterProperties::PngWriterProperties() Tiio::PngWriterProperties::PngWriterProperties()
: m_matte("Alpha Channel", true) : m_matte("Alpha Channel", true)