mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 04:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2112 from SFML/2.6.x

Browse Source 
Merge 2.6.x to master
This commit is contained in:
Lukas Dürrenberger 2022-06-03 17:59:50 +02:00 committed by GitHub
commit 864f0feedd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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];
// Skip the \r char to avoid weird graphical issues
if (curChar == '\r')
if (curChar == L'\r')
continue;
// 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> itEnd;
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)