From e7537ca6033a13ff1d21aac4a61a49ef325684b6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 18 Sep 2017 18:57:19 +0300 Subject: Move imagewriter into utils directory and rename to pnglib. --- src/resources/imagewriter.cpp | 121 ------------------------------------------ src/resources/imagewriter.h | 44 --------------- 2 files changed, 165 deletions(-) delete mode 100644 src/resources/imagewriter.cpp delete mode 100644 src/resources/imagewriter.h (limited to 'src/resources') diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp deleted file mode 100644 index d9485a52c..000000000 --- a/src/resources/imagewriter.cpp +++ /dev/null @@ -1,121 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program 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. - * - * This program 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 this program. If not, see . - */ - -#include "resources/imagewriter.h" - -#include "utils/cast.h" -#include "utils/checkutils.h" - -#include -PRAGMA48(GCC diagnostic push) -PRAGMA48(GCC diagnostic ignored "-Wshadow") -#include -PRAGMA48(GCC diagnostic pop) - -#include "debug.h" - -bool ImageWriter::writePNG(SDL_Surface *const surface, - const std::string &filename) -{ - if (surface == nullptr) - return false; - - - if (SDL_MUSTLOCK(surface)) - SDL_LockSurface(surface); - - png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, - nullptr, nullptr, nullptr); - if (png_ptr == nullptr) - { - reportAlways("Had trouble creating png_structp"); - return false; - } - - png_infop info_ptr = png_create_info_struct(png_ptr); - if (info_ptr == nullptr) - { - png_destroy_write_struct(&png_ptr, static_cast(nullptr)); - reportAlways("Could not create png_info"); - return false; - } - - if (setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_write_struct(&png_ptr, &info_ptr); - reportAlways("problem writing to %s", filename.c_str()); - return false; - } - - FILE *const fp = fopen(filename.c_str(), "wb"); - if (fp == nullptr) - { - reportAlways("could not open file %s for writing", - filename.c_str()); - return false; - } - - png_init_io(png_ptr, fp); - - const int 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); - - png_bytep *const row_pointers - = new png_bytep[CAST_SIZE(surface->h)]; -/* - if (!row_pointers) - { - logger->log1("Had trouble converting surface to row pointers"); - fclose(fp); - return false; - } -*/ - - for (int i = 0; i < surface->h; i++) - { - row_pointers[i] = static_cast(static_cast( - surface->pixels) + CAST_SIZE(i * surface->pitch)); - } - - png_write_image(png_ptr, row_pointers); - png_write_end(png_ptr, info_ptr); - - fclose(fp); - - delete [] row_pointers; - - png_destroy_write_struct(&png_ptr, - &info_ptr); - - if (SDL_MUSTLOCK(surface)) - SDL_UnlockSurface(surface); - - return true; -} diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h deleted file mode 100644 index dbe7c75ff..000000000 --- a/src/resources/imagewriter.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program 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. - * - * This program 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 this program. If not, see . - */ - -#ifndef RESOURCES_IMAGEWRITER_H -#define RESOURCES_IMAGEWRITER_H - -#include - -#include "localconsts.h" - -struct SDL_Surface; - -class ImageWriter final -{ - public: - ImageWriter() - { } - - A_DELETE_COPY(ImageWriter) - - static bool writePNG(SDL_Surface *const surface, - const std::string &filename); -}; - -#endif // RESOURCES_IMAGEWRITER_H -- cgit v1.2.3-60-g2f50