Vadim Pisarevsky
41af58d1d5
Merge pull request #4076 from kalistratovag:parallel_pthreads
2015-06-01 16:53:50 +00:00
kalistratovag
bf5393ae58
parallel for on pthreads initial commit
...
removing trailing whitespaces
Compilation error on Mac fix & warning on android
Warnings fixed on iOs
2015-06-01 17:48:21 +03:00
Vadim Pisarevsky
b866e2672a
Merge pull request #4079 from Dikay900:2_4_to_master
2015-06-01 11:42:18 +00:00
Alexander Smorkalov
1df0f1da97
Precise default CUDA version for Tegra X1 chips.
2015-05-30 23:30:56 +02:00
Vadim Pisarevsky
535dc1e874
Merge pull request #3998 from msandler:master
2015-05-29 21:38:09 +00:00
Vadim Pisarevsky
24dea1c616
Merge pull request #3984 from LaurentBerger:ExampleCppORB
2015-05-29 21:36:43 +00:00
Vadim Pisarevsky
96c3f16a90
Merge pull request #4075 from MSOpenTech:backslash-upd
2015-05-29 13:23:23 +00:00
Evgeny Agafonchikov
fd860d7cd0
Adding backslash in macro-based paths
...
of WINRT samples
This removes requirement to add OPENCV_WINRT_INSTALL_DIR with backslash in the end
in case trailing slash is presented VS handles duplicated slashes w/o issues
2015-05-29 09:36:42 +03:00
Vadim Pisarevsky
b46719b093
Merge pull request #4074 from vpisarev:objdetect_fixes
2015-05-28 19:43:51 +00:00
Vadim Pisarevsky
8b8fc9e66b
Merge pull request #4070 from techfort:fixpythonsample
2015-05-28 18:06:17 +00:00
Vadim Pisarevsky
882c0321f4
clip the found objects in HOG as well ( http://code.opencv.org/issues/3825 ); added test to check CascadeClassifier on small images ( http://code.opencv.org/issues/3710 )
2015-05-28 21:02:27 +03:00
Vadim Pisarevsky
8c3c6b31fc
make sure the returned rectangles are inside the image ( http://code.opencv.org/issues/3136 )
2015-05-28 20:15:22 +03:00
Vadim Pisarevsky
5a94a95fbf
improvements in Haar CascadeClassifier: 1) use CV_32S instead of CV_32F for the integral of squares (which is more accurate and more efficient); 2) skip the window if its contrast is too low
2015-05-28 19:33:21 +03:00
Vadim Pisarevsky
036c438904
make facedetect.py work when the nested cascade is not specified
2015-05-28 19:01:56 +03:00
Vadim Pisarevsky
5e095c8fbd
Merge pull request #4022 from LaurentBerger:ExampleBLOB_MSER
2015-05-28 15:00:36 +00:00
Vadim Pisarevsky
665a317f1c
Merge pull request #4056 from apavlenko:java_memory_release
2015-05-28 15:00:07 +00:00
Vadim Pisarevsky
f7ad192842
Merge pull request #4063 from Dikay900:2_4_to_master
2015-05-28 14:49:13 +00:00
Vadim Pisarevsky
58cf11bd44
Merge pull request #4069 from MSOpenTech:sample-face-contrib
2015-05-28 14:48:00 +00:00
Vadim Pisarevsky
549ef8f141
Merge pull request #4071 from sergarrido:fix_isContourConvex
2015-05-28 14:44:36 +00:00
Vadim Pisarevsky
176dd96698
Merge pull request #4073 from MSOpenTech:video-sample-face
2015-05-28 14:41:40 +00:00
Vadim Pisarevsky
5f8f56ea0e
report an error when trying to load HOG cascade
2015-05-28 17:24:22 +03:00
Joe Minichino
47d8187bc3
fixed outdated params setting
2015-05-28 15:20:08 +01:00
Vadim Pisarevsky
481f786fe7
added simple HAL test; added RHO homography test
2015-05-28 17:05:43 +03:00
Maxim Kostin
3408114602
Added video face detection. Restructured code.
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-05-28 13:42:59 +03:00
S. Garrido
bd2c2f3bd1
fix isContourConvex
2015-05-27 20:51:53 +02:00
Joe Minichino
a4a2659dff
fixed digits.py sample to work with opencv 3
2015-05-27 15:43:52 +01:00
Maxim Kostin
aa932eab41
Adding WinRT face tracking sample. Works with asset images. Created by @ericmitt.
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-05-27 14:55:47 +03:00
Vadim Pisarevsky
565d3dde40
Merge pull request #4055 from rajithr:patch-1
2015-05-27 11:50:58 +00:00
Vadim Pisarevsky
85c08dd170
Merge pull request #4065 from gongzg:master
2015-05-27 11:26:57 +00:00
Vadim Pisarevsky
8bc21fc2f0
Merge pull request #4067 from PhilLab:patch-3
2015-05-27 11:24:35 +00:00
Vadim Pisarevsky
57c3e917e2
Merge pull request #4068 from PhilLab:patch-4
2015-05-27 11:24:17 +00:00
rajithr
7658c2e2d5
Fix for a potential data race condition
...
code changes to handle the failed build
2015-05-27 15:12:04 +05:30
rajithr
993e0b0bf9
Fix for a potential data race condition
2015-05-27 15:00:21 +05:30
Philipp Hasper
9aaa27d46b
Adding missing docs for VideoWriter::release
2015-05-27 07:55:41 +02:00
Philipp Hasper
6c55e7c039
Fixed doc typo
2015-05-27 07:34:27 +02:00
Vadim Pisarevsky
1df244b6f4
Merge pull request #4062 from ilya-lavrenov:android_master
2015-05-26 17:24:32 +00:00
Alexander Alekhin
75558ae75c
Merge pull request #4058 from mshabunin:latch-sample
2015-05-26 16:26:57 +00:00
Andrew Senin
eb40dde688
Fixing XIMEA parameters mapping (issue #4176 )
...
Conflicts:
modules/highgui/src/cap_ximea.cpp
2015-05-26 18:08:29 +02:00
Ilya Lavrenov
bb72206ec5
ability to enable OpenMP simultaneously with other parallel framework
2015-05-26 18:08:28 +02:00
Samyak Datta
e9c765ee2c
C++ sample code to detect facial features
2015-05-26 18:08:26 +02:00
StevenPuttemans
83723c15be
added extra BUFFERSIZE doc and getter
...
Conflicts:
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/highgui/src/cap_dc1394_v2.cpp
2015-05-26 18:08:25 +02:00
StevenPuttemans
8454a8f2d1
adding extra buffer parameter
...
Conflicts:
modules/highgui/include/opencv2/highgui/highgui_c.h
modules/highgui/src/cap_dc1394_v2.cpp
fix typo
2015-05-26 18:08:22 +02:00
StevenPuttemans
6aedd4f7b0
fixing SVM negative value rounding
...
Conflicts:
modules/objdetect/src/hog.cpp
fix android build
2015-05-26 17:26:30 +02:00
Vicente Olivert Riera
e96b8ce781
superres: Fix return value VideoFrameSource_GPU
...
superres module fails to compile with the following error messages:
[100%] Building CXX object modules/superres/CMakeFiles/opencv_superres.dir/src/super_resolution.cpp.o
/opencv-2.4.10/modules/superres/src/frame_source.cpp: In function 'cv::Ptr<cv::superres::FrameSource> cv::superres::createFrameSource_Video_GPU(const string&)':
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected type-specifier before 'VideoFrameSource'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: could not convert '(int*)operator new(4ul)' from 'int*' to 'cv::Ptr<cv::superres::FrameSource>'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected ';' before 'VideoFrameSource'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:41: error: 'VideoFrameSource' was not declared in this scope
/opencv-2.4.10/modules/superres/src/frame_source.cpp:264:1: error: control reaches end of non-void function [-Werror=return-type]
cc1plus: some warnings being treated as errors
make[3]: *** [modules/superres/CMakeFiles/opencv_superres.dir/src/frame_source.cpp.o] Error 1
make[3]: *** Waiting for unfinished jobs....
This is caused because the return value of the createFrameSource_Video_GPU function should be a VideoFrameSource_GPU object.
Conflicts:
modules/superres/src/frame_source.cpp
2015-05-26 16:54:35 +02:00
Ilya Lavrenov
b0cbec922b
port of MR #4061 to master
2015-05-26 17:47:03 +03:00
Zhigang Gong
0f7de40e66
Fixed the race condition between inc and dec on the l_counter.
...
Signed-off-by: Zhigang Gong <zhigang.gong@intel.com>
2015-05-26 22:06:18 +08:00
Maksim Shabunin
5ad4bed70a
Added cvconfig.h copy during the build
2015-05-26 15:58:27 +03:00
Maksim Shabunin
330b3e87eb
Fixed latch sample build without contrib
2015-05-26 15:57:07 +03:00
Vadim Pisarevsky
8fb37606f6
Merge pull request #4032 from mshabunin:fix-pkg-config
2015-05-26 12:47:14 +00:00
Vadim Pisarevsky
dc587992a0
Merge pull request #4053 from vpisarev:calib3d_fixes
2015-05-26 11:23:50 +00:00