mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-09 23:34:20 +00:00
Code Activity

Image: Respect pixelStride when converting between image formats

Browse source 
Previously, this code assumed that a single channel image would always
have a pixel stride of 1. For image types where this assumption did not
hold, such as OpenGL, this function would produce incorrect results.
This commit is contained in:
reuk 2025-05-15 19:27:23 +01:00
parent 1fcdd29bf9
commit 86732069c7
No known key found for this signature in database
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/juce_graphics/images/juce_Image.cpp
View file

@ -768,7 +768,7 @@ Image Image::convertedToFormat (PixelFormat newFormat) const
auto type = image->createType();
Image newImage (type->create (newFormat, w, h, false));
if (newFormat == SingleChannel)
if (newImage.getFormat() == SingleChannel)
{
if (! hasAlphaChannel())
{
@ -781,26 +781,28 @@ Image Image::convertedToFormat (PixelFormat newFormat) const
for (int y = 0; y < h; ++y)
{
auto src = reinterpret_cast<const PixelARGB*> (srcData.getLinePointer (y));
auto dst = destData.getLinePointer (y);
for (int x = 0; x < w; ++x)
dst[x] = src[x].getAlpha();
{
auto* dstPtr = reinterpret_cast<PixelAlpha*> (destData.getPixelPointer (x, y));
auto* srcPtr = reinterpret_cast<const PixelARGB*> (srcData.getPixelPointer (x, y));
dstPtr->set (*srcPtr);
}
}
}
}
else if (image->pixelFormat == SingleChannel && newFormat == Image::ARGB)
else if (image->pixelFormat == SingleChannel && newImage.getFormat() == ARGB)
{
const BitmapData destData (newImage, { w, h }, BitmapData::writeOnly);
const BitmapData srcData (*this, { w, h }, BitmapData::readOnly);
for (int y = 0; y < h; ++y)
{
auto src = reinterpret_cast<const PixelAlpha*> (srcData.getLinePointer (y));
auto dst = reinterpret_cast<PixelARGB*> (destData.getLinePointer (y));
for (int x = 0; x < w; ++x)
dst[x].set (src[x]);
{
auto* dstPtr = reinterpret_cast<PixelARGB*> (destData.getPixelPointer (x, y));
auto* srcPtr = reinterpret_cast<const PixelAlpha*> (srcData.getPixelPointer (x, y));
dstPtr->set (*srcPtr);
}
}
}
else