Changeset 10274

Timestamp:

10/24/11 14:42:27 (13 years ago)

Author:

jschierm

Message:

KML: Fixed reading of KML_Point object coordinates (thanks, Eric).

Location:

issm/trunk/src/c/objects/KML

Files:

• KMLFileReadUtils.cpp (modified) (2 diffs)
• KML_Point.cpp (modified) (3 diffs)

issm/trunk/src/c/objects/KML/KMLFileReadUtils.cpp ¶

@@ -405 +405 @@
 //      _printf_(true,"KMLFileTokenParse -- %s=...\n",ktag);
 //      for (j=0; j<=i; j++)
-//              _printf_(true,"   [%d]: %g\n",j,(*pdval)[j]);
+//              _printf_(true,"   [%d]: %lg\n",j,(*pdval)[j]);
 
         return(0);
@@ -471 +471 @@
 //      _printf_(true,"KMLFileTokenParse -- %s=...\n",ktag);
 //      for (j=0; j<=i; j++)
-//              _printf_(true,"   [%d][0-2]: %g,%g,%g\n",j,(*pdval3)[j][0],(*pdval3)[j][1],(*pdval3)[j][2]);
+//              _printf_(true,"   [%d][0-2]: %lg,%lg,%lg\n",j,(*pdval3)[j][0],(*pdval3)[j][1],(*pdval3)[j][2]);
 
         return(0);

issm/trunk/src/c/objects/KML/KML_Point.cpp ¶

@@ -80 +80 @@
         _printf_(flag,"%s       extrude: %s\n"         ,indent,(extrude ? "true" : "false"));
         _printf_(flag,"%s       altmode: \"%s\"\n"     ,indent,altmode);
-        _printf_(flag,"%s        coords: (%g,%g,%g)\n" ,coords[0],coords[1],coords[2]);
+        _printf_(flag,"%s        coords: (%g,%g,%g)\n" ,indent,coords[0],coords[1],coords[2]);
 
         return;
@@ -109 +109 @@
 void  KML_Point::Read(FILE* fid,char* kstr){
 
+        double*      pcoords=&coords[0];
         char*        kstri;
 
@@ -137 +138 @@
                                                           fid);
                 else if (!strcmp(kstri,"<coordinates>"))
-                        KMLFileTokenParse((double **)&coords    ,NULL       ,3,
+                        KMLFileTokenParse(&pcoords   ,NULL,3,
                                                           kstri,
                                                           fid);