ok, i see
i tested it and the png test pkg works with the fixed build. although in barracks, there is a transparancy issue when cursor is above any button (it should highlight the button only, but it highlights the whole square around the button)
btw. i found discussion on arch-dev about libpng issue with wesnoth (it's similar to this one) and from there>
snip from changelog of 1.4 libpng
b. We removed the typecasted NULL definitions such as
#define png_voidp_NULL (png_voidp)NULL
If you used these in your application, just use NULL instead.
so maybe these replace is ok after all
btw2. here is the patch for png 1.4 compatibility
--- code/pngutils/pngutils.cpp~ 2010-03-15 20:23:46.000000000 +0100
+++ code/pngutils/pngutils.cpp 2010-03-16 00:42:26.000000000 +0100
@@ -100,7 +100,7 @@
{
mprintf(("png_read_header: error creating info struct\n"));
cfclose(png_file);
- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
+ png_destroy_read_struct(&png_ptr, NULL, NULL);
return PNG_ERROR_READING;
}
@@ -108,7 +108,7 @@
{
mprintf(("png_read_header: something went wrong\n"));
/* 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);
cfclose(png_file);
/* If we get here, we had a problem reading the file */
return PNG_ERROR_READING;
@@ -128,7 +128,7 @@
png_file = NULL;
}
- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
return PNG_ERROR_NONE;
}
@@ -183,7 +183,7 @@
{
mprintf(("png_read_bitmap: info_ptr went wrong\n"));
cfclose(png_file);
- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
+ png_destroy_read_struct(&png_ptr, NULL, NULL);
return PNG_ERROR_READING;
}
@@ -191,7 +191,7 @@
{
mprintf(("png_read_bitmap: something went wrong\n"));
/* 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);
cfclose(png_file);
/* If we get here, we had a problem reading the file */
return PNG_ERROR_READING;
@@ -199,7 +199,7 @@
png_set_read_fn(png_ptr, &png_file, png_scp_read_data);
- png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_BGR | PNG_TRANSFORM_EXPAND, png_voidp_NULL);
+ png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_BGR | PNG_TRANSFORM_EXPAND, NULL);
len = png_get_rowbytes(png_ptr, info_ptr);
row_pointers = png_get_rows(png_ptr, info_ptr);
@@ -212,7 +212,7 @@
memcpy(&image_data[i * len], row_pointers[i], len);
}
- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
cfclose(png_file);
return PNG_ERROR_NONE;
