Avoid a warning from g++ 4.3.

[synfig.git] / synfig-core / trunk / src / synfig / context.cpp

diff --git a/synfig-core/trunk/src/synfig/context.cpp b/synfig-core/trunk/src/synfig/context.cpp
index d16c06b..9ac1020 100644 (file)
--- a/synfig-core/trunk/src/synfig/context.cpp
+++ b/synfig-core/trunk/src/synfig/context.cpp
@@ -215,7 +215,7 @@ Context::accelerated_render(Surface *surface,int quality, const RendDesc &rendde
                // is 1.0, and the layer doesn't depend on its context, then
                // we don't want to render the context
                if (composite &&
-                       Color::is_straight(composite->get_blend_method()) &&
+                       composite->get_blend_method() == Color::BLEND_STRAIGHT &&
                        composite->get_amount() == 1.0f &&
                        !composite->reads_context())
                {
@@ -264,7 +264,7 @@ Context::accelerated_render(Surface *surface,int quality, const RendDesc &rendde
        // using the appropriate 'amount'
        if (straight_and_empty)
        {
-               if (ret = Context((context+1)).accelerated_render(surface,quality,renddesc,cb))
+               if ((ret = Context((context+1)).accelerated_render(surface,quality,renddesc,cb)))
                {
                        Surface clearsurface;
                        clearsurface.set_wh(renddesc.get_w(),renddesc.get_h());
@@ -272,7 +272,7 @@ Context::accelerated_render(Surface *surface,int quality, const RendDesc &rendde
 
                        Surface::alpha_pen apen(surface->begin());
                        apen.set_alpha(composite->get_amount());
-                       apen.set_blend_method(Color::BLEND_STRAIGHT);
+                       apen.set_blend_method(composite->get_blend_method());
 
                        clearsurface.blit_to(apen);
                }