Linux test_HTTP fixes.

[simgear.git] / simgear / ephemeris / stardata.cxx

diff --git a/simgear/ephemeris/stardata.cxx b/simgear/ephemeris/stardata.cxx
index 7f04b8b21055f7cb93824ee8c4d2ad2694e9741f..a78583338b95ca34d819c7c8ba05dd6dfb412aaa 100644 (file)
--- a/simgear/ephemeris/stardata.cxx
+++ b/simgear/ephemeris/stardata.cxx
@@ -25,25 +25,21 @@
 #endif
 
 #include <simgear/debug/logstream.hxx>
+#include <simgear/misc/sg_path.hxx>
 #include <simgear/misc/sgstream.hxx>
 
 #include "stardata.hxx"
 
 #if defined (_MSC_VER)
-  SG_USING_STD(getline);
+  using std::getline;
 #endif
 
-// Constructor
-SGStarData::SGStarData() :
-    nstars(0)
-{
-}
+using std::string;
 
-SGStarData::SGStarData( SGPath path ) :
-    nstars(0)
+// Constructor
+SGStarData::SGStarData( const SGPath& path )
 {
-    data_path = SGPath( path );
-    load();
+    load(path);
 }
 
 
@@ -52,31 +48,28 @@ SGStarData::~SGStarData() {
 }
 
 
-bool SGStarData::load() {
+bool SGStarData::load( const SGPath& path ) {
 
-    // -dw- avoid local data > 32k error by dynamic allocation of the
-    // array, problem for some compilers
-    stars = new SGVec3d[SG_MAX_STARS];
+    _stars.clear();
 
-     // build the full path name to the stars data base file
-    data_path.append( "stars" );
-    SG_LOG( SG_ASTRO, SG_INFO, "  Loading stars from " << data_path.str() );
+    // build the full path name to the stars data base file
+    SGPath tmp = path;
+    tmp.append( "stars" );
+    SG_LOG( SG_ASTRO, SG_INFO, "  Loading stars from " << tmp.str() );
 
-    sg_gzifstream in( data_path.str() );
+    sg_gzifstream in( tmp.str() );
     if ( ! in.is_open() ) {
        SG_LOG( SG_ASTRO, SG_ALERT, "Cannot open star file: "
-               << data_path.str() );
-       exit(-1);
+               << tmp.str() );
+        return false;
     }
 
     double ra, dec, mag;
     char c;
     string name;
 
-    nstars = 0;
-
     // read in each line of the file
-    while ( ! in.eof() && nstars < SG_MAX_STARS ) {
+    while ( ! in.eof() ) {
        in >> skipcomment;
 
         getline( in, name, ',' );
@@ -116,13 +109,10 @@ bool SGStarData::load() {
        in >> mag;
 
        // cout << " star data = " << ra << " " << dec << " " << mag << endl;
-
-       sgdSetVec3( stars[nstars].sg(), ra, dec, mag );
-
-       ++nstars;
+        _stars.push_back(SGVec3d(ra, dec, mag));
     }
 
-    SG_LOG( SG_ASTRO, SG_INFO, "  Loaded " << nstars << " stars" );
+    SG_LOG( SG_ASTRO, SG_INFO, "  Loaded " << _stars.size() << " stars" );
 
     return true;
 }