potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity
36,281 Commits 7 Branches 132 Tags
master
Commit Graph

639 Commits

Author SHA1 Message Date
Alexander Alekhin 43467a2ac7 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-05-28 18:29:48 +00:00
Alexander Alekhin d73261844e Merge pull request #14622 from asashour:junit 2019-05-27 14:55:45 +00:00
Ahmed Ashour f9564e053d java: test: use assertNotNull and assertFalse 2019-05-24 10:45:09 +02:00
Jan Starzynski fb9c083a51 handle all orientations properly 2019-05-23 16:51:25 +02:00
Alexander Alekhin f7856a0f35 imgcodecs(tiff): update tile size checks 
backporting of commit: 25247b9f6e
 2019-04-21 18:36:39 +00:00
Alexander Alekhin 25247b9f6e imgcodecs(tiff): update tile size checks 
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14185
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14321
 2019-04-20 20:13:47 +00:00
Alexander Alekhin c024edb9a8 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-04-19 15:43:58 +03:00
Alexander Alekhin 0d747daf47 cmake: use absolute library paths from 'pkgconfig' 
- drop legacy check_module() macro
- drop 'ALIASOF_'
 2019-04-15 22:11:49 +00:00
Alexander Alekhin c9fc27b337 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-04-05 19:08:23 +00:00
Alexander Alekhin 0c490accae imgcodecs(tiff): check TIFF tile size 
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13280
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13283
 2019-04-05 18:13:15 +03:00
Alexander Alekhin 473941c341 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-04-04 18:09:24 +00:00
Alexander Alekhin ba5ddd6499 imgcodecs(tiff): sanitize tiff decoder 
- more checks
- drop separate branches for 32FC1/32FC3(read) handling
- added for 32F/64F non-compressed
- added tests for 32FC3 (RAW + hdr SGILOG compression)
- added test 64FC1
- dump tiff errors on stderr
 2019-04-04 14:16:53 +03:00
Alexander Alekhin c4ec46c195 imgcodecs(sunras): avoid undefined shift 
backporting of commit: f2803aba07
 2019-04-02 18:38:01 +03:00
Alexander Alekhin d2854448c2 Merge pull request #14203 from alalek:fix_ossfuzz_13292 2019-04-02 15:15:13 +00:00
Alexander Alekhin 7d2118e324 Merge pull request #14223 from alalek:backport_14201 2019-04-02 14:33:57 +00:00
Alexander Alekhin b4e2c99346 Merge pull request #14201 from alalek:fix_ossfuzz_13295 2019-04-01 18:47:00 +00:00
Alexander Alekhin 33dde339fe Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-04-01 18:11:55 +03:00
Alexander Alekhin 341e2fa72d Merge pull request #14214 from alalek:backport_14202 2019-04-01 14:39:25 +00:00
Alexander Alekhin 2ece029fe0 imgcodecs(tiff): avoid leak of helper struct on malformed inputs 
backporting of commit: 45428b897f
 2019-04-01 14:08:40 +00:00
Alexander Alekhin 6dfb6a3016 imgcodecs: fix RBaseStream::setPos() outside of current block 
Seeking outside of the current block doesn't update actual data,
so getByte()/etc will get wrong data from stalled buffer.
 2019-03-31 12:55:32 +00:00
Alexander Alekhin f2803aba07 imgcodecs(sunras): avoid undefined shift 
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13292
 2019-03-31 12:14:42 +00:00
Alexander Alekhin 45428b897f imgcodecs(tiff): avoid leak of helper struct on malformed inputs 
oss-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13285
 2019-03-31 11:50:33 +00:00
Alexander Alekhin ccb89a889a imgcodecs(bmp): limit size of processed images 
2Gb+ images can't be handled properly by current implementation

backporting of commit: 50a6f9d251
 2019-03-31 10:52:33 +00:00
Alexander Alekhin 50a6f9d251 imgcodecs(bmp): limit size of processed images 
2Gb+ images can't be handled properly by current implementation

ozz-fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=13295
 2019-03-31 10:48:07 +00:00
