--- CV/CV.xs	2003/11/12 00:59:01	1.6
+++ CV/CV.xs	2003/11/12 23:54:54	1.7
@@ -11,11 +11,13 @@
 
 #define RAND (seed = (seed + 7141) * 54773 % 134456)
 
+#define LINELENGTH 240
+
 #define ELLIPSIS "\xe2\x80\xa6"
 
 static guint32 a85_val;
 static guint a85_cnt;
-static guchar a85_buf[80], *a85_ptr;
+static guchar a85_buf[LINELENGTH], *a85_ptr;
 
 static void
 a85_init (void)
@@ -79,7 +81,7 @@
 {
 	int w = gdk_pixbuf_get_width (pb);
         int h = gdk_pixbuf_get_height (pb);
-        int bpp = gdk_pixbuf_get_has_alpha (pb) ? 4 : 3;
+        int bpp = gdk_pixbuf_get_n_channels (pb);
         int x, y, i;
         guchar *src = gdk_pixbuf_get_pixels (pb), *dst;
         int sstr = gdk_pixbuf_get_rowstride (pb), dstr;
@@ -103,7 +105,7 @@
 {
 	int w = gdk_pixbuf_get_width (pb);
         int h = gdk_pixbuf_get_height (pb);
-        int bpp = gdk_pixbuf_get_has_alpha (pb) ? 4 : 3;
+        int bpp = gdk_pixbuf_get_n_channels (pb);
         int x, y, i;
         guchar *src = gdk_pixbuf_get_pixels (pb), *dst;
         int sstr = gdk_pixbuf_get_rowstride (pb), dstr;
@@ -158,7 +160,7 @@
 	int h = gdk_pixbuf_get_height (pb);
 	int x, y;
         guchar *dst;
-        int bpp = gdk_pixbuf_get_has_alpha (pb) ? 4 : 3;
+        int bpp = gdk_pixbuf_get_n_channels (pb);
         guchar *src = gdk_pixbuf_get_pixels (pb);
         int sstr = gdk_pixbuf_get_rowstride (pb);
         int Er[IW], Eg[IW], Eb[IW];
@@ -213,14 +215,14 @@
 MODULE = Gtk2::CV PACKAGE = Gtk2::CV::PostScript
 
 void
-dump_pb (PerlIO *fp, GdkPixbuf *pb)
+dump_ascii85 (PerlIO *fp, GdkPixbuf *pb)
 	CODE:
 {
 	int w = gdk_pixbuf_get_width  (pb);
 	int h = gdk_pixbuf_get_height (pb);
 	int x, y, i;
         guchar *dst;
-        int bpp = gdk_pixbuf_get_has_alpha (pb) ? 4 : 3;
+        int bpp = gdk_pixbuf_get_n_channels (pb);
         guchar *src = gdk_pixbuf_get_pixels (pb);
         int sstr = gdk_pixbuf_get_rowstride (pb);
 
@@ -228,12 +230,30 @@
 
         for (y = 0; y < h; y++)
           for (x = 0; x < w; x++)
-            for (i = 0; i < 3; i++)
+            for (i = 0; i < (bpp < 3 ? 1 : 3); i++)
               a85_push (fp, src [x * bpp + y * sstr + i]);
 
         a85_finish (fp);
 }
 
+void
+dump_binary (PerlIO *fp, GdkPixbuf *pb)
+	CODE:
+{
+	int w = gdk_pixbuf_get_width  (pb);
+	int h = gdk_pixbuf_get_height (pb);
+	int x, y, i;
+        guchar *dst;
+        int bpp = gdk_pixbuf_get_n_channels (pb);
+        guchar *src = gdk_pixbuf_get_pixels (pb);
+        int sstr = gdk_pixbuf_get_rowstride (pb);
+
+        for (y = 0; y < h; y++)
+          for (x = 0; x < w; x++)
+            for (i = 0; i < (bpp < 3 ? 1 : 3); i++)
+              PerlIO_putc (fp, src [x * bpp + y * sstr + i]);
+}
+