Roman Donchenko
|
cc05493730
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
modules/cudabgsegm/src/cuda/mog.cu
modules/imgproc/perf/opencl/perf_filters.cpp
modules/imgproc/src/opencl/filterSep_singlePass.cl
modules/nonfree/CMakeLists.txt
modules/nonfree/perf/perf_precomp.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/opencl/bgfg_mog.cl
modules/superres/CMakeLists.txt
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/cuda/btv_l1_gpu.cu
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
samples/gpu/CMakeLists.txt
samples/gpu/brox_optical_flow.cpp
samples/gpu/super_resolution.cpp
|
2014-03-24 19:02:16 +04:00 |
|
berak
|
5f94a205d1
|
fixed h / s ranges in histogram_calculation tutorial
literalinclude
literalinclude, dropped :lines:
|
2014-03-17 11:01:02 +01: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 |
|
StevenPuttemans
|
2b106db02f
|
Applied all fixes related to translating C to C++ code
Also fixed some typos and code alignment
Also adapted tutorial CPP samples
Fixed some identation problems
|
2013-11-17 20:34:50 +01:00 |
|
Andrey Kamaev
|
0738ea7d0f
|
Make highgui.hpp independent from C API
|
2013-04-08 15:47:29 +04:00 |
|
Andrey Kamaev
|
288a0634c2
|
Make imgproc.hpp independent from C API
|
2013-04-08 15:47:28 +04:00 |
|
Andrey Kamaev
|
b131dfeecd
|
Build tutorial codes together with other samples
These codes should be included into regular builds.
|
2012-11-09 10:15:48 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Andrey Kamaev
|
ab20da0f53
|
Merged the trunk r8547:8574, r8587
|
2012-06-15 08:36:35 +00:00 |
|
Alexander Shishkov
|
1494da339d
|
fixed #1507
|
2012-03-05 11:08:59 +00:00 |
|
Ana Huaman
|
9c8aafba27
|
Fixed small inconsistency in sample code calcBackProject_Demo2.cpp
|
2011-07-06 14:48:46 +00:00 |
|
Ana Huaman
|
20dd7b70c0
|
Added tutorial for BackProject in cpp (demo 2) - tutorial code
|
2011-07-05 18:08:46 +00:00 |
|
Ana Huaman
|
4f7a8f6fb0
|
Added calcBackProject_Demo1.cpp for tutorial sample code
|
2011-07-05 06:20:39 +00:00 |
|
Ana Huaman
|
cc2bfdec30
|
Added compareHist_demo.cpp code
|
2011-07-04 23:12:27 +00:00 |
|
Ana Huaman
|
4ae5de7f1e
|
Added MatchTemplate_Demo.cpp to tutorial sample code
|
2011-07-04 18:58:57 +00:00 |
|
Ana Huaman
|
6d549490fb
|
Added calcHist_Demo.cpp tutorial code
|
2011-07-04 03:22:16 +00:00 |
|
Ana Huaman
|
08724393f4
|
Added tutorial sample code: EqualizeHist_Demo.cpp
|
2011-07-03 18:55:47 +00:00 |
|