FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the new SGPath::create_dir function

Browse Source 
Ensure no triangles array could have more than 32767 vertices, a PLIB limit.
This commit is contained in:
fredb
2006-01-07 13:21:36 +00:00
parent 94e1d3f0fc
commit 795c079af0
1 changed files with 12 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/io/sg_binobj.cxx
+12 -25
View File
@@ -36,6 +36,7 @@
#include STL_STRING #include STL_STRING
#include <simgear/bucket/newbucket.hxx> #include <simgear/bucket/newbucket.hxx>
#include <simgear/misc/sg_path.hxx>
#include "lowlevel.hxx" #include "lowlevel.hxx"
#include "sg_binobj.hxx" #include "sg_binobj.hxx"
@@ -620,20 +621,13 @@ bool SGBinObject::write_bin( const string& base, const string& name,
unsigned char idx_mask; unsigned char idx_mask;
int idx_size; int idx_size;
string dir = base + "/" + b.gen_base_path(); SGPath file = base + "/" + b.gen_base_path() + "/" + name + ".gz";
string command = "mkdir -p " + dir; file.create_dir( 0755 );
#if defined(_MSC_VER) || defined(__MINGW32__) cout << "Output file = " << file.str() << endl;
system( (string("mkdir ") + dir).c_str() );
#else
system(command.c_str());
#endif
string file = dir + "/" + name + ".gz";
cout << "Output file = " << file << endl;
gzFile fp; gzFile fp;
if ( (fp = gzopen( file.c_str(), "wb9" )) == NULL ) { if ( (fp = gzopen( file.c_str(), "wb9" )) == NULL ) {
cout << "ERROR: opening " << file << " for writing!" << endl; cout << "ERROR: opening " << file.str() << " for writing!" << endl;
return false; return false;
} }
@@ -858,7 +852,8 @@ bool SGBinObject::write_bin( const string& base, const string& name,
// find next group // find next group
material = tri_materials[start]; material = tri_materials[start];
while ( (end < (int)tri_materials.size()) && while ( (end < (int)tri_materials.size()) &&
(material == tri_materials[end]) ) (material == tri_materials[end]) &&
3*(end-start) < 32760 )
{ {
// cout << "end = " << end << endl; // cout << "end = " << end << endl;
end++; end++;
@@ -1051,21 +1046,13 @@ bool SGBinObject::write_ascii( const string& base, const string& name,
Point3D p; Point3D p;
int i, j; int i, j;
string dir = base + "/" + b.gen_base_path(); SGPath file = base + "/" + b.gen_base_path() + "/" + name;
string command = "mkdir -p " + dir; file.create_dir( 0755 );
#if defined(_MSC_VER) || defined(__MINGW32__) cout << "Output file = " << file.str() << endl;
system( (string("mkdir ") + dir).c_str() );
#else
system(command.c_str());
#endif
// string file = dir + "/" + b.gen_index_str();
string file = dir + "/" + name;
cout << "Output file = " << file << endl;
FILE *fp; FILE *fp;
if ( (fp = fopen( file.c_str(), "w" )) == NULL ) { if ( (fp = fopen( file.c_str(), "w" )) == NULL ) {
cout << "ERROR: opening " << file << " for writing!" << endl; cout << "ERROR: opening " << file.str() << " for writing!" << endl;
return false; return false;
} }
@@ -1224,7 +1211,7 @@ bool SGBinObject::write_ascii( const string& base, const string& name,
// close the file // close the file
fclose(fp); fclose(fp);
command = "gzip --force --best " + file; string command = "gzip --force --best " + file.str();
system(command.c_str()); system(command.c_str());
return true; return true;