mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 05:29:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,657 Commits 6 Branches 126 Tags 3 GiB
31c58d23e0
Commit Graph

6698 Commits

Author SHA1 Message Date
ilya-lavrenov
4c28a6f0f6 most of the performance tests was rewritten in google-test manner 2013-08-26 11:43:44 +04:00
Roman Donchenko
67ae438dae Refactored NumPy detection. 
Most importantly, added support for multiple include directores,
but also did some general cleanup.
 2013-08-23 18:46:54 +04:00
Maria Dimashova
989be02562 fixed cpp wrappers of ML tree-based models 2013-08-23 18:13:10 +04:00
Vladislav Vinogradov
21c4753fed used global memory access for up-scaling 2013-08-23 18:08:06 +04:00
Roman Donchenko
3182e68b8a Merge pull request #1334 from MarkBelmont:bugfix_1 2013-08-23 16:49:51 +04:00
Roman Donchenko
cae4480834 Merge pull request #1332 from pengx17:2.4_fix_parallel 2013-08-23 14:47:49 +04:00
Vladislav Vinogradov
d1f6a23abf improved texture usage: 
* use explicit extrapolation only for sub-matrixes
* use built-in interpolation for INTER_NEAREST mode
 2013-08-23 13:57:12 +04:00
Vladislav Vinogradov
241cc417f9 added custom implementation for nearest and linear interpolation 2013-08-23 13:57:12 +04:00
Vladislav Vinogradov
3b05acf936 reorganize code for further modifiction 2013-08-23 13:56:35 +04:00
MarkBelmont
cf34b3d65b Changed the brief description of function Mat::colRange from "Create a matrix header for the specified row span." to "Create a matrix header for the specified column span." 2013-08-23 16:39:39 +08:00
Vladislav Vinogradov
f826bd8bce removed NPP implementation 2013-08-23 12:16:41 +04:00
peng xiao
2519a21935 Fix a potential bug of ParallelLoopBodyWrapper::operator(Range) 
On a 32-bit compiler the calculation may result in data (size_t) overflow when running some paralleled algorithms (which can safely run on a 64-bit compiler).
This bug is found when running OpenCV's Retina tutorial on 32bit VS2010.
 2013-08-23 15:35:55 +08:00
Alexander Alekhin
7685b983db OCL: tests: repair moments implementation in master branch, enable tests 2013-08-22 23:37:06 +04:00
Roman Donchenko
6fed0e85c2 Cut down on the use of ZLIB_LIBRARY/ZLIB_INCLUDE_DIR. 
They're not listed in the documentation for the FindZLIB module,
so we shouldn't use them unless necessary.
 2013-08-22 18:17:19 +04:00
Ilya Lavrenov
6c4ad9b597 fixer error with incorrect condition 2013-08-22 17:38:55 +04:00
Ilya Lavrenov
ec461a2ff0 added a test for ocl::norm 2013-08-22 17:37:48 +04:00
Alexander Alekhin
b7b584984e OCL: tests: repair/disable failed tests in ocl module 2013-08-22 17:06:47 +04:00
Roman Donchenko
20bf1aa244 Merge pull request #1321 from asmorkalov:winrt_mode_warn_fix 2013-08-22 12:46:00 +04:00
Roman Donchenko
fe4c7ae4ae Merge pull request #1317 from jet47:gpu-tvl1-optimization 2013-08-22 11:55:24 +04:00
Roman Donchenko
43aec5ad4a Merge pull request #1318 from SpecLad:wow 2013-08-22 11:49:45 +04:00
Alexander Smorkalov
8aae54b7f4 WindowsRT mode build warning fix. 2013-08-21 23:59:27 -07:00
Roman Donchenko
9c60a2c24c Merge pull request #1316 from asmorkalov:winrt_c4447_fix 2013-08-21 19:24:25 +04:00
Roman Donchenko
3c137f7a04 Converted tabs to spaces. 2013-08-21 18:59:26 +04:00
Roman Donchenko
e9a28f66ee Normalized file endings. 2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70 Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
Roman Donchenko
ebb6c842f9 Merge pull request #1295 from asmorkalov:winrt_ptr_usage_fix 2013-08-21 18:28:36 +04:00
Alexander Smorkalov
b15addec70 C4447 warning about main function format suppressed. 2013-08-21 07:24:46 -07:00
Alexander Smorkalov
d62c98527a Invalid usage of cv::Ptr for arrays fixed. 2013-08-21 07:20:35 -07:00
Vladislav Vinogradov
de214950c4 minor gpu TVL1 optical flow optimization: 
don't calc diff term if it is not used for epsilon criterion
 2013-08-21 18:17:45 +04:00
