mirror of
https://github.com/Ponce/slackbuilds
synced 2024-12-01 01:00:03 +01:00
53 lines
2.8 KiB
Diff
53 lines
2.8 KiB
Diff
--- k3d-source-0.8.0.2/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2010-07-02 23:27:47.000000000 -0300
|
|
+++ k3d-source-0.8.0.2_patched/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2010-07-13 08:04:55.000000000 -0300
|
|
@@ -148,12 +148,12 @@
|
|
// allocate/initialize the image information data
|
|
_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);
|
|
io_error("png_get_file_size: fail to call png_create_info_struct()");
|
|
}
|
|
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);
|
|
io_error("png_get_file_size: fail to call setjmp()");
|
|
}
|
|
png_init_io(_png_ptr, get());
|
|
@@ -165,7 +165,7 @@
|
|
png_reader(const char* filename) : file_mgr(filename, "rb") { init(); }
|
|
|
|
~png_reader() {
|
|
- png_destroy_read_struct(&_png_ptr,&_info_ptr,png_infopp_NULL);
|
|
+ png_destroy_read_struct(&_png_ptr,&_info_ptr,NULL);
|
|
}
|
|
point2<std::ptrdiff_t> get_dimensions() {
|
|
return point2<std::ptrdiff_t>(png_get_image_width(_png_ptr,_info_ptr),
|
|
@@ -177,7 +177,7 @@
|
|
int bit_depth, color_type, interlace_type;
|
|
png_get_IHDR(_png_ptr, _info_ptr,
|
|
&width, &height,&bit_depth,&color_type,&interlace_type,
|
|
- int_p_NULL, int_p_NULL);
|
|
+ NULL, NULL);
|
|
io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
|
|
"png_read_view: input view size does not match PNG file size");
|
|
|
|
@@ -219,7 +219,7 @@
|
|
int bit_depth, color_type, interlace_type;
|
|
png_get_IHDR(_png_ptr, _info_ptr,
|
|
&width, &height,&bit_depth,&color_type,&interlace_type,
|
|
- int_p_NULL, int_p_NULL);
|
|
+ NULL, NULL);
|
|
io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
|
|
"png_reader_color_convert::apply(): input view size does not match PNG file size");
|
|
switch (color_type) {
|
|
@@ -308,7 +308,7 @@
|
|
io_error_if(!_png_ptr,"png_write_initialize: fail to call png_create_write_struct()");
|
|
_info_ptr = png_create_info_struct(_png_ptr);
|
|
if (!_info_ptr) {
|
|
- png_destroy_write_struct(&_png_ptr,png_infopp_NULL);
|
|
+ png_destroy_write_struct(&_png_ptr,NULL);
|
|
io_error("png_write_initialize: fail to call png_create_info_struct()");
|
|
}
|
|
if (setjmp(png_jmpbuf(_png_ptr))) {
|