1. 16 6月, 2014 1 次提交
  2. 06 6月, 2014 1 次提交
  3. 04 6月, 2014 1 次提交
    • T
      On branch gtk3 · f0887a99
      Tony 提交于
      Changes to be committed:
      	modified:   CMakeLists.txt
      Corrected merge error from last resync
      f0887a99
  4. 13 4月, 2014 6 次提交
    • T
      Rebase branch gtk3 · fd5e1806
      Tony 提交于
      fd5e1806
    • T
      Correction to enable compilation on platform with only GTK2 libs · 265148b9
      Tony 提交于
      	modified:   CMakeLists.txt
      	modified:   cmake/OpenCVFindLibsGUI.cmake
      265148b9
    • T
      Correct error with GTK3 not found selection · c0dbc083
      Tony 提交于
      When GTK3 is not found, HAVE_GTK was being set to TRUE. This edit
      ensures that HAVE_GTK is only set if GTK3 or GTK2 (meeting minimum
      version requirements) is present.
      Selection logic for printing 'GTK: No' when the libraries are not found
      has also been removed so the message is printed when GTK is not found or
      selected in common with other libraries.
      
      Changes committed:
      	modified:   CMakeLists.txt
      	modified:   cmake/OpenCVFindLibsGUI.cmake
      c0dbc083
    • T
      Fix bug in GTK+3 logic introduced by previous merge · a28ad40c
      Tony 提交于
      During merging of conflicting versions of this file, I erroneously
      deleted several lines in the GUI reporting section. This is repaired
      in this commit.
      a28ad40c
    • T
      Use GTK_VERSION_MAJOR to switch between GTK+ version two and three · 16383412
      Tony 提交于
      specific code. As a result of this, HAVE_GTK3 no longer needs to be
      exposed.
      
      The use of HAVE_GTK, and HAVE_ GTK3 have been changed to mirror the
      method used by HAVE_QT and HAVE_QT5.
       On branch gtk3
       Changes to be committed:
              modified:   CMakeLists.txt
              modified:   cmake/OpenCVFindLibsGUI.cmake
              modified:   cmake/templates/cvconfig.h.in
              modified:   modules/highgui/src/window.cpp
              modified:   modules/highgui/src/window_gtk.cpp
      16383412
    • T
      Correction to enable compilation on platform with only GTK2 libs · 512cb4fc
      Tony 提交于
      	modified:   CMakeLists.txt
      	modified:   cmake/OpenCVFindLibsGUI.cmake
      512cb4fc
  5. 10 4月, 2014 1 次提交
    • T
      Correct error with GTK3 not found selection · 2f9dad5c
      Tony 提交于
      When GTK3 is not found, HAVE_GTK was being set to TRUE. This edit
      ensures that HAVE_GTK is only set if GTK3 or GTK2 (meeting minimum
      version requirements) is present.
      Selection logic for printing 'GTK: No' when the libraries are not found
      has also been removed so the message is printed when GTK is not found or
      selected in common with other libraries.
      
      Changes committed:
      	modified:   CMakeLists.txt
      	modified:   cmake/OpenCVFindLibsGUI.cmake
      2f9dad5c
  6. 09 4月, 2014 2 次提交
  7. 07 4月, 2014 3 次提交
  8. 03 4月, 2014 1 次提交
  9. 01 4月, 2014 2 次提交
    • E
      Added IPP Async converters, doc and sample · fa2d79a1
      Elena Gvozdeva 提交于
      fa2d79a1
    • T
      Use GTK_VERSION_MAJOR to switch between GTK+ version two and three · 7f671406
      Tony 提交于
      specific code. As a result of this, HAVE_GTK3 no longer needs to be
      exposed.
      
      The use of HAVE_GTK, and HAVE_ GTK3 have been changed to mirror the
      method used by HAVE_QT and HAVE_QT5.
       On branch gtk3
       Changes to be committed:
              modified:   CMakeLists.txt
              modified:   cmake/OpenCVFindLibsGUI.cmake
              modified:   cmake/templates/cvconfig.h.in
              modified:   modules/highgui/src/window.cpp
              modified:   modules/highgui/src/window_gtk.cpp
      7f671406
  10. 21 3月, 2014 1 次提交
  11. 19 3月, 2014 1 次提交
  12. 24 2月, 2014 1 次提交
  13. 18 2月, 2014 1 次提交
  14. 13 2月, 2014 2 次提交
  15. 12 2月, 2014 2 次提交
  16. 04 2月, 2014 1 次提交
  17. 29 1月, 2014 1 次提交
  18. 28 1月, 2014 1 次提交
  19. 27 1月, 2014 2 次提交
  20. 26 1月, 2014 1 次提交
  21. 22 1月, 2014 1 次提交
  22. 21 1月, 2014 1 次提交
  23. 19 1月, 2014 1 次提交
  24. 30 12月, 2013 1 次提交
  25. 26 12月, 2013 1 次提交
    • G
      Update CMakeLists.txt · 48808581
      GregoryMorse 提交于
      WinRT native C++ support allowing building of static libraries
      
      Update CMakeLists.txt
      
      Update OpenCVCRTLinkage.cmake
      
      Update OpenCVCRTLinkage.cmake
      48808581
  26. 23 12月, 2013 1 次提交
  27. 20 12月, 2013 1 次提交
  28. 19 12月, 2013 1 次提交