Caffe importer cleanup

Author: omrope79

modules/dnn_objdetect/README.md

@@ -52,7 +52,7 @@ Here's the brief summary of examples. For detailed usage and testing, refer `tut
 
 ```c++
 // Read the net along with it's trained weights
-cv::dnn::net = cv::dnn::readNetFromCaffe(model_defn, model_weights);
+cv::dnn::Net net = cv::dnn::readNet(model_weights, model_defn);
 
 // Read an image
 cv::Mat image = cv::imread(image_file);

modules/dnn_objdetect/samples/image_classification.cpp

@@ -20,7 +20,7 @@ int main(int argc, char **argv)
     cv::String model_prototxt = argv[1];
     cv::String model_binary = argv[2];
     cv::String test_image = argv[3];
-    cv::dnn::Net net = cv::dnn::readNetFromCaffe(model_prototxt, model_binary);
+    cv::dnn::Net net = cv::dnn::readNet(model_binary, model_prototxt);
 
     if (net.empty())
     {

modules/dnn_objdetect/samples/obj_detect.cpp

@@ -42,7 +42,7 @@ int main(int argc, char **argv)
 
     // Load the network
     std::cout << "Loading the network...\n";
-    Net net = dnn::readNetFromCaffe(model_prototxt, model_binary);
+    Net net = dnn::readNet(model_binary, model_prototxt);
     if (net.empty())
     {
        std::cerr << "Couldn't load the model !\n";

modules/julia/gen/funclist.csv

@@ -292,7 +292,6 @@ cv.dnn.Net.getFLOPS
 cv.dnn.Net.getMemoryConsumption
 cv.dnn.Net.enableFusion
 cv.dnn.Net.getPerfProfile
-cv.dnn.readNetFromCaffe
 cv.dnn.readNetFromTensorflow
 cv.dnn.readNetFromTorch
 cv.dnn.readNet

modules/text/src/ocr_holistic.cpp

@@ -22,7 +22,7 @@ class OCRHolisticWordRecognizerImpl CV_FINAL : public OCRHolisticWordRecognizer
 public:
     OCRHolisticWordRecognizerImpl(const string &archFilename, const string &weightsFilename, const string &wordsFilename)
     {
-        net = dnn::readNetFromCaffe(archFilename, weightsFilename);
+        net = dnn::readNet(weightsFilename, archFilename);
         std::ifstream in(wordsFilename.c_str());
         if (!in)
         {

modules/text/src/text_detectorCNN.cpp

@@ -59,7 +59,7 @@ class TextDetectorCNNImpl : public TextDetectorCNN
     TextDetectorCNNImpl(const String& modelArchFilename, const String& modelWeightsFilename, std::vector<Size> detectionSizes) :
         sizes_(detectionSizes)
     {
-        net_ = readNetFromCaffe(modelArchFilename, modelWeightsFilename);
+        net_ = readNet(modelWeightsFilename, modelArchFilename);
         CV_Assert(!net_.empty());
         inputChannelCount_ = 3;
     }

modules/tracking/samples/tracking_by_matching.cpp

@@ -69,7 +69,7 @@ class DnnObjectDetector
         net_mean(net_mean),
         net_swapRB(net_swapRB)
     {
-        net = dnn::readNetFromCaffe(net_caffe_model_path, net_caffe_weights_path);
+        net = dnn::readNet(net_caffe_weights_path, net_caffe_model_path);
         if (net.empty())
             CV_Error(Error::StsError, "Cannot read Caffe net");
     }

modules/wechat_qrcode/src/detector/ssd_detector.cpp

@@ -10,7 +10,7 @@
 namespace cv {
 namespace wechat_qrcode {
 int SSDDetector::init(const string& proto_path, const string& model_path) {
-    net_ = dnn::readNetFromCaffe(proto_path, model_path);
+    net_ = dnn::readNet(model_path, proto_path);
     return 0;
 }
 

modules/wechat_qrcode/src/scale/super_scale.cpp

@@ -12,7 +12,7 @@
 namespace cv {
 namespace wechat_qrcode {
 int SuperScale::init(const std::string &proto_path, const std::string &model_path) {
-    srnet_ = dnn::readNetFromCaffe(proto_path, model_path);
+    srnet_ = dnn::readNet(model_path, proto_path);
     net_loaded_ = true;
     return 0;
 }