16 Commits

Author	SHA1	Message	Date
edgarriba	a242556b1d	Merge branch 'master' of https://github.com/Itseez/opencv into gdal_lan ... Conflicts: modules/imgcodecs/include/opencv2/imgcodecs.hpp	2015-10-31 20:18:41 +01:00
edgarriba	1e9bd59f07	load multi/hyperspectral images with using gdal	2015-10-14 09:16:04 +02:00
Suleyman TURKMEN	21c0acff24	Update imgcodecs.hpp	2015-10-02 14:00:24 +03:00
Suleyman TURKMEN	7c226ed7a2	adding new flags to imread to load image reduced	2015-09-28 02:00:02 +03:00
Suleyman TURKMEN	f660461bb3	documentation patch	2015-08-26 17:40:38 +03:00
Suleyman TURKMEN	7b7d54df68	new function imread_reduced() ... by this new function we can set libjpeg "scale_denom" parameter and load jpeg images scaled 1/2 - 1/4 - 1/8 other image formats resized after loading	2015-07-19 03:53:43 +03:00
StevenPuttemans	0baaf0a60f	fixing old variables in documentation and transfering to the new interface	2015-05-05 15:05:39 +02:00
Andrey Pavlenko	ed9f933d41	fixing confusing variable naming in a sample code	2015-04-03 14:03:09 +03:00
Marvin Smith	91fbe00caa	Updated gdal tutorial to include comments.	2015-01-17 19:28:58 -08:00
Ashod Nakashian	61ca38103c	Added imreadmulti API to read multi-paged images into a vector of Mat.	2015-01-03 00:09:35 -05:00
Maksim Shabunin	1523fdcc1c	Doxygen documentation: more fixes and cleanups	2014-12-01 15:50:36 +03:00
Maksim Shabunin	dcae7698ad	Doxygen documentation for: highgui, video, imgcodecs and videoio	2014-12-01 15:47:13 +03:00
mshabunin	3ed89a8879	Merge with master and fix conflicts	2014-08-13 18:24:11 +04:00
Sergei Nikulov	eaec132091	#2992: update after review	2014-07-30 00:03:41 +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	4286f60387	Extract imgcodecs module from highgui	2014-07-07 16:28:08 +04:00