Merge remote-tracking branch 'upstream/master' into gtk3

Conflicts:
	CMakeLists.txt

diff --combined CMakeLists.txt
index f15f701,c00dfc5..66a63f0
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -127,8 -127,8 +127,9 @@@ OCV_OPTION(WITH_FFMPEG         "Includ
  OCV_OPTION(WITH_GSTREAMER      "Include Gstreamer support"                   ON   IF (UNIX AND NOT APPLE AND NOT ANDROID) )
  OCV_OPTION(WITH_GSTREAMER_0_10 "Enable Gstreamer 0.10 support (instead of 1.x)"                              OFF )
  OCV_OPTION(WITH_GTK            "Include GTK support"                         ON   IF (UNIX AND NOT APPLE AND NOT ANDROID) )
- OCV_OPTION(WITH_IPP            "Include Intel IPP support"                   OFF  IF (MSVC OR X86 OR X86_64) )
 +OCV_OPTION(WITH_GTK_2_X        "Use GTK version 2"                           OFF  IF (UNIX AND NOT APPLE AND NOT ANDROID) )
+ OCV_OPTION(WITH_ICV            "Include Intel IPP ICV support"               ON   IF (NOT IOS) )
+ OCV_OPTION(WITH_IPP            "Include Intel IPP support"                   OFF  IF (NOT IOS) )
  OCV_OPTION(WITH_JASPER         "Include JPEG2K support"                      ON   IF (NOT IOS) )
  OCV_OPTION(WITH_JPEG           "Include JPEG support"                        ON)
  OCV_OPTION(WITH_WEBP           "Include WebP support"                        ON   IF (NOT IOS) )
@@@ -158,7 -158,7 +159,7 @@@ OCV_OPTION(WITH_OPENCLAMDFFT   "Includ
  OCV_OPTION(WITH_OPENCLAMDBLAS  "Include AMD OpenCL BLAS library support"     ON   IF (NOT ANDROID AND NOT IOS) )
  OCV_OPTION(WITH_DIRECTX        "Include DirectX support"                     ON   IF WIN32 )
  OCV_OPTION(WITH_INTELPERC      "Include Intel Perceptual Computing support"  OFF  IF WIN32 )
 -OCV_OPTION(WITH_IPP_A          "Include Intel IPP_A support"                 OFF  IF (MSVC OR X86 OR X86_64) )
 +
  
  # OpenCV build components
  # ===================================================
@@@ -748,15 -748,7 +749,7 @@@ else(
          status("    Cocoa:"  YES)
        endif()
      else()
-       if(HAVE_GTK3)
-         status("    GTK+ 3.x:" HAVE_GTK     THEN "YES (ver ${ALIASOF_gtk+-3.0_VERSION})"     ELSE NO)
-       elseif(HAVE_GTK)
-         status("    GTK+ 2.x:" HAVE_GTK      THEN "YES (ver ${ALIASOF_gtk+-2.0_VERSION})"     ELSE NO)
-       else()
-         if(DEFINED WITH_GTK)
-           staus("    GTK+:" NO)
-         endif()
-       endif()
+       status("    GTK+ 2.x:" HAVE_GTK      THEN "YES (ver ${ALIASOF_gtk+-2.0_VERSION})"     ELSE NO)
        status("    GThread :" HAVE_GTHREAD  THEN "YES (ver ${ALIASOF_gthread-2.0_VERSION})"  ELSE NO)
        status("    GtkGlExt:" HAVE_GTKGLEXT THEN "YES (ver ${ALIASOF_gtkglext-1.0_VERSION})" ELSE NO)
      endif()
@@@ -925,13 -917,17 +918,13 @@@ endif(DEFINED WITH_INTELPERC
  status("")
  status("  Other third-party libraries:")
  
 -if((WITH_IPP OR WITH_ICV) AND HAVE_IPP)
 -  status("    Use IPP:" "${IPP_VERSION_STR} [${IPP_VERSION_MAJOR}.${IPP_VERSION_MINOR}.${IPP_VERSION_BUILD}]")
 +if(WITH_IPP AND IPP_FOUND)
 +  status("    Use IPP:" "${IPP_LATEST_VERSION_STR} [${IPP_LATEST_VERSION_MAJOR}.${IPP_LATEST_VERSION_MINOR}.${IPP_LATEST_VERSION_BUILD}]")
    status("         at:" "${IPP_ROOT_DIR}")
  else()
 -  status("    Use IPP:"   (WITH_IPP OR WITH_ICV) AND NOT HAVE_IPP THEN "IPP not found" ELSE NO)
 +  status("    Use IPP:"   WITH_IPP AND NOT IPP_FOUND THEN "IPP not found" ELSE NO)
  endif()
  
 -if(DEFINED WITH_IPP_A)
 -status("    Use IPP Async:"  HAVE_IPP_A       THEN "YES" ELSE NO)
 -endif(DEFINED WITH_IPP_A)
 -
  status("    Use Eigen:"      HAVE_EIGEN       THEN "YES (ver ${EIGEN_WORLD_VERSION}.${EIGEN_MAJOR_VERSION}.${EIGEN_MINOR_VERSION})" ELSE NO)
  status("    Use TBB:"        HAVE_TBB         THEN "YES (ver ${TBB_VERSION_MAJOR}.${TBB_VERSION_MINOR} interface ${TBB_INTERFACE_VERSION})" ELSE NO)
  status("    Use OpenMP:"     HAVE_OPENMP      THEN YES ELSE NO)