1. 02 Mar, 2015 1 commit
    • Maxim Kostin's avatar
      Adding support for WinRT(WinPhone 8/8.1 and Win Store) via CMake 3.1 · cdd23440
      Maxim Kostin authored
      - Substituted HAVE_WINRT with WINRT
      - Fixed compilation issues in ocl.cpp and parallel.cpp
      - Fixed compiler issue for WP8: "C2678: binary '+' : no operator found which takes a left-hand - Fixed gitignore
      - Added #ifdef HAVE_OPENCL to remove compiler warnings in ocl.cpp
      - Used NO_GETENV similar to '3rdparty\libjpeg\jmemmgr.c;
      - Added ole32.lib for core module (for WindowsStore 8.0 builds)
      - Made OpenCV_ARCH aware of ARM
      Signed-off-by: 's avatarMaxim Kostin <v-maxkos@microsoft.com>
      cdd23440
  2. 26 Dec, 2014 1 commit
  3. 22 Dec, 2014 1 commit
  4. 01 Dec, 2014 3 commits
  5. 05 Nov, 2014 2 commits
  6. 29 Aug, 2014 1 commit
  7. 18 Aug, 2014 1 commit
    • Ernest Galbrun's avatar
      merged new master branch · 6207d338
      Ernest Galbrun authored
      changed tests for tvl1 optflow
      correction of a bug preventing compilation with cuda (fmin changed to fminf)
      6207d338
  8. 17 Jul, 2014 19 commits
  9. 16 Jun, 2014 1 commit
  10. 12 Oct, 2013 1 commit
  11. 06 Sep, 2013 1 commit
    • Vladislav Vinogradov's avatar
      Merge branch 'master' into gpu-cuda-rename · 0c7663eb
      Vladislav Vinogradov authored
      Conflicts:
      	modules/core/include/opencv2/core/cuda.hpp
      	modules/cudacodec/src/thread.cpp
      	modules/cudacodec/src/thread.hpp
      	modules/superres/perf/perf_superres.cpp
      	modules/superres/src/btv_l1_cuda.cpp
      	modules/superres/src/optical_flow.cpp
      	modules/videostab/src/global_motion.cpp
      	modules/videostab/src/inpainting.cpp
      	samples/cpp/stitching_detailed.cpp
      	samples/cpp/videostab.cpp
      	samples/gpu/stereo_multi.cpp
      0c7663eb
  12. 02 Sep, 2013 5 commits