/[thuban]
ViewVC logotype

Revision 2212


Jump to revision: Previous Next
Author: bh
Date: Mon May 17 15:47:57 2004 UTC (20 years, 9 months ago)
Changed paths: 8
Log Message:
Update to newest shapelib and get rid of Thuban specific extensions,
i.e. use the new DBFUpdateHeader instead of our DBFCommit kludge

* libraries/shapelib/shpopen.c: Update to version from current
shapelib CVS.

* libraries/shapelib/shapefil.h: Update to version from current
shapelib CVS.

* libraries/shapelib/dbfopen.c: Update to version from current
shapelib CVS.
(DBFCommit): Effectively removed since shapelib itself has
DBFUpdateHeader now which is better for what DBFCommit wanted to
achieve.
We're now using an unmodified version of dbfopen.

* libraries/pyshapelib/dbflib_wrap.c, libraries/pyshapelib/dbflib.py:
Update from dbflib.i

* libraries/pyshapelib/dbflib.i (DBFInfo_commit): New. Implementation of
the commit method.  This new indirection is necessary because we use the
DBFUpdateHeader function now which is not available in shapelib <=
1.2.10
(DBFFile::commit): Use DBFInfo_commit as implementation
(pragma __class__): New. Kludge to remove the commit method when
the DBFUpdateHeader function isn't available
(_have_commit): New. Helper for the pragma kludge.

* libraries/pyshapelib/setup.py (dbf_macros): New. Return the
preprocessor macros needed to compile the dbflib wrapper.  Determine
whether DBFUpdateHeader is available and define the right value of
HAVE_UPDATE_HEADER
(extensions): Use dbf_macros for the dbflibc extension

* setup.py (extensions): Add the HAVE_UPDATE_HEADER macro with
value '1' to the Lib.dbflibc extension.  This simply reflects the
shapelib and pyshapelib updates


Changed paths

Path Details
Directorytrunk/thuban/libraries/pyshapelib/dbflib.i modified , text changed
Directorytrunk/thuban/libraries/pyshapelib/dbflib.py modified , text changed
Directorytrunk/thuban/libraries/pyshapelib/dbflib_wrap.c modified , text changed
Directorytrunk/thuban/libraries/pyshapelib/setup.py modified , text changed
Directorytrunk/thuban/libraries/shapelib/dbfopen.c modified , text changed
Directorytrunk/thuban/libraries/shapelib/shapefil.h modified , text changed
Directorytrunk/thuban/libraries/shapelib/shpopen.c modified , text changed
Directorytrunk/thuban/setup.py modified , text changed

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26