cyy 286c2c236b Merge pull request #12458 from DEEPIR:3.4 ... * may be an typo fix * remove identical branch,may be paste error * add parentheses around macro parameter * simplify if condition * check malloc fail * change the condition of branch removed by commit 3041502861318c85d901e8c08226ff67898c77ed		2018-09-07 18:43:47 +03:00
..
include/opencv2	Add export macro for ios conversion functions	2018-08-20 14:10:54 -07:00
misc/java/test	java(test): fix test names	2018-01-12 19:14:00 +00:00
perf	ts: refactor OpenCV tests	2018-02-03 19:39:47 +00:00
src	Merge pull request #12458 from DEEPIR:3.4	2018-09-07 18:43:47 +03:00
test	imgcodecs(webp): multiple fixes	2018-08-30 20:42:33 +00:00
CMakeLists.txt	Merge pull request #11417 from Turim:imgcodecs_cmake_decoders_customize_formats	2018-05-22 15:10:15 +00:00