@ -98,7 +98,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */
* functions . If you want to use the default stderr and longjump method ,
* functions . If you want to use the default stderr and longjump method ,
* you can supply NULL for the last three parameters . We also supply the
* you can supply NULL for the last three parameters . We also supply the
* the compiler header file version , so that we know if the application
* the compiler header file version , so that we know if the application
* was compiled with a compatible version of the library . RE T QUIRED
* was compiled with a compatible version of the library . RE QUIRED
*/
*/
png_ptr = png_create_read_struct ( PNG_LIBPNG_VER_STRING ,
png_ptr = png_create_read_struct ( PNG_LIBPNG_VER_STRING ,
png_voidp user_error_ptr , user_error_fn , user_warning_fn ) ;
png_voidp user_error_ptr , user_error_fn , user_warning_fn ) ;
@ -109,7 +109,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */
return ( ERROR ) ;
return ( ERROR ) ;
}
}
/* Allocate/initialize the memory for image information. RE T QUIRED. */
/* Allocate/initialize the memory for image information. RE QUIRED. */
info_ptr = png_create_info_struct ( png_ptr ) ;
info_ptr = png_create_info_struct ( png_ptr ) ;
if ( info_ptr = = NULL )
if ( info_ptr = = NULL )
{
{
@ -119,7 +119,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */
}
}
/* Set error handling if you are using the setjmp/longjmp method (this is
/* Set error handling if you are using the setjmp/longjmp method (this is
* the normal method of doing things with libpng ) . RE T QUIRED unless you
* the normal method of doing things with libpng ) . RE QUIRED unless you
* set up your own error handlers in the png_create_read_struct ( ) earlier .
* set up your own error handlers in the png_create_read_struct ( ) earlier .
*/
*/
@ -132,7 +132,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */
return ( ERROR ) ;
return ( ERROR ) ;
}
}
/* One of the following I/O initialization methods is RE T QUIRED */
/* One of the following I/O initialization methods is RE QUIRED */
# ifdef streams /* PNG file I/O method 1 */ # ifdef streams /* PNG file I/O method 1 */
/* Set up the input control if you are using standard C streams */
/* Set up the input control if you are using standard C streams */
png_init_io ( png_ptr , fp ) ;
png_init_io ( png_ptr , fp ) ;
@ -162,7 +162,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */
/* OK, you're doing it the hard way, with the lower-level functions */
/* OK, you're doing it the hard way, with the lower-level functions */
/* The call to png_read_info() gives us all of the information from the
/* The call to png_read_info() gives us all of the information from the
* PNG file before the first IDAT ( image data chunk ) . RE T QUIRED
* PNG file before the first IDAT ( image data chunk ) . RE QUIRED
*/
*/
png_read_info ( png_ptr , info_ptr ) ;
png_read_info ( png_ptr , info_ptr ) ;
@ -319,14 +319,14 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */
/* Add filler (or alpha) byte (before/after each RGB triplet) */
/* Add filler (or alpha) byte (before/after each RGB triplet) */
png_set_filler ( png_ptr , 0xff , PNG_FILLER_AFTER ) ;
png_set_filler ( png_ptr , 0xff , PNG_FILLER_AFTER ) ;
/* Turn on interlace handling. RE T QUIRED if you are not using
/* Turn on interlace handling. RE QUIRED if you are not using
* png_read_image ( ) . To see how to handle interlacing passes ,
* png_read_image ( ) . To see how to handle interlacing passes ,
* see the png_read_row ( ) method below :
* see the png_read_row ( ) method below :
*/
*/
number_passes = png_set_interlace_handling ( png_ptr ) ;
number_passes = png_set_interlace_handling ( png_ptr ) ;
/* Optional call to gamma correct and add the background to the palette
/* Optional call to gamma correct and add the background to the palette
* and update info structure . RE T QUIRED if you are expecting libpng to
* and update info structure . RE QUIRED if you are expecting libpng to
* update the palette for you ( ie you selected such a transform above ) .
* update the palette for you ( ie you selected such a transform above ) .
*/
*/
png_read_update_info ( png_ptr , info_ptr ) ;
png_read_update_info ( png_ptr , info_ptr ) ;
@ -342,7 +342,7 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */
info_ptr ) ) ;
info_ptr ) ) ;
}
}
/* Now it's time to read the image. One of these methods is RE T QUIRED */
/* Now it's time to read the image. One of these methods is RE QUIRED */
# ifdef entire /* Read the entire image in one go */ # ifdef entire /* Read the entire image in one go */
png_read_image ( png_ptr , row_pointers ) ;
png_read_image ( png_ptr , row_pointers ) ;
@ -375,13 +375,13 @@ void read_png(FILE *fp, unsigned int sig_read) /* file is already open */
}
}
# endif no_entire /* use only one of these two methods */ # endif no_entire /* use only one of these two methods */
/* read rest of file, and get additional chunks in info_ptr - RE T QUIRED */
/* read rest of file, and get additional chunks in info_ptr - RE QUIRED */
png_read_end ( png_ptr , info_ptr ) ;
png_read_end ( png_ptr , info_ptr ) ;
# endif hilevel # endif hilevel
/* At this point you have read the entire image */
/* At this point you have read the entire image */
/* clean up after the read, and free any memory allocated - RE T QUIRED */
/* clean up after the read, and free any memory allocated - RE QUIRED */
png_destroy_read_struct ( & png_ptr , & info_ptr , png_infopp_NULL ) ;
png_destroy_read_struct ( & png_ptr , & info_ptr , png_infopp_NULL ) ;
/* close the file */
/* close the file */
@ -566,7 +566,7 @@ void write_png(char *file_name /* , ... other image information ... */)
* functions . If you want to use the default stderr and longjump method ,
* functions . If you want to use the default stderr and longjump method ,
* you can supply NULL for the last three parameters . We also check that
* you can supply NULL for the last three parameters . We also check that
* the library version is compatible with the one used at compile time ,
* the library version is compatible with the one used at compile time ,
* in case we are using dynamically linked libraries . RE T QUIRED.
* in case we are using dynamically linked libraries . RE QUIRED.
*/
*/
png_ptr = png_create_write_struct ( PNG_LIBPNG_VER_STRING ,
png_ptr = png_create_write_struct ( PNG_LIBPNG_VER_STRING ,
png_voidp user_error_ptr , user_error_fn , user_warning_fn ) ;
png_voidp user_error_ptr , user_error_fn , user_warning_fn ) ;
@ -577,7 +577,7 @@ void write_png(char *file_name /* , ... other image information ... */)
return ( ERROR ) ;
return ( ERROR ) ;
}
}
/* Allocate/initialize the image information data. RE T QUIRED */
/* Allocate/initialize the image information data. RE QUIRED */
info_ptr = png_create_info_struct ( png_ptr ) ;
info_ptr = png_create_info_struct ( png_ptr ) ;
if ( info_ptr = = NULL )
if ( info_ptr = = NULL )
{
{
@ -586,7 +586,7 @@ void write_png(char *file_name /* , ... other image information ... */)
return ( ERROR ) ;
return ( ERROR ) ;
}
}
/* Set error handling. RE T QUIRED if you aren't supplying your own
/* Set error handling. RE QUIRED if you aren't supplying your own
* error handling functions in the png_create_write_struct ( ) call .
* error handling functions in the png_create_write_struct ( ) call .
*/
*/
if ( setjmp ( png_jmpbuf ( png_ptr ) ) )
if ( setjmp ( png_jmpbuf ( png_ptr ) ) )
@ -597,7 +597,7 @@ void write_png(char *file_name /* , ... other image information ... */)
return ( ERROR ) ;
return ( ERROR ) ;
}
}
/* One of the following I/O initialization functions is RE T QUIRED */
/* One of the following I/O initialization functions is RE QUIRED */
# ifdef streams /* I/O initialization method 1 */ # ifdef streams /* I/O initialization method 1 */
/* set up the output control if you are using standard C streams */
/* set up the output control if you are using standard C streams */
png_init_io ( png_ptr , fp ) ;
png_init_io ( png_ptr , fp ) ;
@ -624,12 +624,12 @@ void write_png(char *file_name /* , ... other image information ... */)
* PNG_COLOR_TYPE_GRAY_ALPHA , PNG_COLOR_TYPE_PALETTE , PNG_COLOR_TYPE_RGB ,
* PNG_COLOR_TYPE_GRAY_ALPHA , PNG_COLOR_TYPE_PALETTE , PNG_COLOR_TYPE_RGB ,
* or PNG_COLOR_TYPE_RGB_ALPHA . interlace is either PNG_INTERLACE_NONE or
* or PNG_COLOR_TYPE_RGB_ALPHA . interlace is either PNG_INTERLACE_NONE or
* PNG_INTERLACE_ADAM7 , and the compression_type and filter_type MUST
* PNG_INTERLACE_ADAM7 , and the compression_type and filter_type MUST
* currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE . RE T QUIRED
* currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE . RE QUIRED
*/
*/
png_set_IHDR ( png_ptr , info_ptr , width , height , bit_depth , PNG_COLOR_TYPE_ ? ? ? ,
png_set_IHDR ( png_ptr , info_ptr , width , height , bit_depth , PNG_COLOR_TYPE_ ? ? ? ,
PNG_INTERLACE_ ? ? ? ? , PNG_COMPRESSION_TYPE_BASE , PNG_FILTER_TYPE_BASE ) ;
PNG_INTERLACE_ ? ? ? ? , PNG_COMPRESSION_TYPE_BASE , PNG_FILTER_TYPE_BASE ) ;
/* set the palette if there is one. RE T QUIRED for indexed-color images */
/* set the palette if there is one. RE QUIRED for indexed-color images */
palette = ( png_colorp ) png_malloc ( png_ptr , PNG_MAX_PALETTE_LENGTH
palette = ( png_colorp ) png_malloc ( png_ptr , PNG_MAX_PALETTE_LENGTH
* sizeof ( png_color ) ) ;
* sizeof ( png_color ) ) ;
/* ... set palette colors ... */
/* ... set palette colors ... */
@ -676,7 +676,7 @@ void write_png(char *file_name /* , ... other image information ... */)
/* note that if sRGB is present the gAMA and cHRM chunks must be ignored
/* note that if sRGB is present the gAMA and cHRM chunks must be ignored
* on read and must be written in accordance with the sRGB profile */
* on read and must be written in accordance with the sRGB profile */
/* Write the file header information. RE T QUIRED */
/* Write the file header information. RE QUIRED */
png_write_info ( png_ptr , info_ptr ) ;
png_write_info ( png_ptr , info_ptr ) ;
/* If you want, you can write the info in two steps, in case you need to
/* If you want, you can write the info in two steps, in case you need to
@ -744,7 +744,7 @@ void write_png(char *file_name /* , ... other image information ... */)
for ( k = 0 ; k < height ; k + + )
for ( k = 0 ; k < height ; k + + )
row_pointers [ k ] = image + k * width * bytes_per_pixel ;
row_pointers [ k ] = image + k * width * bytes_per_pixel ;
/* One of the following output methods is RE T QUIRED */
/* One of the following output methods is RE QUIRED */
# ifdef entire /* write out the entire image data in one call */ # ifdef entire /* write out the entire image data in one call */
png_write_image ( png_ptr , row_pointers ) ;
png_write_image ( png_ptr , row_pointers ) ;
@ -773,7 +773,7 @@ void write_png(char *file_name /* , ... other image information ... */)
* register unknown chunks into the info structure to be written out .
* register unknown chunks into the info structure to be written out .
*/
*/
/* It is RE T QUIRED to call this to finish writing the rest of the file */
/* It is RE QUIRED to call this to finish writing the rest of the file */
png_write_end ( png_ptr , info_ptr ) ;
png_write_end ( png_ptr , info_ptr ) ;
# endif hilevel # endif hilevel
Timothy Pearson
13 years ago