--- CV/CV.xs 2005/08/21 02:18:30 1.26 +++ CV/CV.xs 2021/07/25 11:24:48 1.61 @@ -4,24 +4,46 @@ #include #include +#include + +#include #include +#include + #include #include +#include #include #include #include -#define IW 80 /* MUST match Schnauer.pm! */ -#define IH 60 /* MUST match Schnauer.pm! */ +#include -#define RAND (seed = (seed + 7141) * 54773 % 134456) +#if WEBP +#include +#include +#endif + +#if JXL +#include +#include "jxl/thread_parallel_runner.h" +#endif + +#include "perlmulticore.h" + +#define IW 80 /* MUST match Schnauzer.pm! */ +#define IH 60 /* MUST match Schnauzer.pm! */ #define LINELENGTH 240 #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; @@ -31,12 +53,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; } @@ -67,6 +95,61 @@ } } +struct feature { + float v1, v2, v3; // mean, square, cube + int n; +}; + +static void +feature_init (struct feature *f) +{ + f->v1 = 0.; + f->v2 = 0.; + f->v3 = 0.; + f->n = 0; +} + +// didn't find an algorithm to neatly do mean, variance and skew in one pass. +// elmex ist schuld. +static void +feature_update_pass_1 (struct feature *f, unsigned int v) +{ + f->v1 += v; + f->n += 1; +} + +static void +feature_finish_pass_1 (struct feature *f) +{ + if (f->n < 1) + return; + + f->v1 /= f->n; +} + +static void +feature_update_pass_2 (struct feature *f, unsigned int v) +{ + float d = v - f->v1; + + f->v2 += d * d; + f->v3 += d * d * d; +} + +static void +feature_finish_pass_2 (struct feature *f) +{ + if (f->n < 1) + return; + + f->v2 /= f->n; + f->v3 /= f->n; + + f->v1 /= 255.; + 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; static guint a85_cnt; static guchar a85_buf[LINELENGTH], *a85_ptr; @@ -88,9 +171,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; @@ -123,12 +206,160 @@ } ///////////////////////////////////////////////////////////////////////////// +// memory source for libjpeg + +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) +{ + // unexpected EOF, warn and generate fake EOI marker + + WARNMS (cinfo, JWRN_JPEG_EOF); + + struct jpeg_source_mgr *src = (struct jpeg_source_mgr *)cinfo->src; + + static const JOCTET eoi[] = { 0xFF, JPEG_EOI }; + + src->next_input_byte = eoi; + src->bytes_in_buffer = sizeof (eoi); + + return TRUE; +} + +static void cv_ms_skip (j_decompress_ptr cinfo, long num_bytes) +{ + 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; +} + +///////////////////////////////////////////////////////////////////////////// + +/* great, the jpeg-xl reference implementaton requires us to parse bmff files */ + +struct bmff_box +{ + char type[4]; + const uint8_t *ptr; + size_t size; +}; + +static int +bmff_parse_box (struct bmff_box *box, const uint8_t **next_in, size_t *avail_in) +{ + if (*avail_in < 8) + return 0; + + box->size = ((*next_in)[0] << 24) + | ((*next_in)[1] << 16) + | ((*next_in)[2] << 8) + | ((*next_in)[3] ); + + if (box->size < 8) + return 0; + + if (*avail_in < box->size) + return 0; + + memcpy (box->type, *next_in + 4, 4); + box->ptr = *next_in + 8; + + *next_in += box->size; + *avail_in -= box->size; + + box->size -= 8; + + return 1; +} + +///////////////////////////////////////////////////////////////////////////// MODULE = Gtk2::CV PACKAGE = Gtk2::CV PROTOTYPES: ENABLE -# missing in Gtk2 perl module +# calculate the common prefix length of two strings +# missing function in perl. really :) +int +common_prefix_length (a, b) + unsigned char *a = (unsigned char *)SvPVutf8_nolen ($arg); + unsigned char *b = (unsigned char *)SvPVutf8_nolen ($arg); + CODE: + RETVAL = 0; + + while (*a == *b && *a) + { + RETVAL += (*a & 0xc0) != 0x80; + a++, b++; + } + + OUTPUT: + RETVAL + +const char * +magic (SV *path_or_data) + ALIAS: + magic = 0 + magic_mime = 1 + magic_buffer = 2 + magic_buffer_mime = 3 + CODE: +{ + STRLEN len; + char *data = SvPVbyte (path_or_data, len); + + 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); + } + + perlinterp_release (); + + RETVAL = ix & 2 + ? magic_buffer (magic_cookie[ix & 1], data, len) + : magic_file (magic_cookie[ix & 1], data); + + perlinterp_acquire (); +} + OUTPUT: + RETVAL + +# 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) @@ -144,10 +375,10 @@ GdkPixbuf_noinc * dealpha_expose (GdkPixbuf *pb) CODE: + perlinterp_release (); { int w = gdk_pixbuf_get_width (pb); int h = gdk_pixbuf_get_height (pb); - fprintf (stderr, "new %d %d\n", w, h); int bpp = gdk_pixbuf_get_n_channels (pb); int x, y, i; guchar *src = gdk_pixbuf_get_pixels (pb), *dst; @@ -163,77 +394,315 @@ for (i = 0; i < 3; i++) dst[x * 3 + y * dstr + i] = src[x * bpp + y * sstr + i]; } + perlinterp_acquire (); OUTPUT: RETVAL GdkPixbuf_noinc * -transpose (GdkPixbuf *pb) +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: { - int w = gdk_pixbuf_get_width (pb); - int h = gdk_pixbuf_get_height (pb); - int bpp = gdk_pixbuf_get_n_channels (pb); - int x, y, i; - guchar *src = gdk_pixbuf_get_pixels (pb), *dst; - int sstr = gdk_pixbuf_get_rowstride (pb), dstr; + STRLEN data_len; + U8 *data = SvPVbyte (image_data, data_len); + static const unsigned char jxl_header[] = { + 0, 0, 0, 0x0c, 0x4a, 0x58, 0x4c, 0x20, + 0x0d, 0xa, 0x87, 0x0a, 0, 0, 0, 0x14, + 0x66, 0x74, 0x79, 0x70, 0x6a, 0x78, 0x6c, 0x20, + 0, 0, 0, 0, 0x6a, 0x78, 0x6c, 0x20, + }; + + if (data_len >= 20 + && data[0] == 0xff + && data[1] == 0xd8 + && data[2] == 0xff) + RETVAL = "image/jpeg"; + 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 = "image/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 = "image/png"; + else if (data_len >= sizeof (jxl_header) && memcmp (data, jxl_header, sizeof (jxl_header)) == 0) + RETVAL = "image/jxl"; + else if (data_len >= 13 + && data[0] == 'G' + && data[1] == 'I' + && data[2] == 'F' + && data[3] == '8' + //&& (data[4] == '7' || data[4] == '9') + && data[5] == 'a') + { + RETVAL = "image/gif"; - RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, bpp == 4, 8, h, w); + // now see if its animated - we require the netscape application header for this + int ofs = 13; - dst = gdk_pixbuf_get_pixels (RETVAL); - dstr = gdk_pixbuf_get_rowstride (RETVAL); + if (data[10] & 0x80) + ofs += (1 << ((data[10] & 7) + 1)) * 3; - for (y = 0; y < h; y++) - for (x = 0; x < w; x++) - for (i = 0; i < bpp; i++) - dst[y * bpp + x * dstr + i] = src[x * bpp + y * sstr + i]; + if (data_len >= ofs + 2 + 1 + 11) + { + // skip a rare first graphic control extension block + // we assume there is exactly one block + if (data[ofs] == 0x21 && data[ofs + 1] == 0xf9) + ofs += 3 + data[ofs + 2] + 1; + + if (data_len >= ofs + 2 + 1 + 11) + if (!memcmp (data + ofs, "\x21\xff\x0bNETSCAPE2.0", sizeof ("\x21\xff\x0bNETSCAPE2.0") - 1)) + RETVAL = "video/gif"; + } + } + + else + XSRETURN_UNDEF; } OUTPUT: RETVAL GdkPixbuf_noinc * -flop (GdkPixbuf *pb) +decode_webp (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0) CODE: { - int w = gdk_pixbuf_get_width (pb); - int h = gdk_pixbuf_get_height (pb); - int bpp = gdk_pixbuf_get_n_channels (pb); - int x, y, i; - guchar *src = gdk_pixbuf_get_pixels (pb), *dst; - int sstr = gdk_pixbuf_get_rowstride (pb), dstr; +#if WEBP + STRLEN data_size; + int alpha; + WebPData data; + WebPDemuxer *demux; + WebPIterator iter; + WebPDecoderConfig config; + int inw, inh; - RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, bpp == 4, 8, w, h); + data.bytes = (uint8_t *)SvPVbyte (image_data, data_size); + data.size = data_size; - dst = gdk_pixbuf_get_pixels (RETVAL); - dstr = gdk_pixbuf_get_rowstride (RETVAL); + perlinterp_release (); - for (y = 0; y < h; y++) - for (x = 0; x < w; x++) - for (i = 0; i < bpp; i++) - dst[(w - 1 - x) * bpp + y * dstr + i] = src[x * bpp + y * sstr + i]; + 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_jxl (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0) + CODE: +{ +#if JXL + JxlDecoder *dec = JxlDecoderCreate (0); + JxlBasicInfo info; + const uint8_t *next_in = (uint8_t *)SvPVbyte_nolen (image_data); + size_t avail_in = SvCUR (image_data); + const char *error = 0; + void *runner = 0; + struct bmff_box box; + + perlinterp_release (); + + RETVAL = 0; + + error = "JxlDecoderCreate failed"; + if (!dec) + goto done; + + runner = JxlThreadParallelRunnerCreate (0, JxlThreadParallelRunnerDefaultNumWorkerThreads ()); + + error = "JxlDecoderSetParallelRunner failed"; + if (JxlDecoderSetParallelRunner (dec, JxlThreadParallelRunner, runner) != JXL_DEC_SUCCESS) + goto done; + + error = "JxlDecoderSubscribeEvents failed"; + if (JxlDecoderSubscribeEvents (dec, JXL_DEC_FULL_IMAGE | JXL_DEC_BASIC_INFO) != JXL_DEC_SUCCESS) + goto done; + + error = "JxlDecoderSetInput failed"; + if (JxlDecoderSetInput (dec, next_in, avail_in) != JXL_DEC_SUCCESS) + goto done; + + for (;;) + { + JxlDecoderStatus status = JxlDecoderProcessInput (dec); + + printf ("status %d\n",status); + + switch (status) + { + case JXL_DEC_ERROR: + error = "JxlDecoderProcessInput failed"; + goto done; + + case JXL_DEC_NEED_MORE_INPUT: + error = "incomplete file"; + goto done; + + case JXL_DEC_SUCCESS: + goto done; + + case JXL_DEC_NEED_IMAGE_OUT_BUFFER: + { + error = "JxlDecoderGetBasicInfo failed"; + if (JxlDecoderGetBasicInfo (dec, &info) != JXL_DEC_SUCCESS) + goto done; + + RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, !!info.alpha_bits, 8, info.xsize, info.ysize); + error = "unable to allocate pixbuf"; + if (!RETVAL) + goto done; + + JxlPixelFormat format = { + info.alpha_bits ? 4 : 3, + JXL_TYPE_UINT8, + JXL_NATIVE_ENDIAN, + gdk_pixbuf_get_rowstride (RETVAL) + }; + + error = "JxlDecoderSetImageOutBuffer failed"; + if (JxlDecoderSetImageOutBuffer ( + dec, + &format, + gdk_pixbuf_get_pixels (RETVAL), + gdk_pixbuf_get_byte_length (RETVAL) + ) != JXL_DEC_SUCCESS) + goto done; + } + break; + + default: + error = "unexpected event"; + goto done; + } + } + + done: + if (dec) + JxlDecoderDestroy (dec); + + if (runner) + JxlThreadParallelRunnerDestroy (runner); + + perlinterp_acquire (); + + if (error) + { + if (RETVAL) + g_object_unref (RETVAL); + + croak ("load_jxl: %s", error); + } +#else + croak ("load_jxl: jpeg-xl not enabled at compile time"); +#endif +} + OUTPUT: + RETVAL + +GdkPixbuf_noinc * +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; - gchar *filename; + STRLEN data_len; + guchar *data = SvPVbyte (image_data, data_len); RETVAL = 0; - filename = g_filename_from_utf8 (SvPVutf8_nolen (path), -1, 0, 0, 0); - fp = fopen (filename, "rb"); - g_free (filename); - - if (!fp) - XSRETURN_UNDEF; + perlinterp_release (); cinfo.err = jpeg_std_error (&jerr.err); @@ -242,18 +711,21 @@ if ((rs = setjmp (jerr.setjmp_buffer))) { - fclose (fp); jpeg_destroy_decompress (&cinfo); if (pb) g_object_unref ((gpointer)pb); + perlinterp_acquire (); XSRETURN_UNDEF; } + if (!data_len) + longjmp (jerr.setjmp_buffer, 4); + 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; @@ -273,24 +745,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) @@ -306,26 +784,105 @@ 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 +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); + + guchar *pa = gdk_pixbuf_get_pixels (a); + guchar *pb = gdk_pixbuf_get_pixels (b); + + int x, y; + + assert (w == gdk_pixbuf_get_width (b)); + assert (h == gdk_pixbuf_get_height (b)); + + assert (gdk_pixbuf_get_n_channels (a) == 3); + assert (gdk_pixbuf_get_n_channels (b) == 3); + + double diff = 0.; + int peak = 0; + + if (w && h) + for (y = 0; y < h; y++) + { + guchar *pa_ = pa + y * sa; + guchar *pb_ = pb + y * sb; + + for (x = 0; x < w; x++) + { + int d; + + d = ((int)*pa_++) - ((int)*pb_++); diff += d*d; peak = MAX (peak, abs (d)); + d = ((int)*pa_++) - ((int)*pb_++); diff += d*d; peak = MAX (peak, abs (d)); + d = ((int)*pa_++) - ((int)*pb_++); diff += d*d; peak = MAX (peak, abs (d)); + } + } + + perlinterp_acquire (); + + EXTEND (SP, 2); + PUSHs (sv_2mortal (newSVnv (sqrt (diff / (w * h * 3. * 255. * 255.))))); + PUSHs (sv_2mortal (newSVnv (peak / 255.))); +} + ############################################################################# 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; + U8 dst [plen * 8 * 3], *dstp = dst; while (path < pend) { @@ -333,25 +890,32 @@ if (ch >= 'a' && ch <= 'z') *dstp++ = *path++; + else if (ch >= 'A' && ch <= 'Z') + *dstp++ = *path++ + ('a' - 'A'); else if (ch >= '0' && ch <= '9') { + /* version sort, up to 8 digits */ STRLEN el, nl = 0; while (*path >= '0' && *path <= '9' && path < pend) path++, nl++; - for (el = nl; el < 6; el++) + for (el = nl; el < 8; el++) *dstp++ = '0'; memcpy (dstp, path - nl, nl); 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); @@ -386,64 +950,6 @@ OUTPUT: RETVAL -SV * -pb_to_p7 (GdkPixbuf *pb) - CODE: -{ - int w = gdk_pixbuf_get_width (pb); - int h = gdk_pixbuf_get_height (pb); - int x, y; - guchar *dst; - int bpp = gdk_pixbuf_get_n_channels (pb); - guchar *src = gdk_pixbuf_get_pixels (pb); - int sstr = gdk_pixbuf_get_rowstride (pb); - int Er[IW], Eg[IW], Eb[IW]; - int seed = 77; - - RETVAL = newSV (w * h); - SvPOK_only (RETVAL); - SvCUR_set (RETVAL, w * h); - - dst = (guchar *)SvPVX (RETVAL); - - memset (Er, 0, sizeof (int) * IW); - memset (Eg, 0, sizeof (int) * IW); - memset (Eb, 0, sizeof (int) * IW); - - /* some primitive error distribution + random dithering */ - - for (y = 0; y < h; y++) - { - int er = 0, eg = 0, eb = 0; - - for (x = 0; x < w; x++) - { - int r, g, b; - guchar *p = src + x * bpp + y * sstr; - - r = ((p[0] + er + Er[x]) * 7 + (RAND & 127) + 64) / 255; - g = ((p[1] + eg + Eg[x]) * 7 + (RAND & 127) + 64) / 255; - b = ((p[2] + eb + Eb[x]) * 3 + (RAND & 127) + 64) / 255; - - r = r > 7 ? 7 : r < 0 ? 0 : r; - g = g > 7 ? 7 : g < 0 ? 0 : g; - b = b > 3 ? 3 : b < 0 ? 0 : b; - - er += p[0] - (r * 255 + 4) / 7; - eg += p[1] - (g * 255 + 4) / 7; - eb += p[2] - (b * 255 + 2) / 3; - - Er[x] = er >> 1; er -= (er + 1) >> 1; - Eg[x] = eg >> 1; eg -= (eg + 1) >> 1; - Eb[x] = eb >> 1; eb -= (eb + 1) >> 1; - - *dst++ = r << 5 | g << 2 | b; - } - } -} - OUTPUT: - RETVAL - ############################################################################# MODULE = Gtk2::CV PACKAGE = Gtk2::CV::PostScript @@ -581,50 +1087,77 @@ MODULE = Gtk2::CV PACKAGE = Gtk2::CV::Plugin::RCluster SV * -make_histograms (SV *ar) - CODE: +extract_features (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"); + croak ("Not an array ref as first argument to extract_features"); 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 (9 * sizeof (float) + 1); - SV *histsv = newSV (HISTSIZE * sizeof (float) + 1); SvPOK_on (histsv); - SvCUR_set (histsv, HISTSIZE * sizeof (float)); - hist = (float *)SvPVX (histsv); + SvCUR_set (histsv, 9 * sizeof (float)); + float *hist = (float *)SvPVX (histsv); - Zero (tmphist, sizeof (tmphist), char); + struct feature f_h, f_s, f_v; + feature_init (&f_h); + feature_init (&f_s); + feature_init (&f_v); - for (j = len; j--; ) - { - unsigned int idx - = ((*buf & 0xc0) >> 2) - | ((*buf & 0x18) >> 1) - | (*buf & 0x03); + { + STRLEN len; + unsigned char *buf = (unsigned char *)SvPVbyte (sv, len); + while (len >= 3) + { + unsigned int r, g, b, h, s, v; + r = *buf++; g = *buf++; b = *buf++; + rgb_to_hsv (r, g, b, &h, &s, &v); + + feature_update_pass_1 (&f_h, h); + feature_update_pass_1 (&f_s, s); + feature_update_pass_1 (&f_v, v); + + len -= 3; + } + + feature_finish_pass_1 (&f_h); + feature_finish_pass_1 (&f_s); + feature_finish_pass_1 (&f_v); + } - ++tmphist[idx]; - ++buf; - } - - for (j = 0; j < HISTSIZE; ++j) - hist[j] = (float)tmphist[j] / (len + 1e-30); + { + STRLEN len; + unsigned char *buf = (unsigned char *)SvPVbyte (sv, len); + while (len >= 3) + { + unsigned int r, g, b, h, s, v; + r = *buf++; g = *buf++; b = *buf++; + rgb_to_hsv (r, g, b, &h, &s, &v); + + feature_update_pass_2 (&f_h, h); + feature_update_pass_2 (&f_s, s); + feature_update_pass_2 (&f_v, v); + + len -= 3; + } + + feature_finish_pass_2 (&f_h); + feature_finish_pass_2 (&f_s); + feature_finish_pass_2 (&f_v); + } + + 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 * .5; hist [7] = f_v.v2 * .5; hist [8] = f_v.v3 * .5; av_push (result, histsv); } @@ -634,4 +1167,3 @@ OUTPUT: RETVAL -