pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

add wbmp, jpc, pgx, pnm, ras support and return no-exception

Browse Source
This commit is contained in:
Kulikova Svetlana
2021-03-23 18:18:43 +03:00
parent 9a2e6069b3
commit 07bab0c3b5
3 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
DesktopEditor/cximage/CxImage/ximacfg.h
View File

@ -21,33 +21,6 @@
/////////////////////////////////////////////////////////////////////////////
// CxImage supported formats
#if defined(BUILDING_WASM_MODULE)
#define CXIMAGE_SUPPORT_BMP 1
#define CXIMAGE_SUPPORT_GIF 1
#define CXIMAGE_SUPPORT_JPG 1
#define CXIMAGE_SUPPORT_PNG 1
#define CXIMAGE_SUPPORT_ICO 1
#define CXIMAGE_SUPPORT_TIF 1
#define CXIMAGE_SUPPORT_TGA 1
#define CXIMAGE_SUPPORT_PCX 1
#define CXIMAGE_SUPPORT_WBMP 0
#define CXIMAGE_SUPPORT_WMF 0
#define CXIMAGE_SUPPORT_JP2 1
#define CXIMAGE_SUPPORT_JPC 0
#define CXIMAGE_SUPPORT_PGX 0
#define CXIMAGE_SUPPORT_PNM 0
#define CXIMAGE_SUPPORT_RAS 0
#define CXIMAGE_SUPPORT_JBG 0
#define CXIMAGE_SUPPORT_MNG 0
#define CXIMAGE_SUPPORT_SKA 0
#define CXIMAGE_SUPPORT_RAW 0
#define CXIMAGE_SUPPORT_PSD 0
#else
#define CXIMAGE_SUPPORT_BMP 1
#define CXIMAGE_SUPPORT_GIF 1
@ -68,6 +41,15 @@
#define CXIMAGE_SUPPORT_JBG 0 // GPL'd see ../jbig/copying.txt & ../jbig/patents.htm
#if defined(BUILDING_WASM_MODULE)
#define CXIMAGE_SUPPORT_MNG 0
#define CXIMAGE_SUPPORT_SKA 0
#define CXIMAGE_SUPPORT_RAW 0
#define CXIMAGE_SUPPORT_PSD 0
#else
#define CXIMAGE_SUPPORT_MNG 1
#define CXIMAGE_SUPPORT_SKA 1
#define CXIMAGE_SUPPORT_RAW 1
@ -83,7 +65,11 @@
#define CXIMAGE_ERR_NOFILE "null file handler"
#define CXIMAGE_ERR_NOIMAGE "null image!!!"
#if defined(BUILDING_WASM_MODULE)
#define CXIMAGE_SUPPORT_EXCEPTION_HANDLING 0
#else
#define CXIMAGE_SUPPORT_EXCEPTION_HANDLING 1
#endif // BUILDING_WASM_MODULE
/////////////////////////////////////////////////////////////////////////////
//color to grey mapping <H. Muelner> <jurgene>