diff options
| -rw-r--r-- | projects/openttd_vs100.vcxproj | 2 | ||||
| -rw-r--r-- | projects/openttd_vs100.vcxproj.filters | 6 | ||||
| -rw-r--r-- | projects/openttd_vs80.vcproj | 8 | ||||
| -rw-r--r-- | projects/openttd_vs90.vcproj | 8 | ||||
| -rw-r--r-- | source.list | 4 | ||||
| -rw-r--r-- | src/spritecache.cpp | 25 | ||||
| -rw-r--r-- | src/spriteloader/png.cpp | 222 | ||||
| -rw-r--r-- | src/spriteloader/png.hpp | 23 |
8 files changed, 0 insertions, 298 deletions
diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj index 40fb5a69d..88aa596ec 100644 --- a/projects/openttd_vs100.vcxproj +++ b/projects/openttd_vs100.vcxproj @@ -1079,8 +1079,6 @@ <ClInclude Include="..\src\video\video_driver.hpp" /> <ClCompile Include="..\src\spriteloader\grf.cpp" /> <ClInclude Include="..\src\spriteloader\grf.hpp" /> - <ClCompile Include="..\src\spriteloader\png.cpp" /> - <ClInclude Include="..\src\spriteloader\png.hpp" /> <ClInclude Include="..\src\spriteloader\spriteloader.hpp" /> <ClCompile Include="..\src\newgrf.cpp" /> <ClCompile Include="..\src\newgrf_airport.cpp" /> diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters index 0170fdbde..9fcc8c6ee 100644 --- a/projects/openttd_vs100.vcxproj.filters +++ b/projects/openttd_vs100.vcxproj.filters @@ -2466,12 +2466,6 @@ <ClInclude Include="..\src\spriteloader\grf.hpp"> <Filter>Sprite loaders</Filter> </ClInclude> - <ClCompile Include="..\src\spriteloader\png.cpp"> - <Filter>Sprite loaders</Filter> - </ClCompile> - <ClInclude Include="..\src\spriteloader\png.hpp"> - <Filter>Sprite loaders</Filter> - </ClInclude> <ClInclude Include="..\src\spriteloader\spriteloader.hpp"> <Filter>Sprite loaders</Filter> </ClInclude> diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj index 6eb7cfc3d..f508c877e 100644 --- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -3667,14 +3667,6 @@ > </File> <File - RelativePath=".\..\src\spriteloader\png.cpp" - > - </File> - <File - RelativePath=".\..\src\spriteloader\png.hpp" - > - </File> - <File RelativePath=".\..\src\spriteloader\spriteloader.hpp" > </File> diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj index 001c01c86..d08098d97 100644 --- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -3664,14 +3664,6 @@ > </File> <File - RelativePath=".\..\src\spriteloader\png.cpp" - > - </File> - <File - RelativePath=".\..\src\spriteloader\png.hpp" - > - </File> - <File RelativePath=".\..\src\spriteloader\spriteloader.hpp" > </File> diff --git a/source.list b/source.list index 50020c9a7..3ae8f2a3b 100644 --- a/source.list +++ b/source.list @@ -868,10 +868,6 @@ video/video_driver.hpp # Sprite loaders spriteloader/grf.cpp spriteloader/grf.hpp -#if PNG -spriteloader/png.cpp -spriteloader/png.hpp -#end spriteloader/spriteloader.hpp # NewGRF diff --git a/src/spritecache.cpp b/src/spritecache.cpp index 59b04a4d7..d4f23d0e0 100644 --- a/src/spritecache.cpp +++ b/src/spritecache.cpp @@ -15,9 +15,6 @@ #include "gfx_func.h" #include "zoom_func.h" #include "settings_type.h" -#ifdef WITH_PNG -#include "spriteloader/png.hpp" -#endif /* WITH_PNG */ #include "blitter/factory.hpp" #include "core/math_func.hpp" #include "core/mem_func.hpp" @@ -386,28 +383,6 @@ static void *ReadSprite(const SpriteCache *sc, SpriteID id, SpriteType sprite_ty uint8 sprite_avail = 0; sprite[ZOOM_LVL_NORMAL].type = sprite_type; - if (sprite_type == ST_NORMAL && BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth() == 32) { -#ifdef WITH_PNG - /* Try loading 32bpp graphics in case we are 32bpp output */ - SpriteLoaderPNG sprite_loader; - - sprite_avail = sprite_loader.LoadSprite(sprite, file_slot, sc->id, sprite_type, true); - - if (sprite_avail != 0) { - if (ResizeSprites(sprite, sprite_avail, file_slot, sc->id)) { - return BlitterFactoryBase::GetCurrentBlitter()->Encode(sprite, allocator); - } - } - /* If the PNG couldn't be loaded, fall back to 8bpp grfs */ -#else - static bool show_once = true; - if (show_once) { - DEBUG(misc, 0, "You are running a 32bpp blitter, but this build is without libpng support; falling back to 8bpp graphics"); - show_once = false; - } -#endif /* WITH_PNG */ - } - SpriteLoaderGrf sprite_loader(sc->container_ver); if (sprite_type != ST_MAPGEN && BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth() == 32) { /* Try for 32bpp sprites first. */ diff --git a/src/spriteloader/png.cpp b/src/spriteloader/png.cpp deleted file mode 100644 index 0c65ffc6f..000000000 --- a/src/spriteloader/png.cpp +++ /dev/null @@ -1,222 +0,0 @@ -/* $Id$ */ - -/* - * This file is part of OpenTTD. - * OpenTTD 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, version 2. - * OpenTTD 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 OpenTTD. If not, see <http://www.gnu.org/licenses/>. - */ - -/** @file png.cpp Reading sprites from png files. */ - -#ifdef WITH_PNG - -#include "../stdafx.h" -#include "../fileio_func.h" -#include "../debug.h" -#include "png.hpp" -#include <png.h> - -#define PNG_SLOT 62 - -static void PNGAPI png_my_read(png_structp png_ptr, png_bytep data, png_size_t length) -{ - FioReadBlock(data, length); -} - -static void PNGAPI png_my_error(png_structp png_ptr, png_const_charp message) -{ - DEBUG(sprite, 0, "ERROR (libpng): %s - %s", message, (char *)png_get_error_ptr(png_ptr)); - longjmp(png_jmpbuf(png_ptr), 1); -} - -static void PNGAPI png_my_warning(png_structp png_ptr, png_const_charp message) -{ - DEBUG(sprite, 0, "WARNING (libpng): %s - %s", message, (char *)png_get_error_ptr(png_ptr)); -} - -static bool OpenPNGFile(const char *filename, uint32 id, bool mask) -{ - char png_file[MAX_PATH]; - - /* Add path separator after 'sprites' if not present */ - const char *sep = (filename[0] == PATHSEPCHAR) ? "" : PATHSEP; - snprintf(png_file, sizeof(png_file), "sprites%s%s" PATHSEP "%d%s.png", sep, filename, id, mask ? "m" : ""); - if (FioCheckFileExists(png_file, NEWGRF_DIR)) { - FioOpenFile(PNG_SLOT, png_file, NEWGRF_DIR); - return true; - } - - /* TODO -- Add TAR support */ - return false; -} - -static bool LoadPNG(SpriteLoader::Sprite *sprite, const char *filename, uint32 id, volatile bool mask, ZoomLevel zoom) -{ - png_byte header[8]; - png_structp png_ptr; - png_infop info_ptr, end_info; - uint bit_depth, colour_type; - uint i, pixelsize; - SpriteLoader::CommonPixel *dst; - - if (!OpenPNGFile(filename, id, mask)) return mask; // If mask is true, and file not found, continue true anyway, as it isn't a show-stopper - - /* Check the header */ - FioReadBlock(header, 8); - if (png_sig_cmp(header, 0, 8) != 0) return false; - - /* Create the reader */ - png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, (png_voidp)NULL, png_my_error, png_my_warning); - if (png_ptr == NULL) return false; - - /* Create initial stuff */ - info_ptr = png_create_info_struct(png_ptr); - if (info_ptr == NULL) { - png_destroy_read_struct(&png_ptr, (png_infopp)NULL, (png_infopp)NULL); - return false; - } - end_info = png_create_info_struct(png_ptr); - if (end_info == NULL) { - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); - return false; - } - - /* Make sure that upon error, we can clean up graceful */ - if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - return false; - } - - /* Read the file */ - png_set_read_fn(png_ptr, NULL, png_my_read); - png_set_sig_bytes(png_ptr, 8); - - png_read_info(png_ptr, info_ptr); - - if (!mask) { - /* Read the text chunks */ - png_textp text_ptr; - int num_text = 0; - png_get_text(png_ptr, info_ptr, &text_ptr, &num_text); - if (num_text == 0) DEBUG(misc, 0, "Warning: PNG Sprite '%s/%d.png' doesn't have x_offs and y_offs; expect graphical problems", filename, id); - for (int i = 0; i < num_text; i++) { - /* x_offs and y_offs are in the text-chunk of PNG */ - if (strcmp("x_offs", text_ptr[i].key) == 0) sprite->x_offs = strtol(text_ptr[i].text, NULL, 0); - if (strcmp("y_offs", text_ptr[i].key) == 0) sprite->y_offs = strtol(text_ptr[i].text, NULL, 0); - } - - uint height = png_get_image_height(png_ptr, info_ptr); - uint width = png_get_image_width(png_ptr, info_ptr); - /* Check if sprite dimensions aren't larger than what is allowed in GRF-files. */ - if (height > UINT8_MAX || width > UINT16_MAX) { - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - return false; - } - sprite->height = height; - sprite->width = width; - sprite->AllocateData(zoom, sprite->width * sprite->height); - } else if (sprite->height != png_get_image_height(png_ptr, info_ptr) || sprite->width != png_get_image_width(png_ptr, info_ptr)) { - /* Make sure the mask image isn't larger than the sprite image. */ - DEBUG(misc, 0, "Ignoring mask for SpriteID %d as it isn't the same dimension as the masked sprite", id); - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - return true; - } - - bit_depth = png_get_bit_depth(png_ptr, info_ptr); - colour_type = png_get_color_type(png_ptr, info_ptr); - - if (mask && (bit_depth != 8 || colour_type != PNG_COLOR_TYPE_PALETTE)) { - DEBUG(misc, 0, "Ignoring mask for SpriteID %d as it isn't a 8 bit palette image", id); - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - return true; - } - - bool win_palette = false; - if (!mask) { - if (bit_depth == 16) png_set_strip_16(png_ptr); - - if (colour_type == PNG_COLOR_TYPE_PALETTE) { - png_set_palette_to_rgb(png_ptr); - colour_type = PNG_COLOR_TYPE_RGB; - } - if (colour_type == PNG_COLOR_TYPE_GRAY || colour_type == PNG_COLOR_TYPE_GRAY_ALPHA) { - png_set_gray_to_rgb(png_ptr); - colour_type = PNG_COLOR_TYPE_RGB; - } - - if (colour_type == PNG_COLOR_TYPE_RGB) { - if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { - /* Create an alpha channel when there is a tRNS chunk */ - png_set_tRNS_to_alpha(png_ptr); - } else { - png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER); - } - } - - pixelsize = sizeof(uint32); - } else { - pixelsize = sizeof(uint8); - - /* Check whether the DOS greyscale is in place. If not, we assume WIN palette */ - png_colorp palette; - int num_palette; - if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette) && num_palette == 256) { - for (uint i = 3; i <= 5; i++) { - /* Allow differences between -4 and +4 */ - uint8 intensity = i * 16 - 4; - uint8 diff_r = palette[i].red - intensity; - uint8 diff_g = palette[i].green - intensity; - uint8 diff_b = palette[i].blue - intensity; - if (diff_r > 8 || diff_g > 8 || diff_b > 8) { - win_palette = true; - break; - } - } - } - } - - png_bytep row_pointer = AllocaM(png_byte, png_get_image_width(png_ptr, info_ptr) * pixelsize); - - for (i = 0; i < png_get_image_height(png_ptr, info_ptr); i++) { - png_read_row(png_ptr, row_pointer, NULL); - - dst = sprite->data + i * png_get_image_width(png_ptr, info_ptr); - - for (uint x = 0; x < png_get_image_width(png_ptr, info_ptr); x++) { - if (mask) { - if (row_pointer[x * sizeof(uint8)] != 0) { - /* Alpha channel is used from the original image (to allow transparency in remap colours) */ - extern const byte _palmap_w2d[]; - byte colour = row_pointer[x * sizeof(uint8)]; - dst[x].m = win_palette ? _palmap_w2d[colour] : colour; - } - } else { - dst[x].r = row_pointer[x * sizeof(uint32) + 0]; - dst[x].g = row_pointer[x * sizeof(uint32) + 1]; - dst[x].b = row_pointer[x * sizeof(uint32) + 2]; - dst[x].a = row_pointer[x * sizeof(uint32) + 3]; - dst[x].m = 0; - } - } - } - - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - - return true; -} - -uint8 SpriteLoaderPNG::LoadSprite(SpriteLoader::Sprite *sprite, uint8 file_slot, size_t file_pos, SpriteType sprite_type, bool load_32bpp) -{ - if (!load_32bpp) return 0; - - ZoomLevel zoom_lvl = (sprite_type == ST_NORMAL) ? ZOOM_LVL_OUT_4X : ZOOM_LVL_NORMAL; - - const char *filename = FioGetFilename(file_slot); - if (!LoadPNG(&sprite[zoom_lvl], filename, (uint32)file_pos, false, zoom_lvl)) return 0; - if (!LoadPNG(&sprite[zoom_lvl], filename, (uint32)file_pos, true, zoom_lvl)) return 0; - - return 1 << zoom_lvl; -} - -#endif /* WITH_PNG */ diff --git a/src/spriteloader/png.hpp b/src/spriteloader/png.hpp deleted file mode 100644 index 425904af6..000000000 --- a/src/spriteloader/png.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/* $Id$ */ - -/* - * This file is part of OpenTTD. - * OpenTTD 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, version 2. - * OpenTTD 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 OpenTTD. If not, see <http://www.gnu.org/licenses/>. - */ - -/** @file png.hpp Base for reading files from PNG. */ - -#ifndef SPRITELOADER_PNG_HPP -#define SPRITELOADER_PNG_HPP - -#include "spriteloader.hpp" - -/** Sprite loader for graphics coming from a PNG image. */ -class SpriteLoaderPNG : public SpriteLoader { -public: - uint8 LoadSprite(SpriteLoader::Sprite *sprite, uint8 file_slot, size_t file_pos, SpriteType sprite_type, bool load_32bpp); -}; - -#endif /* SPRITELOADER_PNG_HPP */ |