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: Update return type of getPixelData to avoid dangling pointers

Browse source
This commit is contained in:
reuk 2024-12-03 19:41:43 +00:00
parent 0be5ad1afc
commit dcca72484f
9 changed files with 22 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -103,15 +103,14 @@ public:
{
jassert (getReferenceCount() > 0); // (This method can't be used on an unowned pointer, as it will end up self-deleting)
auto type = createType();
Image newImage (type->create (pixelFormat, area.getWidth(), area.getHeight(), pixelFormat != Image::RGB));
auto result = type->create (pixelFormat, area.getWidth(), area.getHeight(), pixelFormat != Image::RGB);
{
Graphics g (newImage);
Graphics g { Image { result } };
g.drawImageAt (Image (*this), 0, 0);
}
return *newImage.getPixelData();
return result;
}
std::unique_ptr<ImageType> createType() const override { return sourceImage->createType(); }
@ -735,7 +734,7 @@ void Image::moveImageSection (int dx, int dy,
void ImageEffects::applyGaussianBlurEffect (float radius, const Image& input, Image& result)
{
auto* image = input.getPixelData();
auto image = input.getPixelData();
if (image == nullptr)
{
@ -806,7 +805,7 @@ static void blurSingleChannelImage (Image& image, int radius)
void ImageEffects::applySingleChannelBoxBlurEffect (int radius, const Image& input, Image& result)
{
auto* image = input.getPixelData();
auto image = input.getPixelData();
if (image == nullptr)
{

2
modules/juce_graphics/images/juce_Image.h
View file

@ -418,7 +418,7 @@ public:
//==============================================================================
/** @internal */
ImagePixelData* getPixelData() const noexcept { return image.get(); }
ReferenceCountedObjectPtr<ImagePixelData> getPixelData() const noexcept { return image; }
/** @internal */
explicit Image (ReferenceCountedObjectPtr<ImagePixelData>) noexcept;

8
modules/juce_graphics/native/juce_CoreGraphicsContext_mac.mm
View file

@ -104,7 +104,7 @@ public:
//==============================================================================
static CGImageRef getCachedImageRef (const Image& juceImage, CGColorSpaceRef colourSpace)
{
auto cgim = dynamic_cast<CoreGraphicsPixelData*> (juceImage.getPixelData());
auto cgim = dynamic_cast<CoreGraphicsPixelData*> (juceImage.getPixelData().get());
if (cgim != nullptr && cgim->cachedImageRef != nullptr)
return CGImageRetain (cgim->cachedImageRef.get());
@ -123,7 +123,7 @@ public:
const auto provider = [&]
{
if (auto* cgim = dynamic_cast<CoreGraphicsPixelData*> (juceImage.getPixelData()))
if (auto* cgim = dynamic_cast<CoreGraphicsPixelData*> (juceImage.getPixelData().get()))
{
return detail::DataProviderPtr { CGDataProviderCreateWithData (new ImageDataContainer::Ptr (cgim->imageData),
srcData.data,
@ -1033,7 +1033,7 @@ Image juce_loadWithCoreImage (InputStream& input)
(int) CGImageGetHeight (loadedImage),
hasAlphaChan));
auto cgImage = dynamic_cast<CoreGraphicsPixelData*> (image.getPixelData());
auto cgImage = dynamic_cast<CoreGraphicsPixelData*> (image.getPixelData().get());
jassert (cgImage != nullptr); // if USE_COREGRAPHICS_RENDERING is set, the CoreGraphicsPixelData class should have been used.
CGContextDrawImage (cgImage->context.get(), convertToCGRect (image.getBounds()), loadedImage);
@ -1070,7 +1070,7 @@ CGImageRef juce_createCoreGraphicsImage (const Image& juceImage, CGColorSpaceRef
CGContextRef juce_getImageContext (const Image& image)
{
if (auto cgi = dynamic_cast<CoreGraphicsPixelData*> (image.getPixelData()))
if (auto cgi = dynamic_cast<CoreGraphicsPixelData*> (image.getPixelData().get()))
return cgi->context.get();
jassertfalse;

8
modules/juce_graphics/native/juce_Direct2DGraphicsContext_windows.cpp
View file

@ -340,7 +340,7 @@ public:
const auto d2d1Bitmap = [&]
{
if (auto direct2DPixelData = dynamic_cast<Direct2DPixelData*> (fillType.image.getPixelData()))
if (auto direct2DPixelData = dynamic_cast<Direct2DPixelData*> (fillType.image.getPixelData().get()))
if (const auto page = direct2DPixelData->getFirstPageForContext (context))
if (page->GetPixelFormat().format == DXGI_FORMAT_B8G8R8A8_UNORM)
return page;
@ -1170,7 +1170,7 @@ void Direct2DGraphicsContext::clipToImageAlpha (const Image& sourceImage, const
// Is this a Direct2D image already?
ComSmartPtr<ID2D1Bitmap> d2d1Bitmap;
if (auto direct2DPixelData = dynamic_cast<Direct2DPixelData*> (sourceImage.getPixelData()))
if (auto direct2DPixelData = dynamic_cast<Direct2DPixelData*> (sourceImage.getPixelData().get()))
d2d1Bitmap = direct2DPixelData->getFirstPageForContext (deviceContext);
if (! d2d1Bitmap)
@ -1454,7 +1454,7 @@ void Direct2DGraphicsContext::drawImage (const Image& imageIn, const AffineTrans
const auto imageTransform = currentState->currentTransform.getTransformWith (transform);
if (auto* subsectionPixelData = dynamic_cast<SubsectionPixelData*> (image.getPixelData()))
if (auto* subsectionPixelData = dynamic_cast<SubsectionPixelData*> (image.getPixelData().get()))
{
if (auto direct2DPixelData = dynamic_cast<Direct2DPixelData*> (subsectionPixelData->getSourcePixelData().get()))
{
@ -1462,7 +1462,7 @@ void Direct2DGraphicsContext::drawImage (const Image& imageIn, const AffineTrans
imageClipArea = subsectionPixelData->getSubsection();
}
}
else if (auto direct2DPixelData = dynamic_cast<Direct2DPixelData*> (image.getPixelData()))
else if (auto direct2DPixelData = dynamic_cast<Direct2DPixelData*> (image.getPixelData().get()))
{
nativeBitmap = direct2DPixelData;
imageClipArea = { direct2DPixelData->width, direct2DPixelData->height };

6
modules/juce_graphics/native/juce_Direct2DImage_windows.cpp
View file

@ -524,7 +524,7 @@ void Direct2DPixelData::initialiseBitmapData (Image::BitmapData& bitmap,
void Direct2DPixelData::applyGaussianBlurEffect (float radius, Image& result)
{
// The result must be a separate image!
jassert (result.getPixelData() != this);
jassert (result.getPixelData().get() != this);
const auto adapter = directX->adapters.getDefaultAdapter();
@ -571,7 +571,7 @@ void Direct2DPixelData::applyGaussianBlurEffect (float radius, Image& result)
void Direct2DPixelData::applySingleChannelBoxBlurEffect (int radius, Image& result)
{
// The result must be a separate image!
jassert (result.getPixelData() != this);
jassert (result.getPixelData().get() != this);
const auto adapter = directX->adapters.getDefaultAdapter();
@ -778,7 +778,7 @@ public:
const auto maxPageBounds = [&]
{
if (auto* data = dynamic_cast<Direct2DPixelData*> (d2dImage.getPixelData()))
if (auto* data = dynamic_cast<Direct2DPixelData*> (d2dImage.getPixelData().get()))
if (auto pages = data->getPagesForContext (contextToUse); ! pages.empty())
return pages.front().getBounds();

2
modules/juce_gui_basics/native/juce_Windowing_windows.cpp
View file

@ -4977,7 +4977,7 @@ private:
peer.handlePaint (*context);
}
auto* image = static_cast<WindowsBitmapImage*> (offscreenImage.getPixelData());
auto* image = static_cast<WindowsBitmapImage*> (offscreenImage.getPixelData().get());
if (perPixelTransparent)
{

2
modules/juce_gui_basics/native/juce_XWindowSystem_linux.cpp
View file

@ -2207,7 +2207,7 @@ void XWindowSystem::blitToWindow (::Window windowH, Image image, Rectangle<int>
{
jassert (windowH != 0);
auto* xbitmap = static_cast<XBitmapImage*> (image.getPixelData());
auto* xbitmap = static_cast<XBitmapImage*> (image.getPixelData().get());
xbitmap->blitToWindow (windowH,
destinationRect.getX(), destinationRect.getY(),

4
modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp
View file

@ -73,7 +73,7 @@ struct CachedImageList final : public ReferenceCountedObject,
TextureInfo getTextureFor (const Image& image)
{
auto pixelData = image.getPixelData();
auto* c = findCachedImage (pixelData);
auto* c = findCachedImage (pixelData.get());
if (c == nullptr)
{
@ -89,7 +89,7 @@ struct CachedImageList final : public ReferenceCountedObject,
return t;
}
c = images.add (new CachedImage (*this, pixelData));
c = images.add (new CachedImage (*this, pixelData.get()));
totalSize += c->imageSize;
while (totalSize > maxCacheSize && images.size() > 1 && totalSize > 0)

2
modules/juce_opengl/opengl/juce_OpenGLImage.cpp
View file

@ -217,7 +217,7 @@ ImagePixelData::Ptr OpenGLImageType::create (Image::PixelFormat, int width, int
OpenGLFrameBuffer* OpenGLImageType::getFrameBufferFrom (const Image& image)
{
if (OpenGLFrameBufferImage* const glImage = dynamic_cast<OpenGLFrameBufferImage*> (image.getPixelData()))
if (OpenGLFrameBufferImage* const glImage = dynamic_cast<OpenGLFrameBufferImage*> (image.getPixelData().get()))
return &(glImage->frameBuffer);
return nullptr;