Roman Donchenko
901dc3b878
Merge pull request #1854 from asmorkalov:android_engine_tegra4i5
11 years ago
Roman Donchenko
dd817857b4
Replaced most of the instances of "s = s +" with "s +=".
...
This resynchronizes master code with 2.4. I say "most", because I might
have missed some due to different spacing; I'll deal with those
instances later if I find them.
11 years ago
Roman Donchenko
fc49d33c8d
Gave cv::String appropriate += operators.
...
Note that since String is a reference to an immutable string,
this doesn't actually change the string; it just replaces *this
with a reference to the concatenated string.
11 years ago
Ilya Lavrenov
c8abb6124f
recursive mutex for linux
11 years ago
Piotr Miecielica
a19cc6cb64
Added pointer initialization
11 years ago
Alexander Smorkalov
514e97223c
Some hacks to build and run OpenCL on Qualcomm S800.
...
Some of functions were enabled on Qualcomm S800 by changing grid size;
OpenCL kernel grid size unification for different platfroms;
Test pass rate improvements by inclreasing threshold;
Some tests were disabled for Android;
run.py was adopted for devices with brackets in in name.
11 years ago
Alexander Smorkalov
bd314bf955
VFPv4 detection implemented. Some Tegra5 related updates.
11 years ago
Andrey Pavlenko
c1f59c4c76
Merge pull request #1852 from ilya-lavrenov:ocl_retina
11 years ago
StevenPuttemans
2427c03625
Wrong example at the visual studio tutorial. Fixed link, fixed sample
...
content and renamed to a more sensible name. Also fixed a wrong link in the
actual display_image tutorial.
11 years ago
StevenPuttemans
7a8bd31657
Fixed bug in report #3346
11 years ago
Ilya Lavrenov
8834d5e57b
changed eps in Retina_OCL test
11 years ago
Alexander Smorkalov
fd759223fa
Package selection for Tegra 4i fixed. Initial Tegra5 support added.
11 years ago
Piotr Miecielica
923698d700
Fixes of some memory leaks
11 years ago
Andrey Pavlenko
c33cb94d66
Merge pull request #1847 from ilya-lavrenov:ocl_imgproc_fix
11 years ago
Andrey Pavlenko
ca8c129c57
Merge pull request #1848 from ilya-lavrenov:warn
11 years ago
Ilya Lavrenov
650f92f9cc
eliminated warning C4267
11 years ago
Ilya Lavrenov
561a7f5782
fixed kernel compilation in imgproc module
11 years ago
Andrey Pavlenko
8a4f35704a
Merge pull request #1840 from ilya-lavrenov:ocl_cvtColor
11 years ago
Andrey Pavlenko
9bf2516eb1
Merge pull request #1841 from ilya-lavrenov:ocl_kernel_compilation
11 years ago
Roman Donchenko
2509b7954e
Merge pull request #1838 from alekcac:ios64_fix
11 years ago
Ilya Lavrenov
65b7e2018c
fixed kernel compilation
11 years ago
Ilya Lavrenov
d764af5318
added extra parameters to ocl::cvtColor performance test
11 years ago
Roman Donchenko
6b23cb5b02
Merge pull request #1795 from alalek:perf_report_progress
11 years ago
Roman Donchenko
b8f5fcf3f9
Merge pull request #1776 from philippefoubert:merge_upstream_2.4_ximea
11 years ago
Roman Donchenko
623a02c69f
Merge pull request #1834 from SpecLad:svm-copy-ctor
11 years ago
Alexander Alekhin
c1541c9e79
perf report: summary.py: added --progress mode
11 years ago
Andrey Pavlenko
8d1a8df1a9
Merge pull request #1824 from vpisarev:ocl_experiments5
11 years ago
Roman Donchenko
70a4de20d7
Merge pull request #1836 from ilya-lavrenov:ocl_norm_workaround
11 years ago
Alexander Shishkov
9631cb6de9
fix for supporting 64-bit architecture
11 years ago
Roman Donchenko
f6283432ff
Merge pull request #1833 from SpecLad:fix-qt-sample
11 years ago
Roman Donchenko
3703c7040a
Merge pull request #1828 from SpecLad:merge-2.4
11 years ago
Roman Donchenko
8ac3ddf421
Merge pull request #1829 from SpecLad:config-components-libs
11 years ago
Ilya Lavrenov
60b59eeb73
workaround for AMD bug: UNREACHABLE EXECUTED
11 years ago
Roman Donchenko
cf00349b5b
Gave CvSVM a private copy constructor & assignment operator.
...
The implicitly generated ones don't work properly, and I don't want to
write proper ones. :-)
"Fixes" <http://code.opencv.org/issues/3358 >.
11 years ago
Roman Donchenko
b8283edfca
Fix the Qt sample, broken after #1722 .
11 years ago
Roman Donchenko
4cfbee70bd
Simplified the Windows implementation of CV_XADD.
...
_InterlockedExchangeAdd is a Visual Studio intrinsic that's available
for all architectures and in all VS versions that we care about. It's also
faster than the underscore-less function, since it's an intrinsic.
We also don't need to declare it ourselves.
It is, however, a Visual Studio-specific intrinsic, so I changed the
preprocessing condition accordingly.
Fixes <http://code.opencv.org/issues/3365 >.
11 years ago
Roman Donchenko
b197ec9413
Merge pull request #1761 from bhuroc:qtkit-video-file-2.4
11 years ago
Roman Donchenko
95006af170
Merge pull request #1816 from SpecLad:no-more-epoch
11 years ago
Roman Donchenko
63b3db53d7
Merge pull request #1830 from SpecLad:config-includes
11 years ago
Vadim Pisarevsky
ae8b2cbd68
fixed bug with cl_long size on Win32 (thanks to Aaron Kunze)
11 years ago
Vadim Pisarevsky
677c7f27cb
fixed failure in Tonemap test
11 years ago
Philippe FOUBERT
78e16a906b
Back to the previous coding way (using the macro with the goto).
11 years ago
Roman Donchenko
ef27ac3782
In the example in OpenCVConfig.cmake.in, explicitly add the include paths.
...
After #1801 , the include directories are no longer added automatically,
so we should show the user how to do that.
11 years ago
Roman Donchenko
7f935717cb
In OpenCVConfig.cmake.in, lowercased the commands in the example.
...
This is the preferred style nowadays, and more consistent with the
rest of the code.
11 years ago
Roman Donchenko
4037a4f227
Fixed OpenCV_LIBS when find_package has been used with explicit components.
...
Fixes <http://answers.opencv.org/question/23997/opencv-247-cmake-includes-all-modules-even-if-i/ >.
11 years ago
Roman Donchenko
e69d2c1bb1
Merge pull request #1819 from ilya-lavrenov:ocl_resize_AREA
11 years ago
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
11 years ago
Roman Donchenko
5c77784ac9
Merge pull request #1827 from asmorkalov:android_ndk_r9b
11 years ago
Roman Donchenko
0a90a36a1f
Merge pull request #1793 from SpecLad:external-docs-1
11 years ago
Roman Donchenko
c47190ef90
Merge pull request #1787 from hs3180:2.4
11 years ago