--- CV/CV.xs	2003/11/12 23:54:54	1.7
+++ CV/CV.xs	2005/07/20 02:26:46	1.16
@@ -57,6 +57,7 @@
     
 }
 
+static void
 a85_finish (PerlIO *fp)
 {
   while (a85_cnt != 4)
@@ -69,9 +70,36 @@
   PerlIO_write (fp, a85_buf, a85_ptr - a85_buf);
 }
 
+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::ImageWindow
+MODULE = Gtk2::CV PACKAGE = Gtk2::CV
 
 PROTOTYPES: ENABLE
 
@@ -199,9 +227,9 @@
                 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;
+                Er[x] = er / 2; er -= er / 2 + RAND % 5 - 2;
+                Eg[x] = eg / 2; eg -= eg / 2 + RAND % 5 - 2;
+                Eb[x] = eb / 2; eb -= eb / 2 + RAND % 5 - 2;
 
                 *dst++ = r << 5 | g << 2 | b;
               }
@@ -210,6 +238,62 @@
 	OUTPUT:
         RETVAL
 
+SV *
+make_histogram (SV *ar)
+        CODE:
+{
+        int i;
+        AV *av, *result;
+
+        if (!SvROK (ar) || SvTYPE (SvRV (ar)) != SVt_PVAV)
+          croak ("Not an array ref as first argument to make_histogram");
+
+        av = (AV *) SvRV (ar);
+        result = newAV ();
+
+        for (i = 0; i <= av_len (av); ++i)
+          {
+            const int HISTSIZE = 64;
+
+            int j;
+            SV *sv = *av_fetch (av, i, 1);
+            STRLEN len;
+            char *buf = SvPVbyte (sv, len);
+
+            int tmphist[HISTSIZE];
+            float *hist;
+
+            SV *histsv = newSV (HISTSIZE * sizeof (float) + 1);
+            SvPOK_on (histsv);
+            SvCUR_set (histsv, HISTSIZE * sizeof (float));
+            hist = (float *)SvPVX (histsv);
+
+            Zero (tmphist, sizeof (tmphist), char);
+
+            for (j = len; j--; )
+              {
+                unsigned int idx
+                    = ((*buf & 0xc0) >> 2)
+                    | ((*buf & 0x18) >> 1)
+                    |  (*buf & 0x03);
+
+                ++tmphist[idx];
+                ++buf;
+              }
+            
+            for (j = 0; j < HISTSIZE; ++j)
+              hist[j] = (float)tmphist[j] / (len + 1e-30);
+
+            av_push (result, histsv);
+          }
+
+        RETVAL = newRV_noinc ((SV *)result);
+}
+        OUTPUT:
+        RETVAL
+
+
+
 #############################################################################
 
 MODULE = Gtk2::CV PACKAGE = Gtk2::CV::PostScript
@@ -254,6 +338,93 @@
               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