Author: Diego Barrios Romero <[email protected]>
Date: Wed Mar 14 20:07:00 2012 +0100
Stupid mistakes
---
synfig-core/src/synfig/dashitem.cpp | 1 -
synfig-core/src/synfig/gradient.cpp | 2 ++
synfig-core/src/synfig/layer_bitmap.cpp | 2 +-
synfig-core/src/synfig/layer_bitmap.h | 2 +-
synfig-core/src/synfig/target.h | 2 +-
synfig-core/src/synfig/value.h | 2 +-
6 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/synfig-core/src/synfig/dashitem.cpp
b/synfig-core/src/synfig/dashitem.cpp
index 8b2d11c..3b03b99 100644
--- a/synfig-core/src/synfig/dashitem.cpp
+++ b/synfig-core/src/synfig/dashitem.cpp
@@ -36,7 +36,6 @@
/* === U S I N G =========================================================== */
-using namespace std;
using namespace synfig;
/* === M A C R O S ========================================================= */
diff --git a/synfig-core/src/synfig/gradient.cpp
b/synfig-core/src/synfig/gradient.cpp
index 340a59f..9c7cba8 100644
--- a/synfig-core/src/synfig/gradient.cpp
+++ b/synfig-core/src/synfig/gradient.cpp
@@ -165,6 +165,7 @@ synfig::Gradient::operator+=(const Gradient &rhs)
// if there are cpoints in both gradients run through both until one
runs out
if (iter1 != end() && iter2 != rhs.end())
while(true)
+ {
// if the left one has the first cpoint
if (left.pos < right.pos)
{
@@ -239,6 +240,7 @@ synfig::Gradient::operator+=(const Gradient &rhs)
right = *iter2;
if (iter1 == end()) break;
}
+ }
// one of the gradients has run out of points
// does the left one have points left?
diff --git a/synfig-core/src/synfig/layer_bitmap.cpp
b/synfig-core/src/synfig/layer_bitmap.cpp
index 7c6511c..3af4766 100644
--- a/synfig-core/src/synfig/layer_bitmap.cpp
+++ b/synfig-core/src/synfig/layer_bitmap.cpp
@@ -75,7 +75,7 @@ synfig::Layer_Bitmap::Layer_Bitmap():
}
bool
-synfig::Layer_Bitmap::set_param(const String & param, ValueBase value)
+synfig::Layer_Bitmap::set_param(const String & param, const ValueBase & value)
{
IMPORT(tl);
IMPORT(br);
diff --git a/synfig-core/src/synfig/layer_bitmap.h
b/synfig-core/src/synfig/layer_bitmap.h
index b62a93e..bcd9e12 100644
--- a/synfig-core/src/synfig/layer_bitmap.h
+++ b/synfig-core/src/synfig/layer_bitmap.h
@@ -58,7 +58,7 @@ public:
Layer_Bitmap();
- virtual bool set_param(const String & param, ValueBase value);
+ virtual bool set_param(const String & param, const ValueBase & value);
virtual ValueBase get_param(const String & param)const;
diff --git a/synfig-core/src/synfig/target.h b/synfig-core/src/synfig/target.h
index 39d07d7..affad44 100644
--- a/synfig-core/src/synfig/target.h
+++ b/synfig-core/src/synfig/target.h
@@ -77,7 +77,7 @@ class Surface;
class RendDesc;
class Canvas;
class ProgressCallback;
-class TargetParam;
+struct TargetParam;
/*! \class Target
** \brief Used to produce rendered animations of the documents
diff --git a/synfig-core/src/synfig/value.h b/synfig-core/src/synfig/value.h
index 77a3290..71c2eb6 100644
--- a/synfig-core/src/synfig/value.h
+++ b/synfig-core/src/synfig/value.h
@@ -60,7 +60,7 @@ namespace synfig {
class Canvas;
class Vector;
class Time;
-class Segment;
+struct Segment;
class Gradient;
class BLinePoint;
class WidthPoint;
------------------------------------------------------------------------------
Virtualization & Cloud Management Using Capacity Planning
Cloud computing makes use of virtualization - but cloud computing
also focuses on allowing computing to be delivered as a service.
http://www.accelacomm.com/jaw/sfnl/114/51521223/
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
