mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-25 18:18:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,649 Commits 6 Branches 127 Tags 3 GiB
59dd5aea00
Commit Graph

9649 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Donchenko
868e355e33 Merge pull request #1269 from kdrobnyh:FindIPP-cmake-script 2013-08-21 13:32:27 +04:00
Roman Donchenko
84a9755597 Merge pull request #1215 from jet47:cuda-5.5-sanity 2013-08-21 13:25:28 +04:00
kdrobnyh
ea5dd74af1 Add IPP 8.0 support in FindIPP script 2013-08-21 13:02:18 +04:00
Roman Donchenko
7831a2d45c Merge pull request #1314 from jet47:ts-gpu-fix 2013-08-21 11:56:29 +04:00
peng xiao
9b20b51389 Fix build error on Mac 2013-08-21 14:23:10 +08:00
Vladislav Vinogradov
2899d558ac record cuda gpu name to output report 2013-08-21 10:12:44 +04:00
Vladislav Vinogradov
b7ec673001 added cvconfig.h header, because ts_perf.cpp uses HAVE_CUDA macros 2013-08-21 10:00:40 +04:00
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
 2013-08-21 05:31:44 +02:00
peng xiao
3cccded86d Fix build error when WITH_OPENCL is disabled. 2013-08-21 11:18:02 +08:00
Roman Donchenko
a1b633e28e Merge pull request #1298 from jet47:gpu-eliminate-doubles 2013-08-20 18:04:54 +04:00
Vladislav Vinogradov
cb2985c526 fixed gpu bitwize operation: 
incorrect types for template instantiation
 2013-08-20 16:28:45 +04:00
Roman Donchenko
9667a8a1ae Fix the name of perf tests' precompiled header. 
(cherry picked from commit aa96d8d053)
 2013-08-20 14:54:31 +04:00
Roman Donchenko
beada19ad0 Merge pull request #1297 from SpecLad:merge-2.4 2013-08-20 14:10:22 +04:00
Roman Donchenko
aa96d8d053 Fix the name of perf tests' precompiled header. 2013-08-20 12:51:33 +04:00
Roman Donchenko
adc1dd2799 Merge pull request #1301 from asmorkalov:java_video_capture_fix 2013-08-20 12:12:22 +04:00
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
 2013-08-19 19:02:36 +04:00
Alexander Smorkalov
e37f7a4c73 Typo in Java generator fixed. 
Typo breaks debug build for Android platform.
 2013-08-19 16:27:06 +04:00
Vladislav Vinogradov
cd2b7448f4 eliminate unnecessary double arithmetics in CUDA 2013-08-19 15:56:45 +04:00
Roman Donchenko
abf372d759 Fixed incorrect extension on 3rdparty/libpng/opencv-libpng.patch. 2013-08-19 15:00:36 +04:00
Roman Donchenko
0b270e2b08 Merge pull request #1296 from jet47:gpu-cvtcolor-fix-master 2013-08-19 14:26:12 +04:00
Roman Donchenko
3fc1885f48 Merge pull request #1294 from jet47:gpu-tests-fix 2013-08-19 14:21:50 +04:00
Roman Donchenko
70fffa48e5 Merge pull request #1293 from jet47:gpu-cvtcolor-fix 2013-08-19 14:14:22 +04:00
Vladislav Vinogradov
7bda6992e5 fixed gpu BGR <-> YUV color conversion 2013-08-19 13:17:55 +04:00
Vladislav Vinogradov
9f33de7071 added cvconfig.hpp header file to gpu tests 
it uses HAVE_CUDA, HAVE_NVCUVID, etc. macroses
 2013-08-19 12:46:57 +04:00
