diff options
| author | Eugene Sandulenko | 2011-10-23 23:31:23 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2011-10-23 23:44:14 +0100 |
| commit | 4c08fccf589e9c2eab87c53bae912b3f0d23b323 (patch) | |
| tree | 46292fcab85f52ea673ac9a2db0df561ac525629 /graphics | |
| parent | f1165b0b6ead53b68443c649cc544016ad119b1d (diff) | |
| download | scummvm-rg350-4c08fccf589e9c2eab87c53bae912b3f0d23b323.tar.gz scummvm-rg350-4c08fccf589e9c2eab87c53bae912b3f0d23b323.tar.bz2 scummvm-rg350-4c08fccf589e9c2eab87c53bae912b3f0d23b323.zip | |
GUI: Add support for PNG images in themes
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/png.cpp | 4 | ||||
| -rw-r--r-- | graphics/png.h | 13 |
2 files changed, 1 insertions, 16 deletions
diff --git a/graphics/png.cpp b/graphics/png.cpp index 2189fd333f..cea8b575ad 100644 --- a/graphics/png.cpp +++ b/graphics/png.cpp @@ -22,8 +22,6 @@ #include "graphics/png.h" -#ifdef GRAPHICS_PNG_H - #include "graphics/pixelformat.h" #include "graphics/surface.h" @@ -487,5 +485,3 @@ void PNG::readTransparencyChunk(uint32 chunkLength) { } } // End of Graphics namespace - -#endif // GRAPHICS_PNG_H diff --git a/graphics/png.h b/graphics/png.h index 3f8ea85320..25f9c1e7bc 100644 --- a/graphics/png.h +++ b/graphics/png.h @@ -23,20 +23,11 @@ /* * PNG decoder used in engines: * - sword25 + * - ScummVM GUI * Dependencies: * - zlib */ -// Currently, only the sword25 engine uses the PNG decoder, so skip compiling -// it if sword25 is not enabled, or if zlib (a required dependency) is not -// enabled. - -#if !(defined(ENABLE_SWORD25) || defined(USE_ZLIB)) - -// Do not compile the PNG decoder code - -#else - #ifndef GRAPHICS_PNG_H #define GRAPHICS_PNG_H @@ -176,5 +167,3 @@ private: } // End of Graphics namespace #endif // GRAPHICS_PNG_H - -#endif // Engine and zlib guard |