Changeset 16560 for issm/trunk/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp

Timestamp:

10/28/13 14:43:03 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16554

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp (modified) (4 diffs)

issm/trunk/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp

@@ -8 +8 @@
 #include "../../kml/kmlobjects.h"
 
-int Shp2Kmlx(char* filshp,char* filkml,
-                         int sgn){
+int Shp2Kmlx(char* filshp,char* filkml,int sgn){
 
         #ifdef _HAVE_SHAPELIB_ //only works if Shapelib library has been compiled in.
 
         double  cm,sp;
-
-        if (sgn)
-                Xy2lldef(&cm,&sp,sgn);
-
-        return(Shp2Kmlx(filshp,filkml,
-                                        sgn,cm,sp));
+        Xy2lldef(&cm,&sp,sgn);
+
+        return(Shp2Kmlx(filshp,filkml,sgn,cm,sp));
 
         #else //ifdef _HAVE_SHAPELIB_
@@ -26 +22 @@
 }
 
-int Shp2Kmlx(char* filshp,char* filkml,
-                         int sgn,double cm,double sp){
+int Shp2Kmlx(char* filshp,char* filkml,int sgn,double cm,double sp){
 
         #ifdef _HAVE_SHAPELIB_ //only works if Shapelib library has been compiled in.
@@ -103 +98 @@
         pshapm=xNew<double*>(nshape);
 
-/*  loop over the list of shapes  */
-
-        for( i = 0; i < nEntities; i++ )
-        {
-//      int     j;
+        /* loop over the list of shapes  */
+        for(i=0;i<nEntities;i++ ){
                 SHPObject   *psShape;
 
@@ -231 +223 @@
         sprintf(klsty->color     ,"ff000000");
         sprintf(klsty->colormode ,"normal");
-        klsty->width     ,lwidth;
+        klsty->width     =lwidth;
         kpsty =new KML_PolyStyle();
         sprintf(kpsty->color     ,"00ffffff");