--- CV/CV.xs 2006/11/25 15:00:51 1.40 +++ CV/CV.xs 2017/12/23 04:11:49 1.51 @@ -11,11 +11,20 @@ #include #include #include +#include #include #include #include +#include + +#if WEBP +#include +#endif + +#include "perlmulticore.h" + #define IW 80 /* MUST match Schnauzer.pm! */ #define IH 60 /* MUST match Schnauzer.pm! */ @@ -25,6 +34,10 @@ #define ELLIPSIS "\xe2\x80\xa6" +typedef char *octet_string; + +static magic_t magic_cookie[2]; /* !mime, mime */ + struct jpg_err_mgr { struct jpeg_error_mgr err; @@ -34,12 +47,18 @@ static void cv_error_exit (j_common_ptr cinfo) { + cinfo->err->output_message (cinfo); longjmp (((struct jpg_err_mgr *)cinfo->err)->setjmp_buffer, 99); } static void cv_error_output (j_common_ptr cinfo) { + char msg[JMSG_LENGTH_MAX]; + + cinfo->err->format_message (cinfo, msg); + + fprintf (stderr, "JPEG decoding error: %s\n", msg); return; } @@ -146,9 +165,9 @@ a85_cnt = 4; if (a85_val) { - a85_ptr[4] = (a85_val % 85) + 33; a85_val /= 85; - a85_ptr[3] = (a85_val % 85) + 33; a85_val /= 85; - a85_ptr[2] = (a85_val % 85) + 33; a85_val /= 85; + a85_ptr[4] = (a85_val % 85) + 33; a85_val /= 85; + a85_ptr[3] = (a85_val % 85) + 33; a85_val /= 85; + a85_ptr[2] = (a85_val % 85) + 33; a85_val /= 85; a85_ptr[1] = (a85_val % 85) + 33; a85_val /= 85; a85_ptr[0] = (a85_val ) + 33; @@ -204,43 +223,30 @@ RETVAL const char * -magic (const char *path) +magic (SV *path_or_data) + ALIAS: + magic = 0 + magic_mime = 1 + magic_buffer = 2 + magic_buffer_mime = 3 CODE: { - static magic_t cookie; + STRLEN len; + char *data = SvPVbyte (path_or_data, len); - if (!cookie) - { - cookie = magic_open (MAGIC_NONE); + perlinterp_release (); - if (cookie) - magic_load (cookie, 0); - else - XSRETURN_UNDEF; + if (!magic_cookie[0]) + { + magic_cookie[0] = magic_open (MAGIC_SYMLINK); + magic_cookie[1] = magic_open (MAGIC_SYMLINK | MAGIC_MIME); } - RETVAL = magic_file (cookie, path); -} - OUTPUT: - RETVAL - -const char * -magic_mime (const char *path) - CODE: -{ - static magic_t cookie; + RETVAL = ix & 2 + ? magic_buffer (magic_cookie[ix], data, len) + : magic_file (magic_cookie[ix], data); - if (!cookie) - { - cookie = magic_open (MAGIC_MIME); - - if (cookie) - magic_load (cookie, 0); - else - XSRETURN_UNDEF; - } - - RETVAL = magic_file (cookie, path); + perlinterp_acquire (); } OUTPUT: RETVAL @@ -266,6 +272,7 @@ GdkPixbuf_noinc * dealpha_expose (GdkPixbuf *pb) CODE: + perlinterp_release (); { int w = gdk_pixbuf_get_width (pb); int h = gdk_pixbuf_get_height (pb); @@ -284,22 +291,103 @@ 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 + +GdkPixbuf_noinc * +decode_webp (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0) + CODE: +{ +#if WEBP + guchar *data; + STRLEN data_size; + int alpha; + WebPDecoderConfig config; + int inw, inh; + + data = SvPVbyte (image_data, data_size); + + perlinterp_release (); + + RETVAL = 0; + + if (!WebPInitDecoderConfig (&config)) + goto err; + + config.options.use_threads = 1; + + if (WebPGetFeatures (data, data_size, &config.input) != VP8_STATUS_OK) + goto err; + + inw = config.input.width; + inh = config.input.height; + + if (thumbnail) + { + if (inw * ih > inh * iw) + ih = (iw * inh + inw - 1) / inw; + else + iw = (ih * inw + inh - 1) / inh; + + config.options.bypass_filtering = 1; + config.options.no_fancy_upsampling = 1; + + config.options.use_scaling = 1; + config.options.scaled_width = iw; + config.options.scaled_height = ih; + } + else + { + iw = inw; + ih = inh; + } + + alpha = config.input.has_alpha; + + RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, !!alpha, 8, iw, ih); + if (!RETVAL) + goto err; + + config.output.colorspace = alpha ? MODE_RGBA : MODE_RGB; + config.output.u.RGBA.rgba = gdk_pixbuf_get_pixels (RETVAL); + config.output.u.RGBA.stride = gdk_pixbuf_get_rowstride (RETVAL); + config.output.u.RGBA.size = gdk_pixbuf_get_byte_length (RETVAL); + config.output.is_external_memory = 1; + + if (WebPDecode (data, data_size, &config) != VP8_STATUS_OK) + { + g_object_unref (RETVAL); + RETVAL = 0; + goto err; + } + + err: + perlinterp_acquire (); +#else + croak ("load_webp: webp not enabled at compile time"); +#endif +} OUTPUT: RETVAL GdkPixbuf_noinc * -load_jpeg (SV *path, int thumbnail=0) +load_jpeg (SV *path, int thumbnail = 0, int iw = 0, int ih = 0) CODE: { struct jpeg_decompress_struct cinfo; @@ -316,6 +404,8 @@ if (!fp) XSRETURN_UNDEF; + perlinterp_release (); + cinfo.err = jpeg_std_error (&jerr.err); jerr.err.error_exit = cv_error_exit; @@ -329,6 +419,7 @@ if (pb) g_object_unref ((gpointer)pb); + perlinterp_acquire (); XSRETURN_UNDEF; } @@ -354,24 +445,30 @@ cinfo.do_fancy_upsampling = FALSE; while (cinfo.scale_denom < 8 - && cinfo.output_width >= IW*4 - && cinfo.output_height >= IH*4) + && cinfo.output_width >= iw*4 + && cinfo.output_height >= ih*4) { cinfo.scale_denom <<= 1; jpeg_calc_output_dimensions (&cinfo); } } - pb = RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, 0, 8, cinfo.output_width, cinfo.output_height); + if (cinfo.output_components != 3) + longjmp (jerr.setjmp_buffer, 3); + + if (cinfo.jpeg_color_space == JCS_YCCK || cinfo.jpeg_color_space == JCS_CMYK) + { + cinfo.out_color_space = JCS_CMYK; + cinfo.output_components = 4; + } + + pb = RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, cinfo.output_components == 4, 8, cinfo.output_width, cinfo.output_height); if (!RETVAL) longjmp (jerr.setjmp_buffer, 2); data = gdk_pixbuf_get_pixels (RETVAL); rs = gdk_pixbuf_get_rowstride (RETVAL); - if (cinfo.output_components != 3) - longjmp (jerr.setjmp_buffer, 3); - jpeg_start_decompress (&cinfo); while (cinfo.output_scanline < cinfo.output_height) @@ -387,9 +484,39 @@ jpeg_read_scanlines (&cinfo, rp, remaining < 4 ? remaining : 4); } + if (cinfo.out_color_space == JCS_CMYK) + { + guchar *end = data + cinfo.output_height * rs; + + while (data < end) + { + U32 c = data [0]; + U32 m = data [1]; + U32 y = data [2]; + U32 k = data [3]; + + if (0) + if (cinfo.Adobe_transform == 2) + { + c ^= 0xff; + m ^= 0xff; + y ^= 0xff; + k ^= 0xff; + } + + data [0] = (c * k + 0x80) / 0xff; + data [1] = (m * k + 0x80) / 0xff; + data [2] = (y * k + 0x80) / 0xff; + data [3] = 0xff; + + data += 4; + } + } + jpeg_finish_decompress (&cinfo); fclose (fp); jpeg_destroy_decompress (&cinfo); + perlinterp_acquire (); } OUTPUT: RETVAL @@ -397,9 +524,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); @@ -433,6 +562,8 @@ } } + perlinterp_acquire (); + EXTEND (SP, 2); PUSHs (sv_2mortal (newSVnv (sqrt (diff / (w * h * 3. * 255. * 255.))))); PUSHs (sv_2mortal (newSVnv (peak / 255.))); @@ -442,13 +573,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; @@ -458,6 +591,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; @@ -471,12 +606,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);