diff options
| author | dinoex <dinoex@FreeBSD.org> | 2010-03-30 01:58:13 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2010-03-30 01:58:13 +0800 |
| commit | 17d545d044a70447538b4c7348ac2e32c47aafe9 (patch) | |
| tree | c78847ebd465d810007640b0125f538b28d45959 /devel/libclaw | |
| parent | 926b49e8a311c36ddf1850b5e67e7e9fe0bf8320 (diff) | |
| download | freebsd-ports-gnome-17d545d044a70447538b4c7348ac2e32c47aafe9.tar.gz freebsd-ports-gnome-17d545d044a70447538b4c7348ac2e32c47aafe9.tar.zst freebsd-ports-gnome-17d545d044a70447538b4c7348ac2e32c47aafe9.zip | |
- fix build for png-1.4.1
Diffstat (limited to 'devel/libclaw')
| -rw-r--r-- | devel/libclaw/files/patch-claw-code-png_reader.cpp | 38 | ||||
| -rw-r--r-- | devel/libclaw/files/patch-claw-code-png_writer.cpp | 11 |
2 files changed, 49 insertions, 0 deletions
diff --git a/devel/libclaw/files/patch-claw-code-png_reader.cpp b/devel/libclaw/files/patch-claw-code-png_reader.cpp new file mode 100644 index 000000000000..8369b2c7eea6 --- /dev/null +++ b/devel/libclaw/files/patch-claw-code-png_reader.cpp @@ -0,0 +1,38 @@ +--- claw/code/png_reader.cpp.orig 2008-07-08 11:52:14.000000000 +0200 ++++ claw/code/png_reader.cpp 2010-03-29 09:25:03.000000000 +0200 +@@ -146,7 +146,7 @@ + { + /* If we get here, we had a problem reading the file */ + /* 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); + throw CLAW_EXCEPTION("Invalid PNG file."); + } + +@@ -156,7 +156,7 @@ + claw__graphic__png__source_manager__read ); + + png_set_strip_16(png_ptr); +- png_set_gray_1_2_4_to_8(png_ptr); ++ png_set_expand_gray_1_2_4_to_8(png_ptr); + png_set_packing(png_ptr); + + // transform palette index into RGB value +@@ -169,7 +169,7 @@ + png_read_info(png_ptr, info_ptr); + read_image( png_ptr, info_ptr ); + +- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); + } // png::reader::read_from_file() + + /*----------------------------------------------------------------------------*/ +@@ -339,7 +339,7 @@ + info_ptr = png_create_info_struct(png_ptr); + + if (!info_ptr) +- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL); ++ png_destroy_read_struct(&png_ptr, NULL, NULL); + } + + if (!png_ptr || !info_ptr) diff --git a/devel/libclaw/files/patch-claw-code-png_writer.cpp b/devel/libclaw/files/patch-claw-code-png_writer.cpp new file mode 100644 index 000000000000..0c5ee5b77678 --- /dev/null +++ b/devel/libclaw/files/patch-claw-code-png_writer.cpp @@ -0,0 +1,11 @@ +--- claw/code/png_writer.cpp.orig 2008-07-08 11:52:14.000000000 +0200 ++++ claw/code/png_writer.cpp 2010-03-29 10:14:49.000000000 +0200 +@@ -296,7 +296,7 @@ + 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); + } + + if (!png_ptr || !info_ptr) |