Andrey Pavlenko
|
9ec823d800
|
Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert
|
2014-04-08 11:05:30 +04:00 |
|
Alexander Alekhin
|
bfc546d23c
|
enable IPP ICV support
|
2014-04-03 15:05:38 +04:00 |
|
Elena Gvozdeva
|
fa2d79a15b
|
Added IPP Async converters, doc and sample
|
2014-04-01 16:47:29 +04:00 |
|
Roman Donchenko
|
029ffb7c2d
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/core/src/gl_core_3_1.cpp
modules/core/src/opencl/convert.cl
modules/cudaimgproc/src/cuda/canny.cu
modules/cudastereo/perf/perf_stereo.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_denoising.cpp
modules/ocl/src/opencl/imgproc_resize.cl
samples/cpp/Qt_sample/main.cpp
|
2014-02-17 15:24:05 +04:00 |
|
Stuart Cunningham
|
55b9c0374c
|
Fix cmake detection of build platform endianness
Improve comments to indicate actual usage of WORDS_BIGENDIAN where
it is tested with #ifdef rather than #if
|
2014-02-13 22:59:30 +11:00 |
|
Roman Donchenko
|
3c4b24d531
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
CMakeLists.txt
modules/highgui/src/cap.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/color.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/facedetect.cpp
|
2013-12-23 18:50:17 +04:00 |
|
Vladimir Bystricky
|
cc08e00876
|
Fix notes about cmake files. Fix build warning.
|
2013-12-17 16:13:55 +04:00 |
|
Vladimir Bystricky
|
e8d2a9752b
|
Add support Creative Senz3D camera by Intel Perceptual Computing SDK
|
2013-12-13 17:25:16 +04:00 |
|
Alexander Alekhin
|
cc69d4631a
|
cmake: detect Direct 3D 11
|
2013-12-13 15:57:31 +04:00 |
|
Roman Donchenko
|
aacf188e83
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/color.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_color.cpp
samples/cpp/3calibration.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
samples/cpp/Qt_sample/main.cpp
samples/cpp/camshiftdemo.cpp
samples/cpp/descriptor_extractor_matcher.cpp
samples/cpp/distrans.cpp
samples/cpp/generic_descriptor_match.cpp
samples/cpp/grabcut.cpp
samples/cpp/morphology2.cpp
samples/cpp/segment_objects.cpp
samples/cpp/stereo_calib.cpp
samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
samples/cpp/video_dmtx.cpp
|
2013-11-19 16:21:09 +04:00 |
|
Roman Donchenko
|
428fb72625
|
Made the generated file templates' naming more consistent.
The general convention is <output file name> + ".in".
|
2013-11-14 19:14:38 +04:00 |
|