diff --git a/modules/dnn/samples/caffe_googlenet.cpp b/modules/dnn/samples/caffe_googlenet.cpp index 9bf988a91..240171a39 100644 --- a/modules/dnn/samples/caffe_googlenet.cpp +++ b/modules/dnn/samples/caffe_googlenet.cpp @@ -88,19 +88,12 @@ int main(int argc, char **argv) String modelBin = "bvlc_googlenet.caffemodel"; String imageFile = (argc > 1) ? argv[1] : "space_shuttle.jpg"; - //! [Create the importer of Caffe model] - Ptr importer; - try //Try to import Caffe GoogleNet model - { - importer = dnn::createCaffeImporter(modelTxt, modelBin); - } - catch (const cv::Exception &err) //Importer can throw errors, we will catch them - { - std::cerr << err.msg << std::endl; - } - //! [Create the importer of Caffe model] + //! [Read and initialize network] + Net net = dnn::readNetFromCaffe(modelTxt, modelBin); + //! [Read and initialize network] - if (!importer) + //! [Check that net was read successfully] + if (net.empty()) { std::cerr << "Can't load network by using the following files: " << std::endl; std::cerr << "prototxt: " << modelTxt << std::endl; @@ -109,12 +102,7 @@ int main(int argc, char **argv) std::cerr << "http://dl.caffe.berkeleyvision.org/bvlc_googlenet.caffemodel" << std::endl; exit(-1); } - - //! [Initialize network] - dnn::Net net; - importer->populateNet(net); - importer.release(); //We don't need importer anymore - //! [Initialize network] + //! [Check that net was read successfully] //! [Prepare blob] Mat img = imread(imageFile);