109 Commits

Author	SHA1	Message	Date
Roman Donchenko	983e75e5de	Merge remote-tracking branch 'origin/master' into merge-2.4	2014-08-01 15:01:41 +04:00
Vadim Pisarevsky	a782ee93de	Merge pull request #2992 from snikulov:upmerge_jpeg_tweak	2014-07-30 12:48:41 +00:00
Sergei Nikulov	eaec132091	#2992: update after review	2014-07-30 00:03:41 +04:00
Kobi Gurkan	6cac76bfe4	fixes tab indentation - replacing with 4 spaces	2014-07-27 17:14:54 +03:00
Kobi Gurkan	fc8f0e341b	adding support for 16-bit 4 channel tiffs ... - when IMREAD_UNCHANGED is set in flags, the tiff is read with 4 channels - adding test for read/write	2014-07-27 17:09:05 +03:00
Sergey Nikulov	9d107fb2d5	fixed test compilation	2014-07-21 19:26:26 +04:00
Sergey Nikulov	bd144cfa64	upmerged pull req #2974 to master - added more jpeg options to imgcodecs	2014-07-21 18:56:35 +04:00
vbystricky	d58f736935	Split highgui module to videoio and highgui	2014-07-14 23:16:47 +04:00
vbystricky	4286f60387	Extract imgcodecs module from highgui	2014-07-07 16:28:08 +04:00