Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.6.x'

Browse Source
This commit is contained in:
Lukas Dürrenberger 2022-06-03 17:08:06 +02:00
commit 417f003224
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SFML/Graphics/Text.cpp
View File

@ -453,7 +453,7 @@ void Text::ensureGeometryUpdate() const
Uint32 curChar = m_string[i]; Uint32 curChar = m_string[i];
// Skip the \r char to avoid weird graphical issues // Skip the \r char to avoid weird graphical issues
if (curChar == '\r') if (curChar == L'\r')
continue; continue;
// Apply the kerning offset // Apply the kerning offset

5
src/SFML/Network/Http.cpp
View File

@ -246,7 +246,10 @@ void Http::Response::parse(const std::string& data)
std::istreambuf_iterator<char> it(in); std::istreambuf_iterator<char> it(in);
std::istreambuf_iterator<char> itEnd; std::istreambuf_iterator<char> itEnd;
for (std::size_t i = 0; ((i < length) && (it != itEnd)); ++i) for (std::size_t i = 0; ((i < length) && (it != itEnd)); ++i)
m_body.push_back(*it++); {
m_body.push_back(*it);
++it; // Iterate in separate expression to work around false positive -Wnull-dereference warning in GCC 12.1.0
}
} }
// Drop the rest of the line (chunk-extension) // Drop the rest of the line (chunk-extension)