Attachment #282949 for bug #378353

View | Details | Raw Unified | Return to bug 378353
Collapse All | Expand All




    endinfo = png_create_info_struct(png);

    // DH: added following lines
    if (setjmp(png_jmpbuf(png)))
    {
        png_destroy_read_struct(&png, &info, &endinfo);
        return 0;

    endinfo = png_create_info_struct(png);

    // DH: added following lines
    if (setjmp(png_jmpbuf(png)))
    {
        png_destroy_read_struct(&png, &info, &endinfo);
        return 0;

#define ALPHA *q

                switch (trans) {
                    case PNG_CALLBACKT:
                        FORSTART
                            ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);
                        FOREND

Lines 57-63 Link Here

(-)arbsrc_6779.orig/GL/glpng/glpng.h (-1 / +1 lines)
57	#define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS	57	#define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS
58		58
59	/* Transparency parameters */	59	/* Transparency parameters */
60	#define PNG_CALLBACK -3 /* Call the callback function to generate alpha */	60	#define PNG_CALLBACKT -3 /* Call the callback function to generate alpha */
61	#define PNG_ALPHA -2 /* Use alpha channel in PNG file, if there is one */	61	#define PNG_ALPHA -2 /* Use alpha channel in PNG file, if there is one */
62	#define PNG_SOLID -1 /* No transparency */	62	#define PNG_SOLID -1 /* No transparency */
63	#define PNG_STENCIL 0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise */	63	#define PNG_STENCIL 0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise */

Return to bug 378353

Lines 285-291 Link Here

(-)arbsrc_6779.orig/GL/glpng/glpng.c (-3 / +3 lines)
285	endinfo = png_create_info_struct(png);	285	endinfo = png_create_info_struct(png);
286		286
287	// DH: added following lines	287	// DH: added following lines
288	if (setjmp(png->jmpbuf))	288	if (setjmp(png_jmpbuf(png)))
289	{	289	{
290	png_destroy_read_struct(&png, &info, &endinfo);	290	png_destroy_read_struct(&png, &info, &endinfo);
291	return 0;	291	return 0;
Lines 390-396 Link Here
390	endinfo = png_create_info_struct(png);	390	endinfo = png_create_info_struct(png);
391		391
392	// DH: added following lines	392	// DH: added following lines
393	if (setjmp(png->jmpbuf))	393	if (setjmp(png_jmpbuf(png)))
394	{	394	{
395	png_destroy_read_struct(&png, &info, &endinfo);	395	png_destroy_read_struct(&png, &info, &endinfo);
396	return 0;	396	return 0;
Lines 569-575 Link Here
569	#define ALPHA *q	569	#define ALPHA *q
570		570
571	switch (trans) {	571	switch (trans) {
572	case PNG_CALLBACK:	572	case PNG_CALLBACKT:
573	FORSTART	573	FORSTART
574	ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);	574	ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);
575	FOREND	575	FOREND