From a942f3350d3ca3bc2373d7c140dcffc7fdeeee0f Mon Sep 17 00:00:00 2001 From: dooglus Date: Mon, 21 Jan 2008 01:09:35 +0000 Subject: [PATCH] Don't avoid not using negated macro names, because they can be confusing. ie. use "#ifdef SYNFIG_CLIP_PASTECANVAS" rather than "#ifndef SYNFIG_NO_CLIP". git-svn-id: http://svn.voria.com/code@1400 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/synfig/layer_pastecanvas.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp index 7d8fbea..06df545 100644 --- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp +++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp @@ -53,8 +53,10 @@ using namespace synfig; #define MAX_DEPTH 10 +#define SYNFIG_CLIP_PASTECANVAS + //#ifdef __APPLE__ -//#define SYNFIG_NO_CLIP +//#undef SYNFIG_CLIP_PASTECANVAS //#endif /* === C L A S S E S ======================================================= */ @@ -351,7 +353,7 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali blend_method=Color::BLEND_STRAIGHT; } -#ifndef SYNFIG_NO_CLIP +#ifdef SYNFIG_CLIP_PASTECANVAS { //synfig::info("PasteCanv Clip"); Rect area(desc.get_rect()&full_bounding_rect); @@ -393,7 +395,7 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali pastesurface.blit_to(apen); } -#else +#else // SYNFIG_CLIP_PASTECANVAS { Surface pastesurface; @@ -407,7 +409,7 @@ Layer_PasteCanvas::accelerated_render(Context context,Surface *surface,int quali pastesurface.blit_to(apen); } -#endif +#endif // SYNFIG_CLIP_PASTECANVAS if(cb && !cb->amount_complete(10000,10000)) return false; -- 2.7.4