Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-core/trunk/src/synfig/target_scanline.cpp b/synfig-core/trunk/src/synfig/target_scanline.cpp
index 0272442..b4745fe 100644 (file)
--- a/synfig-core/trunk/src/synfig/target_scanline.cpp
+++ b/synfig-core/trunk/src/synfig/target_scanline.cpp
@@ -6,6 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -46,7 +47,13 @@ using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
-#define SYNFIG_OPTIMIZE_LAYER_TREE 1
+// note that if this isn't defined then the rendering is incorrect for
+// the straight blend method since the optimize_layers() function in
+// canvas.cpp which makes the straight blend method work correctly
+// isn't called.  ie. leave this defined.  to see the problem, draw a
+// small circle over a solid background.  set circle to amount 0.99
+// and blend method 'straight'.  the background should vanish but doesn't
+#define SYNFIG_OPTIMIZE_LAYER_TREE
 
 #define PIXEL_RENDERING_LIMIT 1500000
 
@@ -125,7 +132,7 @@ synfig::Target_Scanline::render(ProgressCallback *cb)
        curr_frame_=0;
 
        if( !init() ){
-               if(cb) cb->error(_("Target initialisation failure"));
+               if(cb) cb->error(_("Target initialization failure"));
                return false;
        }
 
@@ -171,13 +178,20 @@ synfig::Target_Scanline::render(ProgressCallback *cb)
 
                Context context;
 
-               #ifdef SYNFIG_OPTIMIZE_LAYER_TREE
-               Canvas::Handle op_canvas(Canvas::create());
-               optimize_layers(canvas->get_context(), op_canvas);
-               context=op_canvas->get_context();
-               #else
+#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
+               Canvas::Handle op_canvas;
+               if (!getenv("SYNFIG_DISABLE_OPTIMIZE_LAYER_TREE"))
+               {
+                       op_canvas = Canvas::create();
+                       op_canvas->set_file_name(canvas->get_file_name());
+                       optimize_layers(canvas->get_time(), canvas->get_context(), op_canvas);
+                       context=op_canvas->get_context();
+               }
+               else
+                       context=canvas->get_context();
+#else
                context=canvas->get_context();
-               #endif
+#endif
 
                // If the quality is set to zero, then we
                // use the parametric scanline-renderer.
@@ -199,16 +213,16 @@ synfig::Target_Scanline::render(ProgressCallback *cb)
                        #if USE_PIXELRENDERING_LIMIT
                        if(desc.get_w()*desc.get_h() > PIXEL_RENDERING_LIMIT)
                        {
-                               synfig::info("Render BROKEN UP! (%d pixels)", desc.get_w()*desc.get_h());
-
                                Surface surface;
                                int rowheight = PIXEL_RENDERING_LIMIT/desc.get_w();
+                               if (!rowheight) rowheight = 1; // TODO: render partial lines to stay within the limit?
                                int rows = desc.get_h()/rowheight;
                                int lastrowheight = desc.get_h() - rows*rowheight;
 
                                rows++;
 
-                               synfig::info("\t blockh=%d,remh=%d,totrows=%d", rowheight,lastrowheight,rows);
+                               synfig::info("Render broken up into %d block%s %d pixels tall, and a final block %d pixels tall",
+                                                        rows-1, rows==2?"":"s", rowheight, lastrowheight);
 
                                // loop through all the full rows
                                if(!start_frame())
@@ -305,13 +319,20 @@ synfig::Target_Scanline::render(ProgressCallback *cb)
                        canvas->set_time(t);
                Context context;
 
-               #ifdef SYNFIG_OPTIMIZE_LAYER_TREE
-               Canvas::Handle op_canvas(Canvas::create());
-               optimize_layers(canvas->get_context(), op_canvas);
-               context=op_canvas->get_context();
-               #else
+#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
+               Canvas::Handle op_canvas;
+               if (!getenv("SYNFIG_DISABLE_OPTIMIZE_LAYER_TREE"))
+               {
+                       op_canvas = Canvas::create();
+                       op_canvas->set_file_name(canvas->get_file_name());
+                       optimize_layers(canvas->get_time(), canvas->get_context(), op_canvas);
+                       context=op_canvas->get_context();
+               }
+               else
+                       context=canvas->get_context();
+#else
                context=canvas->get_context();
-               #endif
+#endif
 
                // If the quality is set to zero, then we
                // use the parametric scanline-renderer.
@@ -333,17 +354,17 @@ synfig::Target_Scanline::render(ProgressCallback *cb)
                        #if USE_PIXELRENDERING_LIMIT
                        if(desc.get_w()*desc.get_h() > PIXEL_RENDERING_LIMIT)
                        {
-                               synfig::info("Render BROKEN UP! (%d pixels)", desc.get_w()*desc.get_h());
-
                                Surface surface;
                                int totalheight = desc.get_h();
                                int rowheight = PIXEL_RENDERING_LIMIT/desc.get_w();
+                               if (!rowheight) rowheight = 1; // TODO: render partial lines to stay within the limit?
                                int rows = desc.get_h()/rowheight;
                                int lastrowheight = desc.get_h() - rows*rowheight;
 
                                rows++;
 
-                               synfig::info("\t blockh=%d,remh=%d,totrows=%d", rowheight,lastrowheight,rows);
+                               synfig::info("Render broken up into %d block%s %d pixels tall, and a final block %d pixels tall",
+                                                        rows-1, rows==2?"":"s", rowheight, lastrowheight);
 
                                // loop through all the full rows
                                if(!start_frame())