[Thuban-commits] r2747 - in branches/WIP-pyshapelib-bramz/libraries: pyshapelib shapelib

[scm-commit@wald.intevation.org]

Author: bramz
Date: 2007-03-21 00:12:45 +0100 (Wed, 21 Mar 2007)
New Revision: 2747

Modified:
   branches/WIP-pyshapelib-bramz/libraries/pyshapelib/ChangeLog
   branches/WIP-pyshapelib-bramz/libraries/pyshapelib/shptreemodule.c
   branches/WIP-pyshapelib-bramz/libraries/shapelib/dbfopen.c
Log:
dbfopen.c: fixing bug in DBFClose, checks for NULL handle now.
shptreemodule.c: restoring something that shouldn't have been committed in the first place.

Modified: branches/WIP-pyshapelib-bramz/libraries/pyshapelib/ChangeLog
===================================================================
--- branches/WIP-pyshapelib-bramz/libraries/pyshapelib/ChangeLog	2007-03-17 13:31:31 UTC (rev 2746)
+++ branches/WIP-pyshapelib-bramz/libraries/pyshapelib/ChangeLog	2007-03-20 23:12:45 UTC (rev 2747)
@@ -1,3 +1,7 @@
+2007-03-21	Bram de Greve <bram.degreve at intec.ugent.be>
+
+	* shptreemodule.c: restoring something that shouldn't have been committed.
+
 2007-03-15	Bram de Greve <bram.degreve at intec.ugent.be>
 
 	* shapelib.c: When creating measured shapes (XYM), treat M value

Modified: branches/WIP-pyshapelib-bramz/libraries/pyshapelib/shptreemodule.c
===================================================================
--- branches/WIP-pyshapelib-bramz/libraries/pyshapelib/shptreemodule.c	2007-03-17 13:31:31 UTC (rev 2746)
+++ branches/WIP-pyshapelib-bramz/libraries/pyshapelib/shptreemodule.c	2007-03-20 23:12:45 UTC (rev 2747)
@@ -166,11 +166,7 @@
 };
 
 
-#ifdef NDEBUG
 PyMODINIT_FUNC initshptree(void)
-#else
-PyMODINIT_FUNC initshptree_d(void)
-#endif
 {
     SHPTreeType.ob_type = &PyType_Type;
 

Modified: branches/WIP-pyshapelib-bramz/libraries/shapelib/dbfopen.c
===================================================================
--- branches/WIP-pyshapelib-bramz/libraries/shapelib/dbfopen.c	2007-03-17 13:31:31 UTC (rev 2746)
+++ branches/WIP-pyshapelib-bramz/libraries/shapelib/dbfopen.c	2007-03-20 23:12:45 UTC (rev 2747)
@@ -553,6 +553,9 @@
 void SHPAPI_CALL
 DBFClose(DBFHandle psDBF)
 {
+	if( psSHP == NULL )
+		return;
+		
 /* -------------------------------------------------------------------- */
 /*      Write out header if not already written.                        */
 /* -------------------------------------------------------------------- */