X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftarget_tile.cpp;h=e16b09a3e05cfdf9b303caa87c24d603cab1703c;hb=542d4300393ce45b3426a2a859fe16131d3d2cf0;hp=c12c2d0aecc35496d7023ac8a433f0f323ecac23;hpb=7708bd2d21d72812db5d0bb4d5ef89d206ec260c;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/target_tile.cpp b/synfig-core/trunk/src/synfig/target_tile.cpp
index c12c2d0..e16b09a 100644
--- a/synfig-core/trunk/src/synfig/target_tile.cpp
+++ b/synfig-core/trunk/src/synfig/target_tile.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 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
@@ -50,9 +51,9 @@ using namespace synfig;
 const unsigned int	DEF_TILE_WIDTH = TILE_SIZE / 2;
 const unsigned int	DEF_TILE_HEIGHT= TILE_SIZE / 2;
 
-#define SYNFIG_OPTIMIZE_LAYER_TREE 	1
+#define SYNFIG_OPTIMIZE_LAYER_TREE
 #ifdef _DEBUG
-#define SYNFIG_DISPLAY_EFFICIENCY	1
+// #define SYNFIG_DISPLAY_EFFICIENCY
 #endif
 
 /* === G L O B A L S ======================================================= */
@@ -282,7 +283,7 @@ synfig::Target_Tile::render_frame_(Context context,ProgressCallback *cb)
 	if(cb && !cb->amount_complete(total_tiles,total_tiles))
 		return false;
 
-#if SYNFIG_DISPLAY_EFFICIENCY==1
+#ifdef SYNFIG_DISPLAY_EFFICIENCY
 	synfig::info(">>>>>> Render Time: %fsec, Find Tile Time: %fsec, Add Tile Time: %fsec, Total Time: %fsec",work_time,find_tile_time,add_tile_time,total_time());
 	synfig::info(">>>>>> FRAME EFFICIENCY: %f%%",(100.0f*work_time/total_time()));
 #endif
@@ -357,7 +358,8 @@ synfig::Target_Tile::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();
@@ -367,9 +369,10 @@ synfig::Target_Tile::render(ProgressCallback *cb)
 			#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
 			Context context;
 			Canvas::Handle op_canvas(Canvas::create());
+			op_canvas->set_file_name(canvas->get_file_name());
 			// Set the time that we wish to render
 			canvas->set_time(t);
-			optimize_layers(canvas->get_context(), op_canvas);
+			optimize_layers(canvas->get_time(), canvas->get_context(), op_canvas);
 			context=op_canvas->get_context();
 			#else
 			Context context;
@@ -402,7 +405,8 @@ synfig::Target_Tile::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();