/[thuban]/branches/WIP-pyshapelib-bramz/libraries/shapelib/shapefil.h
ViewVC logotype

Diff of /branches/WIP-pyshapelib-bramz/libraries/shapelib/shapefil.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1769 by bh, Thu Oct 2 15:15:16 2003 UTC revision 2212 by bh, Mon May 17 15:47:57 2004 UTC
# Line 37  Line 37 
37   ******************************************************************************   ******************************************************************************
38   *   *
39   * $Log$   * $Log$
40   * Revision 1.2  2003/10/02 15:15:16  bh   * Revision 1.3  2004/05/17 15:47:57  bh
41   * Update to shapelib 1.2.10   * Update to newest shapelib and get rid of Thuban specific extensions,
42     * i.e. use the new DBFUpdateHeader instead of our DBFCommit kludge
43     *
44     * * libraries/shapelib/shpopen.c: Update to version from current
45     * shapelib CVS.
46     *
47     * * libraries/shapelib/shapefil.h: Update to version from current
48     * shapelib CVS.
49     *
50     * * libraries/shapelib/dbfopen.c: Update to version from current
51     * shapelib CVS.
52     * (DBFCommit): Effectively removed since shapelib itself has
53     * DBFUpdateHeader now which is better for what DBFCommit wanted to
54     * achieve.
55     * We're now using an unmodified version of dbfopen.
56     *
57     * * libraries/pyshapelib/dbflib_wrap.c, libraries/pyshapelib/dbflib.py:
58     * Update from dbflib.i
59     *
60     * * libraries/pyshapelib/dbflib.i (DBFInfo_commit): New. Implementation of
61     * the commit method.  This new indirection is necessary because we use the
62     * DBFUpdateHeader function now which is not available in shapelib <=
63     * 1.2.10
64     * (DBFFile::commit): Use DBFInfo_commit as implementation
65     * (pragma __class__): New. Kludge to remove the commit method when
66     * the DBFUpdateHeader function isn't available
67     * (_have_commit): New. Helper for the pragma kludge.
68     *
69     * * libraries/pyshapelib/setup.py (dbf_macros): New. Return the
70     * preprocessor macros needed to compile the dbflib wrapper.  Determine
71     * whether DBFUpdateHeader is available and define the right value of
72     * HAVE_UPDATE_HEADER
73     * (extensions): Use dbf_macros for the dbflibc extension
74     *
75     * * setup.py (extensions): Add the HAVE_UPDATE_HEADER macro with
76     * value '1' to the Lib.dbflibc extension.  This simply reflects the
77     * shapelib and pyshapelib updates
78     *
79     * Revision 1.28  2003/12/29 06:02:18  fwarmerdam
80     * added cpl_error.h option
81     *
82     * Revision 1.27  2003/04/21 18:30:37  warmerda
83     * added header write/update public methods
84   *   *
85   * Revision 1.26  2002/09/29 00:00:08  warmerda   * Revision 1.26  2002/09/29 00:00:08  warmerda
86   * added FTLogical and logical attribute read/write calls   * added FTLogical and logical attribute read/write calls
# Line 123  Line 165 
165  #include <dbmalloc.h>  #include <dbmalloc.h>
166  #endif  #endif
167    
168    #ifdef USE_CPL
169    #include "cpl_error.h"
170    #endif
171    
172  #ifdef __cplusplus  #ifdef __cplusplus
173  extern "C" {  extern "C" {
174  #endif  #endif
# Line 308  SHPObject SHPAPI_CALL1(*) Line 354  SHPObject SHPAPI_CALL1(*)
354  int SHPAPI_CALL  int SHPAPI_CALL
355        SHPRewindObject( SHPHandle hSHP, SHPObject * psObject );        SHPRewindObject( SHPHandle hSHP, SHPObject * psObject );
356    
357  void SHPAPI_CALL  void SHPAPI_CALL SHPClose( SHPHandle hSHP );
358        SHPClose( SHPHandle hSHP );  void SHPAPI_CALL SHPWriteHeader( SHPHandle hSHP );
359    
360  const char SHPAPI_CALL1(*)  const char SHPAPI_CALL1(*)
361        SHPTypeName( int nSHPType );        SHPTypeName( int nSHPType );
# Line 477  DBFHandle SHPAPI_CALL Line 523  DBFHandle SHPAPI_CALL
523    
524  void    SHPAPI_CALL  void    SHPAPI_CALL
525        DBFClose( DBFHandle hDBF );        DBFClose( DBFHandle hDBF );
526    void    SHPAPI_CALL
527          DBFUpdateHeader( DBFHandle hDBF );
528  char    SHPAPI_CALL  char    SHPAPI_CALL
529        DBFGetNativeFieldType( DBFHandle hDBF, int iField );        DBFGetNativeFieldType( DBFHandle hDBF, int iField );
530    
 int SHPAPI_CALL  
       DBFCommit( DBFHandle hDBF );  
   
531  #ifdef __cplusplus  #ifdef __cplusplus
532  }  }
533  #endif  #endif
Legend:
Removed from v.1769  
changed lines
  Added in v.2212
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26