Merge pull request #1135 from sovrasov:dnn_build_fix

pull/1140/head
Vadim Pisarevsky 8 years ago
commit 455d178763
  1. 6
      modules/dnn/src/torch/torch_importer.cpp

@ -972,16 +972,16 @@ Mat readTorchBlob(const String &filename, bool isBinary)
} }
#else #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"); CV_Error(Error::StsNotImplemented, "Torch importer is disabled in current build");
return Ptr<Importer>(); 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"); CV_Error(Error::StsNotImplemented, "Torch importer is disabled in current build");
return Blob(); return Mat();
} }
#endif //defined(ENABLE_TORCH_IMPORTER) && ENABLE_TORCH_IMPORTER #endif //defined(ENABLE_TORCH_IMPORTER) && ENABLE_TORCH_IMPORTER

Loading…
Cancel
Save