Merge pull request #5432 from sturkmen72:patch-11

ff35726f · Maksim Shabunin · b34f0d99 · 21c0acff · ff35726f · ff35726f
Commit ff35726f authored Oct 22, 2015 by Maksim Shabunin
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

imgcodecs.hpp modules/imgcodecs/include/opencv2/imgcodecs.hpp +0 -0

loadsave.cpp modules/imgcodecs/src/loadsave.cpp +3 -3

No files found.
--- a/modules/imgcodecs/include/opencv2/imgcodecs.hpp
+++ b/modules/imgcodecs/include/opencv2/imgcodecs.hpp
--- a/modules/imgcodecs/src/loadsave.cpp
+++ b/modules/imgcodecs/src/loadsave.cpp
@@ -265,11 +265,11 @@ imread_( const String& filename, int flags, int hdrtype, Mat* mat=0 )
    int scale_denom = 1;
    if( flags > IMREAD_LOAD_GDAL )
    {
-    if( flags & IMREAD_GRAYSCALE_REDUCED_2 )
+    if( flags & IMREAD_REDUCED_GRAYSCALE_2 )
        scale_denom = 2;
-    else if( flags & IMREAD_GRAYSCALE_REDUCED_4 )
+    else if( flags & IMREAD_REDUCED_GRAYSCALE_4 )
        scale_denom = 4;
-    else if( flags & IMREAD_GRAYSCALE_REDUCED_8 )
+    else if( flags & IMREAD_REDUCED_GRAYSCALE_8 )
        scale_denom = 8;
    }