1. 17 Jan, 2014 1 commit
    • Roman Donchenko's avatar
      Revert 4f9c081d · 092f916d
      Roman Donchenko authored
      That commit introduces problems, as it breaks certain use cases of
      OpenCV functions; for example, convertTo of an Nx1 matrix to an
      std::vector.
      
      Since vectors can't store separate width and height values, OpenCV
      considers them to always be 1xN. So even though the vector is created with
      .create(N, 1), the Mat passed to getContinousSize has dimensions 1xN,
      and the size comparison fails, even though the operation itself is safe.
      
      This is a use case we probably don't want to break, at the very least
      for backwards compatibility. So I'm reverting the commit. This will also
      unfix bug #3319; I'll submit a less intrusive solution as a PR to 2.4, which
      will also revert 4f9c081d there.
      092f916d
  2. 14 Jan, 2014 1 commit
    • Roman Donchenko's avatar
      Merge remote-tracking branch 'origin/2.4' into merge-2.4 · fee2ed37
      Roman Donchenko authored
      Conflicts:
      	modules/contrib/src/retina.cpp
      	modules/core/include/opencv2/core/mat.hpp
      	modules/core/src/algorithm.cpp
      	modules/core/src/arithm.cpp
      	modules/features2d/src/features2d_init.cpp
      	modules/gpu/include/opencv2/gpu/gpu.hpp
      	modules/gpu/perf/perf_imgproc.cpp
      	modules/imgproc/src/generalized_hough.cpp
      	modules/ocl/include/opencv2/ocl/ocl.hpp
      	modules/video/src/tvl1flow.cpp
      	modules/video/src/video_init.cpp
      fee2ed37
  3. 13 Jan, 2014 5 commits
  4. 11 Jan, 2014 3 commits
  5. 10 Jan, 2014 12 commits
  6. 09 Jan, 2014 18 commits