Harvey 9267536fee Merge pull request #20875 from Harvey-Huang:master ... * bmp specified BI_BITFIELDS should take care RGBA bit mask * change the name * support xrgb bmp file * support xrgb bmp file(add test case) * update testing code		2021-10-22 17:04:19 +03:00
..
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2021-05-18 18:06:26 +00:00
misc	Fix build on older Xcode versions	2021-10-06 21:06:30 +09:00
perf	Merge pull request #11897 from Jakub-Golinowski:hpx_backend	2018-08-31 16:23:26 +03:00
src	Merge pull request #20875 from Harvey-Huang:master	2021-10-22 17:04:19 +03:00
test	Merge pull request #20875 from Harvey-Huang:master	2021-10-22 17:04:19 +03:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2021-10-15 13:35:03 +00:00