d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

package gdal: libpng 1.5 compatibility

This commit is contained in:
Mark Brand 2011-03-03 21:00:08 +01:00
parent ff8e372e08
commit 838e2dda4f
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/gdal-1-png.patch Normal file
View File

@ -0,0 +1,36 @@
This file is part of mingw-cross-env.
See doc/index.html for further information.
http://trac.osgeo.org/gdal/changeset/21526
Index: /branches/1.8/gdal/frmts/png/pngdataset.cpp
===================================================================
--- a/frmts/png/pngdataset.cpp (revision 21032)
+++ b/frmts/png/pngdataset.cpp (revision 21526)
@@ -1316,5 +1316,5 @@
*/
check = (png_size_t)VSIFReadL(data, (png_size_t)1, length,
- (VSILFILE*)png_ptr->io_ptr);
+ (VSILFILE*)png_get_io_ptr(png_ptr));
if (check != length)
@@ -1331,5 +1331,5 @@
png_uint_32 check;
- check = VSIFWriteL(data, 1, length, (VSILFILE*)(png_ptr->io_ptr));
+ check = VSIFWriteL(data, 1, length, (VSILFILE*)png_get_io_ptr(png_ptr));
if (check != length)
@@ -1342,5 +1342,5 @@
static void png_vsi_flush(png_structp png_ptr)
{
- VSIFFlushL( (VSILFILE*)(png_ptr->io_ptr) );
+ VSIFFlushL( (VSILFILE*)png_get_io_ptr(png_ptr) );
}
@@ -1358,5 +1358,5 @@
// semantics. Ugg.
- jmp_buf* psSetJmpContext = (jmp_buf*) png_ptr->error_ptr;
+ jmp_buf* psSetJmpContext = (jmp_buf*) png_get_error_ptr(png_ptr);
if (psSetJmpContext)
{

2
src/gdal.mk
View File

@ -32,7 +32,7 @@ define $(PKG)_BUILD
--with-pam \
--without-threads \
--with-libz='$(PREFIX)/$(TARGET)' \
--with-png=internal \
--with-png='$(PREFIX)/$(TARGET)' \
--with-libtiff='$(PREFIX)/$(TARGET)' \
--with-geotiff='$(PREFIX)/$(TARGET)' \
--with-jpeg='$(PREFIX)/$(TARGET)' \