Added testdata images. Fixed Dict copy constructor.

modules/dnn/include/opencv2/dnn/dict.hpp

@@ -256,7 +256,14 @@ inline DictValue & DictValue::operator=(const DictValue &r)
 
 inline DictValue::DictValue(const DictValue &r)
 {
-    *this = r;
+    type = r.type;
+
+    if (r.type == Param::INT)
+        pi = new AutoBuffer<int64, 1>(*r.pi);
+    else if (r.type == Param::STRING)
+        ps = new AutoBuffer<String, 1>(*r.ps);
+    else if (r.type == Param::REAL)
+        pd = new AutoBuffer<double, 1>(*r.pd);
 }
 
 inline bool DictValue::isString() const

modules/dnn/src/dnn.cpp

@@ -525,5 +525,11 @@ Ptr<Layer> LayerRegister::createLayerInstance(const String &_type, LayerParams&
     }
 }
 
+int Net::getLayerId(LayerId)
+{
+    CV_Error(Error::StsNotImplemented, "");
+    return -1;
+}
+
 }
 }

modules/dnn/test/test_googlenet.cpp

@@ -25,8 +25,8 @@ TEST(Reproducibility_GoogLeNet, Accuracy)
     }
 
     std::vector<Mat> inpMats;
-    inpMats.push_back( imread(getTestFile("googlenet_0.png")) );
-    inpMats.push_back( imread(getTestFile("googlenet_1.png")) );
+    inpMats.push_back( imread(getTestFile("googlenet_0.jpg")) );
+    inpMats.push_back( imread(getTestFile("googlenet_1.jpg")) );
     ASSERT_TRUE(!inpMats[0].empty() && !inpMats[1].empty());
 
     Blob inp(inpMats);
@@ -34,7 +34,7 @@ TEST(Reproducibility_GoogLeNet, Accuracy)
     net.forward();
 
     Blob out = net.getBlob("prob");
-    Blob ref = blobFromNPY(getTestFile("googlenet.npy"));
+    Blob ref = blobFromNPY(getTestFile("googlenet_prob.npy"));
     normAssert(out, ref);
 }