Commit Graph

14966 Commits

Author SHA1 Message Date
Alexander Alekhin
10787c68d0 Merge pull request #8581 from ysolovyov:zlib-ios-fix 2017-04-14 20:12:19 +00:00
brian-armstrong-discord
9e054d3880 Merge pull request #8492 from brian-armstrong-discord:exif_inmemory
autorotate in-memory jpegs (#8492)

* autorotate in-memory jpegs

* correct indentation (4 spaces)

* imgcodecs: don't apply EXIF rotation for unloaded images

* videoio: don't try to rotate MJPEG stream

* imgcodecs: ByteStreamBuffer::seekoff support all seek "dir"

* imgcodecs: fix condition: "off == egptr() - eback()" is valid offset
2017-04-14 23:12:07 +03:00
Yuriy Solovyov
26ccc09c46 Fix zlib issue on iOS 2017-04-14 17:16:00 +03:00
Alexander Alekhin
b37f0c5ac2 Merge pull request #8522 from zongwave:master 2017-04-14 11:40:07 +00:00
zongwave
1fc60e6d64 Add method KeypointBasedMotionEstimator::estimate(InputArray, InputArray) to support both cpu & opencl algorithm processing
the orignal estimate function has input parameters defined as "Mat", this prevent users to call into algorithm opencl path
2017-04-14 10:08:48 +08:00
Alexander Alekhin
85321807dd Merge pull request #8567 from tomoaki0705:fixCbrtVS2012 2017-04-12 13:46:09 +00:00
Tomoaki Teshima
c145f28c71 fix build error on VS2012 2017-04-12 20:09:00 +09:00
Alexander Alekhin
4d3cef35c2 Merge pull request #8564 from orisano:patch-1 2017-04-12 08:52:08 +00:00
Alexander Alekhin
ab9bbf645c Merge pull request #8559 from liquidmetal:feature/utsinh_allocate_ecc 2017-04-12 08:39:10 +00:00
orisano
550ca10ec6 Remove stdout log when destructor called. 2017-04-12 17:12:25 +09:00
Utkarsh Sinha
0330934c8b Updating documentation. 2017-04-11 06:42:20 -07:00
Alexander Alekhin
8ba95cd498 Merge pull request #8548 from csukuangfj:fix-typo-RNG 2017-04-11 11:46:06 +00:00
Alexander Alekhin
4e31eef77d Merge pull request #8540 from tomoaki0705:fixWaringPhoto 2017-04-11 10:36:01 +00:00
Alexander Alekhin
a2af1d4f71 Merge pull request #8458 from grundman:patch-2 2017-04-11 10:06:34 +00:00
Alexander Alekhin
c839a2ccb1 Merge pull request #8525 from nnorwitz:master 2017-04-11 09:30:09 +00:00
Tomoaki Teshima
ccc8767b55 suppress warning on Jetson TK1 2017-04-11 18:27:12 +09:00
Utkarsh Sinha
b9c2d88e69 If the user passes an empty output matrix, initialize it to identity. 2017-04-10 20:43:33 -07:00
Fangjun KUANG
4065778255 fix typos. 2017-04-10 09:32:50 +02:00
Tong Ke
0a63ab36bb Merge pull request #8301 from tonyke1993:p3p_alg
New p3p algorithm (accepted by CVPR 2017) (#8301)

* add p3p source code

* indent 4

* update publication info

* fix filename

* interface done

* plug in done, test needed

* debugging

* for test

* a working version

* clean p3p code

* test

* test

* fix warning, blank line

* apply patch from @catree

* add reference info

* namespace, indent 4

* static solveQuartic

* put small functions to anonymous namespace
2017-04-07 09:48:34 +03:00
Alexander Alekhin
2561c59698 Merge pull request #8524 from mshabunin:java-fixes 2017-04-06 20:49:33 +00:00
nnorwitz
24e8cd1a78 Use %% for inline assembly rather than % so this compiles with clang.
Same as 9210cefb36 but for this file too.
2017-04-06 12:54:56 -07:00
nnorwitz
9210cefb36 Use %% for inline assembly rather than % so this compiles with clang. 2017-04-05 10:57:50 -07:00
Maksim Shabunin
4d62f1de1e Added javadoc generation 2017-04-05 18:18:39 +03:00
Maksim Shabunin
8b455e8bb3 Fixed Algorithm.save and other methods work in Java 2017-04-05 17:48:38 +03:00
Alexander Alekhin
fd93ae08b6 Merge pull request #8523 from mshabunin:fix-cvtcolor-ocl 2017-04-05 10:02:01 +00:00
Maksim Shabunin
ce50df564c Fixed cvtColor OCL compilation issue (BGRA2mBGRA) 2017-04-05 11:48:29 +03:00
Alexander Alekhin
bd786f3bea Merge pull request #8520 from tomoaki0705:cudaWarningsSuppress 2017-04-05 06:34:45 +00:00
Tomoaki Teshima
731b5b206f suppress warnings from cuda 2017-04-05 08:30:16 +09:00
Alexander Alekhin
e5d9b608c4 cmake: fix fp16 support 2017-04-04 20:34:58 +03:00
Alexander Alekhin
d15d9f558d Merge pull request #8514 from paroj:v4lretval 2017-04-04 15:01:21 +00:00
Pavel Rojtberg
d92d82d194 cap_v4l: SetProperty - do not return false while setting video size 2017-04-04 15:07:02 +02:00
Alexander Alekhin
e93aa158cf Merge pull request #8496 from Sahloul:fixes/wrappers/imgproc/EMD 2017-04-03 20:55:51 +00:00
Alexander Alekhin
297ba85323 Merge pull request #8441 from alalek:dispatch_mathfuncs_core 2017-04-03 14:03:49 +00:00
Vadim Pisarevsky
36e8017580 Merge pull request #8465 from claudiofantacci:enh/cudastreamhog 2017-04-03 09:58:21 +00:00
Vadim Pisarevsky
4aa51f6a32 Merge pull request #8484 from berak:patch-2 2017-04-03 09:57:58 +00:00
Vadim Pisarevsky
a973d93dcb Merge pull request #8504 from bcr3ative:fixStereoBMROI 2017-04-03 09:57:34 +00:00
Vadim Pisarevsky
2409924dbc Merge pull request #8342 from grundman:patch-1 2017-04-03 09:34:53 +00:00
Alexander Alekhin
c049275512 Merge pull request #8502 from tomoaki0705:fixWarningsArrayBound 2017-04-02 10:15:47 +00:00
Alexander Alekhin
bbdd8ba078 Merge pull request #8506 from sergiud:mat-move-assignment-dont-copy 2017-04-02 10:13:17 +00:00
Sergiu Deitsch
4f31759965 prevent copying in cv::Mat_<T> move assignment 2017-04-01 21:53:30 +02:00
Tomoaki Teshima
6ab10fc3ac suppress warnings on GCC 4.9 series
- check boundary strictly
 - initialize the variable before using it
2017-04-01 20:53:50 +09:00
Paolo Perkovic
dd576c89a3 Fix StereoBM ROI selection
- Fix StereoBM ROI (Region of interest) selection for stereo
images used by block matching algorithm
2017-04-01 13:29:44 +02:00
Hamdi Sahloul
89088937a7 Avoid memory leakage in smart pointers wrapper 2017-04-01 18:27:57 +09:00
Hamdi Sahloul
6a856d677c Wraps cv::EMD for Python and Java 2017-04-01 17:20:03 +09:00
Alexander Alekhin
0ae297ad95 Merge pull request #8497 from Sahloul:fixes/wrappers/ptr 2017-03-31 20:52:46 +00:00
Hamdi Sahloul
c75b589f89 Wraps smart pointers properly 2017-04-01 03:19:29 +09:00
Alexander Alekhin
b67382cbeb Merge pull request #8494 from tomoaki0705:fixWarningCuda 2017-03-31 15:42:01 +00:00
Tomoaki Teshima
507071cc6f suppress warnings on Jetson TK1 2017-03-31 08:20:59 +09:00
berak
3e0b63f65b fix comment in optim.hpp 2017-03-30 11:07:52 +02:00
Alexander Alekhin
f34b2f7b8d Merge pull request #8470 from superbort:stitching-estimators 2017-03-28 13:08:24 +00:00