This commit is contained in:
Joachim Schoeberl 2014-04-28 07:10:21 +00:00
parent bfc7e7772f
commit 9ab799afde

View File

@ -336,7 +336,7 @@ namespace netgen
if(infile.good()) if(infile.good())
{ {
infile >> auxstring; infile >> auxstring;
if(auxstring == "csgsurfaces") if(geometry && auxstring == "csgsurfaces")
geometry -> LoadSurfaces(infile); geometry -> LoadSurfaces(infile);
} }
} }
@ -2137,7 +2137,7 @@ namespace netgen
cout << "Snapshot to file '" << filename << "'" << endl; cout << "Snapshot to file '" << filename << "'" << endl;
int w = Togl_Width (togl); int w = Togl_Width (togl);
w = int((w + 1) / 4) * 4 + 4; // w = int((w + 1) / 4) * 4 + 4;
int h = Togl_Height (togl); int h = Togl_Height (togl);
// unsigned char * buffer = new unsigned char[w*h*4]; // unsigned char * buffer = new unsigned char[w*h*4];
@ -2148,7 +2148,7 @@ namespace netgen
struct jpeg_error_mgr jerr; struct jpeg_error_mgr jerr;
FILE *outfile = fopen(filename,"wb"); FILE *outfile = fopen(filename,"wb");
JSAMPROW row_pointer[1]; JSAMPROW row_pointer[1];
int row_stride, quality = 85; // 1...100 int row_stride, quality = 100; // 1...100
cinfo.err = jpeg_std_error( &jerr ); cinfo.err = jpeg_std_error( &jerr );
jpeg_create_compress( &cinfo ); jpeg_create_compress( &cinfo );
@ -2161,7 +2161,7 @@ namespace netgen
cinfo.in_color_space = JCS_RGB; cinfo.in_color_space = JCS_RGB;
jpeg_set_defaults( &cinfo ); jpeg_set_defaults( &cinfo );
jpeg_set_quality( &cinfo, quality, TRUE ); jpeg_set_quality( &cinfo, quality, FALSE ); // TRUE
jpeg_start_compress( &cinfo, TRUE ); jpeg_start_compress( &cinfo, TRUE );
row_stride = 3*w; row_stride = 3*w;