1. 29 Oct, 2015 1 commit
  2. 20 Oct, 2015 1 commit
  3. 27 Aug, 2015 1 commit
  4. 26 Aug, 2015 1 commit
  5. 02 Jun, 2015 1 commit
  6. 26 May, 2015 2 commits
  7. 19 May, 2015 2 commits
  8. 13 May, 2015 1 commit
  9. 12 May, 2015 1 commit
  10. 25 Mar, 2015 1 commit
    • Prof. Dr. Rudolf Haussmann's avatar
      Changes to be committed: · a9d4e053
      Prof. Dr. Rudolf Haussmann authored
         (use "git reset HEAD <file>..." to unstage)
      
      	modified:   highgui/include/opencv2/highgui/highgui_c.h
      	modified:   highgui/src/cap_dshow.cpp
      	modified:   java/generator/gen_java.py
      
      The correction of the orthographic error in the enumeration constant
      CAP_PROP_MONOCROME has been undone.
      a9d4e053
  11. 20 Mar, 2015 1 commit
    • Prof. Dr. Rudolf Haussmann's avatar
      Changes to be committed: · a7bf1d53
      Prof. Dr. Rudolf Haussmann authored
         (use "git reset HEAD <file>..." to unstage)
      
      	modified:   modules/highgui/include/opencv2/highgui/highgui_c.h
      	modified:   modules/highgui/src/cap_dshow.cpp
      	modified:   modules/highgui/src/cap_pvapi.cpp
      	modified:   modules/java/generator/gen_java.py
      
      Änderungen in der PvAPI hinzugefügt.
      a7bf1d53
  12. 07 Mar, 2015 1 commit
    • Prof. Dr. Rudolf Haussmann's avatar
      Changes to be committed: · 9f1eb70d
      Prof. Dr. Rudolf Haussmann authored
         (use "git reset HEAD <file>..." to unstage)
      
      	modified:   modules/java/generator/gen_java.py
      	modified:   modules/videoio/include/opencv2/videoio.hpp
      	modified:   modules/videoio/include/opencv2/videoio/videoio_c.h
      	modified:   modules/videoio/src/cap_dshow.cpp
      	modified:   modules/videoio/src/cap_pvapi.cpp
      
      Following changes have been made:
      1. Some minor bugs have been removed.
      2. In the PvAPI module the option CAP_PROP_MONOCROME has been removed because
         this option does not make sense and causes an error if a color camera is used.
      3. Instead the new option CAP_PROP_PVAPI_PIXELFORMAT has been added which allows
         to activate the different pixel formats (color modes) of an AVT camera.
      4. Since there were two identical defines
         CAP_PROP_MONOCROME = 19
         CAP_PROP_MONOCHROME = 19
         which were also used in the other module DSHOW, the first one with an orthographic
         error has been removed in favor of the second one.
      9f1eb70d
  13. 02 Mar, 2015 1 commit
  14. 19 Nov, 2014 1 commit
  15. 17 Oct, 2014 1 commit
  16. 22 Sep, 2014 1 commit
  17. 11 Sep, 2014 1 commit
  18. 08 Sep, 2014 1 commit
    • Maksim Shabunin's avatar
      Fixed java tests build · b3bae170
      Maksim Shabunin authored
      - disabled xfeature2d dependency for java wrappers
      - fixed java wrappers build after cmake rerun
      - disabled opencv_ml tests temporarily
      - fixed Imgproc usage in java tests
      b3bae170
  19. 01 Sep, 2014 1 commit
  20. 14 Aug, 2014 2 commits
  21. 14 Jul, 2014 1 commit
  22. 28 Jan, 2014 1 commit
  23. 18 Dec, 2013 1 commit
  24. 15 Nov, 2013 1 commit
  25. 06 Nov, 2013 1 commit
  26. 30 Oct, 2013 1 commit
  27. 15 Oct, 2013 1 commit
    • Roman Donchenko's avatar
      In Java bindings, wrap version constants into functions to prevent inlining. · 7ff91665
      Roman Donchenko authored
      Java inlines static finals if they're defined with a constant expression. In
      case of version constants we don't want that to happen, since they obviously
      change from version to version. If the user substitutes a different OpenCV
      jar without recompiling, we want user code to still have relevant values for
      the version constants.
      
      This arranges that by turning constant values into function calls, which no
      longer count as a constant expression.
      7ff91665
  28. 12 Sep, 2013 1 commit
  29. 21 Aug, 2013 1 commit
  30. 19 Aug, 2013 1 commit
  31. 13 Aug, 2013 2 commits
  32. 10 Jun, 2013 1 commit
  33. 11 Apr, 2013 1 commit
  34. 09 Apr, 2013 1 commit
  35. 26 Mar, 2013 1 commit
  36. 22 Mar, 2013 1 commit