X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fscreen%2Fscreen-dump.cxx;h=ff3e9b71eaa519b166dcf9746f65d9ef1dd0bd15;hb=229837b14c8c31ec5d7c920e3c4dc7cba58e2419;hp=dc5ba7bd56eb0c9310ceb620b5b0e4c8db5bb7ea;hpb=7e7ce2f38e87d6244e05730fa4382da088bb25f1;p=simgear.git

diff --git a/simgear/screen/screen-dump.cxx b/simgear/screen/screen-dump.cxx
index dc5ba7bd..ff3e9b71 100644
--- a/simgear/screen/screen-dump.cxx
+++ b/simgear/screen/screen-dump.cxx
@@ -23,11 +23,7 @@
 #  include <simgear_config.h>
 #endif
 
-#if defined(__CYGWIN__)  /* && !defined(USING_X) */
-#define WIN32
-#endif
-
-#if defined(WIN32)  /* MINGW and MSC predefine WIN32 */
+#ifdef WIN32
 # include <windows.h>
 #endif
 
@@ -37,7 +33,8 @@
 
 #include <simgear/compiler.h>
 
-#include <osg/GL>
+#include <osg/Image>
+#include <osgDB/WriteFile>
 
 #include "screen-dump.hxx"
 
@@ -68,31 +65,26 @@ bool sg_glWritePPMFile(const char *filename, GLubyte *buffer, int win_width, int
 	    for (k = 0; k < RGB3; k++)
 		ibuffer[q++] = (unsigned char)
 		    *(buffer + (pixelSize*((win_height-1-i)*win_width+j)+k));
-    fwrite(ibuffer, sizeof(unsigned char), RGB3*win_width*win_height, fp);
+    int written = fwrite(ibuffer, sizeof(unsigned char), RGB3*win_width*win_height, fp);
     fclose(fp);
     free(ibuffer);
 
+    if ( written != RGB3*win_width*win_height )
+    {
+        printf("Warning: failed to write %s. File truncated.\n", filename);
+        return false;
+    }
+
     printf("wrote file '%s' (%d x %d pixels, %d bytes)\n",
 	   filename, win_width, win_height, RGB3*win_width*win_height);
     return true;
 }
 
 
-// dump the screen buffer to a ppm file
+// dump the screen buffer to a png file, returns true on success
 bool sg_glDumpWindow(const char *filename, int win_width, int win_height) {
-    GLubyte *buffer;
-    bool result;
-
-    buffer = (GLubyte *) malloc(win_width*win_height*RGBA);
-
-    // read window contents from color buffer with glReadPixels
-    glFinish();
-    glReadPixels(0, 0, win_width, win_height, 
-		 GL_RGBA, GL_UNSIGNED_BYTE, buffer);
-    result = sg_glWritePPMFile( filename, buffer, win_width, win_height,
-				GL_RGBA );
-    free(buffer);
-
-    return result;
+  osg::ref_ptr<osg::Image> img(new osg::Image);
+  img->readPixels(0,0, win_width, win_height, GL_RGB, GL_UNSIGNED_BYTE);
+  return osgDB::writeImageFile(*img, filename);
 }