From 76892afa102fd814b3821c246547f28feb3d7394 Mon Sep 17 00:00:00 2001 From: Björn Steinbrink Date: Sun, 18 Sep 2005 00:42:39 +0000 Subject: Added ImageWriter. --- ChangeLog | 8 +++- src/resources/imagewriter.cpp | 108 ++++++++++++++++++++++++++++++++++++++++++ src/resources/imagewriter.h | 33 +++++++++++++ 3 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 src/resources/imagewriter.cpp create mode 100644 src/resources/imagewriter.h diff --git a/ChangeLog b/ChangeLog index ef622d3f..f9b5becd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ -2005-09-17 Duane Bailey +2005-09-18 Björn Steinbrink + + * src/resources/imagewriter.cpp, src/resources/imagewriter.h: Added + ImageWriter class that provides a function to save a SDL surface as + png. + +2005-09-17 Duane Bailey * src/net/messagin.cpp, src/net/messageout.cpp, src/net/network.cpp: removed replaced MACOSX defines with big endian defines diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp new file mode 100644 index 00000000..a6fb3d97 --- /dev/null +++ b/src/resources/imagewriter.cpp @@ -0,0 +1,108 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id$ + */ + +#include "imagewriter.h" + +#include +#include +#include + +#include "../log.h" + +void ImageWriter::writePNG(SDL_Surface *surface, + const std::string &filename) +{ + // TODO Maybe someone can make this look nice? + FILE *fp = fopen(filename.c_str(), "wb"); + if (!fp) + { + logger->log("could not open file &s for writing", filename.c_str()); + return; + } + + png_structp png_ptr; + png_infop info_ptr; + png_bytep *row_pointers; + int colortype; + + if (SDL_MUSTLOCK(surface)) { + 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; + } + + info_ptr = png_create_info_struct(png_ptr); + if (!info_ptr) + { + png_destroy_write_struct(&png_ptr, (png_infopp)NULL); + logger->log("Could not create png_info"); + return; + } + + if (setjmp(png_jmpbuf(png_ptr))) + { + png_destroy_write_struct(&png_ptr, (png_infopp)NULL); + logger->log("problem writing to %s", filename.c_str()); + return; + } + + png_init_io(png_ptr, fp); + + colortype = (surface->format->BitsPerPixel == 24) ? + PNG_COLOR_TYPE_RGB : PNG_COLOR_TYPE_RGB_ALPHA; + + png_set_IHDR(png_ptr, info_ptr, surface->w, surface->h, 8, colortype, + PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); + + 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; + } + + 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); + + if (SDL_MUSTLOCK(surface)) { + SDL_UnlockSurface(surface); + } +} diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h new file mode 100644 index 00000000..edda723f --- /dev/null +++ b/src/resources/imagewriter.h @@ -0,0 +1,33 @@ +/* + * The Mana World + * Copyright 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * The Mana World is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * The Mana World is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with The Mana World; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id$ + */ + +#include + +struct SDL_Surface; + +class ImageWriter +{ + public: + static void writePNG(SDL_Surface *surface, + const std::string &filename); +}; -- cgit v1.2.3-70-g09d2