--- CV/CV.xs 2008/09/14 12:47:59 1.42 +++ CV/CV.xs 2015/07/04 05:31:17 1.46 @@ -16,6 +16,10 @@ #include #include +#include + +#include "perlmulticore.h" + #define IW 80 /* MUST match Schnauzer.pm! */ #define IH 60 /* MUST match Schnauzer.pm! */ @@ -213,7 +217,7 @@ if (!cookie) { - cookie = magic_open (MAGIC_NONE); + cookie = magic_open (MAGIC_SYMLINK); if (cookie) magic_load (cookie, 0); @@ -234,7 +238,7 @@ if (!cookie) { - cookie = magic_open (MAGIC_MIME); + cookie = magic_open (MAGIC_MIME | MAGIC_SYMLINK); if (cookie) magic_load (cookie, 0); @@ -242,7 +246,9 @@ XSRETURN_UNDEF; } + perlinterp_release (); RETVAL = magic_file (cookie, path); + perlinterp_acquire (); } OUTPUT: RETVAL @@ -268,6 +274,7 @@ GdkPixbuf_noinc * dealpha_expose (GdkPixbuf *pb) CODE: + perlinterp_release (); { int w = gdk_pixbuf_get_width (pb); int h = gdk_pixbuf_get_height (pb); @@ -286,17 +293,22 @@ for (i = 0; i < 3; i++) dst[x * 3 + y * dstr + i] = src[x * bpp + y * sstr + i]; } + perlinterp_acquire (); OUTPUT: RETVAL GdkPixbuf_noinc * rotate (GdkPixbuf *pb, int angle) CODE: + perlinterp_release (); + 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 : angle == 270 ? GDK_PIXBUF_ROTATE_CLOCKWISE : angle); + perlinterp_acquire (); OUTPUT: RETVAL @@ -318,6 +330,8 @@ if (!fp) XSRETURN_UNDEF; + perlinterp_release (); + cinfo.err = jpeg_std_error (&jerr.err); jerr.err.error_exit = cv_error_exit; @@ -331,6 +345,7 @@ if (pb) g_object_unref ((gpointer)pb); + perlinterp_acquire (); XSRETURN_UNDEF; } @@ -392,6 +407,7 @@ jpeg_finish_decompress (&cinfo); fclose (fp); jpeg_destroy_decompress (&cinfo); + perlinterp_acquire (); } OUTPUT: RETVAL @@ -399,9 +415,11 @@ void compare (GdkPixbuf *a, GdkPixbuf *b) PPCODE: + perlinterp_release (); { 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); @@ -435,6 +453,8 @@ } } + perlinterp_acquire (); + EXTEND (SP, 2); PUSHs (sv_2mortal (newSVnv (sqrt (diff / (w * h * 3. * 255. * 255.))))); PUSHs (sv_2mortal (newSVnv (peak / 255.)));