X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftarget_scanline.cpp;h=4c3ae0bfcc4d21e9e34e85001a6a6a57f675af0a;hb=b03ddc749e112f35a70cc6455ab85319c659f1bb;hp=d4ba4aea96564a680229cf9debf31a13dddb29ca;hpb=5f937f1d74ccc6dc54f876e62cdea574e7cb56bf;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/target_scanline.cpp b/synfig-core/trunk/src/synfig/target_scanline.cpp
index d4ba4ae..4c3ae0b 100644
--- a/synfig-core/trunk/src/synfig/target_scanline.cpp
+++ b/synfig-core/trunk/src/synfig/target_scanline.cpp
@@ -173,7 +173,8 @@ synfig::Target_Scanline::render(ProgressCallback *cb)
 
 		#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
 		Canvas::Handle op_canvas(Canvas::create());
-		optimize_layers(canvas->get_context(), op_canvas);
+		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();
@@ -199,8 +200,6 @@ 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?
@@ -209,7 +208,8 @@ synfig::Target_Scanline::render(ProgressCallback *cb)
 
 				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())
@@ -308,7 +308,8 @@ synfig::Target_Scanline::render(ProgressCallback *cb)
 
 		#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
 		Canvas::Handle op_canvas(Canvas::create());
-		optimize_layers(canvas->get_context(), op_canvas);
+		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();
@@ -334,8 +335,6 @@ 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();
@@ -345,7 +344,8 @@ synfig::Target_Scanline::render(ProgressCallback *cb)
 
 				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())