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

MacOS: Fixed some more integer overflow issues when loading large images

Browse source
This commit is contained in:
Tom Poole 2017-11-21 16:32:56 +00:00
parent f2261faee7
commit 856e028127
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -87,7 +87,7 @@ public:
pixelStride (format_ == Image::RGB ? 3 : ((format_ == Image::ARGB) ? 4 : 1)),
lineStride ((pixelStride * jmax (1, w) + 3) & ~3)
{
imageData.allocate ((size_t) (lineStride * jmax (1, h)), clearImage);
imageData.allocate ((size_t) lineStride * (size_t) jmax (1, h), clearImage);
}
LowLevelGraphicsContext* createLowLevelContext() override
@ -98,7 +98,7 @@ public:
void initialiseBitmapData (Image::BitmapData& bitmap, int x, int y, Image::BitmapData::ReadWriteMode mode) override
{
bitmap.data = imageData + x * pixelStride + y * lineStride;
bitmap.data = imageData + (size_t) x * (size_t) pixelStride + (size_t) y * (size_t) lineStride;
bitmap.pixelFormat = pixelFormat;
bitmap.lineStride = lineStride;
bitmap.pixelStride = pixelStride;
@ -110,7 +110,7 @@ public:
ImagePixelData::Ptr clone() override
{
SoftwarePixelData* s = new SoftwarePixelData (pixelFormat, width, height, false);
memcpy (s->imageData, imageData, (size_t) (lineStride * height));
memcpy (s->imageData, imageData, (size_t) lineStride * (size_t) height);
return s;
}