Roman Donchenko
|
43aec5ad4a
|
Merge pull request #1318 from SpecLad:wow
|
11 years ago |
Alexander Smorkalov
|
8aae54b7f4
|
WindowsRT mode build warning fix.
|
11 years ago |
Roman Donchenko
|
9c60a2c24c
|
Merge pull request #1316 from asmorkalov:winrt_c4447_fix
|
11 years ago |
Roman Donchenko
|
3c137f7a04
|
Converted tabs to spaces.
|
11 years ago |
Roman Donchenko
|
e9a28f66ee
|
Normalized file endings.
|
11 years ago |
Roman Donchenko
|
f55740da70
|
Deleted all trailing whitespace.
|
11 years ago |
Roman Donchenko
|
0d8cb2e319
|
Disabled whitespace checking for 3rdparty.
|
11 years ago |
Roman Donchenko
|
748201c3dc
|
Added more text/binary/whitespace attributes for files we have.
|
11 years ago |
Roman Donchenko
|
ad7073bc22
|
Merge pull request #1305 from SpecLad:perf-precomp
|
11 years ago |
Roman Donchenko
|
ebb6c842f9
|
Merge pull request #1295 from asmorkalov:winrt_ptr_usage_fix
|
11 years ago |
Alexander Smorkalov
|
b15addec70
|
C4447 warning about main function format suppressed.
|
11 years ago |
Alexander Smorkalov
|
d62c98527a
|
Invalid usage of cv::Ptr for arrays fixed.
|
11 years ago |
Vladislav Vinogradov
|
de214950c4
|
minor gpu TVL1 optical flow optimization:
don't calc diff term if it is not used for epsilon criterion
|
11 years ago |
Roman Donchenko
|
1a7c2eefb8
|
Merge pull request #1306 from jet47:gpu-bitwize-fix
|
11 years ago |
Roman Donchenko
|
893e8b4371
|
Merge pull request #942 from achalddave:patch-1
|
11 years ago |
Hanusz Leszek
|
32635a6834
|
using unsigned char instead of uint8_t to compile under windows
|
11 years ago |
Roman Donchenko
|
868e355e33
|
Merge pull request #1269 from kdrobnyh:FindIPP-cmake-script
|
11 years ago |
Roman Donchenko
|
84a9755597
|
Merge pull request #1215 from jet47:cuda-5.5-sanity
|
11 years ago |
kdrobnyh
|
ea5dd74af1
|
Add IPP 8.0 support in FindIPP script
|
11 years ago |
Roman Donchenko
|
7831a2d45c
|
Merge pull request #1314 from jet47:ts-gpu-fix
|
11 years ago |
peng xiao
|
9b20b51389
|
Fix build error on Mac
|
11 years ago |
Vladislav Vinogradov
|
2899d558ac
|
record cuda gpu name to output report
|
11 years ago |
Vladislav Vinogradov
|
b7ec673001
|
added cvconfig.h header, because ts_perf.cpp uses HAVE_CUDA macros
|
11 years ago |
Hanusz Leszek
|
cf39ba5801
|
Allow to read PNG image of color_type PNG_COLOR_TYPE_PALETTE with alpha channel
Correct reading PNG color type palette with or without alpha imread flags -1 or 1
Better not using pnginfo.h, using png_get_tRNS instead
|
11 years ago |
peng xiao
|
3cccded86d
|
Fix build error when WITH_OPENCL is disabled.
|
11 years ago |
Roman Donchenko
|
a1b633e28e
|
Merge pull request #1298 from jet47:gpu-eliminate-doubles
|
11 years ago |
Vladislav Vinogradov
|
cb2985c526
|
fixed gpu bitwize operation:
incorrect types for template instantiation
|
11 years ago |
Roman Donchenko
|
9667a8a1ae
|
Fix the name of perf tests' precompiled header.
(cherry picked from commit aa96d8d053 )
|
11 years ago |
Roman Donchenko
|
beada19ad0
|
Merge pull request #1297 from SpecLad:merge-2.4
|
11 years ago |
Roman Donchenko
|
aa96d8d053
|
Fix the name of perf tests' precompiled header.
|
11 years ago |
Roman Donchenko
|
adc1dd2799
|
Merge pull request #1301 from asmorkalov:java_video_capture_fix
|
11 years ago |
Roman Donchenko
|
f76dd99299
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
|
11 years ago |
Alexander Smorkalov
|
e37f7a4c73
|
Typo in Java generator fixed.
Typo breaks debug build for Android platform.
|
11 years ago |
Vladislav Vinogradov
|
cd2b7448f4
|
eliminate unnecessary double arithmetics in CUDA
|
11 years ago |
Roman Donchenko
|
abf372d759
|
Fixed incorrect extension on 3rdparty/libpng/opencv-libpng.patch.
|
11 years ago |
Roman Donchenko
|
0b270e2b08
|
Merge pull request #1296 from jet47:gpu-cvtcolor-fix-master
|
11 years ago |
Roman Donchenko
|
3fc1885f48
|
Merge pull request #1294 from jet47:gpu-tests-fix
|
11 years ago |
Roman Donchenko
|
70fffa48e5
|
Merge pull request #1293 from jet47:gpu-cvtcolor-fix
|
11 years ago |
Vladislav Vinogradov
|
7bda6992e5
|
fixed gpu BGR <-> YUV color conversion
|
11 years ago |
Vladislav Vinogradov
|
9f33de7071
|
added cvconfig.hpp header file to gpu tests
it uses HAVE_CUDA, HAVE_NVCUVID, etc. macroses
|
11 years ago |
Roman Donchenko
|
bed3512dd5
|
Merge pull request #1288 from nghiaho12:haar
|
11 years ago |
Roman Donchenko
|
473ca0849d
|
Merge pull request #1285 from SpecLad:enum-compare
|
11 years ago |
Vladislav Vinogradov
|
cfbd791465
|
fixed gpu cvtColor for BGR <-> YUV
|
11 years ago |
kdrobnyh
|
3c9f307193
|
macros -> template in IPP support cvtColor
|
11 years ago |
Nghia Ho
|
c6858c3fb0
|
Buffer is accessed out of bounds.
|
11 years ago |
Roman Donchenko
|
449b99a6d7
|
Merge pull request #1286 from SpecLad:optflow-sf-init
|
11 years ago |
Roman Donchenko
|
7919bcef70
|
Merge pull request #1277 from NCBee:2.4
|
11 years ago |
Bahram Dahi
|
230bc03d97
|
Moved Scalar variable 'value' to int main() to work around a GCC -Wshadow warning in operations.hpp
|
11 years ago |
Roman Donchenko
|
e8f85903c5
|
Merge pull request #1280 from asmorkalov:winrt_detect_fix
|
11 years ago |
Roman Donchenko
|
2349f7ea89
|
Merge pull request #1257 from SpecLad:merge-2.4
|
11 years ago |