too bad upstream doesn't like make ... sigh

[debian/splat] / utils / usgs2sdf.c

diff --git a/utils/usgs2sdf.c b/utils/usgs2sdf.c
index 0c1f1faa61bb13d31395f6a2f7ff3863b525054a..422ea855dd34ebf713cd40550ecc79bb9610b3d4 100644 (file)
--- a/utils/usgs2sdf.c
+++ b/utils/usgs2sdf.c
@@ -1,7 +1,7 @@
 /****************************************************************************
 *            USGS2SDF: USGS to SPLAT Data File Converter Utility            *
-*               Copyright John A. Magliacane, KD2BD 1997-2001               *
-*                         Last update: 13-Apr-2002                          *
+*               Copyright John A. Magliacane, KD2BD 1997-2009               *
+*                         Last update: 14-Mar-2009                          *
 *****************************************************************************
 *                                                                           *
 * This program reads files containing delimited US Geological Survey        *
@@ -62,7 +62,8 @@ char *argv[];
 {
        unsigned char minimum[30], maximum[30], swlong[30], swlat[30],
                 nwlong[30], nwlat[30], nelong[30], nelat[30], selong[30],
-                selat[30], string[40];
+                selat[30];
+       char string[40];
        double max_el, min_el,  max_west, min_west, max_north, min_north;
        int x, y, z, c, array[1202][1202];
        char splatfile[25];
@@ -194,14 +195,14 @@ char *argv[];
 
                maximum[x]=0;
 
-               sscanf(d2e(minimum),"%lf",&min_el);
-               sscanf(d2e(maximum),"%lf",&max_el);
+               sscanf(d2e((char*)minimum),"%lG",&min_el);
+               sscanf(d2e((char*)maximum),"%lf",&max_el);
 
-               sscanf(d2e(swlong),"%lf",&max_west);
-               sscanf(d2e(swlat),"%lf",&min_north);
+               sscanf(d2e((char*)swlong),"%lf",&max_west);
+               sscanf(d2e((char*)swlat),"%lf",&min_north);
 
-               sscanf(d2e(nelong),"%lf",&min_west);
-               sscanf(d2e(nelat),"%lf",&max_north);
+               sscanf(d2e((char*)nelong),"%lf",&min_west);
+               sscanf(d2e((char*)nelat),"%lf",&max_north);
 
                max_west/=-3600.0;
                min_north/=3600.0;