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

New class HeapBlock, which provides a safe and object-oriented way to allocate heap space. I've used HeapBlocks to replace almost all uses of malloc/free throughout the codebase.

Browse source
This commit is contained in:
Julian Storer 2010-01-02 14:55:44 +00:00
parent 8c988319ec
commit 4ed1d791e5
86 changed files with 22712 additions and 22630 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.cpp
View file

@ -41,13 +41,13 @@ BEGIN_JUCE_NAMESPACE
#define JUCE_USE_SSE_INSTRUCTIONS 1
#endif
#if JUCE_MSVC && JUCE_DEBUG
#pragma warning (disable: 4714) // warning about forcedinline methods not being inlined
#endif
#if JUCE_MSVC
#pragma warning (push)
#pragma warning (disable: 4127) // "expression is constant" warning
#if JUCE_DEBUG
#pragma warning (disable: 4714) // warning about forcedinline methods not being inlined
#endif
#endif
//==============================================================================
@ -520,12 +520,11 @@ public:
maxY (srcData_.height - 1),
scratchSize (2048)
{
scratchBuffer = (SrcPixelType*) juce_malloc (scratchSize * sizeof (SrcPixelType));
scratchBuffer.malloc (scratchSize);
}
~TransformedImageFillEdgeTableRenderer() throw()
{
juce_free (scratchBuffer);
}
forcedinline void setEdgeTableYPos (const int newY) throw()
@ -550,8 +549,7 @@ public:
if (width > scratchSize)
{
scratchSize = width;
juce_free (scratchBuffer);
scratchBuffer = (SrcPixelType*) juce_malloc (scratchSize * sizeof (SrcPixelType));
scratchBuffer.malloc (scratchSize);
}
SrcPixelType* span = scratchBuffer;
@ -582,8 +580,7 @@ public:
if (width > scratchSize)
{
scratchSize = width;
juce_free (scratchBuffer);
scratchBuffer = (SrcPixelType*) juce_malloc (scratchSize * sizeof (SrcPixelType));
scratchBuffer.malloc (scratchSize);
}
uint8* mask = (uint8*) scratchBuffer;
@ -893,7 +890,7 @@ private:
const int pixelOffsetInt, maxX, maxY;
int y;
DestPixelType* linePixels;
SrcPixelType* scratchBuffer;
HeapBlock <SrcPixelType> scratchBuffer;
int scratchSize;
TransformedImageFillEdgeTableRenderer (const TransformedImageFillEdgeTableRenderer&);
@ -983,8 +980,8 @@ public:
transform = AffineTransform::identity;
}
int numLookupEntries;
PixelARGB* const lookupTable = g2.createLookupTable (transform, numLookupEntries);
HeapBlock <PixelARGB> lookupTable;
const int numLookupEntries = g2.createLookupTable (transform, lookupTable);
jassert (numLookupEntries > 0);
switch (image.getFormat())
@ -993,8 +990,6 @@ public:
case Image::RGB: renderGradient (et, destData, g2, transform, lookupTable, numLookupEntries, isIdentity, (PixelRGB*) 0); break;
default: renderGradient (et, destData, g2, transform, lookupTable, numLookupEntries, isIdentity, (PixelAlpha*) 0); break;
}
juce_free (lookupTable);
}
else if (fillType.isTiledImage())
{