From 96222f36c3d6b49e23c6adb05f305a73f05f60fb Mon Sep 17 00:00:00 2001 From: Vladislav Sovrasov Date: Tue, 25 Apr 2017 13:50:21 +0300 Subject: [PATCH] dnn: fix build without Torch --- modules/dnn/src/torch/torch_importer.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/dnn/src/torch/torch_importer.cpp b/modules/dnn/src/torch/torch_importer.cpp index 5bd22355a..5db8bac16 100644 --- 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 createTorchImporter(const String &filename, bool isBinary) +Ptr createTorchImporter(const String&, bool) { CV_Error(Error::StsNotImplemented, "Torch importer is disabled in current build"); return Ptr(); } -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