Fix autodetection of input size for dnn networks

lloy1231 · Sep 30, 2019 · fba9fdf · fba9fdf
1 parent 507ca29
commit fba9fdf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/modules/dnn/src/dnn.cpp b/modules/dnn/src/dnn.cpp
@@ -2506,17 +2506,25 @@ struct Net::Impl
     {
         std::vector<LayerPin>& inputLayerIds = layers[id].inputBlobsId;
 
-        if (inOutShapes[0].in[0].empty() && !layers[0].outputBlobs.empty())
+        if (id == 0 && inOutShapes[id].in[0].empty())
         {
-            ShapesVec shapes;
-            for (int i = 0; i < layers[0].outputBlobs.size(); i++)
+            if (!layers[0].outputBlobs.empty())
             {
-                Mat& inp = layers[0].outputBlobs[i];
-                CV_Assert(inp.total());
-                shapes.push_back(shape(inp));
+                ShapesVec shapes;
+                for (int i = 0; i < layers[0].outputBlobs.size(); i++)
+                {
+                    Mat& inp = layers[0].outputBlobs[i];
+                    CV_Assert(inp.total());
+                    shapes.push_back(shape(inp));
+                }
+                inOutShapes[0].in = shapes;
             }
-            inOutShapes[0].in = shapes;
-         }
+            else
+            {
+                inOutShapes[0].out.clear();
+                return;
+            }
+        }
 
         if (inOutShapes[id].in.empty())
         {

diff --git a/modules/dnn/test/test_model.cpp b/modules/dnn/test/test_model.cpp
@@ -105,8 +105,7 @@ TEST_P(Test_Model, Classify)
 }
 
 
-// disabled: https://github.com/opencv/opencv/pull/15593
-TEST_P(Test_Model, DISABLED_DetectRegion)
+TEST_P(Test_Model, DetectRegion)
 {
     applyTestTag(CV_TEST_TAG_LONG, CV_TEST_TAG_MEMORY_1GB);