Merge pull request opencv#9879 from alalek:fix_build

mshabunin · mshabunin · commit c97c1a2454b4 · 2017-10-18T14:49:44.000Z
diff --git a/3rdparty/openexr/CMakeLists.txt b/3rdparty/openexr/CMakeLists.txt
@@ -43,7 +43,7 @@ source_group("Include" FILES ${lib_hdrs} )
 source_group("Src" FILES ${lib_srcs})
 
 ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow -Wunused -Wsign-compare -Wundef -Wmissing-declarations -Wuninitialized -Wswitch -Wparentheses -Warray-bounds -Wextra
-                                     -Wdeprecated-declarations -Wmisleading-indentation
+                                     -Wdeprecated-declarations -Wmisleading-indentation -Wdeprecated
 )
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4018 /wd4099 /wd4100 /wd4101 /wd4127 /wd4189 /wd4245 /wd4305 /wd4389 /wd4512 /wd4701 /wd4702 /wd4706 /wd4800) # vs2005
 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4334) # vs2005 Win64
diff --git a/modules/highgui/src/window_QT.cpp b/modules/highgui/src/window_QT.cpp
@@ -3015,6 +3015,7 @@ void DefaultViewPort::drawImgRegion(QPainter *painter)
 
 
     for (int j=-1;j<height()/pixel_height;j++)//-1 because display the pixels top rows left columns
+    {
         for (int i=-1;i<width()/pixel_width;i++)//-1
         {
             // Calculate top left of the pixel's position in the viewport (screen space)
@@ -3067,15 +3068,15 @@ void DefaultViewPort::drawImgRegion(QPainter *painter)
                     Qt::AlignCenter, val);
             }
         }
+    }
 
-        painter->setPen(QPen(Qt::black, 1));
-        painter->drawLines(linesX.data(), linesX.size());
-        painter->drawLines(linesY.data(), linesY.size());
-
-        //restore font size
-        f.setPointSize(original_font_size);
-        painter->setFont(f);
+    painter->setPen(QPen(Qt::black, 1));
+    painter->drawLines(linesX.data(), linesX.size());
+    painter->drawLines(linesY.data(), linesY.size());
 
+    //restore font size
+    f.setPointSize(original_font_size);
+    painter->setFont(f);
 }
 
 void DefaultViewPort::drawViewOverview(QPainter *painter)

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ source_group("Include" FILES ${lib_hdrs} )`
`43`	`43`	`source_group("Src" FILES ${lib_srcs})`
`44`	`44`
`45`	`45`	`ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow -Wunused -Wsign-compare -Wundef -Wmissing-declarations -Wuninitialized -Wswitch -Wparentheses -Warray-bounds -Wextra`
`46`		`- -Wdeprecated-declarations -Wmisleading-indentation`
	`46`	`+ -Wdeprecated-declarations -Wmisleading-indentation -Wdeprecated`
`47`	`47`	`)`
`48`	`48`	`ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4018 /wd4099 /wd4100 /wd4101 /wd4127 /wd4189 /wd4245 /wd4305 /wd4389 /wd4512 /wd4701 /wd4702 /wd4706 /wd4800) # vs2005`
`49`	`49`	`ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4334) # vs2005 Win64`