aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorwsoltys <wiso@xbmc.org>2014-01-04 16:26:25 -0800
committerwsoltys <wiso@xbmc.org>2014-01-04 16:26:25 -0800
commit03018a58e0b58bd26fc7421960efd89fc6854079 (patch)
tree6d67b41cbbce04b6ccf797e86d2c27a67d70ac63 /lib
parentd04a70fe8422678e9df6bf5ddb2ce3366534e3ed (diff)
parent15b961a55d67b67b15ae311f0c12bb23d714ac93 (diff)
Merge pull request #3947 from wsoltys/imagemimetype
fixed: loading of images from urls which don't have an extension...
Diffstat (limited to 'lib')
-rw-r--r--lib/cximage-6.0/CxImage/DllInterface.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/cximage-6.0/CxImage/DllInterface.cpp b/lib/cximage-6.0/CxImage/DllInterface.cpp
index d6f8ac8f9a..8e139531cb 100644
--- a/lib/cximage-6.0/CxImage/DllInterface.cpp
+++ b/lib/cximage-6.0/CxImage/DllInterface.cpp
@@ -94,6 +94,8 @@ int DetectFileType(const BYTE* pBuffer, int nBufSize)
// don't include the last APP0 byte (0xE0), as some (non-conforming) JPEG/JFIF files might have some other
// APPn-specific data here, and we should skip over this.
return CXIMAGE_FORMAT_JPG;
+ if (pBuffer[0] == 'G' && pBuffer[1] == 'I' && pBuffer[2] == 'F')
+ return CXIMAGE_FORMAT_GIF;
return CXIMAGE_FORMAT_UNKNOWN;
}