X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=ETL%2Ftrunk%2FETL%2F_surface.h;h=8561970ffa3e4e99c40df298478e4b423ae93c31;hb=86ff04016350defab3db97d6de20531ca018bc38;hp=b91ab9839ab4dfa9adfbaaf92032e7fcb8e4e311;hpb=20a38826ee92a217ecbe472a90797788b58e0a9f;p=synfig.git

diff --git a/ETL/trunk/ETL/_surface.h b/ETL/trunk/ETL/_surface.h
index b91ab98..8561970 100644
--- a/ETL/trunk/ETL/_surface.h
+++ b/ETL/trunk/ETL/_surface.h
@@ -32,6 +32,7 @@
 #include "_pen.h"
 #include "_misc.h"
 #include <algorithm>
+#include <cstring>
 
 /* === M A C R O S ========================================================= */
 
@@ -64,7 +65,7 @@ public:
 	typedef VP value_prep_type;
 
 	typedef alpha_pen<const_pen> const_alpha_pen;
-	typedef alpha_pen<pen> alpha_pen;
+	typedef alpha_pen<pen> non_const_alpha_pen;
 
 	typedef typename pen::difference_type size_type;
 	typedef typename pen::difference_type difference_type;
@@ -495,7 +496,7 @@ public:
 		if(y0 > y1) std::swap(y0,y1);
 
 		//local variable madness
-		//all things that want to interoperate should provide a default value constructor for = 0
+		//all things that want to inter-operate should provide a default value constructor for = 0
 		accumulator_type acum = 0;
 		int xi=0,yi=0;
 
@@ -561,7 +562,7 @@ public:
 		if(y0 > y1) std::swap(y0,y1);
 
 		//local variable madness
-		//all things that want to interoperate should provide a default value constructor for = 0
+		//all things that want to inter-operate should provide a default value constructor for = 0
 		accumulator_type acum = 0;
 		int xi=0,yi=0;