Alexander Alekhin 26087e28ad Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-03-15 22:42:57 +00:00
Alexander Alekhin 43c68d1864 imgcodecs: OPENCV_IO_ENABLE_JASPER runtime parameter 2019-03-14 21:43:24 +00:00
Alexander Alekhin bd1fd59fc1 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-03-13 19:13:13 +00:00
rpici 9cca066ee8 Fix bug in test_tiff.cpp 
The big endian data in the tiff_sample_data array was never being tested.  This could be observed by e.g. changing the 9th byte in the big endian data from 0xde to something that should fail the test, e.g. 0xdd, and the test would still pass even though it should fail.
 2019-03-13 09:42:47 -05:00
Alexander Alekhin 8c0b0714e7 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-03-11 19:20:22 +00:00
Gregor Mittag d71977b4dd Add JPEG2000 compression flag. 2019-03-10 07:59:09 +01:00
Rajkiran Natarajan 40af53b1d6 issue-13921: Support setting compression setting for writing tiff images 2019-03-09 15:48:21 -05:00
klemens 997b7b18af spelling fixes 2019-02-09 22:29:54 +01:00
Alexander Alekhin ea64e860de Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-12-09 13:21:58 +00:00
LaurentBerger f1dc26d7ce Merge pull request #13382 from LaurentBerger:imreadsize 
* try to solve #13381

* Add note
 2018-12-09 15:05:27 +03:00
Alexander Alekhin c0016d7fe9 Merge pull request #13253 from alalek:fix_13201 
* cmake: install 'legacy/constants_c.h' files

* samples: add compatibility test code
 2018-11-23 20:02:46 +03:00
pascal 7579cd8068 updated documentation for imread and imwrite (added pfm image format) 2018-11-21 17:59:37 +01:00
Alexander Alekhin a574788e89 move legacy C-API constants into separate files 2018-11-17 23:47:51 +00:00
Alexander Alekhin 1913482cf5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-11-10 20:50:26 +00:00
Vadim Pisarevsky 11eafca3e2 removed C API in the following modules: photo, video, imgcodecs, videoio (#13060) 
* removed C API in the following modules: photo, video, imgcodecs, videoio

* trying to fix various compile errors and warnings on Windows and Linux

* continue to fix compile errors and warnings

* continue to fix compile errors, warnings, as well as the test failures

* trying to resolve compile warnings on Android

* Update cap_dc1394_v2.cpp

fix warning from the new GCC
 2018-11-09 00:52:09 +03:00
Alexander Alekhin b74b05d1b3 Revert CV_TRY/CV_CATCH macros 
This reverts commit 7349b8f5ce (partially).
 2018-11-08 19:56:52 +03:00
Alexander Alekhin 687fa6a8ca Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-11-02 05:33:35 +00:00
Ilari Venäläinen e6c41f0de6 Merge pull request #12989 from venalil:fix_thresholded_tiff_read 
* Fix reading of black-and-white (thresholded) TIFF images

I recently updated my local OpenCV version to 3.4.3 and found out that
I could not read my TIFF images related to my project. After debugging I
found out that there has been some static analysis fixes made
that accidentally have broken reading those black-and-white TIFF images.

Commit hash in which reading of mentioned TIFF images has been broken:
cbb1e867e5

Basically the fix is to revert back to the same functionality that has been there before,
when black-and-white images are read bpp (bitspersample) is 1.
Without the case 1: this TiffDecoder::readHeader() function always return false.

* Added type and default error message

* Added stdexcept include

* Use CV_Error instead of throw std::runtime_error

* imgcodecs(test): add TIFF B/W decoding tests
 2018-11-01 14:34:34 +03:00
Suleyman TURKMEN 4d0ed5c13c Merge pull request #12971 from sturkmen72:upd_imgproc_hpp 
* Update imgproc.hpp

* update color conversion codes
 2018-10-31 18:08:24 +03:00
Maksim Shabunin 0ccd810738 Fixed several issues found by static analysis 2018-10-25 10:45:59 +03:00
Alexander Alekhin 5115e5decb Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-10-13 16:19:05 +00:00
drkoller 978ad4981e Clean up documentation for imread and imwrite 2018-10-12 17:08:01 -04:00
Alexander Alekhin 690fb0544c Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-10-02 14:31:05 +03:00
Alexander Alekhin 9253e8bda2 Merge pull request #12705 from berak:imread_document_grayscale 2018-09-30 23:59:48 +03:00
berak df4139d373 document imread grayscale behaviour 2018-09-30 15:22:26 +02:00
Alexander Alekhin dca657a2fd Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-09-10 00:10:21 +03:00