4 Commits

Author	SHA1	Message	Date
Alexander Alekhin	583bd1a6e2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2022-06-04 19:10:35 +00:00
Kumataro	1a24e316d5	Merge pull request #22030 from Kumataro:3.4-fix22029 ... * objdetect: qrcode_encoder: fix to missing timing pattern * objdetect: qrcode_encoder: Add SCOPED_TRACE() and replace CV_Assert() to ASSERT_EQ(). - Add SCOPED_TRACE() for version loop. - Replace CV_Assert() to ASSERT_EQ(). - Rename expect_msg to msg.	2022-05-31 13:58:17 +03:00
Alexander Alekhin	ac4b592b4e	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2021-11-20 05:13:50 +00:00
Qiushi Zheng	3e51448ef0	Merge pull request #17889 from ZhengQiushi:my_3.4 ... QR code (encoding process) * add qrcode encoder * qr encoder fixes * qr encoder: fix api and realization * fixed qr encoder, added eci and kanji modes * trigger CI * qr encoder constructor fixes Co-authored-by: APrigarina <ann73617@gmail.com>	2021-11-15 17:15:39 +00:00