forked from pool/shapelib
Dirk Stoecker
39b4e5a433
- Update to version 1.5.0:
* shpopen.c: resync with GDAL internal shapelib to avoid being
dependent on correctness of file size field in .shp. Fixes
https://lists.osgeo.org/pipermail/gdal-dev/2018-October/049218.html
* contrib/shpgeo.h/.c: Remove PROJ.4 dependency and
functionality, causing removal of SHPProject(),
SHPSetProjection() and SHPFreeProjection()
* contrib/shpproj.c: removed
shpopen.c, dbfopen.c, shptree.c, sbnsearch.c: resyc with GDAL
internal shapelib. Mostly to allow building those files as C++
without warning. Also add FTDate entry in DBFFieldType (see
https://github.com/OSGeo/gdal/pull/308). And some other code
cleanups
* dbfopen.c: fix a bug where the end of file character was
written on top of the first character of the first field name
when deleting a field on a .dbf without records. Fixes
https://github.com/OSGeo/gdal/issues/863
* safileio.c: remove duplicate test. Patch by Jaroslav Fojtik.
Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2744
- Rebase rpmlint-errors.patch for current version.
- Drop proj4 Requires and BuildRequires: functionality dropped by
upstream.
OBS-URL: https://build.opensuse.org/request/show/690070
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/shapelib?expand=0&rev=19
82 lines
2.2 KiB
Diff
82 lines
2.2 KiB
Diff
Index: shapelib-1.5.0/contrib/shpcentrd.c
|
|
===================================================================
|
|
--- shapelib-1.5.0.orig/contrib/shpcentrd.c
|
|
+++ shapelib-1.5.0/contrib/shpcentrd.c
|
|
@@ -156,4 +156,6 @@ int main( int argc, char ** argv )
|
|
DBFClose( old_DBF );
|
|
DBFClose( new_DBF );
|
|
printf ("\n");
|
|
+
|
|
+ return 0;
|
|
}
|
|
Index: shapelib-1.5.0/contrib/shpdata.c
|
|
===================================================================
|
|
--- shapelib-1.5.0.orig/contrib/shpdata.c
|
|
+++ shapelib-1.5.0/contrib/shpdata.c
|
|
@@ -131,4 +131,6 @@ int main( int argc, char ** argv )
|
|
DBFClose( old_DBF );
|
|
|
|
printf ("\n");
|
|
+
|
|
+ return 0;
|
|
}
|
|
Index: shapelib-1.5.0/contrib/shpdxf.c
|
|
===================================================================
|
|
--- shapelib-1.5.0.orig/contrib/shpdxf.c
|
|
+++ shapelib-1.5.0/contrib/shpdxf.c
|
|
@@ -331,6 +331,8 @@ main (int argc, char **argv)
|
|
SHPClose (shp);
|
|
DBFClose (dbf);
|
|
fclose (dxf);
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
|
|
Index: shapelib-1.5.0/contrib/shpfix.c
|
|
===================================================================
|
|
--- shapelib-1.5.0.orig/contrib/shpfix.c
|
|
+++ shapelib-1.5.0/contrib/shpfix.c
|
|
@@ -107,4 +107,6 @@ int main( int argc, char ** argv )
|
|
|
|
SHPClose ( hSHP );
|
|
SHPClose ( cSHP );
|
|
+
|
|
+ return 0;
|
|
}
|
|
Index: shapelib-1.5.0/contrib/shpinfo.c
|
|
===================================================================
|
|
--- shapelib-1.5.0.orig/contrib/shpinfo.c
|
|
+++ shapelib-1.5.0/contrib/shpinfo.c
|
|
@@ -115,4 +115,6 @@ int main( int argc, char ** argv )
|
|
|
|
|
|
SHPClose( hSHP );
|
|
+
|
|
+ return 0;
|
|
}
|
|
Index: shapelib-1.5.0/contrib/shpwkb.c
|
|
===================================================================
|
|
--- shapelib-1.5.0.orig/contrib/shpwkb.c
|
|
+++ shapelib-1.5.0/contrib/shpwkb.c
|
|
@@ -126,4 +126,6 @@ int main( int argc, char ** argv )
|
|
if ( wkb_file ) fclose ( wkb_file );
|
|
|
|
printf ("\n");
|
|
+
|
|
+ return 0;
|
|
}
|
|
Index: shapelib-1.5.0/shputils.c
|
|
===================================================================
|
|
--- shapelib-1.5.0.orig/shputils.c
|
|
+++ shapelib-1.5.0/shputils.c
|
|
@@ -902,6 +902,8 @@ int clip_boundary()
|
|
if (i2 == 0) return(0); /** SKIP RECORD **/
|
|
else return(1); /** WRITE RECORD **/
|
|
} /** End CUT **/
|
|
+
|
|
+ return 0; /** SKIP RECORD **/
|
|
}
|
|
|
|
|