Author: Carlos Lopez <[email protected]>
Date:   Tue Sep 25 20:20:23 2012 +0200

Halftone2: tidy up

---

 synfig-core/src/modules/mod_filter/halftone2.cpp |   37 +++++++++++----------
 1 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/synfig-core/src/modules/mod_filter/halftone2.cpp 
b/synfig-core/src/modules/mod_filter/halftone2.cpp
index 47854f9..af473a3 100644
--- a/synfig-core/src/modules/mod_filter/halftone2.cpp
+++ b/synfig-core/src/modules/mod_filter/halftone2.cpp
@@ -277,12 +277,13 @@ Halftone2::accelerated_cairorender(Context 
context,cairo_surface_t *surface,int
                
for(y=0,pos[1]=tl[1];y<h;y++,pen.inc_y(),pen.dec_x(x),pos[1]+=ph)
                        for(x=0,pos[0]=tl[0];x<w;x++,pen.inc_x(),pos[0]+=pw)
                                pen.put_value(
-                                                         CairoColor(color_func(
-                                                                               
 pos,
-                                                                               
 supersample_size,
-                                                                               
 Color(pen.get_value().demult_alpha())
-                                                                               
 )).premult_alpha()
-                                                         );
+                                       CairoColor(color_func(
+                                                                               
  pos,
+                                                                               
  supersample_size,
+                                                                               
  Color(pen.get_value().demult_alpha())
+                                                                               
 )
+                                       ).premult_alpha()
+                               );
        }
        else
        {
@@ -291,18 +292,18 @@ Halftone2::accelerated_cairorender(Context 
context,cairo_surface_t *surface,int
                        {
                                Color val=Color(pen.get_value().demult_alpha());
                                pen.put_value(
-                                                         
CairoColor(Color::blend(
-                                                                               
                          color_func(
-                                                                               
                                                 pos,
-                                                                               
                                                 supersample_size,
-                                                                               
                                                 val
-                                                                               
                                                 ),
-                                                                               
                          val,
-                                                                               
                          get_amount(),
-                                                                               
                          get_blend_method()
-                                                                               
                        ).clamped()
-                                                                               
 ).premult_alpha()
-                                                               );
+                                               CairoColor(Color::blend(
+                                                                               
          color_func(
+                                                                               
                                 pos,
+                                                                               
                                 supersample_size,
+                                                                               
                                 val
+                                                                               
                                 ),
+                                                                               
          val,
+                                                                               
          get_amount(),
+                                                                               
          get_blend_method()
+                                                                               
          ).clamped()
+                                               ).premult_alpha()
+                               );
                        }
                                
        }


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl

Reply via email to