1. 18 1月, 2018 6 次提交
    • A
      0def2dbb
    • M
      Merge pull request #10621 from mshabunin:disable-docs · 1b0ff575
      Maksim Shabunin 提交于
      Documentation generation refactoring (#10621)
      
      * Documentation build updates:
      
      - disable documentation by default, do not add to ALL target
      - combine Doxygen and Javadoc
      - optimize Doxygen html
      
      * javadoc: fix path in build directory
      
      * cmake: fix "Documentation" status line
      1b0ff575
    • G
      Merge pull request #10412 from GregoryMorse:patch-2 · ec353dbd
      Gregory Morse 提交于
      Update to add window position and size retrieval to HighGUI (#10412)
      
      * Update highgui.hpp
      
      Add read only property retrieval for enhanced rendering capabilities and more sophisticated research tools
      
      * Update window.cpp
      
      * Update window_w32.cpp
      
      * Update window_QT.cpp
      
      * Update window_QT.h
      
      * Update window_QT.h
      
      * Update window_gtk.cpp
      
      * Update precomp.hpp
      
      * Update highgui_c.h
      
      * Update highgui_c.h
      
      * Update window_w32.cpp
      
      * Update precomp.hpp
      
      * Update window_QT.cpp
      
      * Update window_QT.h
      
      * Update window_gtk.cpp
      
      * Update window_gtk.cpp
      
      * Update window_w32.cpp
      
      * Update window_QT.cpp
      
      * Update window_carbon.cpp
      
      * Update window_cocoa.mm
      
      * Update precomp.hpp
      
      * Update window_cocoa.mm
      
      * Update window_w32.cpp
      
      * Update window_gtk.cpp
      
      * Update window_QT.cpp
      
      * Update window_gtk.cpp
      
      * Update window_QT.cpp
      
      * Update window_cocoa.mm
      
      * Update window_carbon.cpp
      
      * Update window_w32.cpp
      
      * Update window_cocoa.mm
      
      * Update window_gtk.cpp
      
      * Update window_cocoa.mm
      
      * Update window_gtk.cpp
      
      * Update window_cocoa.mm
      
      * Update window_cocoa.mm
      
      * Update window.cpp
      
      * Update test_gui.cpp
      
      * Update test_gui.cpp
      
      * Update test_gui.cpp
      
      * Update highgui_c.h
      
      * Update highgui.hpp
      
      * Update window.cpp
      
      * Update highgui_c.h
      
      * Update test_gui.cpp
      
      * Update highgui.hpp
      
      * Update window.cpp
      
      * Update window.cpp
      
      * Update window.cpp
      
      * Update window.cpp
      
      * Update window.cpp
      ec353dbd
    • A
    • A
      Merge pull request #10622 from alalek:fix_build_js · aa55cdb7
      Alexander Alekhin 提交于
      Re-apply protobuf fix for JavaScript builds
      aa55cdb7
    • D
      Re-apply protobuf fix for JavaScript builds · ec8d39d0
      Dmitry Kurtaev 提交于
      original commit: f5035150
      JavaScript bindings for dnn module
      ec8d39d0
  2. 17 1月, 2018 12 次提交
  3. 16 1月, 2018 11 次提交
  4. 15 1月, 2018 6 次提交
  5. 14 1月, 2018 1 次提交
  6. 13 1月, 2018 4 次提交