1. 08 Nov, 2013 1 commit
    • Michael Pratt's avatar
      Support PyString_AsString() in Python 3 < 3.3 · 8aafd569
      Michael Pratt authored
      In Python 3, version 3.3+, PyUnicode_AsUTF8() provides similar
      functionality to Python 2's PyString_AsString().
      
      In older versions of Python 3, there is no public function to provide
      the same functionality.  However, the "internal" _PyUnicode_AsString()
      does provide that functionality, so use it to replace
      PyString_AsString().
      
      With this patch, cv2 should compile for Python 3.[0-2].
      8aafd569
  2. 06 Nov, 2013 6 commits
  3. 05 Nov, 2013 2 commits
    • Roman Donchenko's avatar
      Remove the explicit setting of CMP0017, partially undoing #1720. · 8f5eaca3
      Roman Donchenko authored
      In master, it's already set to NEW, since we declare the minimal CMake
      version as 2.8.7, which is newer than the policy.
      8f5eaca3
    • Roman Donchenko's avatar
      Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 9c83f6c4
      Roman Donchenko authored
      Conflicts:
      	cmake/OpenCVDetectCUDA.cmake
      	modules/core/include/opencv2/core/version.hpp
      	modules/cudacodec/src/ffmpeg_video_source.cpp
      	modules/gpu/src/video_writer.cpp
      	modules/highgui/test/test_ffmpeg.cpp
      	modules/highgui/test/test_video_io.cpp
      	modules/highgui/test/test_video_pos.cpp
      	modules/ocl/include/opencv2/ocl/ocl.hpp
      	modules/ocl/include/opencv2/ocl/private/util.hpp
      	modules/ocl/src/arithm.cpp
      	modules/ocl/src/blend.cpp
      	modules/ocl/src/canny.cpp
      	modules/ocl/src/cl_operations.cpp
      	modules/ocl/src/filtering.cpp
      	modules/ocl/src/haar.cpp
      	modules/ocl/src/imgproc.cpp
      	modules/ocl/src/kmeans.cpp
      	modules/ocl/src/moments.cpp
      	modules/ocl/src/safe_call.hpp
      	modules/ocl/src/split_merge.cpp
      	modules/ocl/test/test_moments.cpp
      	samples/ocl/squares.cpp
      9c83f6c4
  4. 01 Nov, 2013 14 commits
  5. 31 Oct, 2013 13 commits
  6. 30 Oct, 2013 4 commits