dockerfile/openalpr-base
1
0
Fork 0
mirror of https://github.com/kerberos-io/openalpr-base.git synced 2025-10-08 00:41:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Allow main config file to be missing, as long as default is available

Browse Source
This commit is contained in:
Matt Hill
2016-03-25 09:12:05 -04:00
parent 510b39ceb6
commit 747acb6d96
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openalpr/config.cpp
View File

@@ -66,7 +66,7 @@ namespace alpr
} }
if (fileExists(config_file_path.c_str()) == false) if (fileExists(config_file_path.c_str()) == false && fileExists(CONFIG_FILE_TEMPLATE_LOCATION) == false)
{ {
std::cerr << "--(!) Config file '" << config_file_path << "' does not exist!" << endl; std::cerr << "--(!) Config file '" << config_file_path << "' does not exist!" << endl;
std::cerr << "--(!) You can specify the configuration file location via the command line " << endl; std::cerr << "--(!) You can specify the configuration file location via the command line " << endl;

8
src/openalpr/config_helper.cpp
View File

@@ -113,7 +113,7 @@ namespace alpr
int getInt(CSimpleIniA* ini, CSimpleIniA* defaultIni, std::string section, std::string key, int defaultValue) int getInt(CSimpleIniA* ini, CSimpleIniA* defaultIni, std::string section, std::string key, int defaultValue)
{ {
if (hasValue(ini, section, key)) if (ini != NULL && hasValue(ini, section, key))
return getInt(ini, section, key, defaultValue); return getInt(ini, section, key, defaultValue);
if (defaultIni != NULL && hasValue(defaultIni, section, key)) if (defaultIni != NULL && hasValue(defaultIni, section, key))
@@ -125,7 +125,7 @@ namespace alpr
} }
float getFloat(CSimpleIniA* ini, CSimpleIniA* defaultIni, std::string section, std::string key, float defaultValue) float getFloat(CSimpleIniA* ini, CSimpleIniA* defaultIni, std::string section, std::string key, float defaultValue)
{ {
if (hasValue(ini, section, key)) if (ini != NULL && hasValue(ini, section, key))
return getFloat(ini, section, key, defaultValue); return getFloat(ini, section, key, defaultValue);
if (defaultIni != NULL && hasValue(defaultIni, section, key)) if (defaultIni != NULL && hasValue(defaultIni, section, key))
@@ -137,7 +137,7 @@ namespace alpr
} }
std::string getString(CSimpleIniA* ini, CSimpleIniA* defaultIni, std::string section, std::string key, std::string defaultValue) std::string getString(CSimpleIniA* ini, CSimpleIniA* defaultIni, std::string section, std::string key, std::string defaultValue)
{ {
if (hasValue(ini, section, key)) if (ini != NULL && hasValue(ini, section, key))
return getString(ini, section, key, defaultValue); return getString(ini, section, key, defaultValue);
if (defaultIni != NULL && hasValue(defaultIni, section, key)) if (defaultIni != NULL && hasValue(defaultIni, section, key))
@@ -148,7 +148,7 @@ namespace alpr
} }
bool getBoolean(CSimpleIniA* ini, CSimpleIniA* defaultIni, std::string section, std::string key, bool defaultValue) bool getBoolean(CSimpleIniA* ini, CSimpleIniA* defaultIni, std::string section, std::string key, bool defaultValue)
{ {
if (hasValue(ini, section, key)) if (ini != NULL && hasValue(ini, section, key))
return getBoolean(ini, section, key, defaultValue); return getBoolean(ini, section, key, defaultValue);
if (defaultIni != NULL && hasValue(defaultIni, section, key)) if (defaultIni != NULL && hasValue(defaultIni, section, key))