Author: Carlos Lopez <[email protected]>
Date:   Thu Nov  1 10:48:15 2012 +0100

Layer_Bitmap:: fix bug that calculates wrongly the surface positions to read 
the pixel colors. Restore demultiply and filter returned color. This commit 
fixes Twirl layer render in Cairo

---

 synfig-core/src/synfig/layer_bitmap.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/synfig-core/src/synfig/layer_bitmap.cpp 
b/synfig-core/src/synfig/layer_bitmap.cpp
index 4b0957b..abd93a4 100644
--- a/synfig-core/src/synfig/layer_bitmap.cpp
+++ b/synfig-core/src/synfig/layer_bitmap.cpp
@@ -336,8 +336,8 @@ synfig::Layer_Bitmap::get_cairocolor(Context context, const 
Point &pos)const
                        }
                        else
                        {
-                               surface_pos[0]*=surface.get_w();
-                               surface_pos[1]*=surface.get_h();
+                               surface_pos[0]*=csurface.get_w();
+                               surface_pos[1]*=csurface.get_h();
                        }
                        
                        CairoColor ret(CairoColor::alpha());
@@ -366,8 +366,8 @@ synfig::Layer_Bitmap::get_cairocolor(Context context, const 
Point &pos)const
                                }
                                        break;
                        }
-                       //ret=ret.demult_alpha();
-                       //ret=filter(ret);
+                       ret=ret.demult_alpha();
+                       ret=filter(ret);
                        
                        if(get_amount()==1 && 
get_blend_method()==Color::BLEND_STRAIGHT)
                                return ret;


------------------------------------------------------------------------------
Monitor your physical, virtual and cloud infrastructure from a single
web console. Get in-depth insight into apps, servers, databases, vmware,
SAP, cloud infrastructure, etc. Download 30-day Free Trial.
Pricing starts from $795 for 25 servers or applications!
http://p.sf.net/sfu/zoho_dev2dev_nov
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl

Reply via email to