Revert "Fix: Listbox was sometimes sending EGET_LISTBOX_SELECTED_AGAIN instead of...

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

diff --git a/source/Irrlicht/CImageWriterPNG.cpp b/source/Irrlicht/CImageWriterPNG.cpp
index 55ae00ec5b31a73cd323bc37e8a9f599d502740b..2f5260a89e53955dd5b231c7099c30a300a842d7 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
@@ -80,7 +69,7 @@ bool CImageWriterPNG::writeImage(io::IWriteFile* file, IImage* image,u32 param)
                NULL, (png_error_ptr)png_cpexcept_error, (png_error_ptr)png_cpexcept_warning);\r
        if (!png_ptr)\r
        {\r
-               os::Printer::log("PNGWriter: Internal PNG create write struct failure\n", file->getFileName(), ELL_ERROR);\r
+               os::Printer::log("PNGWriter: Internal PNG create write struct failure", file->getFileName(), ELL_ERROR);\r
                return false;\r
        }\r
 \r
@@ -88,7 +77,7 @@ bool CImageWriterPNG::writeImage(io::IWriteFile* file, IImage* image,u32 param)
        png_infop info_ptr = png_create_info_struct(png_ptr);\r
        if (!info_ptr)\r
        {\r
-               os::Printer::log("PNGWriter: Internal PNG create info struct failure\n", file->getFileName(), ELL_ERROR);\r
+               os::Printer::log("PNGWriter: Internal PNG create info struct failure", file->getFileName(), ELL_ERROR);\r
                png_destroy_write_struct(&png_ptr, NULL);\r
                return false;\r
        }\r
@@ -137,7 +126,7 @@ bool CImageWriterPNG::writeImage(io::IWriteFile* file, IImage* image,u32 param)
        u8* tmpImage = new u8[image->getDimension().Height*lineWidth];\r
        if (!tmpImage)\r
        {\r
-               os::Printer::log("PNGWriter: Internal PNG create image failure\n", file->getFileName(), ELL_ERROR);\r
+               os::Printer::log("PNGWriter: Internal PNG create image failure", file->getFileName(), ELL_ERROR);\r
                png_destroy_write_struct(&png_ptr, &info_ptr);\r
                return false;\r
        }\r
@@ -171,7 +160,7 @@ bool CImageWriterPNG::writeImage(io::IWriteFile* file, IImage* image,u32 param)
        u8** RowPointers = new png_bytep[image->getDimension().Height];\r
        if (!RowPointers)\r
        {\r
-               os::Printer::log("PNGWriter: Internal PNG create row pointers failure\n", file->getFileName(), ELL_ERROR);\r
+               os::Printer::log("PNGWriter: Internal PNG create row pointers failure", file->getFileName(), ELL_ERROR);\r
                png_destroy_write_struct(&png_ptr, &info_ptr);\r
                delete [] tmpImage;\r
                return false;\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