--- CV/CV.xs	2003/11/08 22:18:50	1.5
+++ CV/CV.xs	2004/04/06 23:53:20	1.9
@@ -11,9 +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)
@@ -53,6 +57,7 @@
     
 }
 
+static void
 a85_finish (PerlIO *fp)
 {
   while (a85_cnt != 4)
@@ -65,7 +70,36 @@
   PerlIO_write (fp, a85_buf, a85_ptr - a85_buf);
 }
 
-MODULE = Gtk2::CV PACKAGE = Gtk2::CV::ImageWindow
+static void
+rgb_to_hsv (unsigned int  r, unsigned int  g, unsigned int  b,
+            unsigned int *h, unsigned int *s, unsigned int *v)
+{
+  unsigned int mx = r; if (g > mx) mx = g; if (b > mx) mx = b;
+  unsigned int mn = r; if (g < mn) mn = g; if (b < mn) mn = b;
+  unsigned int delta = mx - mn;
+
+  *v = mx;
+
+  *s = mx ? delta * 255 / mx : 0;
+
+  if (delta == 0)
+    *h = 0;
+  else
+    {
+      if (r == mx)
+        *h = ((int)g - (int)b) * 255 / (int)(delta * 3);
+      else if (g == mx)
+        *h = ((int)b - (int)r) * 255 / (int)(delta * 3) + 52;
+      else if (b == mx)
+        *h = ((int)r - (int)g) * 255 / (int)(delta * 3) + 103;
+
+      *h &= 255;
+    }
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
+MODULE = Gtk2::CV PACKAGE = Gtk2::CV
 
 PROTOTYPES: ENABLE
 
@@ -75,7 +109,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;
@@ -99,7 +133,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;
@@ -117,6 +151,8 @@
 	OUTPUT:
         RETVAL
 
+#############################################################################
+
 MODULE = Gtk2::CV PACKAGE = Gtk2::CV::Schnauzer
 
 GdkPixbuf_noinc *
@@ -152,7 +188,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];
@@ -202,17 +238,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);
 
@@ -220,12 +258,117 @@
 
         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]);
+}
+
+#############################################################################
+
+MODULE = Gtk2::CV PACKAGE = Gtk2::CV
+
+SV *
+pb_to_hv84 (GdkPixbuf *pb)
+	CODE:
+{
+	int w = gdk_pixbuf_get_width  (pb);
+	int h = gdk_pixbuf_get_height (pb);
+	int x, y;
+        guchar *dst;
+        int bpp = gdk_pixbuf_get_n_channels (pb);
+        guchar *src = gdk_pixbuf_get_pixels (pb);
+        int sstr = gdk_pixbuf_get_rowstride (pb);
+
+	RETVAL = newSV (6 * 8 * 12 / 8);
+        SvPOK_only (RETVAL);
+        SvCUR_set (RETVAL, 6 * 8 * 12 / 8);
+
+        dst = SvPVX (RETVAL);
+
+        /* some primitive error distribution + random dithering */
+
+        for (y = 0; y < h; y++)
+          {
+            guchar *p = src + y * sstr;
+
+            for (x = 0; x < w; x += 2)
+              {
+                unsigned int r, g, b, h, s, v, H, V1, V2;
+
+                if (bpp == 3)
+                  r = *p++, g = *p++, b = *p++;
+                else if (bpp == 1)
+                  r = g = b = *p++;
+                else
+                  abort ();
+
+                rgb_to_hsv (r, g, b, &h, &s, &v);
+
+                H = (h * 15 / 255) << 4;
+                V1 = v;
+
+                if (bpp == 3)
+                  r = *p++, g = *p++, b = *p++;
+                else if (bpp == 1)
+                  r = g = b = *p++;
+                else
+                  abort ();
+
+                rgb_to_hsv (r, g, b, &h, &s, &v);
+
+                H |= h * 15 / 255;
+                V2 = v;
+
+                *dst++ = H;
+                *dst++ = V1;
+                *dst++ = V2;
+              }
+          }
+}
+	OUTPUT:
+        RETVAL
+
+SV *
+hv84_to_av (unsigned char *hv84)
+	CODE:
+{
+        int i = 72 / 3;
+        AV *av = newAV ();
+
+        RETVAL = (SV *)newRV_noinc ((SV *)av);
+        while (i--)
+          {
+            int h  = *hv84++;
+            int v1 = *hv84++;
+            int v2 = *hv84++;
+
+            av_push (av, newSViv (v1));
+            av_push (av, newSViv ((h >> 4) * 255 / 15));
+            av_push (av, newSViv (v2));
+            av_push (av, newSViv ((h & 15) * 255 / 15));
+          }
+}
+	OUTPUT:
+        RETVAL