--- CV/CV.xs	2006/06/22 22:01:26	1.37
+++ CV/CV.xs	2012/12/30 16:23:23	1.44
@@ -16,6 +16,8 @@
 #include <gperl.h>
 #include <gtk2perl.h>
 
+#include <assert.h>
+
 #define IW 80 /* MUST match Schnauzer.pm! */
 #define IH 60 /* MUST match Schnauzer.pm! */
 
@@ -25,6 +27,8 @@
 
 #define ELLIPSIS "\xe2\x80\xa6"
 
+typedef char *octet_string;
+
 struct jpg_err_mgr
 {
   struct jpeg_error_mgr err;
@@ -204,7 +208,7 @@
         RETVAL
 
 const char *
-magic (const char *path)
+magic (octet_string path)
 	CODE:
 {
 	static magic_t cookie;
@@ -225,7 +229,7 @@
         RETVAL
 
 const char *
-magic_mime (const char *path)
+magic_mime (octet_string path)
 	CODE:
 {
 	static magic_t cookie;
@@ -245,7 +249,12 @@
 	OUTPUT:
         RETVAL
 
-# missing in Gtk2 perl module
+# missing/broken in Gtk2 perl module
+
+void
+gdk_window_clear_hints (GdkWindow *window)
+	CODE:
+        gdk_window_set_geometry_hints (window, 0, 0);
 
 gboolean
 gdk_net_wm_supports (GdkAtom property)
@@ -285,6 +294,8 @@
 GdkPixbuf_noinc *
 rotate (GdkPixbuf *pb, int angle)
 	CODE:
+        if (angle < 0)
+          angle += 360;
         RETVAL = gdk_pixbuf_rotate_simple (pb, angle ==   0 ? GDK_PIXBUF_ROTATE_NONE
                                              : angle ==  90 ? GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE
                                              : angle == 180 ? GDK_PIXBUF_ROTATE_UPSIDEDOWN
@@ -395,6 +406,7 @@
 {
 	int w  = gdk_pixbuf_get_width  (a);
 	int h  = gdk_pixbuf_get_height (a);
+
         int sa = gdk_pixbuf_get_rowstride (a);
         int sb = gdk_pixbuf_get_rowstride (b);
 
@@ -437,13 +449,15 @@
 
 MODULE = Gtk2::CV PACKAGE = Gtk2::CV::Schnauzer
 
+# currently only works for filenames (octet strings)
+
 SV *
 foldcase (SV *pathsv)
 	PROTOTYPE: $
 	CODE:
 {
 	STRLEN plen;
-        U8 *path = (U8 *)SvPVutf8 (pathsv, plen);
+        U8 *path = (U8 *)SvPV (pathsv, plen);
         U8 *pend = path + plen;
         U8 dst [plen * 6 * 3], *dstp = dst;
 
@@ -453,6 +467,8 @@
 
             if (ch >= 'a' && ch <= 'z')
               *dstp++ = *path++;
+            else if (ch >= 'A' && ch <= 'Z')
+              *dstp++ = *path++ + ('a' - 'A');
             else if (ch >= '0' && ch <= '9')
               {
                 STRLEN el, nl = 0;
@@ -466,12 +482,16 @@
                 dstp += nl;
               }
             else
+              *dstp++ = *path++;
+#if 0
+            else
               {
                 STRLEN cl;
                 to_utf8_fold (path, dstp, &cl);
                 dstp += cl;
                 path += is_utf8_char (path);
               }
+#endif
           }
 
         RETVAL = newSVpvn ((const char *)dst, dstp - dst);
@@ -650,7 +670,7 @@
         AV *av, *result;
 
         if (!SvROK (ar) || SvTYPE (SvRV (ar)) != SVt_PVAV)
-          croak ("Not an array ref as first argument to make_histogram");
+          croak ("Not an array ref as first argument to extract_features");
 
         av = (AV *) SvRV (ar);
         result = newAV ();
@@ -713,61 +733,7 @@
 
             hist [0] = f_h.v1 * 2.; hist [1] = f_h.v2 * 2.; hist [2] = f_h.v3 * 2.;
             hist [3] = f_s.v1     ; hist [4] = f_s.v2     ; hist [5] = f_s.v3     ;
-            hist [6] = f_v.v1     ; hist [7] = f_v.v2     ; hist [8] = f_v.v3     ;
-
-            av_push (result, histsv);
-          }
-
-        RETVAL = newRV_noinc ((SV *)result);
-}
-        OUTPUT:
-        RETVAL
-
-SV *
-make_histograms (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);
+            hist [6] = f_v.v1 * .5; hist [7] = f_v.v2 * .5; hist [8] = f_v.v3 * .5;
 
             av_push (result, histsv);
           }
@@ -777,4 +743,3 @@
         OUTPUT:
         RETVAL
 
-