mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-11 11:45:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10194 from mshabunin:fix-gcc7-warnings

Browse Source
This commit is contained in:
Alexander Alekhin 2017-11-29 18:22:40 +00:00
commit a79d0e19ad
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/OpenCVCompilerOptions.cmake
View File

@ -128,6 +128,9 @@ if(CMAKE_COMPILER_IS_GNUCXX)
add_extra_compiler_option(-Wno-unnamed-type-template-args) add_extra_compiler_option(-Wno-unnamed-type-template-args)
add_extra_compiler_option(-Wno-comment) add_extra_compiler_option(-Wno-comment)
add_extra_compiler_option(-Wno-implicit-fallthrough) add_extra_compiler_option(-Wno-implicit-fallthrough)
if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 7.2.0)
add_extra_compiler_option(-Wno-strict-overflow) # Issue is fixed in GCC 7.2.1
endif()
endif() endif()
add_extra_compiler_option(-fdiagnostics-show-option) add_extra_compiler_option(-fdiagnostics-show-option)

3
modules/imgcodecs/src/grfmt_gdal.cpp
View File

@ -426,7 +426,8 @@ bool GdalDecoder::readData( Mat& img ){
for( int y=0; y<nRows; y++ ){ for( int y=0; y<nRows; y++ ){
// get the entire row // get the entire row
band->RasterIO( GF_Read, 0, y, nCols, 1, scanline, nCols, 1, GDT_Float64, 0, 0); CPLErr err = band->RasterIO( GF_Read, 0, y, nCols, 1, scanline, nCols, 1, GDT_Float64, 0, 0);
CV_Assert(err == CE_None);
// set inside the image // set inside the image
for( int x=0; x<nCols; x++ ){ for( int x=0; x<nCols; x++ ){

2
modules/videoio/src/cap_openni2.cpp
View File

@ -609,7 +609,7 @@ bool CvCapture_OpenNI2::setDepthGeneratorProperty( int propIdx, double propValue
if ( streams[CV_COLOR_STREAM].isValid() ) if ( streams[CV_COLOR_STREAM].isValid() )
{ {
openni::ImageRegistrationMode mode = propValue != 0.0 ? openni::IMAGE_REGISTRATION_DEPTH_TO_COLOR : openni::IMAGE_REGISTRATION_OFF; openni::ImageRegistrationMode mode = propValue != 0.0 ? openni::IMAGE_REGISTRATION_DEPTH_TO_COLOR : openni::IMAGE_REGISTRATION_OFF;
if( !device.getImageRegistrationMode() == mode ) if( device.getImageRegistrationMode() != mode )
{ {
if (device.isImageRegistrationModeSupported(mode)) if (device.isImageRegistrationModeSupported(mode))
{ {