Changeset 12358

Timestamp:

10/09/07 13:49:17 (1 year ago)

Author:

warmerdam

Message:

refresh from upstream - corresponds roughly with 1.6.3 beta2 (#1883)

Files:

• trunk/gdal/ogr/ogrsf_frmts/mitab/HISTORY.TXT (modified) (2 diffs)
• trunk/gdal/ogr/ogrsf_frmts/mitab/mitab.h (modified) (18 diffs)
• trunk/gdal/ogr/ogrsf_frmts/mitab/mitab_datfile.cpp (modified) (7 diffs)
• trunk/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp (modified) (110 diffs)
• trunk/gdal/ogr/ogrsf_frmts/mitab/mitab_mapfile.cpp (modified) (5 diffs)
• trunk/gdal/ogr/ogrsf_frmts/mitab/mitab_mapobjectblock.cpp (modified) (5 diffs)
• trunk/gdal/ogr/ogrsf_frmts/mitab/mitab_miffile.cpp (modified) (4 diffs)
• trunk/gdal/ogr/ogrsf_frmts/mitab/mitab_priv.h (modified) (3 diffs)
• trunk/gdal/ogr/ogrsf_frmts/mitab/mitab_tabfile.cpp (modified) (3 diffs)

trunk/gdal/ogr/ogrsf_frmts/mitab/HISTORY.TXT

@@ -13 +13 @@
-CHANGES - Current Version:
---------------------------
+
+Version 1.6.3-beta2 (2007-09-18)
+--------------------------------
+
+- Fixed another issue related to splitting of object blocks with the 
+  optimized spatial index. The compressed coordinate origin values were
+  not initialized properly before being written (bug 1732)
+
+- Remove static variables that interfere with reentrancy. 
+  http://trac.osgeo.org/gdal/ticket/1883
+
+
+Version 1.6.3-beta1 (2007-09-14)
+--------------------------------
+
+- Fixed the splitting of object blocks with the optimized spatial
+  index mode that was producing files with misaligned bytes that
+  confused MapInfo (bug 1732)
+  Note that even if this bug is (hopefully) fixed, the optimized spatial
+  index is still disabled by default in this release and we still use
+  the quick (i.e. traditional) spatial index mode by default.
+
+- Fixed problem with MIF parser being confused by special attribute 
+  names (bug 1795)
-
-
@@ -813 +837 @@
-
-------------
-0 2007/07/31 21:06:51 dmorissette
+5 2007/10/09 17:43:16 fwarmerdam
-------------

trunk/gdal/ogr/ogrsf_frmts/mitab/mitab.h

@@ -1 +1 @@
-/**********************************************************************
-97 2007/07/12 12:39:59
+102 2007/09/18 18:13:42
- *
- * Name:     mitab.h
@@ -31 +31 @@
- *
- * $Log: mitab.h,v $
+ * Revision 1.102  2007/09/18 18:13:42  dmorissette
+ * Updated for 1.6.3-beta2
+ *
+ * Revision 1.101  2007/09/14 20:03:08  dmorissette
+ * Removed stray ReadGeometryFromMAPFile() declaration
+ *
+ * Revision 1.100  2007/09/14 19:42:39  dmorissette
+ * Updated for 1.6.3-beta1
+ *
+ * Revision 1.99  2007/09/14 18:30:18  dmorissette
+ * Fixed the splitting of object blocks with the optimized spatial
+ * index mode that was producing files with misaligned bytes that
+ * confused MapInfo (bug 1732)
+ *
+ * Revision 1.98  2007/09/12 20:22:31  dmorissette
+ * Added TABFeature::CreateFromMapInfoType()
+ *
- * Revision 1.97  2007/07/12 12:39:59  dmorissette
- * Set version to 1.6.2
@@ -147 +164 @@
- * Current version of the MITAB library... always useful!
- *--------------------------------------------------------------------*/
-2 (2007-07-12
-2
+3-beta2 (2007-09-18
+3
-
-#ifndef PI
@@ -1060 +1077 @@
-    virtual ~TABFeature();
-
+    static  TABFeature     *CreateFromMapInfoType(int nMapInfoType,
+                                                  OGRFeatureDefn *poDefn);
+
-    virtual TABFeature     *CloneTABFeature(OGRFeatureDefn *pNewDefn = NULL);
-    virtual TABFeatureClass GetFeatureClass() { return TABFCNoGeomFeature; };
@@ -1074 +1094 @@
-
-    virtual int ReadRecordFromDATFile(TABDATFile *poDATFile);
-
+
+
+
-
-    virtual int WriteRecordToDATFile(TABDATFile *poDATFile,
-                                     TABINDFile *poINDFile, int *panIndexNo);
-
+
+
+
-    GBool       ValidateCoordType(TABMAPFile * poMapFile);
-    void        ForceCoordTypeAndOrigin(int nMapInfoType, GBool bCompr,
@@ -1105 +1129 @@
-    void        GetMBR(double &dXMin, double &dYMin, 
-                       double &dXMax, double &dYMax);
+    void        SetIntMBR(GInt32 nXMin, GInt32 nYMin, 
+                          GInt32 nXMax, GInt32 nYMax);
-    void        GetIntMBR(GInt32 &nXMin, GInt32 &nYMin, 
-                          GInt32 &nXMax, GInt32 &nYMax);
@@ -1145 +1171 @@
-    double      GetY();
-
-
-
+
+
+
+
+
+
-
-    virtual int ReadGeometryFromMIFFile(MIDDATAFile *fp);
@@ -1185 +1215 @@
-    virtual TABFeature *CloneTABFeature(OGRFeatureDefn *poNewDefn = NULL );
-
-
-
+
+
+
+
+
+
-
-    virtual int ReadGeometryFromMIFFile(MIDDATAFile *fp);
@@ -1238 +1272 @@
-    virtual TABFeature *CloneTABFeature(OGRFeatureDefn *poNewDefn = NULL );
-
-
-
+
+
+
+
+
+
-
-    virtual int ReadGeometryFromMIFFile(MIDDATAFile *fp);
@@ -1292 +1330 @@
-    OGRLineString      *GetPartRef(int nPartIndex);
-
-    int         ReadGeometryFromMAPFile(TABMAPFile *poMapFile, TABMAPObjHdr *,
-                                        TABMAPCoordBlock **ppoCoordBlock);
-
-    GBool       TwoPointLineAsPolyline();
-    void        TwoPointLineAsPolyline(GBool bTwoPointLineAsPolyline);
-
-
-
+
+
+
+
+
+
-
-    virtual int ReadGeometryFromMIFFile(MIDDATAFile *fp);
@@ -1368 +1407 @@
-    GBool               IsInteriorRing(int nRequestedRingIndex);
-
-
-
-
-
+
+
+
+
+
+
-
-    virtual int ReadGeometryFromMIFFile(MIDDATAFile *fp);
@@ -1417 +1458 @@
-    virtual TABFeature *CloneTABFeature(OGRFeatureDefn *poNewDefn = NULL );
-
-
-
+
+
+
+
+
+
-
-    virtual int ReadGeometryFromMIFFile(MIDDATAFile *fp);
@@ -1474 +1519 @@
-    virtual TABFeature *CloneTABFeature(OGRFeatureDefn *poNewDefn = NULL );
-
-
-
+
+
+
+
+
+
-
-    virtual int ReadGeometryFromMIFFile(MIDDATAFile *fp);
@@ -1532 +1581 @@
-    virtual TABFeature *CloneTABFeature(OGRFeatureDefn *poNewDefn = NULL );
-
-
-
+
+
+
+
+
+
-
-    virtual int ReadGeometryFromMIFFile(MIDDATAFile *fp);
@@ -1605 +1658 @@
-    virtual TABFeature *CloneTABFeature(OGRFeatureDefn *poNewDefn = NULL );
-
-
-
+
+
+
+
+
+
-
-    virtual int ReadGeometryFromMIFFile(MIDDATAFile *fp);
@@ -1687 +1744 @@
-    void        SetCenter(double dX, double dY);
-
-
-
-
-
+
+
+
+
+
+
-
-    virtual int ReadGeometryFromMIFFile(MIDDATAFile *fp);
@@ -1757 +1816 @@
-    virtual TABFeature *CloneTABFeature(OGRFeatureDefn *poNewDefn = NULL );
-
-
-
+
+
+
+
+
+
-    
-    virtual int ReadGeometryFromMIFFile(MIDDATAFile *fp);
@@ -1798 +1861 @@
-    virtual TABFeatureClass GetFeatureClass() { return TABFCDebugFeature; };
-
-
-
+
+
+
+
+
+
-
-    virtual int ReadGeometryFromMIFFile(MIDDATAFile *fp);

trunk/gdal/ogr/ogrsf_frmts/mitab/mitab_datfile.cpp

@@ -1 +1 @@
-/**********************************************************************
-7 2004/06/30 20:29:03 dmorissette
+8 2007/10/09 17:43:16 fwarmerdam
- *
- * Name:     mitab_datfile.cpp
@@ -32 +32 @@
- *
- * $Log: mitab_datfile.cpp,v $
+ * Revision 1.18  2007/10/09 17:43:16  fwarmerdam
+ * Remove static variables that interfere with reentrancy. (GDAL #1883)
+ *
- * Revision 1.17  2004/06/30 20:29:03  dmorissette
- * Fixed refs to old address danmo@videotron.ca
@@ -820 +823 @@
-const char *TABDATFile::ReadCharField(int nWidth)
-{
-    // We know that character strings are limited to 254 chars in MapInfo
-    static char szBuf[256];
-
-    // If current record has been deleted, then return an acceptable 
-    // default value.
@@ -842 +842 @@
-    }
-
-szBuf
+m_szBuffer
-        return "";
-
-szBuf
+m_szBuffer
-
-    // NATIVE tables are padded with '\0' chars, but DBF tables are padded
@@ -851 +851 @@
-    if (m_eTableType == TABTableDBF)
-    {
-szBuf
-szBuf
-szBuf
-
-
-szBuf
+m_szBuffer
+m_szBuffer
+m_szBuffer
+
+
+m_szBuffer
-}
-
@@ -1012 +1012 @@
-{
-    int nDay, nMonth, nYear;
-    static char szBuf[20];
-
-    // If current record has been deleted, then return an acceptable 
@@ -1039 +1038 @@
-        return "";
-
-szBuf
-
-szBuf
+m_szBuffer
+
+m_szBuffer
-}
-

trunk/gdal/ogr/ogrsf_frmts/mitab/mitab_feature.cpp

@@ -1 +1 @@
-/**********************************************************************
-2 2007/06/12 14:17:1
+6 2007/09/18 17:43:5
- *
- * Name:     mitab_feature.cpp
@@ -31 +31 @@
- *
- * $Log: mitab_feature.cpp,v $
+ * Revision 1.76  2007/09/18 17:43:56  dmorissette
+ * Fixed another index splitting issue: compr coordinates origin was not
+ * stored in the TABFeature in ReadGeometry... (bug 1732)
+ *
+ * Revision 1.75  2007/09/14 19:29:24  dmorissette
+ * Completed handling of bCoordBlockDataOnly arg to Read/WriteGeometry()
+ * functions to avoid screwing up pen/brush ref counters (bug 1732)
+ *
+ * Revision 1.74  2007/09/14 18:30:19  dmorissette
+ * Fixed the splitting of object blocks with the optimized spatial
+ * index mode that was producing files with misaligned bytes that
+ * confused MapInfo (bug 1732)
+ *
+ * Revision 1.73  2007/09/12 20:22:31  dmorissette
+ * Added TABFeature::CreateFromMapInfoType()
+ *
- * Revision 1.72  2007/06/12 14:17:16  dmorissette
- * Added TABFile::TwoPointLineAsPolyline() to allow writing two point lines
@@ -68 +84 @@
- * geometry (GDAL bug 1059)
- *
- * Revision 1.62  2005/11/08 22:02:36  fwarmerdam
- * cast strstr() results as per email from Charles Savage for VC8.
- *
- * Revision 1.61  2005/10/12 19:13:30  jlacroix
- * bug1012 Make sure Style Units are set when seting a feature from StyleString
- *
- * Revision 1.60  2005/10/07 21:22:33  dmorissette
- * Clone region/pline/mpoint components in TABCollection::CloneTABFeature()
- *
- * Revision 1.59  2005/10/06 23:05:08  dmorissette
- * TABCollection: Added automated sync'ing of OGRFeature's geometry in
- * SetRegion/Pline/MpointDirectly() methods (bug 1126)
- *
- * Revision 1.58  2005/10/06 19:15:30  dmorissette
- * Collections: added support for reading/writing pen/brush/symbol ids and
- * for writing collection objects to .TAB/.MAP (bug 1126)
- *
- * Revision 1.57  2005/10/04 15:44:31  dmorissette
- * First round of support for Collection objects. Currently supports reading
- * from .TAB/.MAP and writing to .MIF. Still lacks symbol support and write
- * support. (Based in part on patch and docs from Jim Hope, bug 1126)
- *
- * Revision 1.56  2005/07/14 16:15:05  jlacroix
- * \n and \ are now unescaped internally.
- *
- * Revision 1.55  2005/05/19 15:26:59  jlacroix
- * Implement a method to set the StyleString of a TABFeature.
- * This is done via the ITABFeaturePen, Brush and Symbol classes.
- *
- * Revision 1.54  2004/12/01 18:25:03  dmorissette
- * Fixed potential memory leaks in error conditions (bug 881)
- *
- * Revision 1.53  2004/10/19 14:21:11  jlacroix
- * Support pen width bigger than 7 with GetStyleString. (Bug 683)
- *
- * Revision 1.52  2004/10/11 20:18:27  dmorissette
- * Do not output a BG color in style string for transparent brushes (bug 693)
- *
- * Revision 1.51  2004/06/30 20:29:03  dmorissette
- * Fixed refs to old address danmo@videotron.ca
- *
- * Revision 1.50  2003/12/19 08:30:10  fwarmerdam
- * write 3d geometries to tab in 2D
- *
- * Revision 1.49  2003/03/28 14:01:14  warmerda
- * use TRUE/FALSE in place of true/false
- *
- * Revision 1.48  2002/08/27 17:17:33  warmerda
- * handle errors better, auto-add FID column if there aren't any columns
- *
- * Revision 1.47  2002/06/17 15:00:30  julien
- * Add IsInteriorRing() function in TABRegion to validate if a ring is internal
- *
- * Revision 1.46  2002/03/26 03:17:13  daniel
- * Added Get/SetCenter() to MultiPoint
- *
- * Revision 1.45  2002/03/26 01:48:40  daniel
- * Added Multipoint object type (V650)
- *
- * Revision 1.44  2002/01/23 20:29:56  daniel
- * Fixed warning produced by CPLAssert() in non-DEBUG mode.
- *
- * Revision 1.43  2001/12/05 22:38:59  daniel
- * Fixed problems writing TAB_GEOM_LINE (bug 610, 633).
- *
- * Revision 1.42  2001/11/23 22:50:17  daniel
- * Fixed geometry type assertion in TABPolyline::WriteGeomToMAPFile (bug605)
- *
- * Revision 1.41  2001/11/17 21:54:06  daniel
- * Made several changes in order to support writing objects in 16 bits 
- * coordinate format.  New TABMAPObjHdr-derived classes are used to hold 
- * object info in mem until block is full.
- *
- * Revision 1.40  2001/09/17 21:33:44  daniel
- * TABText: do not produce an error when reading 0-length text strings.
- *
- * Revision 1.39  2001/09/05 13:33:33  daniel
- * TABPolyline::ValidateMapInfoType(): return TAB_GEOM_NONE if numpoints < 2
- *
- * Revision 1.38  2001/07/03 03:14:52  daniel
- * GetLabelStyleString(): take line spacing and num. of lines into account
- * when calculating text height.
- *
- * Revision 1.37  2001/06/25 01:04:21  daniel
- * StyleString fixes: include font name in text style string, and placed
- * brush before pen in region style strings.
- *
- * Revision 1.36  2001/05/01 18:34:12  daniel
- * TABRegion: use outside/inside ring relationship to build geometry if
- * the information is available in the source file.
- *
- * Revision 1.35  2001/02/28 07:15:08  daniel
- * Added support for text label line end point
- *
- * Revision 1.34  2001/01/22 16:03:58  warmerda
- * expanded tabs
- *
- * Revision 1.33  2000/11/23 21:11:07  daniel
- * OOpps... VC++ didn't like the way TABPenDef, etc. were initialized
- *
- * Revision 1.32  2000/11/23 20:47:45  daniel
- * Use MI defaults for Pen, Brush, Font, Symbol instead of all zeros
- *
- * Revision 1.31  2000/10/18 03:23:37  warmerda
- * ensure TABText::m_dWidth is initialized in constructor
- *
- * Revision 1.30  2000/10/03 19:29:51  daniel
- * Include OGR StyleString stuff (implemented by Stephane)
- *
- * Revision 1.29  2000/09/19 17:23:52  daniel
- * Maintain and/or compute valid region and polyline center/label point
- *
- * Revision 1.28  2000/09/07 23:32:13  daniel
- * Added RecordDeletedFlag to TABFeature with get/set methods
- *
- * Revision 1.27  2000/07/10 14:56:25  daniel
- * Handle m_nOriginQuadrant==0 as quadrant 3 (reverse x and y axis)
- *
- * Revision 1.26  2000/04/21 12:39:05  daniel
- * Added TABPolyline::GetNumParts()/GetPartRef()
- *
- * Revision 1.25  2000/02/28 16:44:10  daniel
- * Added support for indexed, unique, and for new V450 object types
- *
- * ...
- *
@@ -233 +125 @@
-
-/**********************************************************************
+ *                     TABFeature::CreateFromMapInfoType()
+ *
+ * Factory that creates a TABFeature of the right class for the specified
+ * MapInfo Type
+ *
+ **********************************************************************/
+TABFeature *TABFeature::CreateFromMapInfoType(int nMapInfoType,
+                                              OGRFeatureDefn *poDefn)
+{
+    TABFeature *poFeature = NULL;
+
+    /*-----------------------------------------------------------------
+     * Create new feature object of the right type
+     *----------------------------------------------------------------*/
+    switch(nMapInfoType)
+    {
+      case TAB_GEOM_NONE:
+        poFeature = new TABFeature(poDefn);
+        break;
+      case TAB_GEOM_SYMBOL_C:
+      case TAB_GEOM_SYMBOL:
+        poFeature = new TABPoint(poDefn);
+        break;
+      case TAB_GEOM_FONTSYMBOL_C:
+      case TAB_GEOM_FONTSYMBOL:
+        poFeature = new TABFontPoint(poDefn);
+        break;
+      case TAB_GEOM_CUSTOMSYMBOL_C:
+      case TAB_GEOM_CUSTOMSYMBOL:
+        poFeature = new TABCustomPoint(poDefn);
+        break;
+      case TAB_GEOM_LINE_C:
+      case TAB_GEOM_LINE:
+      case TAB_GEOM_PLINE_C:
+      case TAB_GEOM_PLINE:
+      case TAB_GEOM_MULTIPLINE_C:
+      case TAB_GEOM_MULTIPLINE:
+      case TAB_GEOM_V450_MULTIPLINE_C:
+      case TAB_GEOM_V450_MULTIPLINE:
+       poFeature = new TABPolyline(poDefn);
+        break;
+      case TAB_GEOM_ARC_C:
+      case TAB_GEOM_ARC:
+        poFeature = new TABArc(poDefn);
+        break;
+
+      case TAB_GEOM_REGION_C:
+      case TAB_GEOM_REGION:
+      case TAB_GEOM_V450_REGION_C:
+      case TAB_GEOM_V450_REGION:
+        poFeature = new TABRegion(poDefn);
+        break;
+      case TAB_GEOM_RECT_C:
+      case TAB_GEOM_RECT:
+      case TAB_GEOM_ROUNDRECT_C:
+      case TAB_GEOM_ROUNDRECT:
+        poFeature = new TABRectangle(poDefn);
+        break;
+      case TAB_GEOM_ELLIPSE_C:
+      case TAB_GEOM_ELLIPSE:
+        poFeature = new TABEllipse(poDefn);
+        break;
+      case TAB_GEOM_TEXT_C:
+      case TAB_GEOM_TEXT:
+        poFeature = new TABText(poDefn);
+        break;
+      case TAB_GEOM_MULTIPOINT_C:
+      case TAB_GEOM_MULTIPOINT:
+        poFeature = new TABMultiPoint(poDefn);
+        break;
+      case TAB_GEOM_COLLECTION_C:
+      case TAB_GEOM_COLLECTION:
+        poFeature = new TABCollection(poDefn);  
+        break;
+      default:
+        /*-------------------------------------------------------------
+         * Unsupported feature type... we still return a valid feature
+         * with NONE geometry after producing a Warning.
+         * Callers can trap that case by checking CPLGetLastErrorNo() 
+         * against TAB_WarningFeatureTypeNotSupported
+         *------------------------------------------------------------*/
+//        poFeature = new TABDebugFeature(poDefn);
+        poFeature = new TABFeature(poDefn);
+
+        CPLError(CE_Warning, TAB_WarningFeatureTypeNotSupported,
+                 "Unsupported object type %d (0x%2.2x).  Feature will be "
+                 "returned with NONE geometry.",
+                 nMapInfoType, nMapInfoType);
+    }
+
+    return poFeature;
+}
+
+
+/**********************************************************************
- *                     TABFeature::CopyTABFeatureBase()
- *
@@ -268 +255 @@
-    GetMBR(dXMin, dYMin, dXMax, dYMax);
-    poDestFeature->SetMBR(dXMin, dYMin, dXMax, dYMax);
+
+    GInt32 nXMin, nYMin, nXMax, nYMax;
+    GetIntMBR(nXMin, nYMin, nXMax, nYMax);
+    poDestFeature->SetIntMBR(nXMin, nYMin, nXMax, nYMax);
-
-    // m_nMapInfoType is not carried but it is not required anyways.
@@ -331 +322 @@
-    dXMax = m_dXMax;
-    dYMax = m_dYMax;
+}
+
+/**********************************************************************
+ *                   TABFeature::SetIntMBR()
+ *
+ * Set the integer coordinates values of the MBR of this feature.
+ **********************************************************************/
+void TABFeature::SetIntMBR(GInt32 nXMin, GInt32 nYMin, 
+                           GInt32 nXMax, GInt32 nYMax)
+{
+    m_nXMin = nXMin;
+    m_nYMin = nYMin;
+    m_nXMax = nXMax;
+    m_nYMax = nYMax;
-}
-
@@ -506 +511 @@
- * currently points to the beginning of a map object.
- *
+ * bCoordBlockDataOnly=TRUE is used when this method is called to copy only
+ * the CoordBlock data during splitting of object blocks. In this case we
+ * need to process only the information related to the CoordBlock. One 
+ * important thing to avoid is reading/writing pen/brush/symbol definitions
+ * as that would screw up their ref counters.
+ *
+ * ppoCoordBlock is used by TABCollection and by index splitting code
+ * to provide a CoordBlock to use instead of the one from the poMAPFile and
+ * return the current pointer at the end of the call.
+ *
- * The current implementation does nothing since instances of TABFeature
- * objects contain no geometry (i.e. TAB_GEOM_NONE).
@@ -513 +528 @@
- **********************************************************************/
-int TABFeature::ReadGeometryFromMAPFile(TABMAPFile * /*poMapFile*/,
-
+
+
+
-{
-    /*-----------------------------------------------------------------
@@ -643 +660 @@
- * currently points to a valid map object.
- *
+ * bCoordBlockDataOnly=TRUE is used when this method is called to copy only
+ * the CoordBlock data during splitting of object blocks. In this case we
+ * need to process only the information related to the CoordBlock. One 
+ * important thing to avoid is reading/writing pen/brush/symbol definitions
+ * as that would screw up their ref counters.
+ *
+ * ppoCoordBlock is used by TABCollection and by index splitting code
+ * to provide a CoordBlock to use instead of the one from the poMAPFile and
+ * return the current pointer at the end of the call.
+ *
- * The current implementation does nothing since instances of TABFeature
- * objects contain no geometry (i.e. TAB_GEOM_NONE).
@@ -650 +677 @@
- **********************************************************************/
-int TABFeature::WriteGeometryToMAPFile(TABMAPFile * /* poMapFile*/,
-
+
+
+
-{
-    /*-----------------------------------------------------------------
@@ -818 +847 @@
- **********************************************************************/
-int TABPoint::ReadGeometryFromMAPFile(TABMAPFile *poMapFile,
-
+
+
+
-{
-    double              dX, dY;
-    OGRGeometry         *poGeometry;
-
+    /* Nothing to do for bCoordBlockDataOnly (used by index splitting) */
+    if (bCoordBlockDataOnly)
+        return 0;
+
-    /*-----------------------------------------------------------------
-     * Fetch and validate geometry type
-     *----------------------------------------------------------------*/
-MapFile->GetCurObjType()
+ObjHdr->m_nType
-
-    if (m_nMapInfoType != TAB_GEOM_SYMBOL &&
@@ -855 +890 @@
-
-    SetMBR(dX, dY, dX, dY);
+    SetIntMBR(poObjHdr->m_nMinX, poObjHdr->m_nMinY, 
+              poObjHdr->m_nMaxX, poObjHdr->m_nMaxY);
-
-    return 0;
@@ -871 +908 @@
- **********************************************************************/
-int TABPoint::WriteGeometryToMAPFile(TABMAPFile *poMapFile,
-
+
+
+
-{
-    GInt32              nX, nY;
-    OGRGeometry         *poGeom;
-    OGRPoint            *poPoint;
+
+    /* Nothing to do for bCoordBlockDataOnly (used by index splitting) */
+    if (bCoordBlockDataOnly)
+        return 0;
-
-    /*-----------------------------------------------------------------
@@ -1121 +1164 @@
- **********************************************************************/
-int TABFontPoint::ReadGeometryFromMAPFile(TABMAPFile *poMapFile,
-
+
+
+
-{
-    double              dX, dY;
-    OGRGeometry         *poGeometry;
-
+    /* Nothing to do for bCoordBlockDataOnly (used by index splitting) */
+    if (bCoordBlockDataOnly)
+        return 0;
+
-    /*-----------------------------------------------------------------
-     * Fetch and validate geometry type
-     *----------------------------------------------------------------*/
-MapFile->GetCurObjType()
+ObjHdr->m_nType
-
-    if (m_nMapInfoType != TAB_GEOM_FONTSYMBOL &&
@@ -1181 +1230 @@
-
-    SetMBR(dX, dY, dX, dY);
+    SetIntMBR(poObjHdr->m_nMinX, poObjHdr->m_nMinY, 
+              poObjHdr->m_nMaxX, poObjHdr->m_nMaxY);
-
-    return 0;
@@ -1197 +1248 @@
- **********************************************************************/
-int TABFontPoint::WriteGeometryToMAPFile(TABMAPFile *poMapFile,
-
+
+
+
-{
-    GInt32              nX, nY;
-    OGRGeometry         *poGeom;
-    OGRPoint            *poPoint;
+
+    /* Nothing to do for bCoordBlockDataOnly (used by index splitting) */
+    if (bCoordBlockDataOnly)
+        return 0;
-
-    /*-----------------------------------------------------------------
@@ -1414 +1471 @@
- **********************************************************************/
-int TABCustomPoint::ReadGeometryFromMAPFile(TABMAPFile *poMapFile,
-
+
+
+
-{
-    double              dX, dY;
-    OGRGeometry         *poGeometry;
-
+    /* Nothing to do for bCoordBlockDataOnly (used by index splitting) */
+    if (bCoordBlockDataOnly)
+        return 0;
+
-    /*-----------------------------------------------------------------
-     * Fetch and validate geometry type
-     *----------------------------------------------------------------*/
-MapFile->GetCurObjType()
+ObjHdr->m_nType
-
-    if (m_nMapInfoType != TAB_GEOM_CUSTOMSYMBOL &&
@@ -1457 +1520 @@
-
-    SetMBR(dX, dY, dX, dY);
+    SetIntMBR(poObjHdr->m_nMinX, poObjHdr->m_nMinY, 
+              poObjHdr->m_nMaxX, poObjHdr->m_nMaxY);
-
-    return 0;
@@ -1473 +1538 @@
- **********************************************************************/
-int TABCustomPoint::WriteGeometryToMAPFile(TABMAPFile *poMapFile,
-
+
+
+
-{
-    GInt32              nX, nY;
-    OGRGeometry         *poGeom;
-    OGRPoint            *poPoint;
+
+    /* Nothing to do for bCoordBlockDataOnly (used by index splitting) */
+    if (bCoordBlockDataOnly)
+        return 0;
-
-    /*-----------------------------------------------------------------
@@ -1795 +1866 @@
- **********************************************************************/
-int TABPolyline::ReadGeometryFromMAPFile(TABMAPFile *poMapFile,
-                                         TABMAPObjHdr *poObjHdr)
-{
-    return ReadGeometryFromMAPFile(poMapFile, poObjHdr, NULL);
-}
-
-int TABPolyline::ReadGeometryFromMAPFile(TABMAPFile *poMapFile,
-                                         TABMAPObjHdr *poObjHdr,
-
+
+
-{
-    GInt32              nX, nY;
@@ -1837 +1903 @@
-        poLine->setPoint(1, dXMax, dYMax);
-
-
-
+
+
+
+
+
-    }
-    else if (m_nMapInfoType == TAB_GEOM_PLINE ||
@@ -1848 +1917 @@
-        int     i, numPoints, nStatus;
-        GUInt32 nCoordDataSize;
-, nCenterX, nCenterY
+
-
-        /*-------------------------------------------------------------
@@ -1866 +1935 @@
-
-        // Compressed coordinate origin (useful only in compressed case!)
-nCenter
-nCenter
+m_nComprOrg
+m_nComprOrg
-
-        // MBR
@@ -1875 +1944 @@
-                                dXMax, dYMax);
-
-
-
+
+
+
+
+
-
-        /*-------------------------------------------------------------
@@ -1883 +1955 @@
-        numPoints = nCoordDataSize/(bComprCoord?4:8);
-
-
+
+
+