Merge branch 'master' of https://github.com/Itseez/opencv into gdal_lan

Conflicts:
	modules/imgcodecs/include/opencv2/imgcodecs.hpp

diff --cc modules/imgcodecs/include/opencv2/imgcodecs.hpp
index 04dcdb3,699bc16..3222321
--- 1/modules/imgcodecs/include/opencv2/imgcodecs.hpp
--- 2/modules/imgcodecs/include/opencv2/imgcodecs.hpp
+++ b/modules/imgcodecs/include/opencv2/imgcodecs.hpp
@@@ -129,29 -141,18 +142,22 @@@ Currently, the following file formats a
      codecs supplied with an OS image. Install the relevant packages (do not forget the development
      files, for example, "libjpeg-dev", in Debian\* and Ubuntu\*) to get the codec support or turn
      on the OPENCV_BUILD_3RDPARTY_LIBS flag in CMake.
- 
- @note In the case of color images, the decoded images will have the channels stored in B G R order.
-  */
- CV_EXPORTS_W Mat imread( const String& filename, int flags = IMREAD_COLOR );
- 
- /** @brief Loads and resizes down an image from a file.
- @anchor imread_reduced
 +-   In the case you set *WITH_GDAL* flag to true in CMake and @ref IMREAD_LOAD_GDAL to load the image,
 +    then [GDAL](http://www.gdal.org) driver will be used in order to decode the image by supporting
 +    the following formats: [Raster](http://www.gdal.org/formats_list.html),
 +    [Vector](http://www.gdal.org/ogr_formats.html).
  @param filename Name of file to be loaded.
- @param flags Flag that can take values of @ref cv::ImreadModes
- @param scale_denom
-  */
- CV_EXPORTS_W Mat imread_reduced( const String& filename, int flags = IMREAD_COLOR, int scale_denom=1 );
+ @param flags Flag that can take values of cv::ImreadModes
+ */
+ CV_EXPORTS_W Mat imread( const String& filename, int flags = IMREAD_COLOR );
  
- /** @brief Loads a multi-page image from a file. (see imread for details.)
+ /** @brief Loads a multi-page image from a file.
  
+ The function imreadmulti loads a multi-page image from the specified file into a vector of Mat objects.
  @param filename Name of file to be loaded.
- @param flags Flag that can take values of @ref cv::ImreadModes, default with IMREAD_ANYCOLOR.
+ @param flags Flag that can take values of cv::ImreadModes, default with cv::IMREAD_ANYCOLOR.
  @param mats A vector of Mat objects holding each page, if more than one.
- 
+ @sa cv::imread
  */
  CV_EXPORTS_W bool imreadmulti(const String& filename, std::vector<Mat>& mats, int flags = IMREAD_ANYCOLOR);
  

diff --cc modules/imgcodecs/src/loadsave.cpp
Simple merge