diff options
| author |   Benjamin Trigona-Harany <bosth@alumni.sfu.ca> | 2010-06-23 16:07:40 -0500 |
|---|---|---|
| committer |   Erik Hanson <erik@slackbuilds.org> | 2010-06-29 00:36:35 -0500 |
| commit | a4e30f9f3e827cd1b0245e72fcba87cb8d9b1a60 (patch) | |
| tree | 189b64a89edb75d59f7be8e913e1d36d196a8498 /graphics/exact-image/png.cc-libpng14.diff | |
| parent | 5e48145d7d7d792a5033872202b8b40a809082d3 (diff) | |
| download | slackbuilds-a4e30f9f3e827cd1b0245e72fcba87cb8d9b1a60.tar.gz slackbuilds-a4e30f9f3e827cd1b0245e72fcba87cb8d9b1a60.tar.xz | |
graphics/exact-image: Added (image processing library)
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'graphics/exact-image/png.cc-libpng14.diff')
| -rw-r--r-- | graphics/exact-image/png.cc-libpng14.diff | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/graphics/exact-image/png.cc-libpng14.diff b/graphics/exact-image/png.cc-libpng14.diff new file mode 100644 index 0000000000..d6f639ff4a --- /dev/null +++ b/graphics/exact-image/png.cc-libpng14.diff @@ -0,0 +1,62 @@ +diff -Naur exact-image-0.8.1-old/codecs/png.cc exact-image-0.8.1/codecs/png.cc +--- exact-image-0.8.1-old/codecs/png.cc 2010-06-16 02:46:40.349543689 +0300 ++++ exact-image-0.8.1/codecs/png.cc 2010-06-16 02:57:50.156542917 +0300 +@@ -71,7 +71,7 @@ + /* Allocate/initialize the memory for image information. REQUIRED. */ + info_ptr = png_create_info_struct(png_ptr); + if (info_ptr == NULL) { +- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, NULL, NULL); + return 0; + } + +@@ -82,7 +82,7 @@ + + if (setjmp(png_jmpbuf(png_ptr))) { + /* Free all of the memory associated with the png_ptr and info_ptr */ +- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + /* If we get here, we had a problem reading the file */ + return 0; + } +@@ -99,7 +99,7 @@ + png_read_info (png_ptr, info_ptr); + + png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, +- &interlace_type, int_p_NULL, int_p_NULL); ++ &interlace_type, NULL, NULL); + + image.w = width; + image.h = height; +@@ -196,11 +196,11 @@ + for (int pass = 0; pass < number_passes; ++pass) + for (unsigned int y = 0; y < height; ++y) { + row_pointers[0] = image.getRawData() + y * stride; +- png_read_rows(png_ptr, row_pointers, png_bytepp_NULL, 1); ++ png_read_rows(png_ptr, row_pointers, NULL, 1); + } + + /* clean up after the read, and free any memory allocated - REQUIRED */ +- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + + /* that's it */ + return true; +@@ -224,7 +224,7 @@ + /* Allocate/initialize the memory for image information. REQUIRED. */ + info_ptr = png_create_info_struct(png_ptr); + if (info_ptr == NULL) { +- png_destroy_write_struct(&png_ptr, png_infopp_NULL); ++ png_destroy_write_struct(&png_ptr, NULL); + return false; + } + +@@ -244,8 +244,6 @@ + else if (quality > Z_BEST_COMPRESSION) quality = Z_BEST_COMPRESSION; + png_set_compression_level(png_ptr, quality); + +- png_info_init (info_ptr); +- + /* Set up our STL stream output control */ + png_set_write_fn (png_ptr, stream, &stdstream_write_data, &stdstream_flush_data); + |