X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fsavecanvas.cpp;h=a2ae0d92e2594c258b83d03e57148385796632ca;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=eb2bf759d04843d8a181b08a282833a22ed1c96b;hpb=756c0d29ac1742f231e6615f9a577e574e35a4af;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/savecanvas.cpp b/synfig-core/trunk/src/synfig/savecanvas.cpp
index eb2bf75..a2ae0d9 100644
--- a/synfig-core/trunk/src/synfig/savecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/savecanvas.cpp
@@ -333,8 +333,8 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
 
 		if(iter->get_tension()!=0.0)
 			waypoint_node->set_attribute("tension",strprintf("%f",iter->get_tension()));
-		if(iter->get_time_tension()!=0.0)
-			waypoint_node->set_attribute("temporal-tension",strprintf("%f",iter->get_time_tension()));
+		if(iter->get_temporal_tension()!=0.0)
+			waypoint_node->set_attribute("temporal-tension",strprintf("%f",iter->get_temporal_tension()));
 		if(iter->get_continuity()!=0.0)
 			waypoint_node->set_attribute("continuity",strprintf("%f",iter->get_continuity()));
 		if(iter->get_bias()!=0.0)
@@ -427,19 +427,13 @@ xmlpp::Element* encode_dynamic_list(xmlpp::Element* root,ValueNode_DynamicList::
 				if(entry_iter->state==true)
 				{
 					if(entry_iter->priority)
-					{
-						printf("begin priority is %d\n", entry_iter->priority);
 						begin_sequence+=strprintf("p%d ",entry_iter->priority);
-					}
 					begin_sequence+=entry_iter->time.get_string(fps)+", ";
 				}
 				else
 				{
 					if(entry_iter->priority)
-					{
-						printf("end priority is %d\n", entry_iter->priority);
 						end_sequence+=strprintf("p%d ",entry_iter->priority);
-					}
 					end_sequence+=entry_iter->time.get_string(fps)+", ";
 				}
 
@@ -768,29 +762,28 @@ synfig::save_canvas(const String &filename, Canvas::ConstHandle canvas)
 		encode_canvas_toplevel(document.create_root_node("canvas"),canvas);
 
 		document.write_to_file_formatted(tmp_filename);
-	}
-	catch(...) { synfig::error("synfig::save_canvas(): Caught unknown exception"); return false; }
-
 
 #ifdef _WIN32
-	// On Win32 platforms, rename() has bad behavior. work around it.
-	char old_file[80]="sif.XXXXXXXX";
-	mktemp(old_file);
-	rename(filename.c_str(),old_file);
-	if(rename(tmp_filename.c_str(),filename.c_str())!=0)
-	{
-		rename(old_file,tmp_filename.c_str());
-		synfig::error("synfig::save_canvas(): Unable to rename file to correct filename, errno=%d",errno);
-		return false;
-	}
-	remove(old_file);
+		// On Win32 platforms, rename() has bad behavior. work around it.
+		char old_file[80]="sif.XXXXXXXX";
+		mktemp(old_file);
+		rename(filename.c_str(),old_file);
+		if(rename(tmp_filename.c_str(),filename.c_str())!=0)
+		{
+			rename(old_file,tmp_filename.c_str());
+			synfig::error("synfig::save_canvas(): Unable to rename file to correct filename, errno=%d",errno);
+			return false;
+		}
+		remove(old_file);
 #else
-	if(rename(tmp_filename.c_str(),filename.c_str())!=0)
-	{
-		synfig::error("synfig::save_canvas(): Unable to rename file to correct filename, errno=%d",errno);
-		return false;
-	}
+		if(rename(tmp_filename.c_str(),filename.c_str())!=0)
+		{
+			synfig::error("synfig::save_canvas(): Unable to rename file to correct filename, errno=%d",errno);
+			return false;
+		}
 #endif
+	}
+	catch(...) { synfig::error("synfig::save_canvas(): Caught unknown exception"); return false; }
 
 	return true;
 }