--- CV/CV.xs	2005/08/14 02:25:44	1.22
+++ CV/CV.xs	2005/08/19 00:34:54	1.25
@@ -6,6 +6,8 @@
 #include <setjmp.h>
 
 #include <jpeglib.h>
+#include <glib.h>
+#include <gtk/gtk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 #include <gperl.h>
@@ -188,7 +190,7 @@
         RETVAL
 
 GdkPixbuf_noinc *
-load_jpeg (char *path, int thumbnail=0)
+load_jpeg (SV *path, int thumbnail=0)
 	CODE:
 {
         struct jpeg_decompress_struct cinfo;
@@ -197,9 +199,15 @@
         int rs;
         FILE *fp;
         volatile GdkPixbuf *pb = 0;
+        gchar *filename;
+
         RETVAL = 0;
 
-        if (!(fp = fopen (path, "rb")))
+        filename = g_filename_from_utf8 (SvPVutf8_nolen (path), -1, 0, 0, 0);
+        fp = fopen (filename, "rb");
+        g_free (filename);
+
+        if (!fp)
           XSRETURN_UNDEF;
 
         cinfo.err = jpeg_std_error (&jerr.err);
@@ -290,7 +298,7 @@
 	CODE:
 {
 	STRLEN plen;
-        U8 *path = SvPVutf8 (pathsv, plen);
+        U8 *path = (U8 *)SvPVutf8 (pathsv, plen);
         U8 *pend = path + plen;
         U8 dst [plen * 6 * 3], *dstp = dst;
 
@@ -321,19 +329,20 @@
               }
           }
 
-        RETVAL = newSVpvn (dst, dstp - dst);
+        RETVAL = newSVpvn ((const char *)dst, dstp - dst);
 }
 	OUTPUT:
         RETVAL
 
 GdkPixbuf_noinc *
-p7_to_pb (int w, int h, guchar *src)
+p7_to_pb (int w, int h, SV *src_sv)
         PROTOTYPE: @
 	CODE:
 {
 	int x, y;
         guchar *dst, *d;
         int dstr;
+        guchar *src = (guchar *)SvPVbyte_nolen (src_sv);
 
 	RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, 0, 8,  w, h);
         dst = gdk_pixbuf_get_pixels (RETVAL);
@@ -370,7 +379,7 @@
         SvPOK_only (RETVAL);
         SvCUR_set (RETVAL, w * h);
 
-        dst = SvPVX (RETVAL);
+        dst = (guchar *)SvPVX (RETVAL);
 
         memset (Er, 0, sizeof (int) * IW);
         memset (Eg, 0, sizeof (int) * IW);
@@ -474,7 +483,7 @@
         SvPOK_only (RETVAL);
         SvCUR_set (RETVAL, 6 * 8 * 12 / 8);
 
-        dst = SvPVX (RETVAL);
+        dst = (guchar *)SvPVX (RETVAL);
 
         /* some primitive error distribution + random dithering */