mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-05 22:19:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9806 from mshabunin:fix-static-7

Browse Source
This commit is contained in:
Vadim Pisarevsky 2017-10-09 12:09:55 +00:00
commit 593329401a
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/libjpeg/CMakeLists.txt vendored
View File

@ -38,7 +38,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set_source_files_properties(jcdctmgr.c PROPERTIES COMPILE_FLAGS "-O1")
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 /wd4013 /wd4244 /wd4267) # vs2005

7
modules/dnn/src/ocl4dnn/include/ocl4dnn.hpp
View File

@ -402,7 +402,10 @@ typedef enum {
struct OCL4DNNLRNConfig
{
OCL4DNNLRNConfig() :
phase_test(true)
lrn_type(LRNParameter_NormRegion_ACROSS_CHANNELS),
phase_test(true),
local_size(0), alpha(0.f), beta(0.f), k(0.f), norm_by_size(false),
batch_size(0), channels(0), height(0), width(0)
{}
MatShape in_shape;
LRNParameter_NormRegion_WITHIN_CHANNEL_t lrn_type;
@ -442,7 +445,7 @@ class OCL4DNNLRN
struct OCL4DNNSoftmaxConfig
{
OCL4DNNSoftmaxConfig()
OCL4DNNSoftmaxConfig() : axis(0), channels(0)
{}
MatShape in_shape;
int axis;

6
modules/videoio/src/cap_dc1394_v2.cpp
View File

@ -603,9 +603,9 @@ bool CvCaptureCAM_DC1394_v2_CPP::grabFrame()
cvInitImageHeader(&fhdr, cvSize(fc->size[0], fc->size[1]), 8, nch);
cvSetData(&fhdr, fc->image, fc->size[0]*nch);
// Swap R&B channels:
if (nch==3)
cvConvertImage(&fhdr,&fhdr,CV_CVTIMG_SWAP_RB);
// Swap R&B channels:
if (nch==3)
cvConvertImage(&fhdr,&fhdr,CV_CVTIMG_SWAP_RB);
if( rectify && cameraId == VIDERE && nimages == 2 )
{