summaryrefslogtreecommitdiff
path: root/src/graphics.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/graphics.cpp')
-rw-r--r--src/graphics.cpp104
1 files changed, 15 insertions, 89 deletions
diff --git a/src/graphics.cpp b/src/graphics.cpp
index f12d3898..33f25468 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -23,9 +23,6 @@
#include "graphics.h"
-#include <cstdarg>
-#include <png.h>
-
#include "log.h"
#include "graphic/imagerect.h"
@@ -243,100 +240,29 @@ void Graphics::updateScreen()
}
}
-bool Graphics::saveScreenshot(char *filename, ...)
+SDL_Surface* Graphics::getScreenshot()
{
- va_list ap;
- char *newname = (char *)malloc(32);
- va_start(ap, filename);
- vsprintf(newname, filename, ap);
- va_end(ap);
-
- FILE *fp = fopen(newname, "wb");
- if (!fp)
- {
- logger->log("could not open file &s for writing", newname);
- return false;
- }
-
- png_structp png_ptr;
- png_infop info_ptr;
- png_bytep *row_pointers;
- int colortype;
-
- #if SDL_BYTEORDER == SDL_BIG_ENDIAN
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
int rmask = 0xff000000;
int gmask = 0x00ff0000;
int bmask = 0x0000ff00;
- int amask = 0x000000ff;
- #else
+#else
int rmask = 0x000000ff;
int gmask = 0x0000ff00;
int bmask = 0x00ff0000;
- int amask = 0xff000000;
- #endif
-
- SDL_Surface *surface = SDL_CreateRGBSurface(SDL_SWSURFACE, mScreen->w,
- mScreen->h, 32, rmask, gmask, bmask, amask);
- //SDL_LockSurface(mScreen);
- SDL_BlitSurface(mScreen, NULL, surface, NULL);
- //SDL_UnlockSurface(mScreen);
-
- SDL_LockSurface(surface);
-
- png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0);
- if (!png_ptr)
- {
- logger->log("Had trouble creating png_structp");
- return false;
- }
-
- info_ptr = png_create_info_struct(png_ptr);
- if (!info_ptr)
- {
- logger->log("Could not create png_info");
- return false;
+#endif
+ int amask = 0x00000000;
+
+ SDL_Surface *screenshot = SDL_CreateRGBSurface(SDL_SWSURFACE, mScreen->w,
+ mScreen->h, 24, rmask, gmask, bmask, amask);
+
+ if (SDL_MUSTLOCK(mScreen)) {
+ SDL_LockSurface(mScreen);
}
-
-
- if (setjmp(png_ptr->jmpbuf))
- {
- logger->log("problem writing to %s", newname);
- return false;
- }
-
- png_init_io(png_ptr, fp);
-
- if (mScreen->format->BitsPerPixel == 24) colortype = PNG_COLOR_TYPE_RGB;
- else colortype = PNG_COLOR_TYPE_RGB_ALPHA;
-
- png_set_IHDR(png_ptr, info_ptr, surface->w, surface->h, 8,colortype,
- PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-
- png_write_info(png_ptr, info_ptr);
-
- png_set_packing(png_ptr);
-
- row_pointers = (png_bytep*) malloc(sizeof(png_bytep)*surface->h);
- if (!row_pointers)
- {
- logger->log("Had trouble converting surface to row pointers");
- return false;
+ SDL_BlitSurface(mScreen, NULL, screenshot, NULL);
+ if (SDL_MUSTLOCK(mScreen)) {
+ SDL_UnlockSurface(mScreen);
}
-
- for (int i = 0; i < surface->h; i++)
- row_pointers[i] = (png_bytep)(Uint8 *)surface->pixels + i * surface->pitch;
-
- png_write_image(png_ptr, row_pointers);
- png_write_end(png_ptr, info_ptr);
- fclose(fp);
- if (row_pointers) free(row_pointers);
-
- if (info_ptr->palette) free(info_ptr->palette);
-
- png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
-
- SDL_UnlockSurface(surface);
- SDL_FreeSurface(surface);
- return true;
+ return screenshot;
}