OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-19 13:40:49 +03:00
Code Activity

0029055: Visualization, Image_AlienPixMap - fallback using Wincodec

Browse Source 
Possibility to read and write images in BMP, PNG, JPEG formats without using FreeImage library is provided on Windows using system image library.
This commit is contained in:
kgv
2017-08-26 00:48:23 +03:00
committed by bugmaster
parent cc77a38d94
commit a975e06e70
3 changed files with 338 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
adm/cmake/occt_csf.cmake
View File

@@ -35,7 +35,11 @@ endif()
if (USE_FREEIMAGE)
set (CSF_FreeImagePlus "freeimage")
else()
set (CSF_FreeImagePlus)
if (WIN32)
set (CSF_FreeImagePlus "windowscodecs")
else()
set (CSF_FreeImagePlus)
endif()
endif()
# TCL/TK

2
adm/genproj.tcl
View File

@@ -1312,6 +1312,8 @@ proc osutils:csfList { theOS theCsfLibsMap theCsfFrmsMap } {
} else {
set aLibsMap(CSF_FreeImagePlus) "freeimage"
}
} elseif { "$theOS" == "wnt" } {
set aLibsMap(CSF_FreeImagePlus) "windowscodecs"
}
if { "$::HAVE_FFMPEG" == "true" } {
set aLibsMap(CSF_FFmpeg) "avcodec avformat swscale avutil"