Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Image::flipVertically(), Image::flipHorizontally() optimizations. #555

Merged
merged 1 commit into from
Mar 30, 2014
Merged

Image::flipVertically(), Image::flipHorizontally() optimizations. #555

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions src/SFML/Graphics/Image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,20 +271,19 @@ void Image::flipHorizontally()
{
if (!m_pixels.empty())
{
std::vector<Uint8> before = m_pixels;
for (unsigned int y = 0; y < m_size.y; ++y)
std::size_t rowSize = m_size.x * 4;

for (std::size_t y = 0; y < m_size.y; ++y)
{
const Uint8* source = &before[y * m_size.x * 4];
Uint8* dest = &m_pixels[(y + 1) * m_size.x * 4 - 4];
for (unsigned int x = 0; x < m_size.x; ++x)
std::vector<Uint8>::iterator left = m_pixels.begin() + y * rowSize;
std::vector<Uint8>::iterator right = m_pixels.begin() + (y + 1) * rowSize - 4;

for (std::size_t x = 0; x < m_size.x / 2; ++x)
{
dest[0] = source[0];
dest[1] = source[1];
dest[2] = source[2];
dest[3] = source[3];
std::swap_ranges(left, left + 4, right);

source += 4;
dest -= 4;
left += 4;
right -= 4;
}
}
}
Expand All @@ -296,16 +295,17 @@ void Image::flipVertically()
{
if (!m_pixels.empty())
{
std::vector<Uint8> before = m_pixels;
const Uint8* source = &before[m_size.x * (m_size.y - 1) * 4];
Uint8* dest = &m_pixels[0];
std::size_t rowSize = m_size.x * 4;

for (unsigned int y = 0; y < m_size.y; ++y)
std::vector<Uint8>::iterator top = m_pixels.begin();
std::vector<Uint8>::iterator bottom = m_pixels.end() - rowSize;

for (std::size_t y = 0; y < m_size.y / 2; ++y)
{
std::memcpy(dest, source, rowSize);
source -= rowSize;
dest += rowSize;
std::swap_ranges(top, top + rowSize, bottom);

top += rowSize;
bottom -= rowSize;
}
}
}
Expand Down