admin/Slnkdwf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#35855 Versie 4.14: voortaan ook BMP ondersteunen (omdat de autodetect anders kan crashen in de TIFF code)

Browse Source 
svn path=/Slnkdwf/trunk/; revision=30261
This commit is contained in:
Jos Groot Lipman
2016-08-11 12:23:50 +00:00
parent 0340182217
commit 612839df43
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SlnkDWFCom/ImageConvert.cpp
View File

@@ -36,8 +36,7 @@ CString FindExtension(const CString& name)
int FindFormat(const CString& ext)
{
int type = 0;
// if (ext == "bmp") type = CXIMAGE_FORMAT_BMP;
if (0) {}
if (ext == "bmp") type = CXIMAGE_FORMAT_BMP;
#if CXIMAGE_SUPPORT_JPG
else if (ext=="jpg"||ext=="jpeg") type = CXIMAGE_FORMAT_JPG;
#endif

2
SlnkDWFCom/SLNKDWFVersion.h
View File

@@ -1,6 +1,6 @@
// Zorg dat versies alfabetisch altijd op elkaar volgen!
#define SLNK_MAJOR_VERSION 4
#define SLNK_MINOR_VERSION 13
#define SLNK_MINOR_VERSION 14
#define SLNK_BUILD_VERSION 0
// Define resource strings

2
SlnkDWFImpl/CxImage/CxImage/ximacfg.h
View File

@@ -17,7 +17,7 @@
/////////////////////////////////////////////////////////////////////////////
// CxImage supported formats
#define CXIMAGE_SUPPORT_BMP 0
#define CXIMAGE_SUPPORT_BMP 1
#define CXIMAGE_SUPPORT_GIF 1
#define CXIMAGE_SUPPORT_JPG 1
#define CXIMAGE_SUPPORT_PNG 1