# 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
#include <simgear/compiler.h>
-#include SG_GL_H
+#include <osg/Image>
+#include <osgDB/WriteFile>
#include "screen-dump.hxx"
ibuffer = (unsigned char *) malloc(win_width*win_height*RGB3);
if ( (fp = fopen(filename, "wb")) == NULL ) {
+ free(ibuffer);
printf("Warning: cannot open %s\n", filename);
return false;
}
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);
}