Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
a79d0e19
Commit
a79d0e19
authored
7 years ago
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #10194 from mshabunin:fix-gcc7-warnings
parents
872500c4
7eb10659
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
2 deletions
+6
-2
OpenCVCompilerOptions.cmake
cmake/OpenCVCompilerOptions.cmake
+3
-0
grfmt_gdal.cpp
modules/imgcodecs/src/grfmt_gdal.cpp
+2
-1
cap_openni2.cpp
modules/videoio/src/cap_openni2.cpp
+1
-1
No files found.
cmake/OpenCVCompilerOptions.cmake
View file @
a79d0e19
...
...
@@ -128,6 +128,9 @@ if(CMAKE_COMPILER_IS_GNUCXX)
add_extra_compiler_option
(
-Wno-unnamed-type-template-args
)
add_extra_compiler_option
(
-Wno-comment
)
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
()
add_extra_compiler_option
(
-fdiagnostics-show-option
)
...
...
This diff is collapsed.
Click to expand it.
modules/imgcodecs/src/grfmt_gdal.cpp
View file @
a79d0e19
...
...
@@ -426,7 +426,8 @@ bool GdalDecoder::readData( Mat& img ){
for
(
int
y
=
0
;
y
<
nRows
;
y
++
){
// 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
for
(
int
x
=
0
;
x
<
nCols
;
x
++
){
...
...
This diff is collapsed.
Click to expand it.
modules/videoio/src/cap_openni2.cpp
View file @
a79d0e19
...
...
@@ -609,7 +609,7 @@ bool CvCapture_OpenNI2::setDepthGeneratorProperty( int propIdx, double propValue
if
(
streams
[
CV_COLOR_STREAM
].
isValid
()
)
{
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
))
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment