Changeset 1596

Timestamp:

01/28/10 20:59:50 (6 months ago)

Author:

dane

Message:

fix broken support for pointz as code assumed pointzm - closes #504

Location:

trunk/plugins/input/shape

Files:

• shape_featureset.cpp (modified) (1 diff)
• shape_index_featureset.cpp (modified) (1 diff)

trunk/plugins/input/shape/shape_featureset.cpp

@@ -91 +91 @@
             double x=shape_.shp().read_double();
             double y=shape_.shp().read_double();
-            shape_.shp().skip(8*2); // m, z
+            // skip z
+            shape_.shp().skip(8);
+
+            //skip m if exists
+            if ( shape_.reclength_ == 8 + 36) 
+            {
+                shape_.shp().skip(8);
+            }
             geometry2d * point=new point_impl;
             point->move_to(x,y);

trunk/plugins/input/shape/shape_index_featureset.cpp

@@ -112 +112 @@
             double x=shape_.shp().read_double();
             double y=shape_.shp().read_double();
-            shape_.shp().skip(8*2); // skip m,z
+            // skip z
+            shape_.shp().skip(8);
+
+            //skip m if exists
+            if ( shape_.reclength_ == 8 + 36) 
+            {
+                shape_.shp().skip(8);
+            }
             geometry2d * point = new point_impl;
             point->move_to(x,y);