--- rxvt-unicode/src/rxvtimg.h	2012/06/12 10:45:53	1.31
+++ rxvt-unicode/src/rxvtimg.h	2012/06/14 18:13:18	1.35
@@ -67,7 +67,8 @@
   }
 
   void unshare (); // prepare for write
-  void fill (const rxvt_color &c);
+  void fill (const rgba &c);
+  void add_alpha ();
   //void linear_gradient  (const XLinearGradient  *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
   //void radial_gradient  (const XRadialGradient  *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
   //void conical_gradient (const XConicalGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
@@ -95,11 +96,11 @@
   rxvt_img *blur (int rh, int rv);
   rxvt_img *clone ();
   rxvt_img *sub_rect (int x, int y, int width, int height);
-  rxvt_img *transform (double matrix[9], int new_width = 0, int new_height = 0);
+  rxvt_img *transform (double matrix[3][3]);
   rxvt_img *scale (int new_width, int new_height);
-  rxvt_img *rotate (int x, int y, double phi, int new_width = 0, int new_height = 0);
-  rxvt_img *convert_format (XRenderPictFormat *format, const rxvt_color &bg);
-  rxvt_img *blend (rxvt_img *img, double factor);
+  rxvt_img *rotate (int cx, int cy, double phi);
+  rxvt_img *convert_format (XRenderPictFormat *format, const rgba &bg);
+  rxvt_img *blend (rxvt_img *img, double factor = 1.);
 
   // egregiuous helper category
   rxvt_img *replace (rxvt_img *&p)