Zhenqing, Hu
94a9e16943
Fix bug 6445
...
Root cause: when calling imread to read the pgm file, when returning with success reading file, the destructor will free the resource which used by memcpy, but in the code, the resource calculation was not correct, therefore, it will cause memory corruption during resource free.
2016-04-21 14:39:55 +08:00
Alexander Alekhin
59975db6a4
Merge pull request #6441 from asmorkalov:version++
2016-04-20 14:21:19 +00:00
Alexander Alekhin
ec2ff7f0c0
Merge branch '2.4.12.x-prep' into 2.4
2016-04-20 16:26:12 +03:00
Alexander Alekhin
5d038686b1
Merge pull request #6401 from StevenPuttemans:add_model_visualisation_tool_2.4
2016-04-20 13:24:25 +00:00
Alexander Smorkalov
6084901610
OpenCV version++.
2016-04-20 16:03:47 +03:00
Maksim Shabunin
ec63343f34
Merge pull request #6420 from ioxp:foreachDoc
2016-04-20 11:55:03 +00:00
Alexander Alekhin
9ebe29a8f1
Merge pull request #6433 from schenker:master
2016-04-19 16:06:35 +00:00
Alexander Alekhin
e58c28974b
Merge pull request #6431 from StevenPuttemans:add_fixed_video_2.4
2016-04-19 14:19:41 +00:00
Alexander Alekhin
1b4bd6a905
Merge pull request #6432 from kevin-coder:bugfix_6317_Restore_2.4
2016-04-19 13:32:44 +00:00
StevenPuttemans
67fe57a0a3
add fixed video
2016-04-19 15:30:49 +02:00
Thomas Schenker
76ced14b3b
fix typo
2016-04-19 15:09:27 +02:00
Maksim Shabunin
5a938309c1
More compilation warnings fixed
2016-04-19 16:08:48 +03:00
Maksim Shabunin
11378fcb17
Fixed compiation problems
2016-04-19 14:50:07 +03:00
Kevin, Hu
db0ae2ca50
Restore 2.4 source branch for bug fix 6317.
2016-04-19 19:27:42 +08:00
Alexander Alekhin
289b6ff2a5
Merge pull request #6393 from paroj:v4l_exposure
2016-04-18 15:14:21 +00:00
Alexander Alekhin
9e9165c25e
Merge pull request #5516 from AVshokurov:master
2016-04-18 15:13:14 +00:00
Alexander Alekhin
de164b0ccf
Merge pull request #6421 from alalek:backport_6417
2016-04-18 15:12:17 +00:00
Maksim Shabunin
5e9192287d
Added HAL cvtColor interface
2016-04-18 16:34:25 +03:00
Ivar Clemens
3287ab386c
Fixed typo in BRISK feature detector.
2016-04-18 13:04:04 +01:00
Alexander Alekhin
d02f17c39d
Merge pull request #6397 from ioxp:androidCamLog
2016-04-18 11:56:18 +00:00
Suleyman TURKMEN
194f1beae8
fix for writing 16-bit jpeg2000
2016-04-18 14:51:55 +03:00
Philipp Hasper
c52759432d
Fixing doc for cv::Mat::forEach
...
image.forEachWithPosition does not exist
2016-04-18 13:51:07 +02:00
Alexander Alekhin
08761f5fb5
Merge pull request #6410 from alalek:issue_6403
2016-04-18 11:43:14 +00:00
Alexander Alekhin
68b7323b4e
Merge pull request #6417 from sturkmen72:patch-14
2016-04-18 10:35:28 +00:00
Alexander Alekhin
c02d89bf2d
Merge pull request #6408 from dtmoodie:InputOutputArray_constructor_fix
2016-04-18 10:34:43 +00:00
Alexander Alekhin
a513f482c0
Merge pull request #6406 from ohnozzy:Bug-Fix-for-Issue-6377
2016-04-18 10:29:29 +00:00
Alexander Alekhin
9393a0c5bb
cmake: don't use -isystem for opencv_contrib paths
2016-04-18 12:48:14 +03:00
Maksim Shabunin
809c159e11
Merge pull request #6414 from mshabunin:fix-macosx-warnings
2016-04-17 22:11:57 +00:00
Maksim Shabunin
ba3b1de93f
Updates for XCode 7.3
2016-04-17 20:21:29 +03:00
Alexander Alekhin
169b5e9fde
Merge pull request #6359 from alalek:videocapture_exceptions
2016-04-17 09:30:43 +00:00
Suleyman TURKMEN
98239664f6
fix for writing 16-bit jpeg2000
2016-04-17 00:37:28 +03:00
Maksim Shabunin
3bd6912e01
Merge pull request #6415 from mshabunin:fix-xcode-warnings-24
2016-04-16 06:39:00 +00:00
Maksim Shabunin
1a41ed2fda
Updates for XCode 7.3
2016-04-15 21:56:50 +03:00
Dan
e9461d3feb
templated std::vector<T> constructor was being called instead of const std::vector<cv::cuda::GpuMat>.
2016-04-14 15:50:24 -04:00
Alexander Alekhin
0df901b389
Merge pull request #6404 from solosuper:bugfix/issue6315
2016-04-14 14:27:59 +00:00
Alexander Alekhin
ccff20328d
Merge pull request #6407 from StevenPuttemans:fix_ts_perf_warnings
2016-04-14 14:27:27 +00:00
Alexander Alekhin
ac32450c38
Merge pull request #6405 from StevenPuttemans:fix_gstreamer_cap_linux
2016-04-14 14:27:12 +00:00
StevenPuttemans
88c0d64b4e
fixing gstreamer cap
2016-04-14 14:16:05 +02:00
StevenPuttemans
c34bb0ed03
remove warnings generated during TS module tests
2016-04-14 13:48:11 +02:00
ohnozzy
9be6b4f2d1
Bug Fix for 6377
...
Rewrite linearPolar & logPolar so that they do not depend on the
deprecated API CvMat. Issue 6377 is resolved in this way because the two
routines do not convert UMat to CvMat anymore.
2016-04-14 19:39:02 +08:00
solosuper
372890f1d7
fix #6315
2016-04-14 11:57:49 +02:00
StevenPuttemans
9d71c19939
add visualisation tool for 2.4 branch
2016-04-14 11:33:37 +02:00
Maksim Shabunin
fc5e32c7ac
Merge pull request #6305 from rishirajsurti:master
2016-04-14 08:42:40 +00:00
rishirajsurti
4a9170ba42
Thresholding Tutorial using inRange function on a video
2016-04-14 11:55:52 +05:30
Alexander Alekhin
5b73f3a316
Merge pull request #6373 from terfendail:vt/stereobm_valgrind
2016-04-13 13:38:53 +00:00
Maksim Shabunin
ed508dc8ed
Merge pull request #6399 from mshabunin:fix-flann-memleak
2016-04-13 11:34:58 +00:00
Alexander Alekhin
fc55e54aa1
Merge pull request #6318 from paroj:gst_cap_props
2016-04-13 10:05:40 +00:00
Maksim Shabunin
98763528ab
Merge pull request #6382 from StevenPuttemans:update_annotation_tool
2016-04-13 10:05:26 +00:00
Maksim Shabunin
96d747f030
Merge pull request #6384 from StevenPuttemans:update_annotation_tool_2.4
2016-04-13 10:02:56 +00:00
Maksim Shabunin
b99d010977
Fixed memory leak in flann KMeansIndex
2016-04-13 12:08:42 +03:00
