mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

avoid allocating memory for string with a length of zero.

Browse Source 
Remove the specifier "explicit", because the constructor has no parameter. There is no point to add it here.
This commit is contained in:
Fangjun KUANG 2017-04-07 20:46:17 +02:00
parent 0a63ab36bb
commit ff31d069d0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/include/opencv2/core/cvstd.hpp
View File

@ -489,7 +489,7 @@ public:
static const size_t npos = size_t(-1); static const size_t npos = size_t(-1);
explicit String(); String();
String(const String& str); String(const String& str);
String(const String& str, size_t pos, size_t len = npos); String(const String& str, size_t pos, size_t len = npos);
String(const char* s); String(const char* s);
@ -627,6 +627,7 @@ String::String(const char* s, size_t n)
: cstr_(0), len_(0) : cstr_(0), len_(0)
{ {
if (!n) return; if (!n) return;
if (!s) return;
memcpy(allocate(n), s, n); memcpy(allocate(n), s, n);
} }
@ -634,6 +635,7 @@ inline
String::String(size_t n, char c) String::String(size_t n, char c)
: cstr_(0), len_(0) : cstr_(0), len_(0)
{ {
if (!n) return;
memset(allocate(n), c, n); memset(allocate(n), c, n);
} }
@ -642,6 +644,7 @@ String::String(const char* first, const char* last)
: cstr_(0), len_(0) : cstr_(0), len_(0)
{ {
size_t len = (size_t)(last - first); size_t len = (size_t)(last - first);
if (!len) return;
memcpy(allocate(len), first, len); memcpy(allocate(len), first, len);
} }
@ -650,6 +653,7 @@ String::String(Iterator first, Iterator last)
: cstr_(0), len_(0) : cstr_(0), len_(0)
{ {
size_t len = (size_t)(last - first); size_t len = (size_t)(last - first);
if (!len) return;
char* str = allocate(len); char* str = allocate(len);
while (first != last) while (first != last)
{ {