X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fsavecanvas.cpp;h=44468a6c16a7f03ed06196c0cf8bfe0fa5c464f4;hb=b494445bc3ba5344e65869c7c6bab2b008438f1c;hp=32c820352446e84b39ad29e91522dabf4c395076;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/savecanvas.cpp b/synfig-core/trunk/src/synfig/savecanvas.cpp
index 32c8203..44468a6 100644
--- a/synfig-core/trunk/src/synfig/savecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/savecanvas.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file savecanvas.cpp
 **	\brief Writeme
 **
 **	$Id: savecanvas.cpp,v 1.2 2005/01/07 03:29:12 darco Exp $
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -28,6 +29,10 @@
 #	include <config.h>
 #endif
 
+#ifdef HAVE_SYS_ERRNO_H
+#	include <sys/errno.h>
+#endif
+
 #include "savecanvas.h"
 #include "general.h"
 #include "valuenode.h"
@@ -57,7 +62,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 
 /* === M A C R O S ========================================================= */
 
@@ -233,11 +238,11 @@ xmlpp::Element* encode_value(xmlpp::Element* root,const ValueBase &data,Canvas::
 	case ValueBase::TYPE_CANVAS:
 		return encode_canvas(root,data.get(Canvas::Handle()).get());
 	case ValueBase::TYPE_NIL:
-		sinfg::error("Encountered NIL ValueBase");
+		synfig::error("Encountered NIL ValueBase");
 		root->set_name("nil");
 		return root;
 	default:
-		sinfg::error(strprintf("Unknown value(%s), cannot create XML representation!",ValueBase::type_name(data.get_type()).c_str()));
+		synfig::error(strprintf("Unknown value(%s), cannot create XML representation!",ValueBase::type_name(data.get_type()).c_str()));
 		root->set_name("nil");
 		return root;
 	}
@@ -383,8 +388,7 @@ xmlpp::Element* encode_subtract(xmlpp::Element* root,ValueNode_Subtract::ConstHa
 xmlpp::Element* encode_dynamic_list(xmlpp::Element* root,ValueNode_DynamicList::ConstHandle value_node,Canvas::ConstHandle canvas=0)
 {
 	assert(value_node);
-//	const float fps(canvas?canvas->rend_desc().get_frame_rate():0);
-	const float fps(0);
+	const float fps(canvas?canvas->rend_desc().get_frame_rate():0);
 	
 	root->set_name(value_node->get_name());
 
@@ -413,8 +417,8 @@ xmlpp::Element* encode_dynamic_list(xmlpp::Element* root,ValueNode_DynamicList::
 
 		// process waypoints
 		{
-			typedef sinfg::ValueNode_DynamicList::ListEntry::Activepoint Activepoint;
-			typedef sinfg::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList;
+			typedef synfig::ValueNode_DynamicList::ListEntry::Activepoint Activepoint;
+			typedef synfig::ValueNode_DynamicList::ListEntry::ActivepointList ActivepointList;
 			String begin_sequence;
 			String end_sequence;
 
@@ -703,9 +707,11 @@ xmlpp::Element* encode_canvas(xmlpp::Element* root,Canvas::ConstHandle canvas)
 }
 
 bool
-sinfg::save_canvas(const String &filename, Canvas::ConstHandle canvas)
+synfig::save_canvas(const String &filename, Canvas::ConstHandle canvas)
 {
-	sinfg::String tmp_filename(filename+".TMP");
+    ChangeLocale change_locale(LC_NUMERIC, "C");
+
+	synfig::String tmp_filename(filename+".TMP");
 
 	try
 	{
@@ -716,7 +722,7 @@ sinfg::save_canvas(const String &filename, Canvas::ConstHandle canvas)
 	
 		document.write_to_file_formatted(tmp_filename);
 	}
-	catch(...) { sinfg::error("sinfg::save_canvas(): Caught unknown exception"); return false; }
+	catch(...) { synfig::error("synfig::save_canvas(): Caught unknown exception"); return false; }
 	
 	
 #ifdef _WIN32
@@ -727,14 +733,14 @@ sinfg::save_canvas(const String &filename, Canvas::ConstHandle canvas)
 	if(rename(tmp_filename.c_str(),filename.c_str())!=0)
 	{
 		rename(old_file,tmp_filename.c_str());
-		sinfg::error("sinfg::save_canvas(): Unable to rename file to correct filename, errno=%d",errno);
+		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)
 	{
-		sinfg::error("sinfg::save_canvas(): Unable to rename file to correct filename, errno=%d",errno);
+		synfig::error("synfig::save_canvas(): Unable to rename file to correct filename, errno=%d",errno);
 		return false;
 	}
 #endif
@@ -743,8 +749,9 @@ sinfg::save_canvas(const String &filename, Canvas::ConstHandle canvas)
 }
 
 String
-sinfg::canvas_to_string(Canvas::ConstHandle canvas)
+synfig::canvas_to_string(Canvas::ConstHandle canvas)
 {
+    ChangeLocale change_locale(LC_NUMERIC, "C");
 	assert(canvas);
 
 	xmlpp::Document document;