Changeset 12497 for issm/trunk-jpl/src/modules/Shp2Kml/Shp2Kml.cpp

Timestamp:

06/21/12 14:08:16 (13 years ago)

Author:

Mathieu Morlighem

Message:

moved _error_ to _error2_ and added circular dependencies in Makefile.am to resolve all symbols

File:

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

issm/trunk-jpl/src/modules/Shp2Kml/Shp2Kml.cpp ¶

@@ -25 +25 @@
 
         #ifndef _HAVE_SHAPELIB_ //only works if shapelib library has been compiled in.
-        _error_("Shapelib not available! Cannot carry out shp file translation!");
+        _error2_("Shapelib not available! Cannot carry out shp file translation!");
         #endif
 
@@ -33 +33 @@
         /*checks on arguments on the matlab side: */
         if (nlhs > NLHS) {
-                Shp2KmlUsage(); _error_("Shp2Kml usage error");
+                Shp2KmlUsage(); _error2_("Shp2Kml usage error");
         }
         if (nrhs < NRHS) {
-                Shp2KmlUsage(); _error_("Shp2Kml usage error");
+                Shp2KmlUsage(); _error2_("Shp2Kml usage error");
         }
 
@@ -54 +54 @@
 
         /*some checks*/
-        if (sgn < -1 || sgn > +1) _error_("Hemisphere sgn=%d must be +1 (north), -1 (south), or 0 (no translation).",sgn);
-        if (fabs(cm)      > 180.) _error_("Central meridian cm=%g must be between -180 (west) and +180 (east) degrees.",cm);
-        if (sp < 0. || sp >  90.) _error_("Standard parallel sp=%g must be between 0 and 90 degrees (in specified hemisphere).",sp);
+        if (sgn < -1 || sgn > +1) _error2_("Hemisphere sgn=" << sgn << " must be +1 (north), -1 (south), or 0 (no translation).");
+        if (fabs(cm)      > 180.) _error2_("Central meridian cm=" << cm << " must be between -180 (west) and +180 (east) degrees.");
+        if (sp < 0. || sp >  90.) _error2_("Standard parallel sp=" << sp << " must be between 0 and 90 degrees (in specified hemisphere).");
 
         /* Run core computations: */