mirror of
https://github.com/opencv/opencv.git
synced 2025-08-06 06:26:29 +08:00
Merge pull request #9879 from alalek:fix_build
This commit is contained in:
commit
c97c1a2454
2
3rdparty/openexr/CMakeLists.txt
vendored
2
3rdparty/openexr/CMakeLists.txt
vendored
@ -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
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user