Merge pull request #972 from sovrasov:dnn_torch_python_fix

0b3b096f · Alexander Alekhin · 68e19d50 · 7c7c2848 · 0b3b096f
Commit 0b3b096f authored Jan 26, 2017 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

torch_importer.cpp modules/dnn/src/torch/torch_importer.cpp +6 -0

No files found.
--- a/modules/dnn/src/torch/torch_importer.cpp
+++ b/modules/dnn/src/torch/torch_importer.cpp
@@ -972,6 +972,12 @@ Ptr<Importer> createTorchImporter(const String &filename, bool isBinary)
    return Ptr<Importer>();
 }

+Blob readTorchBlob(const String &filename, bool isBinary)
+{
+    CV_Error(Error::StsNotImplemented, "Torch importer is disabled in current build");
+    return Blob();
+}
+
 #endif //defined(ENABLE_TORCH_IMPORTER) && ENABLE_TORCH_IMPORTER
 }
 }