diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2011-07-14 22:24:22 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2011-07-14 22:24:22 (GMT) |
| commit | 885bd7003c24b3be1b5505bed0b854d8fd02ae52 (patch) | |
| tree | 3bfcf045f94720b47b474e3208b4b7b519869670 | |
| parent | 5f9ddbc7388765d462898740da0663c4a83815da (diff) | |
| download | mxe-885bd7003c24b3be1b5505bed0b854d8fd02ae52.zip mxe-885bd7003c24b3be1b5505bed0b854d8fd02ae52.tar.gz mxe-885bd7003c24b3be1b5505bed0b854d8fd02ae52.tar.bz2 | |
update package gdal
| -rw-r--r-- | src/gdal-1-png.patch | 36 | ||||
| -rw-r--r-- | src/gdal.mk | 4 |
2 files changed, 2 insertions, 38 deletions
diff --git a/src/gdal-1-png.patch b/src/gdal-1-png.patch deleted file mode 100644 index 357e2dd..0000000 --- a/src/gdal-1-png.patch +++ /dev/null @@ -1,36 +0,0 @@ -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)
- {
diff --git a/src/gdal.mk b/src/gdal.mk index e4c4e3b..cfae678 100644 --- a/src/gdal.mk +++ b/src/gdal.mk @@ -4,8 +4,8 @@ # GDAL PKG := gdal $(PKG)_IGNORE := -$(PKG)_VERSION := 1.8.0 -$(PKG)_CHECKSUM := e5a2802933054050c6fb0b0a0e1f46b5dd195b0a +$(PKG)_VERSION := 1.8.1 +$(PKG)_CHECKSUM := b2f8b12ebdd00c05bc7f1ab7b761d9ac335c470c $(PKG)_SUBDIR := gdal-$($(PKG)_VERSION) $(PKG)_FILE := gdal-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.gdal.org/ |