297e2b6f1a
Merge pull request #3834 from asmorkalov:retina_docs_fix
2015-03-20 10:14:29 +00:00
226b4e3ed5
Merge pull request #3839 from hyperscience:fix-free-space-check-in-grow-seq
2015-03-20 09:37:49 +00:00
756c1a22d9
Merge remote-tracking branch 'upstream/2.4' into 2.4
2015-03-20 01:44:29 +01:00
a7bf1d53d8
Changes to be committed:
...
(use "git reset HEAD <file>..." to unstage)
modified: modules/highgui/include/opencv2/highgui/highgui_c.h
modified: modules/highgui/src/cap_dshow.cpp
modified: modules/highgui/src/cap_pvapi.cpp
modified: modules/java/generator/gen_java.py
Änderungen in der PvAPI hinzugefügt.
2015-03-20 01:42:16 +01:00
7711cd284b
Fix a bug that impede to set the trackbar pos using the Qt control panel
2015-03-19 21:25:10 +01:00
8755ffbf31
Fix a bad free space check in icvGrowSeq.
...
A difference of two pointers was casted to unsigned which can lead to
overflow on 64-bit systems.
2015-03-19 17:32:32 +02:00
69344f175b
Merge pull request #3843 from piponazo:BugFix4244
2015-03-19 12:15:41 +00:00
d14a1de947
Fixing the bug #4244 that I just reported in code.opencv.org
2015-03-18 20:07:08 +01:00
514b3b520c
Documentation update after iOS warnings fix in contrib/retina header.
2015-03-17 19:25:05 +03:00
7d665a4754
Fix warn conversion from 'size_t' to 'int'. add comment for doxygen
2015-03-14 09:35:53 +09:00
f7d52c774e
Fix compile error on linux change cv::InputArray& to cv::InputArray
2015-03-14 06:58:34 +09:00
8efdfd9dfc
Fix unused-parameter Warning
2015-03-14 06:07:55 +09:00
cd42e38013
FlannBasedMatcher(LshIndex) in the feature2d optimization for continuance additional train()
...
Current implementation of miniflann is releasing the trained index, and
rebuilding the index from the beginning.
But, some indexing algorithms like the LSH are able to add the indexing
data after that.
This branch is implementation of that optimization for LshIndex
FlannBasedMatcher in the feature2d.
2015-03-14 04:38:07 +09:00
ac8045b9c6
Merge pull request #3754 from eliteraspberries:unsigned-mask
2015-03-02 11:34:43 +00:00
417f1e51a4
Merge pull request #3755 from eliteraspberries:mat-size-sign
2015-03-02 11:34:09 +00:00
0172bd6beb
Merge pull request #3756 from eliteraspberries:cast-double
2015-03-02 10:52:28 +00:00
e02d6e2c8f
Merge pull request #3766 from StevenPuttemans:add_GPU_old_models
2015-03-02 10:49:38 +00:00
7458dfc082
Merge pull request #3765 from jet47:gpu-hog-fix
2015-03-02 10:34:51 +00:00
c849492dfa
fix tests for gpu HOG
...
initialize HOG after CUDA device switch
2015-03-02 11:02:47 +03:00
4f5d30a865
fix GpuMat::setTo implementation
...
previous implementation was not thread/stream safe, since it used constant
memory
new implementation doesn't use any global objects, so it is thread/stream safe
2015-02-27 16:28:06 +03:00
2c0ef660bf
Add GPU models in seperate folder, only old models are supported and they were replaced to make the CPU interface work.
...
This solves the undesired consequence of breaking the GPU interface.
2015-02-27 14:15:30 +01:00
21bbed7baf
fix gpu HOG implementation:
...
move hog::set_up_constants from constructor to compute method
if user changed CUDA device between constructor and computation,
some variables were uninitialized
2015-02-27 14:28:12 +03:00
f73a97b53b
Merge pull request #3751 from jet47:gpu-bmoptflow-test-epsilon
2015-02-25 11:54:44 +00:00
c147ab1e85
set epsilon for gpu OpticalFlowBM to 1e-6, since it uses floating point arithmetic
2015-02-25 13:16:36 +03:00
7d4cbbd7aa
Cast a long integer to double explicitly.
2015-02-24 17:04:28 -05:00
b7be49426d
Cast some image coordinates and sizes to double.
2015-02-24 12:21:34 -05:00
d56dd0e091
Merge pull request #3727 from StevenPuttemans:fix_3714_2.4
2015-02-24 10:08:43 +00:00
baabd95f30
Merge pull request #3740 from StevenPuttemans:fix_3028_2.4
2015-02-24 10:06:20 +00:00
42b1c6440c
Cast some matrix sizes to type int.
2015-02-23 23:19:33 -05:00
35a89b1541
Change some vector mask types to unsigned.
2015-02-23 23:10:57 -05:00
720fd144ef
add fit ellipse technique notice
2015-02-23 14:59:40 +01:00
c059f7ddcd
Merge pull request #3726 from asmorkalov:ocv_version_inc4
2015-02-20 16:11:58 +00:00
85fd599939
Merge pull request #3588 from vpradeep07:feature/deterministic_pnpransac
2015-02-20 12:32:35 +00:00
99ae48f0b4
Merge pull request #3707 from alalek:fix_android_camera
2015-02-20 12:27:13 +00:00
96e5300fdd
OpenCV and OpenCV Manager version++
2015-02-20 15:17:11 +03:00
4f621de849
fix bug 3714 2.4 branch
2015-02-20 12:39:31 +01:00
65e4df751c
Merge pull request #3705 from SpecLad:unused-nNull
2015-02-19 18:40:22 +00:00
4e8aac5308
Merge pull request #3683 from SeninAndrew:2.4
2015-02-18 17:15:10 +00:00
4ce31c7c1a
Merge remote-tracking branch 'itseez/2.4' into feature/deterministic_pnpransac
2015-02-17 10:16:44 -08:00
49bc100e51
Removing rng_seed arg in order to maintain ABI compatibility. Hardcoding seed
2015-02-17 09:19:36 -08:00
dc21a0a6b5
Android: fix JavaCameraView implementation
...
1) Fixed deadlock if camera is started and stopped immediately
2) Invalid pattern usage of Object.wait(). Refer to "spurious wakeup": http://docs.oracle.com/javase/8/docs/api/java/lang/Object.html#wait
3) Fixed buffer usage:
a) fix eliminates processing of zero NV12 (green in RGB) first frame
b) latest ready frame is delivered for processing (not previous)
2015-02-17 01:28:43 +03:00
d218f28070
cap_msmf.hpp: fix a warning about nNull being unused
...
The two functions featuring nNull are not particularly needed, so
I simply removed them.
2015-02-16 19:31:51 +03:00
6a3a6416d7
Merge pull request #3698 from SpecLad:avcodec-free-frame
2015-02-16 11:33:00 +00:00
77578d415f
Fix a memory leak in CvCapture_FFMPEG::close
...
FFmpeg now requires that frames allocated with avcodec_alloc_frame are
freed with avcodec_free_frame.
2015-02-13 15:12:52 +03:00
ff4c42d182
Fix iOS warnings about implicit conversion precision by changing double literals to float ones
2015-02-13 00:51:03 +00:00
b9a6edfe3d
Fixing XIMEA parameters mapping (issue #4176 )
2015-02-09 15:15:23 +03:00
cd1ca7b08b
Merge pull request #3667 from AfterEight:cap_ximea_setResolution_bugfix
2015-02-05 07:48:43 +00:00
5253265342
Merge pull request #3671 from jet47:disable-gpu-match-template-tests
2015-02-04 13:17:26 +00:00
7bb8c50080
disable gpu::matchTemplate tests
2015-02-04 11:21:17 +03:00
e938563de5
Modified resetCvImage() in cap_ximea.cpp, so that the IplImage* frame is also updated after the resolution has changed via set(CV_CAP_PROP_FRAME_WIDTH, value)/set(CV_CAP_PROP_XI_DOWNSAMPLING, value)
2015-02-02 15:04:29 +01:00
Vadim Pisarevsky
Prof. Dr. Rudolf Haussmann
Luis Díaz Más
Boris Daskalov
Alexander Smorkalov
ippei ito
Vladislav Vinogradov
StevenPuttemans
Mansour Moufid
Maksim Shabunin
Andrey Pavlenko
Alexander Alekhin
Vijay Pradeep
Roman Donchenko
Thomas Gabrowski
Andrew Senin
AfterEight