Merge pull request #1135 from sovrasov:dnn_build_fix

vpisarev · vpisarev · commit 455d178763a3 · 2017-04-25T15:46:45.000Z
diff --git a/modules/dnn/src/torch/torch_importer.cpp b/modules/dnn/src/torch/torch_importer.cpp
@@ -972,16 +972,16 @@ Mat readTorchBlob(const String &filename, bool isBinary)
 }
 #else
 
-Ptr<Importer> createTorchImporter(const String &filename, bool isBinary)
+Ptr<Importer> createTorchImporter(const String&, bool)
 {
     CV_Error(Error::StsNotImplemented, "Torch importer is disabled in current build");
     return Ptr<Importer>();
 }
 
-Blob readTorchBlob(const String &filename, bool isBinary)
+Mat readTorchBlob(const String&, bool)
 {
     CV_Error(Error::StsNotImplemented, "Torch importer is disabled in current build");
-    return Blob();
+    return Mat();
 }
 
 #endif //defined(ENABLE_TORCH_IMPORTER) && ENABLE_TORCH_IMPORTER

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