Drop obsolete configuration macros

[irrlicht.git] / source / Irrlicht / CImageWriterPNG.cpp

diff --git a/source/Irrlicht/CImageWriterPNG.cpp b/source/Irrlicht/CImageWriterPNG.cpp
index 55ae00ec5b31a73cd323bc37e8a9f599d502740b..0e2a71ecf77f39267206319a9e87ebb63b527f1b 100644 (file)
--- a/source/Irrlicht/CImageWriterPNG.cpp
+++ b/source/Irrlicht/CImageWriterPNG.cpp
@@ -4,17 +4,13 @@
 \r
 #include "CImageWriterPNG.h"\r
 \r
-#ifdef _IRR_COMPILE_WITH_PNG_WRITER_\r
-\r
 #include "CImageLoaderPNG.h"\r
 #include "CColorConverter.h"\r
 #include "IWriteFile.h"\r
 #include "irrString.h"\r
 #include "os.h" // for logging\r
 \r
-#ifdef _IRR_COMPILE_WITH_LIBPNG_\r
-       #include <png.h> // use system lib png\r
-#endif // _IRR_COMPILE_WITH_LIBPNG_\r
+#include <png.h> // use system lib png\r
 \r
 namespace irr\r
 {\r
@@ -26,7 +22,6 @@ IImageWriter* createImageWriterPNG()
        return new CImageWriterPNG;\r
 }\r
 \r
-#ifdef _IRR_COMPILE_WITH_LIBPNG_\r
 // PNG function for error handling\r
 static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)\r
 {\r
@@ -51,7 +46,6 @@ void PNGAPI user_write_data_fcn(png_structp png_ptr, png_bytep data, png_size_t
        if (check != length)\r
                png_error(png_ptr, "Write Error");\r
 }\r
-#endif // _IRR_COMPILE_WITH_LIBPNG_\r
 \r
 CImageWriterPNG::CImageWriterPNG()\r
 {\r
@@ -62,16 +56,11 @@ CImageWriterPNG::CImageWriterPNG()
 \r
 bool CImageWriterPNG::isAWriteableFileExtension(const io::path& filename) const\r
 {\r
-#ifdef _IRR_COMPILE_WITH_LIBPNG_\r
        return core::hasFileExtension ( filename, "png" );\r
-#else\r
-       return false;\r
-#endif\r
 }\r
 \r
 bool CImageWriterPNG::writeImage(io::IWriteFile* file, IImage* image,u32 param) const\r
 {\r
-#ifdef _IRR_COMPILE_WITH_LIBPNG_\r
        if (!file || !image)\r
                return false;\r
 \r
@@ -206,13 +195,7 @@ bool CImageWriterPNG::writeImage(io::IWriteFile* file, IImage* image,u32 param)
        delete [] tmpImage;\r
        png_destroy_write_struct(&png_ptr, &info_ptr);\r
        return true;\r
-#else\r
-       return false;\r
-#endif\r
 }\r
 \r
 } // namespace video\r
 } // namespace irr\r
-\r
-#endif\r
-\r