Convert fgDEM to FGDem ...

[flightgear.git] / DemInfo / deminfo.cxx

diff --git a/DemInfo/deminfo.cxx b/DemInfo/deminfo.cxx
index 9af81a9dd2c1a7fb26d179879b2e4f63a054298d..75f9c2f55cd0f553639160df08ceeeee888ff6a9 100644 (file)
--- a/DemInfo/deminfo.cxx
+++ b/DemInfo/deminfo.cxx
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <string>
 
 #include <DEM/dem.hxx>
 
@@ -36,9 +37,8 @@
 
 int main(int argc, char **argv) {
     // DEM data
-    fgDEM dem;
-    char fg_root[256];
-    char filename[256];
+    FGDem dem;
+    string filename;
     double error;
     int i, j;
 
@@ -48,17 +48,16 @@ int main(int argc, char **argv) {
     }
 
     // set input dem file name
-    strcpy(filename, argv[1]);
+    filename = argv[1];
 
     dem.open(filename);
 
     if ( dem.read_a_record() ) {
-       printf("Results = %s  %.1f %.1f\n", 
-              filename, 
-              dem.info_originx() / 3600.0,
-              dem.info_originy() / 3600.0 ) ;
+       cout << "Results = " << filename << "  "
+            << dem.get_originx() / 3600.0 << " "
+            << dem.get_originy() / 3600.0 << "\n";
     } else {
-       printf("Error parsing DEM file.\n");
+       cout << "Error parsing DEM file.\n";
     }
 
     dem.close();
@@ -68,6 +67,12 @@ int main(int argc, char **argv) {
 
 
 // $Log$
+// Revision 1.3  1999/03/12 22:54:04  curt
+// Convert fgDEM to FGDem ...
+//
+// Revision 1.2  1998/09/19 18:01:22  curt
+// Support for changes to libDEM.a
+//
 // Revision 1.1  1998/06/04 19:18:05  curt
 // Initial revision.
 //