--- CV/CV.xs 2006/06/22 20:50:05 1.36 +++ CV/CV.xs 2017/12/23 08:05:32 1.55 @@ -9,13 +9,25 @@ #include #include +#include + #include #include +#include #include #include #include +#include + +#if WEBP +#include +#include +#endif + +#include "perlmulticore.h" + #define IW 80 /* MUST match Schnauzer.pm! */ #define IH 60 /* MUST match Schnauzer.pm! */ @@ -25,6 +37,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 +50,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; } @@ -120,10 +142,9 @@ f->v2 /= f->n; f->v3 /= f->n; - // this is a peculiar weightung, but it works fine f->v1 /= 255.; - f->v2 /= 128. * 128.; - f->v3 /= 128. * 128. * 64.; + f->v2 /= 255. * 255.; f->v2 = sqrtf (f->v2); + f->v3 /= 255. * 255. * 255.; f->v3 = powf (fabsf (f->v3), 1./3.); } static guint32 a85_val; @@ -147,9 +168,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; @@ -183,6 +204,54 @@ ///////////////////////////////////////////////////////////////////////////// +static void cv_ms_init (j_decompress_ptr cinfo) +{ +} + +static void cv_ms_term (j_decompress_ptr cinfo) +{ +} + +static boolean cv_ms_fill (j_decompress_ptr cinfo) +{ + ERREXIT (cinfo, JERR_INPUT_EMPTY); + + return TRUE; +} + +static void cv_ms_skip (j_decompress_ptr cinfo, long num_bytes) +{ + if (num_bytes > 0) + { + struct jpeg_source_mgr *src = (struct jpeg_source_mgr *)cinfo->src; + + src->next_input_byte += num_bytes; + src->bytes_in_buffer -= num_bytes; + } +} + +static void cv_jpeg_mem_src (j_decompress_ptr cinfo, void *buf, size_t buflen) +{ + struct jpeg_source_mgr *src; + + if (!cinfo->src) + cinfo->src = (struct jpeg_source_mgr *) + (*cinfo->mem->alloc_small) ( + (j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof (struct jpeg_source_mgr) + ); + + src = (struct jpeg_source_mgr *)cinfo->src; + src->init_source = cv_ms_init; + src->fill_input_buffer = cv_ms_fill; + src->skip_input_data = cv_ms_skip; + src->resync_to_restart = jpeg_resync_to_restart; + src->term_source = cv_ms_term; + src->next_input_byte = (JOCTET *)buf; + src->bytes_in_buffer = buflen; +} + +///////////////////////////////////////////////////////////////////////////// + MODULE = Gtk2::CV PACKAGE = Gtk2::CV PROTOTYPES: ENABLE @@ -205,48 +274,42 @@ 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; - - if (!cookie) - { - cookie = magic_open (MAGIC_NONE); + STRLEN len; + char *data = SvPVbyte (path_or_data, len); - 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_TYPE); + magic_load (magic_cookie[0], 0); + magic_load (magic_cookie[1], 0); } - RETVAL = magic_file (cookie, path); -} - OUTPUT: - RETVAL + perlinterp_release (); -const char * -magic_mime (const char *path) - CODE: -{ - static magic_t cookie; - - if (!cookie) - { - cookie = magic_open (MAGIC_MIME); + RETVAL = ix & 2 + ? magic_buffer (magic_cookie[ix & 1], data, len) + : magic_file (magic_cookie[ix & 1], data); - if (cookie) - magic_load (cookie, 0); - else - XSRETURN_UNDEF; - } - - RETVAL = magic_file (cookie, path); + perlinterp_acquire (); } 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) @@ -262,6 +325,7 @@ GdkPixbuf_noinc * dealpha_expose (GdkPixbuf *pb) CODE: + perlinterp_release (); { int w = gdk_pixbuf_get_width (pb); int h = gdk_pixbuf_get_height (pb); @@ -280,37 +344,166 @@ 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 + +const char * +filetype (SV *image_data) + CODE: +{ + STRLEN data_len; + U8 *data = SvPVbyte (image_data, data_len); + + if (data_len >= 20 + && data[0] == 0xff + && data[1] == 0xd8 + && data[2] == 0xff) + RETVAL = "jpg"; + else if (data_len >= 12 + && data[ 0] == (U8)'R' + && data[ 1] == (U8)'I' + && data[ 2] == (U8)'F' + && data[ 3] == (U8)'F' + && data[ 8] == (U8)'W' + && data[ 9] == (U8)'E' + && data[10] == (U8)'B' + && data[11] == (U8)'P') + RETVAL = "webp"; + else if (data_len >= 16 + && data[ 0] == 0x89 + && data[ 1] == (U8)'P' + && data[ 2] == (U8)'N' + && data[ 3] == (U8)'G' + && data[ 4] == 0x0d + && data[ 5] == 0x0a + && data[ 6] == 0x1a + && data[ 7] == 0x0a) + RETVAL = "png"; + else + RETVAL = "other"; +} + OUTPUT: + RETVAL + +GdkPixbuf_noinc * +decode_webp (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0) + CODE: +{ +#if WEBP + STRLEN data_size; + int alpha; + WebPData data; + WebPDemuxer *demux; + WebPIterator iter; + WebPDecoderConfig config; + int inw, inh; + + data.bytes = (uint8_t *)SvPVbyte (image_data, data_size); + data.size = data_size; + + perlinterp_release (); + + RETVAL = 0; + + if (!(demux = WebPDemux (&data))) + goto err_demux; + + if (!WebPDemuxGetFrame (demux, 1, &iter)) + goto err_iter; + + if (!WebPInitDecoderConfig (&config)) + goto err_iter; + + config.options.use_threads = 1; + + if (WebPGetFeatures (iter.fragment.bytes, iter.fragment.size, &config.input) != VP8_STATUS_OK) + goto err_iter; + + 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_iter; + + 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 (iter.fragment.bytes, iter.fragment.size, &config) != VP8_STATUS_OK) + { + g_object_unref (RETVAL); + RETVAL = 0; + goto err_iter; + } + + err_iter: + WebPDemuxReleaseIterator (&iter); + err_demux: + WebPDemuxDelete (demux); + + perlinterp_acquire (); +#else + croak ("load_webp: webp not enabled at compile time"); +#endif +} OUTPUT: RETVAL GdkPixbuf_noinc * -load_jpeg (SV *path, int thumbnail=0) +decode_jpeg (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0) CODE: { struct jpeg_decompress_struct cinfo; struct jpg_err_mgr jerr; - guchar *data; int rs; - FILE *fp; volatile GdkPixbuf *pb = 0; + STRLEN data_len; + guchar *data = SvPVbyte (image_data, data_len); RETVAL = 0; - fp = fopen (SvPVbyte_nolen (path), "rb"); - - if (!fp) - XSRETURN_UNDEF; + perlinterp_release (); cinfo.err = jpeg_std_error (&jerr.err); @@ -319,18 +512,18 @@ if ((rs = setjmp (jerr.setjmp_buffer))) { - fclose (fp); jpeg_destroy_decompress (&cinfo); if (pb) g_object_unref ((gpointer)pb); + perlinterp_acquire (); XSRETURN_UNDEF; } jpeg_create_decompress (&cinfo); + cv_jpeg_mem_src (&cinfo, data, data_len); - jpeg_stdio_src (&cinfo, fp); jpeg_read_header (&cinfo, TRUE); cinfo.dct_method = JDCT_DEFAULT; @@ -350,24 +543,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) @@ -383,9 +582,38 @@ 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 @@ -393,9 +621,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); @@ -429,6 +659,8 @@ } } + perlinterp_acquire (); + EXTEND (SP, 2); PUSHs (sv_2mortal (newSVnv (sqrt (diff / (w * h * 3. * 255. * 255.))))); PUSHs (sv_2mortal (newSVnv (peak / 255.))); @@ -438,13 +670,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; @@ -454,6 +688,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; @@ -467,12 +703,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); @@ -651,7 +891,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 (); @@ -714,61 +954,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); } @@ -778,4 +964,3 @@ OUTPUT: RETVAL -