8 Commits

Author	SHA1	Message	Date
StevenPuttemans	6d34d6b47e	update samples: waitKey() usage ... Original commit is a5f19f7dd6	2016-12-15 15:39:47 +03:00
Vadim Pisarevsky	77f9bb7b76	Merge pull request #6831 from bobpaulin:master	2016-07-18 15:24:35 +00:00
Alexander Alekhin	67a734ce73	Merge branch '2.4' into master ... Commits: 67fe57a add fixed video db0ae2c Restore 2.4 source branch for bug fix 6317. 97ac59c Fix a memory leak indirectly caused by cvDestroyWindow eb40afa Add a workaround for FFmpeg's color conversion accessing past the end of the buffer 421fcf9 Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability 912592d Remove "INSTALL_NAME_DIR lib" target property bb1c2d7 fix bug on border at pyrUp	2016-04-21 20:15:08 +03:00
Bob Paulin	bb8faec885	#6443 Cast maxscale from double to float for scale calculation.	2016-04-21 07:47:13 -05:00
Bob Paulin	b973b73ae7	Add -maxscale parameter to limit the amount sample images can scale in background images	2016-04-20 21:53:52 -05:00
Maksim Shabunin	35b2139929	Basic HAL module	2015-04-07 18:16:22 +03:00
Maksim Shabunin	a5a510da4b	Support for compound modules, support for contrib_world	2015-02-10 18:30:05 +03:00
vbystricky	c48f30d4ec	Move createsamples application from 2.4 version	2014-12-10 12:17:58 +04:00