Commit 412a2aa4 authored by Maxim Kostin's avatar Maxim Kostin

Added support for 'imgcodecs' module:

 - Resolved GET_ENV and input type incompatibility
 - Made libjpeg compile for WINRT. So does imgcodecs module.
 - Updated .gitignore (log, tlog)
parent 864b4e3b
...@@ -9,7 +9,6 @@ Thumbs.db ...@@ -9,7 +9,6 @@ Thumbs.db
tags tags
tegra/ tegra/
bin/ bin/
CMakeFiles/
*.sdf *.sdf
*.opensdf *.opensdf
*.obj *.obj
...@@ -17,3 +16,9 @@ CMakeFiles/ ...@@ -17,3 +16,9 @@ CMakeFiles/
*.depend *.depend
*.rule *.rule
*.tmp *.tmp
*/debug
*/CMakeFiles
CMakeCache.txt
*.suo
*.log
*.tlog
\ No newline at end of file
...@@ -15,6 +15,13 @@ else() ...@@ -15,6 +15,13 @@ else()
ocv_list_filterout(lib_srcs jmemnobs.c) ocv_list_filterout(lib_srcs jmemnobs.c)
endif() endif()
if(WINRT)
add_definitions(-DNO_GETENV)
get_directory_property( DirDefs COMPILE_DEFINITIONS )
message(STATUS "Adding NO_GETENV to compiler definitions for WINRT:")
message(STATUS " COMPILE_DEFINITIONS = ${DirDefs}")
endif()
# ---------------------------------------------------------------------------------- # ----------------------------------------------------------------------------------
# Define the library target: # Define the library target:
# ---------------------------------------------------------------------------------- # ----------------------------------------------------------------------------------
......
...@@ -17,7 +17,7 @@ check_include_file(string.h HAVE_STRING_H) ...@@ -17,7 +17,7 @@ check_include_file(string.h HAVE_STRING_H)
check_include_file(sys/types.h HAVE_SYS_TYPES_H) check_include_file(sys/types.h HAVE_SYS_TYPES_H)
check_include_file(unistd.h HAVE_UNISTD_H) check_include_file(unistd.h HAVE_UNISTD_H)
if(WIN32) if(WIN32 AND NOT WINRT)
set(USE_WIN32_FILEIO 1) set(USE_WIN32_FILEIO 1)
endif() endif()
...@@ -79,7 +79,7 @@ set(lib_srcs ...@@ -79,7 +79,7 @@ set(lib_srcs
"${CMAKE_CURRENT_BINARY_DIR}/tif_config.h" "${CMAKE_CURRENT_BINARY_DIR}/tif_config.h"
) )
if(WIN32) if(WIN32 AND NOT WINRT)
list(APPEND lib_srcs tif_win32.c) list(APPEND lib_srcs tif_win32.c)
else() else()
list(APPEND lib_srcs tif_unix.c) list(APPEND lib_srcs tif_unix.c)
......
if(WINRT)
ocv_module_disable(imgcodecs)
endif()
set(the_description "Image codecs") set(the_description "Image codecs")
ocv_add_module(imgcodecs opencv_imgproc WRAP java python) ocv_add_module(imgcodecs opencv_imgproc WRAP java python)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment