Merge with master and fix conflicts

diff --cc CMakeLists.txt
Simple merge

diff --cc cmake/templates/cvconfig.h.in
Simple merge

diff --cc modules/imgcodecs/CMakeLists.txt
index 0000000,5ef34da..6705405
mode 000000,100644..100644
--- /dev/null
--- 2/modules/imgcodecs/CMakeLists.txt
+++ b/modules/imgcodecs/CMakeLists.txt
@@@ -1,0 -1,140 +1,145 @@@
+ set(the_description "Image codecs")
+ ocv_add_module(imgcodecs opencv_imgproc)
+ 
+ # ----------------------------------------------------------------------------
+ #  CMake file for imgcodecs. See root CMakeLists.txt
+ #   Some parts taken from version of Hartmut Seichter, HIT Lab NZ.
+ #   Jose Luis Blanco, 2008
+ # ----------------------------------------------------------------------------
+ 
+ ocv_clear_vars(GRFMT_LIBS)
+ 
+ if(HAVE_WINRT_CX)
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /ZW")
+ endif()
+ 
+ if(HAVE_PNG OR HAVE_TIFF OR HAVE_OPENEXR)
+   ocv_include_directories(${ZLIB_INCLUDE_DIRS})
+   list(APPEND GRFMT_LIBS ${ZLIB_LIBRARIES})
+ endif()
+ 
+ if(HAVE_JPEG)
+   ocv_include_directories(${JPEG_INCLUDE_DIR})
+   list(APPEND GRFMT_LIBS ${JPEG_LIBRARIES})
+ endif()
+ 
+ if(WITH_WEBP)
+   add_definitions(-DHAVE_WEBP)
+   ocv_include_directories(${WEBP_INCLUDE_DIR})
+   list(APPEND GRFMT_LIBS ${WEBP_LIBRARIES})
+ endif()
+ 
+ if(HAVE_PNG)
+   add_definitions(${PNG_DEFINITIONS})
+   ocv_include_directories(${PNG_INCLUDE_DIR})
+   list(APPEND GRFMT_LIBS ${PNG_LIBRARIES})
+ endif()
+ 
+ if(HAVE_TIFF)
+   ocv_include_directories(${TIFF_INCLUDE_DIR})
+   list(APPEND GRFMT_LIBS ${TIFF_LIBRARIES})
+ endif()
+ 
+ if(HAVE_JASPER)
+   ocv_include_directories(${JASPER_INCLUDE_DIR})
+   list(APPEND GRFMT_LIBS ${JASPER_LIBRARIES})
+ endif()
+ 
+ if(HAVE_OPENEXR)
+   include_directories(SYSTEM ${OPENEXR_INCLUDE_PATHS})
+   list(APPEND GRFMT_LIBS ${OPENEXR_LIBRARIES})
+ endif()
+ 
++if(HAVE_GDAL)
++  include_directories(SYSTEM ${GDAL_INCLUDE_DIR})
++  list(APPEND GRFMT_LIBS ${GDAL_LIBRARY})
++endif()
++
+ file(GLOB grfmt_hdrs ${CMAKE_CURRENT_LIST_DIR}/src/grfmt*.hpp)
+ file(GLOB grfmt_srcs ${CMAKE_CURRENT_LIST_DIR}/src/grfmt*.cpp)
+ list(APPEND grfmt_hdrs ${CMAKE_CURRENT_LIST_DIR}/src/bitstrm.hpp)
+ list(APPEND grfmt_srcs ${CMAKE_CURRENT_LIST_DIR}/src/bitstrm.cpp)
+ list(APPEND grfmt_hdrs ${CMAKE_CURRENT_LIST_DIR}/src/rgbe.hpp)
+ list(APPEND grfmt_srcs ${CMAKE_CURRENT_LIST_DIR}/src/rgbe.cpp)
+ 
+ source_group("Src\\grfmts" FILES ${grfmt_hdrs} ${grfmt_srcs})
+ 
+ set(imgcodecs_hdrs
+     ${CMAKE_CURRENT_LIST_DIR}/src/precomp.hpp
+     ${CMAKE_CURRENT_LIST_DIR}/src/utils.hpp
+     )
+ 
+ set(imgcodecs_srcs
+     ${CMAKE_CURRENT_LIST_DIR}/src/loadsave.cpp
+     ${CMAKE_CURRENT_LIST_DIR}/src/utils.cpp
+     )
+ 
+ file(GLOB imgcodecs_ext_hdrs
+      "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/*.hpp"
+      "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*.hpp"
+      "${CMAKE_CURRENT_LIST_DIR}/include/opencv2/${name}/*.h"
+      )
+ 
+ if(IOS)
+   add_definitions(-DHAVE_IOS=1)
+   list(APPEND imgcodecs_srcs ${CMAKE_CURRENT_LIST_DIR}/src/ios_conversions.mm)
+   list(APPEND IMGCODECS_LIBRARIES "-framework Accelerate" "-framework CoreGraphics" "-framework CoreImage" "-framework QuartzCore" "-framework AssetsLibrary")
+ endif()
+ 
+ if(UNIX)
+   #these variables are set by CHECK_MODULE macro
+   foreach(P ${IMGCODECS_INCLUDE_DIRS})
+     ocv_include_directories(${P})
+   endforeach()
+ 
+   foreach(P ${IMGCODECS_LIBRARY_DIRS})
+     link_directories(${P})
+   endforeach()
+ endif()
+ 
+ source_group("Src" FILES ${imgcodecs_srcs} ${imgcodecs_hdrs})
+ source_group("Include" FILES ${imgcodecs_ext_hdrs})
+ ocv_set_module_sources(HEADERS ${imgcodecs_ext_hdrs} SOURCES ${imgcodecs_srcs} ${imgcodecs_hdrs} ${grfmt_srcs} ${grfmt_hdrs})
+ ocv_module_include_directories()
+ 
+ ocv_create_module(${GRFMT_LIBS} ${IMGCODECS_LIBRARIES})
+ 
+ macro(ocv_imgcodecs_configure_target)
+ if(APPLE)
+   ocv_check_flag_support(OBJCXX "-fobjc-exceptions" HAVE_OBJC_EXCEPTIONS)
+   if(HAVE_OBJC_EXCEPTIONS)
+     foreach(source ${OPENCV_MODULE_${the_module}_SOURCES})
+       if("${source}" MATCHES "\\.mm$")
+         get_source_file_property(flags "${source}" COMPILE_FLAGS)
+         if(flags)
+           set(flags "${_flags} -fobjc-exceptions")
+         else()
+           set(flags "-fobjc-exceptions")
+         endif()
+ 
+         set_source_files_properties("${source}" PROPERTIES COMPILE_FLAGS "${flags}")
+       endif()
+     endforeach()
+   endif()
+ endif()
+ 
+ if(BUILD_SHARED_LIBS)
+   add_definitions(-DIMGCODECS_EXPORTS)
+ endif()
+ 
+ if(MSVC)
+   set_target_properties(${the_module} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:atlthunk.lib /NODEFAULTLIB:atlsd.lib /NODEFAULTLIB:libcmt.lib /DEBUG")
+ endif()
+ 
+ #stop automatic dependencies propagation for this module
+ set_target_properties(${the_module} PROPERTIES LINK_INTERFACE_LIBRARIES "")
+ 
+ ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-deprecated-declarations)
+ endmacro()
+ 
+ if(NOT BUILD_opencv_world)
+   ocv_imgcodecs_configure_target()
+ endif()
+ 
+ ocv_add_accuracy_tests()
+ ocv_add_perf_tests()

diff --cc modules/imgcodecs/include/opencv2/imgcodecs.hpp
index fcf9e1c,97fff83..fd5c08a
--- 1/modules/ml/src/ml_init.cpp
--- 2/modules/imgcodecs/include/opencv2/imgcodecs.hpp
+++ b/modules/imgcodecs/include/opencv2/imgcodecs.hpp
@@@ -45,19 -49,46 +49,47 @@@
  namespace cv
  {
  
- CV_INIT_ALGORITHM(EM, "StatModel.EM",
-                   obj.info()->addParam(obj, "nclusters", obj.nclusters);
-                   obj.info()->addParam(obj, "covMatType", obj.covMatType);
-                   obj.info()->addParam(obj, "maxIters", obj.maxIters);
-                   obj.info()->addParam(obj, "epsilon", obj.epsilon);
-                   obj.info()->addParam(obj, "weights", obj.weights, true);
-                   obj.info()->addParam(obj, "means", obj.means, true);
-                   obj.info()->addParam(obj, "covs", obj.covs, true))
+ enum { IMREAD_UNCHANGED  = -1, // 8bit, color or not
+        IMREAD_GRAYSCALE  = 0,  // 8bit, gray
+        IMREAD_COLOR      = 1,  // ?, color
+        IMREAD_ANYDEPTH   = 2,  // any depth, ?
 -       IMREAD_ANYCOLOR   = 4   // ?, any color
++       IMREAD_ANYCOLOR   = 4,  // ?, any color
++       IMREAD_LOAD_GDAL  = 8   // Use gdal driver
+      };
  
- bool initModule_ml(void)
- {
-     Ptr<Algorithm> em = createEM_ptr_hidden();
-     return em->info() != 0;
- }
+ enum { IMWRITE_JPEG_QUALITY        = 1,
+        IMWRITE_JPEG_PROGRESSIVE    = 2,
+        IMWRITE_JPEG_OPTIMIZE       = 3,
+        IMWRITE_JPEG_RST_INTERVAL   = 4,
+        IMWRITE_JPEG_LUMA_QUALITY   = 5,
+        IMWRITE_JPEG_CHROMA_QUALITY = 6,
+        IMWRITE_PNG_COMPRESSION     = 16,
+        IMWRITE_PNG_STRATEGY        = 17,
+        IMWRITE_PNG_BILEVEL         = 18,
+        IMWRITE_PXM_BINARY          = 32,
+        IMWRITE_WEBP_QUALITY        = 64
+      };
+ 
+ enum { IMWRITE_PNG_STRATEGY_DEFAULT      = 0,
+        IMWRITE_PNG_STRATEGY_FILTERED     = 1,
+        IMWRITE_PNG_STRATEGY_HUFFMAN_ONLY = 2,
+        IMWRITE_PNG_STRATEGY_RLE          = 3,
+        IMWRITE_PNG_STRATEGY_FIXED        = 4
+      };
+ 
+ CV_EXPORTS_W Mat imread( const String& filename, int flags = IMREAD_COLOR );
+ 
+ CV_EXPORTS_W bool imwrite( const String& filename, InputArray img,
+               const std::vector<int>& params = std::vector<int>());
+ 
+ CV_EXPORTS_W Mat imdecode( InputArray buf, int flags );
+ 
+ CV_EXPORTS Mat imdecode( InputArray buf, int flags, Mat* dst);
+ 
+ CV_EXPORTS_W bool imencode( const String& ext, InputArray img,
+                             CV_OUT std::vector<uchar>& buf,
+                             const std::vector<int>& params = std::vector<int>());
+ 
+ } // cv
  
- }
+ #endif //__OPENCV_IMGCODECS_HPP__

diff --cc modules/imgcodecs/src/grfmt_gdal.cpp
index f172f6f,0000000..f172f6f
mode 100644,000000..100644
--- 1/modules/highgui/src/grfmt_gdal.cpp
--- /dev/null
+++ b/modules/imgcodecs/src/grfmt_gdal.cpp

diff --cc modules/imgcodecs/src/grfmt_gdal.hpp
index b2cd224,0000000..b2cd224
mode 100644,000000..100644
--- 1/modules/highgui/src/grfmt_gdal.hpp
--- /dev/null
+++ b/modules/imgcodecs/src/grfmt_gdal.hpp

diff --cc modules/imgcodecs/src/grfmts.hpp
Simple merge

diff --cc modules/imgcodecs/src/loadsave.cpp
Simple merge