cafd0f72cd
The changes are fully described at
http://trac.osgeo.org/gdal/wiki/Release/1.8.0-News
However, the following are the highlights.
In a nutshell:
* New GDAL drivers : GTX, HF2, JPEGLS, JP2OpenJPEG, JPIPKAK,
KMLSUPEROVERLAY, LOS/LAS, MG4Lidar, NTv2, OZI, PDF, RASDAMAN,
XYZ
* New OGR drivers : AeronavFAA, ArcObjects, GPSBabel, HTF, LIBKML,
MSSQLSpatial, NAS, OpenAir, PDS, PGDump, SOSI, SUA, WFS
* Significantly improved OGR drivers : DXF, GML
* New implemented RFCs:
o RFC 7: Use VSILFILE for VSI*L Functions
o RFC 24: Progressive data support in GDAL
o RFC 28: OGR SQL Generalized Expressions
o RFC 29: OGR Set Ignored Fields
o RFC 30: Unicode Filenames
o RFC 33: GTIFF - Corrected !PixelIsPoint Interpretation
* New utility : gdallocationinfo
Backward compatibility issues:
* MITAB driver: use "," for the OGR Feature Style id: parameter
delimiter, not "." as per the spec. Known impacted application:
MapServer?
* RFC 33 changes the way PixelIsPoint? is handled for GeoTIFF
* GML driver: write valid <gml:MultiGeometry> element instead of
the non-conformant <gml:GeometryCollection>. For backward
compatibility, recognize both syntax for the reading part
43 lines
1.5 KiB
Text
43 lines
1.5 KiB
Text
$NetBSD: patch-ab,v 1.9 2011/02/10 03:45:09 brook Exp $
|
|
|
|
Fix build with png-1.5.
|
|
http://trac.osgeo.org/gdal/ticket/3914
|
|
|
|
--- frmts/png/pngdataset.cpp.orig 2011-01-13 22:19:04.000000000 -0700
|
|
+++ frmts/png/pngdataset.cpp 2011-02-06 12:43:09.000000000 -0700
|
|
@@ -1315,7 +1315,7 @@
|
|
* instead of an int, which is what fread() actually returns.
|
|
*/
|
|
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)
|
|
png_error(png_ptr, "Read Error");
|
|
@@ -1330,7 +1330,7 @@
|
|
{
|
|
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)
|
|
png_error(png_ptr, "Write Error");
|
|
@@ -1341,7 +1341,7 @@
|
|
/************************************************************************/
|
|
static void png_vsi_flush(png_structp png_ptr)
|
|
{
|
|
- VSIFFlushL( (VSILFILE*)(png_ptr->io_ptr) );
|
|
+ VSIFFlushL( (VSILFILE*)(png_get_io_ptr(png_ptr)) );
|
|
}
|
|
|
|
/************************************************************************/
|
|
@@ -1357,7 +1357,7 @@
|
|
// libpng is generally not built as C++ and so won't honour unwind
|
|
// semantics. Ugg.
|
|
|
|
- jmp_buf* psSetJmpContext = (jmp_buf*) png_ptr->error_ptr;
|
|
+ jmp_buf* psSetJmpContext = (jmp_buf*) png_get_error_ptr(png_ptr);
|
|
if (psSetJmpContext)
|
|
{
|
|
longjmp( *psSetJmpContext, 1 );
|