mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-05-27 21:20:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use std::string::c_str() rather than &s[0] where a const pointer is required.

Browse Source
This commit is contained in:
Tsuda Kageyu 2014-01-24 09:48:39 +09:00
parent 584bbc7c78
commit d0f3e9b186
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
taglib/toolkit/tstring.cpp
View File

@ -198,9 +198,9 @@ String::String(const std::string &s, Type t)
: d(new StringPrivate())
{
if(t == Latin1)
copyFromLatin1(&s[0], s.length());
copyFromLatin1(s.c_str(), s.length());
else if(t == String::UTF8)
copyFromUTF8(&s[0], s.length());
copyFromUTF8(s.c_str(), s.length());
else {
debug("String::String() -- A std::string should not contain UTF16.");
}
@ -778,8 +778,10 @@ void String::copyFromUTF8(const char *s, size_t length)
{
d->data.resize(length);
UTF8toUTF16(s, length, &d->data[0], d->data.size());
d->data.resize(::wcslen(d->data.c_str()));
if(length > 0) {
UTF8toUTF16(s, length, &d->data[0], d->data.size());
d->data.resize(::wcslen(d->data.c_str()));
}
}
void String::copyFromUTF16(const wchar_t *s, size_t length, Type t)