png_struct *png;
png_info *info, *end;
pngBuffer_t pb;
- int bitDepth, colorType, channels;
+ int bitDepth, colorType;
png_uint_32 w, h, i;
byte **rowPointers;
pb.size = size;
pb.offset = 0;
png_set_read_fn( png, &pb, PNGReadData );
- png->io_ptr = &pb; /* hack! */
/* set error longjmp */
- if( setjmp( png->jmpbuf ) )
+ if( setjmp( png_jmpbuf(png) ) )
{
Sys_Printf( "WARNING: An error occurred reading PNG image\n" );
png_destroy_read_struct( &png, &info, &end );
png_get_IHDR( png, info,
&w, &h, &bitDepth, &colorType, NULL, NULL, NULL );
- /* read number of channels */
- channels = png_get_channels( png, info );
-
/* the following will probably bork on certain types of png images, but hey... */
/* force indexed/gray/trans chunk to rgb */