]> git.sesse.net Git - casparcg/commitdiff
Workaround for FreeImage sometimes not detecting .TGA files as FIF_TARGA, when in...
authorHelge Norberg <helge.norberg@svt.se>
Mon, 9 Nov 2015 16:36:15 +0000 (17:36 +0100)
committerHelge Norberg <helge.norberg@svt.se>
Mon, 9 Nov 2015 16:36:15 +0000 (17:36 +0100)
modules/image/util/image_loader.cpp

index f5e15ebcf7ec34b0cc3544ed7e04a8c30267feb5..1768d2891761ae1043e32258adf24fb1517941e8 100644 (file)
@@ -46,6 +46,14 @@ std::shared_ptr<FIBITMAP> load_image(const std::wstring& filename)
 #else
        FREE_IMAGE_FORMAT fif = FreeImage_GetFileType(u8(filename).c_str(), 0);
 #endif
+
+       if (fif == FIF_UNKNOWN)
+#ifdef WIN32
+               fif = FreeImage_GetFIFFromFilenameU(filename.c_str());
+#else
+               fif = FreeImage_GetFIFFromFilename(u8(filename).c_str());
+#endif
+
        if(fif == FIF_UNKNOWN || !FreeImage_FIFSupportsReading(fif)) 
                CASPAR_THROW_EXCEPTION(invalid_argument() << msg_info("Unsupported image format."));