X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=padding_effect.h;h=9a32abbe41c343661abdef7bfa9d0e289a48d85e;hp=a836ba208cc4c096fad3d0b9c7de6cc2da20ae7c;hb=f8e636666b3d36f97b125bc1a0f0f582c5026c7f;hpb=37f56fcbe571b2322243f6de59494bf9e0cbb37a

diff --git a/padding_effect.h b/padding_effect.h
index a836ba2..9a32abb 100644
--- a/padding_effect.h
+++ b/padding_effect.h
@@ -1,5 +1,5 @@
-#ifndef _PADDING_EFFECT_H
-#define _PADDING_EFFECT_H 1
+#ifndef _MOVIT_PADDING_EFFECT_H
+#define _MOVIT_PADDING_EFFECT_H 1
 
 // Takes an image and pads it to fit a larger image, or crops it to fit a smaller one
 // (although the latter is implemented slightly less efficiently, and you cannot both
@@ -33,10 +33,10 @@ public:
 	virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height);
 
 private:
-	RGBATriplet border_color;
+	RGBATuple border_color;
 	int input_width, input_height;
 	int output_width, output_height;
 	float top, left;
 };
 
-#endif // !defined(_PADDING_EFFECT_H)
+#endif // !defined(_MOVIT_PADDING_EFFECT_H)