--- rxvt-unicode/src/rxvtimg.h	2012/06/09 11:13:14	1.28
+++ rxvt-unicode/src/rxvtimg.h	2012/06/12 18:25:57	1.32
@@ -1,7 +1,7 @@
 #ifndef IMG_H
 #define IMG_H
 
-#if HAVE_BG_PIXMAP && BG_IMAGE_FROM_FILE && ENABLE_TRANSPARENCY && HAVE_PIXBUF
+#if HAVE_BG_PIXMAP
   #define HAVE_IMG 1
 #endif
 
@@ -13,7 +13,6 @@
 
 class rxvt_img
 {
-  void alloc ();
   void destroy ();
   Picture src_picture ();
 
@@ -39,9 +38,12 @@
 
   rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat = RepeatNormal);
   rxvt_img (const rxvt_img &img);
+  void alloc ();
 
+# if HAVE_PIXBUF
   static rxvt_img *new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb); // from pixbuf
   static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // via pixbuf
+# endif
   static rxvt_img *new_from_root (rxvt_screen *s); // get root pixmap
 
   ~rxvt_img ();
@@ -93,9 +95,9 @@
   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 (int new_width, int new_height, double matrix[9]);
+  rxvt_img *transform (double matrix[3][3]);
   rxvt_img *scale (int new_width, int new_height);
-  rxvt_img *rotate (int new_width, int new_height, int x, int y, double phi);
+  rxvt_img *rotate (int cx, int cy, double phi);
   rxvt_img *convert_format (XRenderPictFormat *format, const rxvt_color &bg);
   rxvt_img *blend (rxvt_img *img, double factor);