From 4c08fccf589e9c2eab87c53bae912b3f0d23b323 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Sun, 23 Oct 2011 23:31:23 +0100
Subject: GUI: Add support for PNG images in themes

---
 graphics/png.cpp |  4 ----
 graphics/png.h   | 13 +------------
 2 files changed, 1 insertion(+), 16 deletions(-)

(limited to 'graphics')

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
-- 
cgit v1.2.3