--- CV/CV.xs	2004/04/05 20:55:10	1.8
+++ CV/CV.xs	2005/07/20 02:26:46	1.16
@@ -99,7 +99,7 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
-MODULE = Gtk2::CV PACKAGE = Gtk2::CV::ImageWindow
+MODULE = Gtk2::CV PACKAGE = Gtk2::CV
 
 PROTOTYPES: ENABLE
 
@@ -227,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;
               }
@@ -238,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
@@ -347,6 +403,28 @@
 	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