Merge pull request #972 from sovrasov:dnn_torch_python_fix

alalek · alalek · commit 0b3b096fb207 · 2017-01-26T18:13:36.000Z
diff --git 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
 }
 }

Original file line number	Diff line number	Diff line change
`@@ -972,6 +972,12 @@ Ptr<Importer> createTorchImporter(const String &filename, bool isBinary)`
`972`	`972`	`return Ptr<Importer>();`
`973`	`973`	`}`
`974`	`974`
	`975`	`+Blob readTorchBlob(const String &filename, bool isBinary)`
	`976`	`+{`
	`977`	`+ CV_Error(Error::StsNotImplemented, "Torch importer is disabled in current build");`
	`978`	`+ return Blob();`
	`979`	`+}`
	`980`	`+`
`975`	`981`	`#endif //defined(ENABLE_TORCH_IMPORTER) && ENABLE_TORCH_IMPORTER`
`976`	`982`	`}`
`977`	`983`	`}`