diff --git a/CHANGES b/CHANGES index e06370be5..094017a01 100644 --- a/CHANGES +++ b/CHANGES @@ -5011,7 +5011,11 @@ Version 1.7.0beta51 [February 17, 2015] with a method that prevents overflow and does not increase cpu usage significantly. -Version 1.7.0beta52 [February 17, 2015] +Version 1.7.0beta52 [February 18, 2015] + Added information about setjmp/simplified API interaction in the + manual page and INSTALL file. Added information about using + row_pointers with a single height*width*bpp allocated block + to the manual page. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/libpng-manual.txt b/libpng-manual.txt index e94e1b4e8..443a6e4d0 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1185,13 +1185,10 @@ row_pointers prior to calling png_read_png() with png_set_rows(png_ptr, info_ptr, &row_pointers); Alternatively you could allocate your image in one big block and define -row_pointers[i] to point into the proper places in your block. Allocate -extra memory after the last row to leave working room for reading the -entire row if you are doing reductions such as 16-to-8 or rgb-to-gray. -In the worst case, reducing 16-bit RGBA to 8-bit gray, you'd need to -allocate seven extra rows worth of memory (you don't need extra memory -for any but the last row, because for other rows the working space just -overlaps the next row(s). +row_pointers[i] to point into the proper places in your block. If +you do this, be sure to call png_read_update_info() described below, +to update the "rowbytes" value to account for any transformations that +change the number of bytes per row before you use it to allocate your block. If you use png_set_rows(), the application is responsible for freeing row_pointers (and row_pointers[i], if they were separately allocated). diff --git a/libpng.3 b/libpng.3 index 0a990e02b..c8cc0eefd 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1679,13 +1679,10 @@ row_pointers prior to calling png_read_png() with png_set_rows(png_ptr, info_ptr, &row_pointers); Alternatively you could allocate your image in one big block and define -row_pointers[i] to point into the proper places in your block. Allocate -extra memory after the last row to leave working room for reading the -entire row if you are doing reductions such as 16-to-8 or rgb-to-gray. -In the worst case, reducing 16-bit RGBA to 8-bit gray, you'd need to -allocate seven extra rows worth of memory (you don't need extra memory -for any but the last row, because for other rows the working space just -overlaps the next row(s). +row_pointers[i] to point into the proper places in your block. If +you do this, be sure to call png_read_update_info() described below, +to update the "rowbytes" value to account for any transformations that +change the number of bytes per row before you use it to allocate your block. If you use png_set_rows(), the application is responsible for freeing row_pointers (and row_pointers[i], if they were separately allocated). diff --git a/libpngpf.3 b/libpngpf.3 index 613b6f97a..be8b7799f 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "February 17, 2015" +.TH LIBPNGPF 3 "February 18, 2015" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta52 (private functions)