Resolve conflicts with master

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

diff --git a/source/Irrlicht/CImageLoaderTGA.cpp b/source/Irrlicht/CImageLoaderTGA.cpp
index c9b3a9d52e075a13a1b6414336a0637026b353b4..d5e24a584ce16f4829aea7687e6c41d849f41a49 100644 (file)
--- a/source/Irrlicht/CImageLoaderTGA.cpp
+++ b/source/Irrlicht/CImageLoaderTGA.cpp
@@ -4,8 +4,6 @@
 \r
 #include "CImageLoaderTGA.h"\r
 \r
-#ifdef _IRR_COMPILE_WITH_TGA_LOADER_\r
-\r
 #include "IReadFile.h"\r
 #include "os.h"\r
 #include "CColorConverter.h"\r
@@ -106,6 +104,12 @@ IImage* CImageLoaderTGA::loadImage(io::IReadFile* file) const
        header.ImageHeight = os::Byteswap::byteswap(header.ImageHeight);\r
 #endif\r
 \r
+       if (!checkImageDimensions(header.ImageWidth, header.ImageHeight))\r
+       {\r
+               os::Printer::log("Image dimensions too large in file", file->getFileName(), ELL_ERROR);\r
+               return 0;\r
+       }\r
+\r
        // skip image identification field\r
        if (header.IdLength)\r
                file->seek(header.IdLength, true);\r
@@ -232,6 +236,3 @@ IImageLoader* createImageLoaderTGA()
 \r
 } // end namespace video\r
 } // end namespace irr\r
-\r
-#endif\r
-\r