Changeset 16149 for issm/trunk-jpl/src/c/modules/Shp2Expx/Shp2Expx.cpp

Timestamp:

09/17/13 13:51:02 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing cppcheck errors

File:

• issm/trunk-jpl/src/c/modules/Shp2Expx/Shp2Expx.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/modules/Shp2Expx/Shp2Expx.cpp

@@ -12 +12 @@
         #ifdef _HAVE_SHAPELIB_ //only works if Shapelib library has been compiled in.
 
-        return(Shp2Expx(filshp,filexp,
-                                        0));
+        return(Shp2Expx(filshp,filexp,0));
 
         #else //ifdef _HAVE_SHAPELIB_
@@ -20 +19 @@
 }
 
-int Shp2Expx(char* filshp,char* filexp,
-                         int sgn){
+int Shp2Expx(char* filshp,char* filexp,int sgn){
 
         #ifdef _HAVE_SHAPELIB_ //only works if Shapelib library has been compiled in.
 
         double  cm,sp;
-
-        if (sgn)
-                Xy2lldef(&cm,&sp,sgn);
-
-        return(Shp2Expx(filshp,filexp,
-                                        sgn,cm,sp));
+        Xy2lldef(&cm,&sp,sgn);
+
+        return(Shp2Expx(filshp,filexp,sgn,cm,sp));
 
         #else //ifdef _HAVE_SHAPELIB_
@@ -38 +33 @@
 }
 
-int Shp2Expx(char* filshp,char* filexp,
-                         int sgn,double cm,double sp){
+int Shp2Expx(char* filshp,char* filexp,int sgn,double cm,double sp){
 
         #ifdef _HAVE_SHAPELIB_ //only works if Shapelib library has been compiled in.