From e73b06bbb81d487e79b849e9dbbffaeda9aaba71 Mon Sep 17 00:00:00 2001
From: nihuini <nihuini@tencent.com>
Date: Mon, 4 Nov 2019 11:16:54 +0800
Subject: [PATCH] fix build with NCNN_STRING=OFF

---
 src/datareader.cpp | 8 ++++++++
 src/datareader.h   | 8 ++++++++
 src/net.cpp        | 2 ++
 src/net.h          | 2 ++
 4 files changed, 20 insertions(+)

diff --git a/src/datareader.cpp b/src/datareader.cpp
index 12f54cebd..f75c2944b 100644
--- a/src/datareader.cpp
+++ b/src/datareader.cpp
@@ -21,10 +21,12 @@ DataReader::~DataReader()
 {
 }
 
+#if NCNN_STRING
 int DataReader::scan(const char* /*format*/, void* /*p*/) const
 {
     return 0;
 }
+#endif // NCNN_STRING
 
 int DataReader::read(void* /*buf*/, int /*size*/) const
 {
@@ -36,10 +38,12 @@ DataReaderFromStdio::DataReaderFromStdio(FILE* _fp) : fp(_fp)
 {
 }
 
+#if NCNN_STRING
 int DataReaderFromStdio::scan(const char* format, void* p) const
 {
     return fscanf(fp, format, p);
 }
+#endif // NCNN_STRING
 
 int DataReaderFromStdio::read(void* buf, int size) const
 {
@@ -51,6 +55,7 @@ DataReaderFromMemory::DataReaderFromMemory(const unsigned char*& _mem) : mem(_me
 {
 }
 
+#if NCNN_STRING
 int DataReaderFromMemory::scan(const char* format, void* p) const
 {
     int fmtlen = strlen(format);
@@ -66,6 +71,7 @@ int DataReaderFromMemory::scan(const char* format, void* p) const
 
     return nconsumed > 0 ? nscan : 0;
 }
+#endif // NCNN_STRING
 
 int DataReaderFromMemory::read(void* buf, int size) const
 {
@@ -79,6 +85,7 @@ DataReaderFromAndroidAsset::DataReaderFromAndroidAsset(AAsset* _asset) : asset(_
 {
 }
 
+#if NCNN_STRING
 int DataReaderFromAndroidAsset::scan(const char* format, void* p) const
 {
     if (!mem)
@@ -106,6 +113,7 @@ int DataReaderFromAndroidAsset::scan(const char* format, void* p) const
 
     return nscan;
 }
+#endif // NCNN_STRING
 
 int DataReaderFromAndroidAsset::read(void* buf, int size) const
 {
diff --git a/src/datareader.h b/src/datareader.h
index ee460d6d5..b959bbb4a 100644
--- a/src/datareader.h
+++ b/src/datareader.h
@@ -30,9 +30,11 @@ class DataReader
 public:
     virtual ~DataReader();
 
+#if NCNN_STRING
     // parse plain param text
     // return 1 if scan success
     virtual int scan(const char* format, void* p) const;
+#endif // NCNN_STRING
 
     // read binary param and model data
     // return bytes read
@@ -45,7 +47,9 @@ class DataReaderFromStdio : public DataReader
 public:
     DataReaderFromStdio(FILE* fp);
 
+#if NCNN_STRING
     virtual int scan(const char* format, void* p) const;
+#endif // NCNN_STRING
     virtual int read(void* buf, int size) const;
 
 protected:
@@ -58,7 +62,9 @@ class DataReaderFromMemory : public DataReader
 public:
     DataReaderFromMemory(const unsigned char*& mem);
 
+#if NCNN_STRING
     virtual int scan(const char* format, void* p) const;
+#endif // NCNN_STRING
     virtual int read(void* buf, int size) const;
 
 protected:
@@ -71,7 +77,9 @@ class DataReaderFromAndroidAsset : public DataReader
 public:
     DataReaderFromAndroidAsset(AAsset* asset);
 
+#if NCNN_STRING
     virtual int scan(const char* format, void* p) const;
+#endif // NCNN_STRING
     virtual int read(void* buf, int size) const;
 
 protected:
diff --git a/src/net.cpp b/src/net.cpp
index 70fa5f322..2d835ce65 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -121,6 +121,7 @@ int Net::register_custom_layer(int index, layer_creator_func creator)
     return 0;
 }
 
+#if NCNN_STRING
 int Net::load_param(const DataReader& dr)
 {
 #define SCAN_VALUE(fmt, v) \
@@ -270,6 +271,7 @@ int Net::load_param(const DataReader& dr)
 #undef SCAN_VALUE
     return 0;
 }
+#endif // NCNN_STRING
 
 int Net::load_param_bin(const DataReader& dr)
 {
diff --git a/src/net.h b/src/net.h
index 67d310ce9..ca44d834b 100644
--- a/src/net.h
+++ b/src/net.h
@@ -65,7 +65,9 @@ public:
     // return 0 if success
     int register_custom_layer(int index, layer_creator_func creator);
 
+#if NCNN_STRING
     int load_param(const DataReader& dr);
+#endif // NCNN_STRING
 
     int load_param_bin(const DataReader& dr);