core: don't call std::string(NULL)

This commit is contained in:
Alexander Alekhin 2018-08-24 09:11:10 +00:00 committed by Alexander Alekhin
parent 7f73b105ca
commit 9fb8f6347f

View File

@ -1655,12 +1655,7 @@ cv::String utils::getConfigurationParameterString(const char* name, const char*
#else
const char* envValue = getenv(name);
#endif
if (envValue == NULL)
{
return defaultValue;
}
cv::String value = envValue;
return value;
return envValue ? cv::String(envValue) : (defaultValue ? cv::String(defaultValue) : cv::String());
}