Merge pull request #10938 from mshabunin:fix-static-issues-9

This commit is contained in:
Alexander Alekhin 2018-03-02 11:34:52 +00:00
commit fda7bb95d0
2 changed files with 3 additions and 0 deletions

View File

@ -323,6 +323,8 @@ public:
#if CV_SIMD128
const int* ofsptr = ofsbuf.empty() ? 0 : (const int*)&ofsbuf[0];
if (poolingType == MAX && !compMaxIdx && !ofsptr)
CV_Error(Error::StsBadArg, "ofsbuf should be initialized in this mode");
v_float32x4 idx00(0.f, (float)stride_w, (float)(stride_w*2), (float)(stride_w*3));
v_float32x4 ones = v_setall_f32(1.f);
v_float32x4 idx_delta = v_setall_f32((float)(inp_width - kernel_w));

View File

@ -775,6 +775,7 @@ bool TiffEncoder::writeLibTiff( const std::vector<Mat>& img_vec, const std::vect
}
default:
{
TIFFClose(pTiffHandle);
return false;
}
}