Changeset 8069

Timestamp:

04/28/11 11:52:14 (14 years ago)

Author:

jschierm

Message:

KML classes: changed string length defines to not include null terminator, since C's strlen function does not.

Location:

issm/trunk/src/c/objects/KML

Files:

• KML_ColorStyle.h (modified) (2 diffs)
• KML_Feature.h (modified) (2 diffs)
• KML_LineString.h (modified) (2 diffs)
• KML_LinearRing.h (modified) (2 diffs)
• KML_Object.h (modified) (2 diffs)
• KML_Polygon.h (modified) (2 diffs)

issm/trunk/src/c/objects/KML/KML_ColorStyle.h

@@ -6 +6 @@
 #define _KML_COLORSTYLE_H_
 
-#define KML_COLORSTYLE_COLOR_LENGTH      9
-#define KML_COLORSTYLE_COLORMODE_LENGTH  7
+#define KML_COLORSTYLE_COLOR_LENGTH      8
+#define KML_COLORSTYLE_COLORMODE_LENGTH  6
 
 /*Headers:*/
@@ -22 +22 @@
         public:
 
-                char  color[KML_COLORSTYLE_COLOR_LENGTH];
-                char  colormode[KML_COLORSTYLE_COLORMODE_LENGTH];
+                char  color[KML_COLORSTYLE_COLOR_LENGTH+1];
+                char  colormode[KML_COLORSTYLE_COLORMODE_LENGTH+1];
 
                 /*KML_ColorStyle constructors, destructors {{{1*/

issm/trunk/src/c/objects/KML/KML_Feature.h

@@ -6 +6 @@
 #define _KML_FEATURE_H_
 
-#define KML_FEATURE_NAME_LENGTH         81
-#define KML_FEATURE_SNIPPET_LENGTH     161
-#define KML_FEATURE_DESCRIPT_LENGTH   3201
-#define KML_FEATURE_STYLEURL_LENGTH     81
+#define KML_FEATURE_NAME_LENGTH         80
+#define KML_FEATURE_SNIPPET_LENGTH     160
+#define KML_FEATURE_DESCRIPT_LENGTH   3200
+#define KML_FEATURE_STYLEURL_LENGTH     80
 
 /*Headers:*/
@@ -26 +26 @@
         public:
 
-                char  name[KML_FEATURE_NAME_LENGTH];
+                char  name[KML_FEATURE_NAME_LENGTH+1];
                 bool  visibility;
                 bool  open;
-                char  snippet[KML_FEATURE_SNIPPET_LENGTH];
-                char  descript[KML_FEATURE_DESCRIPT_LENGTH];
-                char  styleurl[KML_FEATURE_STYLEURL_LENGTH];
+                char  snippet[KML_FEATURE_SNIPPET_LENGTH+1];
+                char  descript[KML_FEATURE_DESCRIPT_LENGTH+1];
+                char  styleurl[KML_FEATURE_STYLEURL_LENGTH+1];
                 DataSet* style;
 

issm/trunk/src/c/objects/KML/KML_LineString.h

@@ -6 +6 @@
 #define _KML_LINESTRING_H_
 
-#define KML_LINESTRING_ALTMODE_LENGTH    19
+#define KML_LINESTRING_ALTMODE_LENGTH    18
 
 /*Headers:*/
@@ -23 +23 @@
                 bool  extrude;
                 bool  tessellate;
-                char  altmode[KML_LINESTRING_ALTMODE_LENGTH];
+                char  altmode[KML_LINESTRING_ALTMODE_LENGTH+1];
         int   ncoord;
                 double (*coords)[3];

issm/trunk/src/c/objects/KML/KML_LinearRing.h

@@ -6 +6 @@
 #define _KML_LINEARRING_H_
 
-#define KML_LINEARRING_ALTMODE_LENGTH    19
+#define KML_LINEARRING_ALTMODE_LENGTH    18
 
 /*Headers:*/
@@ -23 +23 @@
                 bool  extrude;
                 bool  tessellate;
-                char  altmode[KML_LINEARRING_ALTMODE_LENGTH];
+                char  altmode[KML_LINEARRING_ALTMODE_LENGTH+1];
         int   ncoord;
                 double (*coords)[3];

issm/trunk/src/c/objects/KML/KML_Object.h

@@ -6 +6 @@
 #define _KML_OBJECT_H_
 
-#define KML_OBJECT_ID_LENGTH         81
+#define KML_OBJECT_ID_LENGTH         80
 
 /*Headers:{{{1*/
@@ -20 +20 @@
         public:
 
-                char  id[KML_OBJECT_ID_LENGTH];
+                char  id[KML_OBJECT_ID_LENGTH+1];
 
                 /*KML_Object constructors, destructors {{{1*/

issm/trunk/src/c/objects/KML/KML_Polygon.h

@@ -6 +6 @@
 #define _KML_POLYGON_H_
 
-#define KML_POLYGON_ALTMODE_LENGTH    19
+#define KML_POLYGON_ALTMODE_LENGTH    18
 
 /*Headers:*/
@@ -25 +25 @@
                 bool  extrude;
                 bool  tessellate;
-                char  altmode[KML_POLYGON_ALTMODE_LENGTH];
+                char  altmode[KML_POLYGON_ALTMODE_LENGTH+1];
                 DataSet* outer;
                 DataSet* inner;