From: darco <darco@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Thu, 31 Aug 2006 23:13:49 +0000 (+0000)
Subject: Fixed a handful of bugs, including:
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=b494445bc3ba5344e65869c7c6bab2b008438f1c;p=synfig.git

Fixed a handful of bugs, including:
 * Time class was parsing BOT/SOT and EOT times incorrectly. Fixed.
 * Turned on automatic break-up for scanline renderer. (This enables the rendering of really large images without running out of memory)
 * One of the functions in synfig/context.h was incorrectly marked as virtual. Fixed.
 * Misc other minor changes



git-svn-id: http://svn.voria.com/code@227 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/synfig-core/trunk/src/synfig/context.h b/synfig-core/trunk/src/synfig/context.h
index 48e73ed..1ab2556 100644
--- a/synfig-core/trunk/src/synfig/context.h
+++ b/synfig-core/trunk/src/synfig/context.h
@@ -57,7 +57,7 @@ public:
 	Context() { }
 
 	Context(const CanvasBase::const_iterator &x):CanvasBase::const_iterator(x) { }
-
+	
 	Context operator=(const CanvasBase::const_iterator &x)
 	{ return CanvasBase::const_iterator::operator=(x); }
 	
@@ -76,7 +76,7 @@ public:
 	Rect get_full_bounding_rect()const;
 
 	/*! \writeme */
-	virtual etl::handle<Layer> hit_check(const Point &point)const;
+	etl::handle<Layer> hit_check(const Point &point)const;
 
 }; // END of class Context
 	
diff --git a/synfig-core/trunk/src/synfig/savecanvas.cpp b/synfig-core/trunk/src/synfig/savecanvas.cpp
index 6bb025a..44468a6 100644
--- a/synfig-core/trunk/src/synfig/savecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/savecanvas.cpp
@@ -388,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());
 
diff --git a/synfig-core/trunk/src/synfig/target_scanline.cpp b/synfig-core/trunk/src/synfig/target_scanline.cpp
index 24a18a4..fe5f2a5 100644
--- a/synfig-core/trunk/src/synfig/target_scanline.cpp
+++ b/synfig-core/trunk/src/synfig/target_scanline.cpp
@@ -50,7 +50,7 @@ using namespace synfig;
 
 #define PIXEL_RENDERING_LIMIT 1500000
 
-#define USE_PIXELRENDERING_LIMIT 0
+#define USE_PIXELRENDERING_LIMIT 1
 
 /* === G L O B A L S ======================================================= */
 
diff --git a/synfig-core/trunk/src/synfig/time.cpp b/synfig-core/trunk/src/synfig/time.cpp
index c4bff19..946ac0b 100644
--- a/synfig-core/trunk/src/synfig/time.cpp
+++ b/synfig-core/trunk/src/synfig/time.cpp
@@ -77,13 +77,13 @@ Time::Time(const String &str_, float fps):
 	std::transform(str.begin(),str.end(),str.begin(),&tolower);
 
 	// Start/Begin Of Time
-	if(str=="SOT" || str=="BOT")
+	if(str=="sot" || str=="bot")
 	{
 		operator=(begin());
 		return;
 	}
 	// End Of Time
-	if(str=="EOT")
+	if(str=="eot")
 	{
 		operator=(end());
 		return;