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

More ScopedPointer/unique_ptr compatibility work

Browse source
This commit is contained in:
jules 2018-01-10 17:35:08 +00:00
parent 48a5fbd333
commit 1a60fa9765
80 changed files with 404 additions and 368 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1587,7 +1587,7 @@ struct SavedState : public RenderingHelpers::SavedStateBase<SavedState>
SavedState (const SavedState& other)
: BaseClass (other), font (other.font), state (other.state),
transparencyLayer (other.transparencyLayer),
previousTarget (other.previousTarget.createCopy())
previousTarget (createCopyIfNotNull (other.previousTarget.get()))
{}
SavedState* beginTransparencyLayer (float opacity)
@ -1600,7 +1600,7 @@ struct SavedState : public RenderingHelpers::SavedStateBase<SavedState>
state->flush();
s->transparencyLayer = Image (OpenGLImageType().create (Image::ARGB, clipBounds.getWidth(), clipBounds.getHeight(), true));
s->previousTarget = new Target (state->target);
s->previousTarget.reset (new Target (state->target));
state->target = Target (state->target.context, *OpenGLImageType::getFrameBufferFrom (s->transparencyLayer), clipBounds.getPosition());
s->transparencyLayerAlpha = opacity;
s->cloneClipIfMultiplyReferenced();