Roman Donchenko
1a7c2eefb8 Merge pull request #1306 from jet47:gpu-bitwize-fix 2013-08-21 16:18:31 +04:00
Roman Donchenko
893e8b4371 Merge pull request #942 from achalddave:patch-1 2013-08-21 16:06:31 +04:00
Hanusz Leszek
32635a6834 using unsigned char instead of uint8_t to compile under windows 2013-08-21 12:33:51 +02:00
Roman Donchenko
84a9755597 Merge pull request #1215 from jet47:cuda-5.5-sanity 2013-08-21 13:25:28 +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
beada19ad0 Merge pull request #1297 from SpecLad:merge-2.4 2013-08-20 14:10: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
0b270e2b08 Merge pull request #1296 from jet47:gpu-cvtcolor-fix-master 2013-08-19 14:26:12 +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
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
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
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
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
Roman Donchenko
556028eff5 Merge pull request #1253 from kamjagin:fixingCompilationOnOSX 2013-08-15 11:54:55 +04:00
Bahram Dahi
83e21568ee Minor bug fix, missing const in method signature 2013-08-14 15:54:13 -07:00
Bahram Dahi
6cf9070b9a Added ability to read several opencv types (Size, Point, etc.) to FileStorage. Solves issue #3196 2013-08-14 15:08:34 -07:00
kamjagin
ed29d91d42 adding std to cstdint typedef of uint32_t 2013-08-14 17:16:52 +02:00
Miroslav Kobetski
b595d73d6d defined uint for non-windows platforms too. replaced isnan for cvIsNaN. 2013-08-14 17:16:52 +02:00
Roman Donchenko
d09c89c63e Merge pull request #1265 from abidrahmank:misc_docs2 2013-08-14 19:03:45 +04:00
Roman Donchenko
7b95bb20f7 Merge pull request #1272 from kamjagin:fixingQTKitPublic2.4 2013-08-14 18:50:26 +04:00
Roman Donchenko
902aa309f8 Merge pull request #1270 from rdm12:bugfix_3094 2013-08-14 18:49:38 +04:00
Dmitry Retinskiy
f013baf739 bug #1922: restored most of the class definitions in basic_structures.rst 2013-08-14 17:37:59 +04:00
Roman Donchenko
6ae9870de4 Merge pull request #1254 from pengx17:2.4_filter2d_ 2013-08-14 17:27:18 +04:00
Roman Donchenko
8e245f8a3a Merge pull request #1186 from SpecLad:dont-export-templates 2013-08-14 17:25:01 +04:00
kamjagin
69287c936b missed # in if defined 2013-08-14 14:25:46 +02:00
kamjagin
c24c1a5926 added HAVE_QTKIT to tests 2013-08-14 13:40:50 +02:00
kamjagin
7ff07e94a3 Fix for bug Bug #3215. Added HAVE_QTKIT as a separate mode from HAVE_QUICKTIME 2013-08-14 13:34:34 +02:00
Dmitry Retinskiy
4eb85189e5 bug #3094: added CV_Assert to PyrDown_ to check if source matrix is not empty 2013-08-14 15:30:35 +04:00
Roman Donchenko
7992402ecf Merge pull request #1149 from jet47:generalized-hough-refactoring 2013-08-14 13:26:24 +04:00
Roman Donchenko
bcba3fc6b8 Merge pull request #1263 from abidrahmank:pyCLAHE_24 2013-08-14 12:10:22 +04:00
Roman Donchenko
18358521f2 Merge pull request #1162 from jet47:cudev-integration 2013-08-14 12:00:34 +04:00
Achal Dave
0bc609257d Comparing rejected stage index with minimum required neighbors does not make sense 
As described here, http://code.opencv.org/issues/3064, the test before
led to a case where we compared the index of the latest stage at which a
rectangle was rejected with the minimum number of neighbors required as
specified in `detectMultiScale`. Please see the issue for more
information.
 2013-08-13 20:42:04 -07:00
peng xiao
124ede611b Update with apavlenko's suggestions. 2013-08-14 10:00:09 +08:00
abidrahmank
1b93ecfae8 docs changes 2013-08-13 22:07:44 +05:30
abidrahmank
92d04d439e docs changes 2013-08-13 21:58:49 +05:30
abidrahmank
96c1df14f4 CLAHE Python bindings 2013-08-13 19:51:32 +05:30
Roman Donchenko
43c7a8ae93 Merge pull request #1259 from pengx17:2.4_fix_cvtcolor 2013-08-13 16:34:19 +04:00
Andrey Pavlenko
f3b1933a92 LinkedList -> ArrayList 2013-08-13 15:51:37 +04:00
Andrey Pavlenko
4902db1c42 also fixing JNI library name in JUnit tests 2013-08-13 13:18:01 +04:00
peng xiao
2fb2ac8836 Apply bugfix #3121 for OCL. 2013-08-13 17:17:07 +08:00
Roman Donchenko
6b5ac42a9b Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
	modules/features2d/doc/object_categorization.rst
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/image_filtering.rst
	modules/gpu/doc/image_processing.rst
	modules/gpu/doc/video.rst
	modules/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/object_detection.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/imgproc/src/samplers.cpp
	modules/ml/doc/k_nearest_neighbors.rst
	modules/nonfree/doc/feature_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/photo/doc/inpainting.rst
	modules/ts/include/opencv2/ts.hpp
	platforms/scripts/camera_build.conf
	samples/android/camera-calibration/AndroidManifest.xml
 2013-08-13 12:56:39 +04:00
peng xiao
29eefe52bb Add OpenCL accelerated implementation for Retina. 2013-08-13 16:27:12 +08:00
Andrey Pavlenko
d4e098f401 enabling of VideoCapture(String) [fixing issue #3207] 
- enable auto-wrap of VideoCapture;
- minor refactoring of generated code templates.
 2013-08-13 12:04:36 +04:00
peng xiao
7fe8403074 Let ocl::filter2D support kernel size >= 3. 2013-08-13 13:58:55 +08:00
Roman Donchenko
390b67e5a0 Merge pull request #1251 from StevenPuttemans:bugfix_3209 2013-08-12 18:56:35 +04:00
Roman Donchenko
dc06d47f1c Merge pull request #1241 from SpecLad:redundant-precomps 2013-08-12 17:19:53 +04:00
Roman Donchenko
d8c6e89a54 Merge pull request #1238 from SpecLad:cmake-min-ver 2013-08-12 15:50:23 +04:00