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

9fb8f634 · Alexander Alekhin · Alexander Alekhin · 7f73b105 · 9fb8f634
Commit 9fb8f634 authored Aug 24, 2018 by Alexander Alekhin Committed by Alexander Alekhin Aug 27, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 6 deletions

system.cpp modules/core/src/system.cpp +1 -6

No files found.
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@@ -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());
 }