Skip to content

O
opencv
Commit ef332dc5 authored by Maksim Shabunin's avatar Maksim Shabunin
Browse files
Options

Fixed and suppressed warnings produced by GCC 6.3.0

parent 5a22d81f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
3rdparty/libjpeg/CMakeLists.txt
View file @ ef332dc5
...@@ -38,7 +38,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) ...@@ -38,7 +38,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set_source_files_properties(jcdctmgr.c PROPERTIES COMPILE_FLAGS "-O1") set_source_files_properties(jcdctmgr.c PROPERTIES COMPILE_FLAGS "-O1")
endif() endif()
ocv_warnings_disable(CMAKE_C_FLAGS -Wcast-align -Wshadow -Wunused) ocv_warnings_disable(CMAKE_C_FLAGS -Wcast-align -Wshadow -Wunused -Wshift-negative-value)
ocv_warnings_disable(CMAKE_C_FLAGS -Wunused-parameter) # clang ocv_warnings_disable(CMAKE_C_FLAGS -Wunused-parameter) # clang
ocv_warnings_disable(CMAKE_C_FLAGS /wd4013 /wd4244 /wd4267) # vs2005 ocv_warnings_disable(CMAKE_C_FLAGS /wd4013 /wd4244 /wd4267) # vs2005
......
modules/videoio/src/cap_dc1394_v2.cpp
View file @ ef332dc5
...@@ -603,9 +603,9 @@ bool CvCaptureCAM_DC1394_v2_CPP::grabFrame() ...@@ -603,9 +603,9 @@ bool CvCaptureCAM_DC1394_v2_CPP::grabFrame()
cvInitImageHeader(&fhdr, cvSize(fc->size[0], fc->size[1]), 8, nch); cvInitImageHeader(&fhdr, cvSize(fc->size[0], fc->size[1]), 8, nch);
cvSetData(&fhdr, fc->image, fc->size[0]*nch); cvSetData(&fhdr, fc->image, fc->size[0]*nch);
// Swap R&B channels: // Swap R&B channels:
if (nch==3) if (nch==3)
cvConvertImage(&fhdr,&fhdr,CV_CVTIMG_SWAP_RB); cvConvertImage(&fhdr,&fhdr,CV_CVTIMG_SWAP_RB);
if( rectify && cameraId == VIDERE && nimages == 2 ) if( rectify && cameraId == VIDERE && nimages == 2 )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment