1. 09 Feb, 2016 2 commits
    • Alexander Alekhin's avatar
    • Marian Zajko's avatar
      ximea interface update · c2165733
      Marian Zajko authored
      - fixed getProperty call definition
      - added new parameter defitions
      
      removed whitespaces
      
      Reworked enumerators to keep values from previous commit
      
      ximea enums fixes
      
      - fixed whitespaces issue
      - fixed duplicate enum values error
      
      ximea enum definitions update
      
      - fixed videioio.hpp code style
      - fixed ABI violation in enums
      - added new parameter handlers to cpp
      
      XIMEA setProperty update
      
      Added acquisition resetting to buffer size adjustment parameters.
      c2165733
  2. 08 Feb, 2016 7 commits
  3. 07 Feb, 2016 1 commit
  4. 06 Feb, 2016 1 commit
  5. 05 Feb, 2016 4 commits
  6. 04 Feb, 2016 7 commits
  7. 03 Feb, 2016 2 commits
  8. 02 Feb, 2016 3 commits
  9. 01 Feb, 2016 2 commits
  10. 30 Jan, 2016 3 commits
  11. 29 Jan, 2016 1 commit
  12. 26 Jan, 2016 2 commits
  13. 25 Jan, 2016 2 commits
  14. 23 Jan, 2016 2 commits
    • Patrick Snape's avatar
      Fix parsing of training vecs for FlannBasedMatcher · 05cfe286
      Patrick Snape authored
      FlannBasedMatcher::add is overloaded, but the style of parsing the
      InputArrayOfArrays does not match the style from
      DescriptorMatcher::add. The issue is that InputArrayOfArrays
      must be properly marshalled so that the data can be read
      correctly. In this case, the method expects the training
      descriptors to be either a vector of matrices or a single matrix
      (as is shown in DescriptorMatcher::add). These code
      replicates that for the case of the FlannBasedMatcher::add.
      
      In fact, a similar commit to this was added by 26d9a7cd but was
      ultimately not accepted in #4111. This is likely due to the
      fact that the input arrays were not parsed properly and the
      case of a single matrix was being improperly handled. I believe
      this commit to be correct given the logic from
      DescriptorMatcher::add.
      05cfe286
    • Patrick Snape's avatar
      Update indentation to match rest of file · 2f5ea343
      Patrick Snape authored
      Very cosmetic, but was analyzing code and just wanted to make it
      consistent.
      2f5ea343
  15. 21 Jan, 2016 1 commit