potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #10375 from tomoaki0705:buildWarningMSVC

Browse Source
This commit is contained in:
Alexander Alekhin
2017-12-22 13:17:11 +00:00
parent 4e542a65a3 fe7b3f1228
commit 83b8cd0152
11 changed files with 4 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/src/canny.cpp
-4
View File
@@ -47,10 +47,6 @@
#include "opencv2/core/openvx/ovx_defs.hpp"
#ifdef _MSC_VER
#pragma warning( disable: 4127 ) // conditional expression is constant
#endif
#if CV_SIMD128
#define CV_MALLOC_SIMD128 16
#endif