Vadim Pisarevsky
0824ed595b
Merge pull request #4090 from MSOpenTech:highgui_winrt
2015-06-17 11:22:41 +00:00
Vadim Pisarevsky
fd225469bc
Merge pull request #4122 from alalek:fix_issue_3891
2015-06-17 11:13:27 +00:00
rajithr
510dec4927
Fixing resource leaks
2015-06-17 11:07:49 +05:30
Alexander Alekhin
9394486147
fix issue 3891
2015-06-16 18:53:58 +03:00
Vadim Pisarevsky
01c3ed6157
Merge pull request #4108 from Reen:patch-1
2015-06-16 13:26:47 +00:00
Vadim Pisarevsky
a003d1d758
Merge pull request #4109 from alalek:fix_build_dbt_bindings
2015-06-16 13:06:36 +00:00
Vadim Pisarevsky
f824db4803
Merge pull request #4119 from D-Alex:master
2015-06-16 12:29:44 +00:00
Vadim Pisarevsky
0c67c6c136
Merge pull request #4112 from sturkmen72:patch-1
2015-06-16 12:18:13 +00:00
Maxim Kostin
6724a0b8cd
Added dummy highgui WinRT implementation
2015-06-15 15:59:16 +03:00
Alexander Duda
def2256609
cv::stereoRectify: fix segfault in case of empty distCoeffs
...
cvStereoRectify assumes that NULL is provided in case of no distCoeffs
2015-06-12 13:50:43 +02:00
Alexander Alekhin
a482dcce46
fix support for pthreads parallel_for
2015-06-11 16:53:07 +03:00
Suleyman TURKMEN
caa0058d5b
Update imgproc.hpp
2015-06-11 11:46:42 +03:00
Suleyman TURKMEN
dac715ad1f
Update imgproc.hpp
2015-06-11 11:03:14 +03:00
Suleyman TURKMEN
061131a5ee
Update imgproc.hpp
2015-06-10 13:18:40 +03:00
Alexander Alekhin
caaf60ba00
remove bindings generation for DetectionBasedTracker
2015-06-09 19:01:04 +03:00
René
3e2515d735
Fix bug in distanceATS_L1_8u and typos.
...
The inner loop of the backward scan got the wrong initial "a".
2015-06-09 17:23:22 +02:00
Maksim Shabunin
1f983ec39c
Fixed compilation of pthread-based parallel_for with gcc 4.4.3
2015-06-09 13:59:48 +03:00
Maksim Shabunin
39fdcf4df3
Merge pull request #4083 from mshabunin:java-engine
2015-06-03 17:17:36 +00:00
Alexander Alekhin
1f3043f618
videoio: VideoWriter H264/.mp4 support via ffmpeg/libav
2015-06-03 18:35:12 +03:00
Maksim Shabunin
33ab9ea188
AndroidMgr: fixed typos and package name
2015-06-03 11:53:29 +03:00
Maksim Shabunin
caffbaafbe
Updated Manager for Android
2015-06-02 17:33:04 +03:00
Diogo Rolo
f57fb2375e
Update cuda.markdown
...
Small typo fix in the documentation.
It was written 'devie' instead of 'device' in: 'Switching active device can be done using cuda::setDevice() function'
2015-06-02 14:34:15 +01:00
Vadim Pisarevsky
a4073ed676
made improvements in ECC code (comments from https://github.com/Itseez/opencv/pull/3845 ), as well as minor tweak in pthread's based parallel for.
2015-06-02 01:30:00 +03:00
Vadim Pisarevsky
78e07d3210
Merge pull request #3845 from ellbur:findTransformECC-mask
2015-06-01 20:35:29 +00:00
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
535dc1e874
Merge pull request #3998 from msandler:master
2015-05-29 21:38:09 +00:00
Vadim Pisarevsky
b46719b093
Merge pull request #4074 from vpisarev:objdetect_fixes
2015-05-28 19:43:51 +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
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
5f8f56ea0e
report an error when trying to load HOG cascade
2015-05-28 17:24:22 +03:00
Vadim Pisarevsky
481f786fe7
added simple HAL test; added RHO homography test
2015-05-28 17:05:43 +03:00
S. Garrido
bd2c2f3bd1
fix isContourConvex
2015-05-27 20:51:53 +02: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
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
Andrew Senin
eb40dde688
Fixing XIMEA parameters mapping (issue #4176 )
...
Conflicts:
modules/highgui/src/cap_ximea.cpp
2015-05-26 18:08:29 +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