Browse Source

fix build with NCNN_STRING=OFF

tags/20191113
nihuini 6 years ago
parent
commit
e73b06bbb8
4 changed files with 20 additions and 0 deletions
  1. +8
    -0
      src/datareader.cpp
  2. +8
    -0
      src/datareader.h
  3. +2
    -0
      src/net.cpp
  4. +2
    -0
      src/net.h

+ 8
- 0
src/datareader.cpp View File

@@ -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
{


+ 8
- 0
src/datareader.h View File

@@ -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:


+ 2
- 0
src/net.cpp View File

@@ -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)
{


+ 2
- 0
src/net.h View File

@@ -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);



Loading…
Cancel
Save