Merge pull request #11419 from alalek:msvs2017_build_warning

c67613e0 · Alexander Alekhin · 4934f7c5 · 65b0b319 · c67613e0
Commit c67613e0 authored Apr 28, 2018 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

prior_box_layer.cpp modules/dnn/src/layers/prior_box_layer.cpp +3 -1

No files found.
--- a/modules/dnn/src/layers/prior_box_layer.cpp
+++ b/modules/dnn/src/layers/prior_box_layer.cpp
@@ -205,7 +205,9 @@ public:

        if (_explicitSizes)
        {
-            CV_Assert(_aspectRatios.empty(), !params.has("min_size"), !params.has("max_size"));
+            CV_Assert(_aspectRatios.empty());
+            CV_Assert(!params.has("min_size"));
+            CV_Assert(!params.has("max_size"));
            _boxWidths = widths;
            _boxHeights = heights;
        }