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

Merge pull request #13889 from mshabunin:enable-narrowing-warning

Browse Source 
* Enabled -Wnarrowing warning

* Fixed type narrowing issues

* Cast python constants

* Use long long for python constants

* Use int for python constants with fallback to long

* Update cv2.cpp
This commit is contained in:
Maksim Shabunin 2019-02-26 13:15:59 +03:00 committed by Alexander Alekhin
parent 5421d0866b
commit 8c1e0537ec
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/OpenCVCompilerOptions.cmake
View File

@ -119,7 +119,6 @@ if(CV_GCC OR CV_CLANG)
add_extra_compiler_option(-Wcast-align) add_extra_compiler_option(-Wcast-align)
add_extra_compiler_option(-Wstrict-aliasing=2) add_extra_compiler_option(-Wstrict-aliasing=2)
else() else()
add_extra_compiler_option(-Wno-narrowing)
add_extra_compiler_option(-Wno-delete-non-virtual-dtor) add_extra_compiler_option(-Wno-delete-non-virtual-dtor)
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)

4
modules/python/src2/cv2.cpp
View File

@ -1838,7 +1838,7 @@ static PyMethodDef special_methods[] = {
struct ConstDef struct ConstDef
{ {
const char * name; const char * name;
long val; long long val;
}; };
static void init_submodule(PyObject * root, const char * name, PyMethodDef * methods, ConstDef * consts) static void init_submodule(PyObject * root, const char * name, PyMethodDef * methods, ConstDef * consts)
@ -1877,7 +1877,7 @@ static void init_submodule(PyObject * root, const char * name, PyMethodDef * met
} }
for (ConstDef * c = consts; c->name != NULL; ++c) for (ConstDef * c = consts; c->name != NULL; ++c)
{ {
PyDict_SetItemString(d, c->name, PyInt_FromLong(c->val)); PyDict_SetItemString(d, c->name, PyLong_FromLongLong(c->val));
} }
} }

5
modules/videoio/src/cap_v4l.cpp
View File

@ -226,6 +226,7 @@ make & enjoy!
#include <assert.h> #include <assert.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <limits>
#ifdef HAVE_CAMV4L2 #ifdef HAVE_CAMV4L2
#include <asm/types.h> /* for videodev2.h */ #include <asm/types.h> /* for videodev2.h */
@ -538,7 +539,9 @@ bool CvCaptureCAM_V4L::convertableToRgb() const
void CvCaptureCAM_V4L::v4l2_create_frame() void CvCaptureCAM_V4L::v4l2_create_frame()
{ {
CvSize size = {form.fmt.pix.width, form.fmt.pix.height}; CV_Assert(form.fmt.pix.width <= (uint)std::numeric_limits<int>::max());
CV_Assert(form.fmt.pix.height <= (uint)std::numeric_limits<int>::max());
CvSize size = {(int)form.fmt.pix.width, (int)form.fmt.pix.height};
int channels = 3; int channels = 3;
int depth = IPL_DEPTH_8U; int depth = IPL_DEPTH_8U;