--- CV/CV.xs	2003/11/08 18:22:21	1.4
+++ CV/CV.xs	2003/11/12 23:54:54	1.7
@@ -7,9 +7,17 @@
 #include <gperl.h>
 #include <gtk2perl.h>
 
+#define IW 80
+
+#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)
@@ -61,6 +69,8 @@
   PerlIO_write (fp, a85_buf, a85_ptr - a85_buf);
 }
 
+/////////////////////////////////////////////////////////////////////////////
+
 MODULE = Gtk2::CV PACKAGE = Gtk2::CV::ImageWindow
 
 PROTOTYPES: ENABLE
@@ -71,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;
@@ -95,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;
@@ -113,6 +123,8 @@
 	OUTPUT:
         RETVAL
 
+#############################################################################
+
 MODULE = Gtk2::CV PACKAGE = Gtk2::CV::Schnauzer
 
 GdkPixbuf_noinc *
@@ -148,9 +160,11 @@
 	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];
+        int seed = 77;
 
 	RETVAL = newSV (w * h);
         SvPOK_only (RETVAL);
@@ -158,9 +172,14 @@
 
         dst = SvPVX (RETVAL);
 
+        memset (Er, 0, sizeof (int) * IW);
+        memset (Eg, 0, sizeof (int) * IW);
+        memset (Eb, 0, sizeof (int) * IW);
+
+        /* some primitive error distribution + random dithering */
+
         for (y = 0; y < h; y++)
           {
-            /* use a very primitive form of error distribution. */
             int er = 0, eg = 0, eb = 0;
 
             for (x = 0; x < w; x++)
@@ -168,9 +187,9 @@
                 int r, g, b;
                 guchar *p = src + x * bpp + y * sstr;
 
-                r = ((p[0] + er) * 7 + 128) / 255;
-                g = ((p[1] + eg) * 7 + 128) / 255;
-                b = ((p[2] + eb) * 3 + 128) / 255;
+                r = ((p[0] + er + Er[x]) * 7 + 128) / 255;
+                g = ((p[1] + eg + Eg[x]) * 7 + 128) / 255;
+                b = ((p[2] + eb + Eb[x]) * 3 + 128) / 255;
 
                 r = r > 7 ? 7 : r < 0 ? 0 : r;
                 g = g > 7 ? 7 : g < 0 ? 0 : g;
@@ -180,6 +199,10 @@
                 eg += p[1] - (g * 255 + 4) / 7;
                 eb += p[2] - (b * 255 + 2) / 3;
 
+                Er[x] = er / 2; er -= er / 2 + RAND % 7 - 3;
+                Eg[x] = eg / 2; eg -= eg / 2 + RAND % 7 - 3;
+                Eb[x] = eb / 2; eb -= eb / 2 + RAND % 7 - 3;
+
                 *dst++ = r << 5 | g << 2 | b;
               }
           }
@@ -187,17 +210,19 @@
 	OUTPUT:
         RETVAL
 
+#############################################################################
+
 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);
 
@@ -205,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]);
+}
+