Roman Donchenko
bed3512dd5 Merge pull request #1288 from nghiaho12:haar 2013-08-19 12:04:24 +04:00
Roman Donchenko
473ca0849d Merge pull request #1285 from SpecLad:enum-compare 2013-08-19 12:00:18 +04:00
Vladislav Vinogradov
cfbd791465 fixed gpu cvtColor for BGR <-> YUV 2013-08-19 11:56:58 +04:00
kdrobnyh
3c9f307193 macros -> template in IPP support cvtColor 2013-08-17 20:04:03 +04:00
Nghia Ho
c6858c3fb0 Buffer is accessed out of bounds. 2013-08-17 20:32:13 +10:00
Roman Donchenko
449b99a6d7 Merge pull request #1286 from SpecLad:optflow-sf-init 2013-08-16 19:59:26 +04:00
Roman Donchenko
7919bcef70 Merge pull request #1277 from NCBee:2.4 2013-08-16 19:59:12 +04:00
Bahram Dahi
230bc03d97 Moved Scalar variable 'value' to int main() to work around a GCC -Wshadow warning in operations.hpp 2013-08-16 08:14:32 -07:00
Roman Donchenko
e8f85903c5 Merge pull request #1280 from asmorkalov:winrt_detect_fix 2013-08-16 19:03:45 +04:00
Roman Donchenko
2349f7ea89 Merge pull request #1257 from SpecLad:merge-2.4 2013-08-16 18:42:18 +04:00
Alexander Smorkalov
ddbeac503c WindowsRT availability check reorganized. Build script updated. 2013-08-16 05:22:54 -07:00
Roman Donchenko
5ca1b559a8 Merge pull request #1284 from melody-rain:superres_example_2 2013-08-16 16:07:41 +04:00
Roman Donchenko
7d768d2159 In calcOpticalFlowSF, fixed several uninitialized uses of matrices. 
This should fix that pesky test failure that pops up from time to time.

I don't actually know if the default values should be zeros, but the tests
pass, so...
 2013-08-16 14:43:18 +04:00
Roman Donchenko
2530b580a8 Merge branch 'master' into merge-2.4 
Conflicts:
	modules/photo/doc/inpainting.rst
 2013-08-16 14:14:12 +04:00
Roman Donchenko
47b3e7855f Merge pull request #1252 from asmorkalov:winrt_api_cert_highgui_fix 2013-08-16 14:05:39 +04:00
Roman Donchenko
a3bbb3dd3d Merge pull request #1279 from asmorkalov:ocv_opt_tabs 2013-08-16 13:58:14 +04:00
Roman Donchenko
2304a561ca Fixed a -Wenum-compare warning in cudev. 2013-08-16 13:53:37 +04:00
Roman Donchenko
46fb737bdc Merge pull request #1152 from StevenPuttemans:bugfix_2795 2013-08-16 12:52:48 +04:00
Jin Ma
8fb6b689c6 1. Added OpenCL version of superres to the sample. 
2. Modified according to the feedback of the community.
 2013-08-16 16:31:31 +08:00
Roman Donchenko
ac8506db32 Merge pull request #1210 from pengx17:2.4_ocl_surf_intel_fix 2013-08-16 12:22:18 +04:00
Alexander Smorkalov
a3dd13450c All optimized function tables wrapped to getters to change its 
initialization time.
 2013-08-16 12:10:07 +04:00
Roman Donchenko
35cb59bb22 Merge pull request #1258 from apavlenko:java_video_capture 2013-08-16 12:05:13 +04:00
Andrey Pavlenko
5a9bd3f080 restoring binary compatibility 2013-08-15 23:49:32 +04:00
Roman Donchenko
95143fdc13 Merge pull request #1275 from rdm12:bug_1922 2013-08-15 19:12:23 +04:00
Alexander Smorkalov
9af2c1661a Restricted Win32 API was fixed in Highgui and some 3rd party libs. Patch 
for libpng added.
 2013-08-15 06:42:00 -07:00
Dmitry Retinskiy
ab8c0fde52 applied comments after review 2013-08-15 16:18:01 +04:00