ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/CV/CV.xs
(Generate patch)

Comparing CV/CV.xs (file contents):
Revision 1.39 by root, Fri Jun 23 09:09:14 2006 UTC vs.
Revision 1.55 by root, Sat Dec 23 08:05:32 2017 UTC

… …
7#include <math.h> 7#include <math.h>
8 8
9#include <magic.h> 9#include <magic.h>
10 10
11#include <jpeglib.h> 11#include <jpeglib.h>
12#include <jerror.h>
13
12#include <glib.h> 14#include <glib.h>
13#include <gtk/gtk.h> 15#include <gtk/gtk.h>
16#include <gdk/gdkx.h>
14#include <gdk-pixbuf/gdk-pixbuf.h> 17#include <gdk-pixbuf/gdk-pixbuf.h>
15 18
16#include <gperl.h> 19#include <gperl.h>
17#include <gtk2perl.h> 20#include <gtk2perl.h>
18 21
22#include <assert.h>
23
24#if WEBP
25#include <webp/demux.h>
26#include <webp/decode.h>
27#endif
28
29#include "perlmulticore.h"
30
19#define IW 80 /* MUST match Schnauzer.pm! */ 31#define IW 80 /* MUST match Schnauzer.pm! */
20#define IH 60 /* MUST match Schnauzer.pm! */ 32#define IH 60 /* MUST match Schnauzer.pm! */
21 33
22#define RAND (seed = (seed + 7141) * 54773 % 134456) 34#define RAND (seed = (seed + 7141) * 54773 % 134456)
23 35
24#define LINELENGTH 240 36#define LINELENGTH 240
25 37
26#define ELLIPSIS "\xe2\x80\xa6" 38#define ELLIPSIS "\xe2\x80\xa6"
39
40typedef char *octet_string;
41
42static magic_t magic_cookie[2]; /* !mime, mime */
27 43
28struct jpg_err_mgr 44struct jpg_err_mgr
29{ 45{
30 struct jpeg_error_mgr err; 46 struct jpeg_error_mgr err;
31 jmp_buf setjmp_buffer; 47 jmp_buf setjmp_buffer;
32}; 48};
33 49
34static void 50static void
35cv_error_exit (j_common_ptr cinfo) 51cv_error_exit (j_common_ptr cinfo)
36{ 52{
53 cinfo->err->output_message (cinfo);
37 longjmp (((struct jpg_err_mgr *)cinfo->err)->setjmp_buffer, 99); 54 longjmp (((struct jpg_err_mgr *)cinfo->err)->setjmp_buffer, 99);
38} 55}
39 56
40static void 57static void
41cv_error_output (j_common_ptr cinfo) 58cv_error_output (j_common_ptr cinfo)
42{ 59{
60 char msg[JMSG_LENGTH_MAX];
61
62 cinfo->err->format_message (cinfo, msg);
63
64 fprintf (stderr, "JPEG decoding error: %s\n", msg);
43 return; 65 return;
44} 66}
45 67
46static void 68static void
47rgb_to_hsv (unsigned int r, unsigned int g, unsigned int b, 69rgb_to_hsv (unsigned int r, unsigned int g, unsigned int b,
… …
144 if (!--a85_cnt) 166 if (!--a85_cnt)
145 { 167 {
146 a85_cnt = 4; 168 a85_cnt = 4;
147 if (a85_val) 169 if (a85_val)
148 { 170 {
149 a85_ptr[4] = (a85_val % 85) + 33; a85_val /= 85; 171 a85_ptr[4] = (a85_val % 85) + 33; a85_val /= 85;
150 a85_ptr[3] = (a85_val % 85) + 33; a85_val /= 85; 172 a85_ptr[3] = (a85_val % 85) + 33; a85_val /= 85;
151 a85_ptr[2] = (a85_val % 85) + 33; a85_val /= 85; 173 a85_ptr[2] = (a85_val % 85) + 33; a85_val /= 85;
152 a85_ptr[1] = (a85_val % 85) + 33; a85_val /= 85; 174 a85_ptr[1] = (a85_val % 85) + 33; a85_val /= 85;
153 a85_ptr[0] = (a85_val ) + 33; 175 a85_ptr[0] = (a85_val ) + 33;
154 176
155 a85_ptr += 5; 177 a85_ptr += 5;
156 } 178 }
… …
180 PerlIO_write (fp, a85_buf, a85_ptr - a85_buf); 202 PerlIO_write (fp, a85_buf, a85_ptr - a85_buf);
181} 203}
182 204
183///////////////////////////////////////////////////////////////////////////// 205/////////////////////////////////////////////////////////////////////////////
184 206
207static void cv_ms_init (j_decompress_ptr cinfo)
208{
209}
210
211static void cv_ms_term (j_decompress_ptr cinfo)
212{
213}
214
215static boolean cv_ms_fill (j_decompress_ptr cinfo)
216{
217 ERREXIT (cinfo, JERR_INPUT_EMPTY);
218
219 return TRUE;
220}
221
222static void cv_ms_skip (j_decompress_ptr cinfo, long num_bytes)
223{
224 if (num_bytes > 0)
225 {
226 struct jpeg_source_mgr *src = (struct jpeg_source_mgr *)cinfo->src;
227
228 src->next_input_byte += num_bytes;
229 src->bytes_in_buffer -= num_bytes;
230 }
231}
232
233static void cv_jpeg_mem_src (j_decompress_ptr cinfo, void *buf, size_t buflen)
234{
235 struct jpeg_source_mgr *src;
236
237 if (!cinfo->src)
238 cinfo->src = (struct jpeg_source_mgr *)
239 (*cinfo->mem->alloc_small) (
240 (j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof (struct jpeg_source_mgr)
241 );
242
243 src = (struct jpeg_source_mgr *)cinfo->src;
244 src->init_source = cv_ms_init;
245 src->fill_input_buffer = cv_ms_fill;
246 src->skip_input_data = cv_ms_skip;
247 src->resync_to_restart = jpeg_resync_to_restart;
248 src->term_source = cv_ms_term;
249 src->next_input_byte = (JOCTET *)buf;
250 src->bytes_in_buffer = buflen;
251}
252
253/////////////////////////////////////////////////////////////////////////////
254
185MODULE = Gtk2::CV PACKAGE = Gtk2::CV 255MODULE = Gtk2::CV PACKAGE = Gtk2::CV
186 256
187PROTOTYPES: ENABLE 257PROTOTYPES: ENABLE
188 258
189# missing function in perl. really :) 259# missing function in perl. really :)
… …
202 272
203 OUTPUT: 273 OUTPUT:
204 RETVAL 274 RETVAL
205 275
206const char * 276const char *
207magic (const char *path) 277magic (SV *path_or_data)
278 ALIAS:
279 magic = 0
280 magic_mime = 1
281 magic_buffer = 2
282 magic_buffer_mime = 3
208 CODE: 283 CODE:
209{ 284{
210 static magic_t cookie; 285 STRLEN len;
286 char *data = SvPVbyte (path_or_data, len);
211 287
212 if (!cookie) 288 if (!magic_cookie[0])
289 {
290 magic_cookie[0] = magic_open (MAGIC_SYMLINK);
291 magic_cookie[1] = magic_open (MAGIC_SYMLINK | MAGIC_MIME_TYPE);
292 magic_load (magic_cookie[0], 0);
293 magic_load (magic_cookie[1], 0);
213 { 294 }
214 cookie = magic_open (MAGIC_NONE);
215 295
216 if (cookie) 296 perlinterp_release ();
217 magic_load (cookie, 0);
218 else
219 XSRETURN_UNDEF;
220 }
221 297
222 RETVAL = magic_file (cookie, path); 298 RETVAL = ix & 2
299 ? magic_buffer (magic_cookie[ix & 1], data, len)
300 : magic_file (magic_cookie[ix & 1], data);
301
302 perlinterp_acquire ();
223} 303}
224 OUTPUT: 304 OUTPUT:
225 RETVAL 305 RETVAL
226 306
227const char *
228magic_mime (const char *path)
229 CODE:
230{
231 static magic_t cookie;
232
233 if (!cookie)
234 {
235 cookie = magic_open (MAGIC_MIME);
236
237 if (cookie)
238 magic_load (cookie, 0);
239 else
240 XSRETURN_UNDEF;
241 }
242
243 RETVAL = magic_file (cookie, path);
244}
245 OUTPUT:
246 RETVAL
247
248# missing in Gtk2 perl module 307# missing/broken in Gtk2 perl module
308
309void
310gdk_window_clear_hints (GdkWindow *window)
311 CODE:
312 gdk_window_set_geometry_hints (window, 0, 0);
249 313
250gboolean 314gboolean
251gdk_net_wm_supports (GdkAtom property) 315gdk_net_wm_supports (GdkAtom property)
252 CODE: 316 CODE:
253#if defined(GDK_WINDOWING_X11) && !defined(GDK_MULTIHEAD_SAFE) 317#if defined(GDK_WINDOWING_X11) && !defined(GDK_MULTIHEAD_SAFE)
… …
259 RETVAL 323 RETVAL
260 324
261GdkPixbuf_noinc * 325GdkPixbuf_noinc *
262dealpha_expose (GdkPixbuf *pb) 326dealpha_expose (GdkPixbuf *pb)
263 CODE: 327 CODE:
328 perlinterp_release ();
264{ 329{
265 int w = gdk_pixbuf_get_width (pb); 330 int w = gdk_pixbuf_get_width (pb);
266 int h = gdk_pixbuf_get_height (pb); 331 int h = gdk_pixbuf_get_height (pb);
267 int bpp = gdk_pixbuf_get_n_channels (pb); 332 int bpp = gdk_pixbuf_get_n_channels (pb);
268 int x, y, i; 333 int x, y, i;
… …
277 for (x = 0; x < w; x++) 342 for (x = 0; x < w; x++)
278 for (y = 0; y < h; y++) 343 for (y = 0; y < h; y++)
279 for (i = 0; i < 3; i++) 344 for (i = 0; i < 3; i++)
280 dst[x * 3 + y * dstr + i] = src[x * bpp + y * sstr + i]; 345 dst[x * 3 + y * dstr + i] = src[x * bpp + y * sstr + i];
281} 346}
347 perlinterp_acquire ();
282 OUTPUT: 348 OUTPUT:
283 RETVAL 349 RETVAL
284 350
285GdkPixbuf_noinc * 351GdkPixbuf_noinc *
286rotate (GdkPixbuf *pb, int angle) 352rotate (GdkPixbuf *pb, int angle)
287 CODE: 353 CODE:
354 perlinterp_release ();
355 if (angle < 0)
356 angle += 360;
288 RETVAL = gdk_pixbuf_rotate_simple (pb, angle == 0 ? GDK_PIXBUF_ROTATE_NONE 357 RETVAL = gdk_pixbuf_rotate_simple (pb, angle == 0 ? GDK_PIXBUF_ROTATE_NONE
289 : angle == 90 ? GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE 358 : angle == 90 ? GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE
290 : angle == 180 ? GDK_PIXBUF_ROTATE_UPSIDEDOWN 359 : angle == 180 ? GDK_PIXBUF_ROTATE_UPSIDEDOWN
291 : angle == 270 ? GDK_PIXBUF_ROTATE_CLOCKWISE 360 : angle == 270 ? GDK_PIXBUF_ROTATE_CLOCKWISE
292 : angle); 361 : angle);
362 perlinterp_acquire ();
293 OUTPUT: 363 OUTPUT:
294 RETVAL 364 RETVAL
295 365
366const char *
367filetype (SV *image_data)
368 CODE:
369{
370 STRLEN data_len;
371 U8 *data = SvPVbyte (image_data, data_len);
372
373 if (data_len >= 20
374 && data[0] == 0xff
375 && data[1] == 0xd8
376 && data[2] == 0xff)
377 RETVAL = "jpg";
378 else if (data_len >= 12
379 && data[ 0] == (U8)'R'
380 && data[ 1] == (U8)'I'
381 && data[ 2] == (U8)'F'
382 && data[ 3] == (U8)'F'
383 && data[ 8] == (U8)'W'
384 && data[ 9] == (U8)'E'
385 && data[10] == (U8)'B'
386 && data[11] == (U8)'P')
387 RETVAL = "webp";
388 else if (data_len >= 16
389 && data[ 0] == 0x89
390 && data[ 1] == (U8)'P'
391 && data[ 2] == (U8)'N'
392 && data[ 3] == (U8)'G'
393 && data[ 4] == 0x0d
394 && data[ 5] == 0x0a
395 && data[ 6] == 0x1a
396 && data[ 7] == 0x0a)
397 RETVAL = "png";
398 else
399 RETVAL = "other";
400}
401 OUTPUT:
402 RETVAL
403
296GdkPixbuf_noinc * 404GdkPixbuf_noinc *
297load_jpeg (SV *path, int thumbnail=0) 405decode_webp (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
406 CODE:
407{
408#if WEBP
409 STRLEN data_size;
410 int alpha;
411 WebPData data;
412 WebPDemuxer *demux;
413 WebPIterator iter;
414 WebPDecoderConfig config;
415 int inw, inh;
416
417 data.bytes = (uint8_t *)SvPVbyte (image_data, data_size);
418 data.size = data_size;
419
420 perlinterp_release ();
421
422 RETVAL = 0;
423
424 if (!(demux = WebPDemux (&data)))
425 goto err_demux;
426
427 if (!WebPDemuxGetFrame (demux, 1, &iter))
428 goto err_iter;
429
430 if (!WebPInitDecoderConfig (&config))
431 goto err_iter;
432
433 config.options.use_threads = 1;
434
435 if (WebPGetFeatures (iter.fragment.bytes, iter.fragment.size, &config.input) != VP8_STATUS_OK)
436 goto err_iter;
437
438 inw = config.input.width;
439 inh = config.input.height;
440
441 if (thumbnail)
442 {
443 if (inw * ih > inh * iw)
444 ih = (iw * inh + inw - 1) / inw;
445 else
446 iw = (ih * inw + inh - 1) / inh;
447
448 config.options.bypass_filtering = 1;
449 config.options.no_fancy_upsampling = 1;
450
451 config.options.use_scaling = 1;
452 config.options.scaled_width = iw;
453 config.options.scaled_height = ih;
454 }
455 else
456 {
457 iw = inw;
458 ih = inh;
459 }
460
461 alpha = !!config.input.has_alpha;
462
463 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, alpha, 8, iw, ih);
464 if (!RETVAL)
465 goto err_iter;
466
467 config.output.colorspace = alpha ? MODE_RGBA : MODE_RGB;
468 config.output.u.RGBA.rgba = gdk_pixbuf_get_pixels (RETVAL);
469 config.output.u.RGBA.stride = gdk_pixbuf_get_rowstride (RETVAL);
470 config.output.u.RGBA.size = gdk_pixbuf_get_byte_length (RETVAL);
471 config.output.is_external_memory = 1;
472
473 if (WebPDecode (iter.fragment.bytes, iter.fragment.size, &config) != VP8_STATUS_OK)
474 {
475 g_object_unref (RETVAL);
476 RETVAL = 0;
477 goto err_iter;
478 }
479
480 err_iter:
481 WebPDemuxReleaseIterator (&iter);
482 err_demux:
483 WebPDemuxDelete (demux);
484
485 perlinterp_acquire ();
486#else
487 croak ("load_webp: webp not enabled at compile time");
488#endif
489}
490 OUTPUT:
491 RETVAL
492
493GdkPixbuf_noinc *
494decode_jpeg (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
298 CODE: 495 CODE:
299{ 496{
300 struct jpeg_decompress_struct cinfo; 497 struct jpeg_decompress_struct cinfo;
301 struct jpg_err_mgr jerr; 498 struct jpg_err_mgr jerr;
302 guchar *data;
303 int rs; 499 int rs;
304 FILE *fp;
305 volatile GdkPixbuf *pb = 0; 500 volatile GdkPixbuf *pb = 0;
501 STRLEN data_len;
502 guchar *data = SvPVbyte (image_data, data_len);
306 503
307 RETVAL = 0; 504 RETVAL = 0;
308 505
309 fp = fopen (SvPVbyte_nolen (path), "rb"); 506 perlinterp_release ();
310
311 if (!fp)
312 XSRETURN_UNDEF;
313 507
314 cinfo.err = jpeg_std_error (&jerr.err); 508 cinfo.err = jpeg_std_error (&jerr.err);
315 509
316 jerr.err.error_exit = cv_error_exit; 510 jerr.err.error_exit = cv_error_exit;
317 jerr.err.output_message = cv_error_output; 511 jerr.err.output_message = cv_error_output;
318 512
319 if ((rs = setjmp (jerr.setjmp_buffer))) 513 if ((rs = setjmp (jerr.setjmp_buffer)))
320 { 514 {
321 fclose (fp);
322 jpeg_destroy_decompress (&cinfo); 515 jpeg_destroy_decompress (&cinfo);
323 516
324 if (pb) 517 if (pb)
325 g_object_unref ((gpointer)pb); 518 g_object_unref ((gpointer)pb);
326 519
520 perlinterp_acquire ();
327 XSRETURN_UNDEF; 521 XSRETURN_UNDEF;
328 } 522 }
329 523
330 jpeg_create_decompress (&cinfo); 524 jpeg_create_decompress (&cinfo);
525 cv_jpeg_mem_src (&cinfo, data, data_len);
331 526
332 jpeg_stdio_src (&cinfo, fp);
333 jpeg_read_header (&cinfo, TRUE); 527 jpeg_read_header (&cinfo, TRUE);
334 528
335 cinfo.dct_method = JDCT_DEFAULT; 529 cinfo.dct_method = JDCT_DEFAULT;
336 cinfo.do_fancy_upsampling = FALSE; /* worse quality, but nobody compained so far, and gdk-pixbuf does the same */ 530 cinfo.do_fancy_upsampling = FALSE; /* worse quality, but nobody compained so far, and gdk-pixbuf does the same */
337 cinfo.do_block_smoothing = FALSE; 531 cinfo.do_block_smoothing = FALSE;
… …
347 { 541 {
348 cinfo.dct_method = JDCT_FASTEST; 542 cinfo.dct_method = JDCT_FASTEST;
349 cinfo.do_fancy_upsampling = FALSE; 543 cinfo.do_fancy_upsampling = FALSE;
350 544
351 while (cinfo.scale_denom < 8 545 while (cinfo.scale_denom < 8
352 && cinfo.output_width >= IW*4 546 && cinfo.output_width >= iw*4
353 && cinfo.output_height >= IH*4) 547 && cinfo.output_height >= ih*4)
354 { 548 {
355 cinfo.scale_denom <<= 1; 549 cinfo.scale_denom <<= 1;
356 jpeg_calc_output_dimensions (&cinfo); 550 jpeg_calc_output_dimensions (&cinfo);
357 } 551 }
358 } 552 }
359 553
554 if (cinfo.output_components != 3)
555 longjmp (jerr.setjmp_buffer, 3);
556
557 if (cinfo.jpeg_color_space == JCS_YCCK || cinfo.jpeg_color_space == JCS_CMYK)
558 {
559 cinfo.out_color_space = JCS_CMYK;
560 cinfo.output_components = 4;
561 }
562
360 pb = RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, 0, 8, cinfo.output_width, cinfo.output_height); 563 pb = RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, cinfo.output_components == 4, 8, cinfo.output_width, cinfo.output_height);
361 if (!RETVAL) 564 if (!RETVAL)
362 longjmp (jerr.setjmp_buffer, 2); 565 longjmp (jerr.setjmp_buffer, 2);
363 566
364 data = gdk_pixbuf_get_pixels (RETVAL); 567 data = gdk_pixbuf_get_pixels (RETVAL);
365 rs = gdk_pixbuf_get_rowstride (RETVAL); 568 rs = gdk_pixbuf_get_rowstride (RETVAL);
366
367 if (cinfo.output_components != 3)
368 longjmp (jerr.setjmp_buffer, 3);
369 569
370 jpeg_start_decompress (&cinfo); 570 jpeg_start_decompress (&cinfo);
371 571
372 while (cinfo.output_scanline < cinfo.output_height) 572 while (cinfo.output_scanline < cinfo.output_height)
373 { 573 {
… …
380 rp [3] = (guchar *)rp [2] + rs; 580 rp [3] = (guchar *)rp [2] + rs;
381 581
382 jpeg_read_scanlines (&cinfo, rp, remaining < 4 ? remaining : 4); 582 jpeg_read_scanlines (&cinfo, rp, remaining < 4 ? remaining : 4);
383 } 583 }
384 584
585 if (cinfo.out_color_space == JCS_CMYK)
586 {
587 guchar *end = data + cinfo.output_height * rs;
588
589 while (data < end)
590 {
591 U32 c = data [0];
592 U32 m = data [1];
593 U32 y = data [2];
594 U32 k = data [3];
595
596 if (0)
597 if (cinfo.Adobe_transform == 2)
598 {
599 c ^= 0xff;
600 m ^= 0xff;
601 y ^= 0xff;
602 k ^= 0xff;
603 }
604
605 data [0] = (c * k + 0x80) / 0xff;
606 data [1] = (m * k + 0x80) / 0xff;
607 data [2] = (y * k + 0x80) / 0xff;
608 data [3] = 0xff;
609
610 data += 4;
611 }
612 }
613
385 jpeg_finish_decompress (&cinfo); 614 jpeg_finish_decompress (&cinfo);
386 fclose (fp);
387 jpeg_destroy_decompress (&cinfo); 615 jpeg_destroy_decompress (&cinfo);
616 perlinterp_acquire ();
388} 617}
389 OUTPUT: 618 OUTPUT:
390 RETVAL 619 RETVAL
391 620
392void 621void
393compare (GdkPixbuf *a, GdkPixbuf *b) 622compare (GdkPixbuf *a, GdkPixbuf *b)
394 PPCODE: 623 PPCODE:
624 perlinterp_release ();
395{ 625{
396 int w = gdk_pixbuf_get_width (a); 626 int w = gdk_pixbuf_get_width (a);
397 int h = gdk_pixbuf_get_height (a); 627 int h = gdk_pixbuf_get_height (a);
628
398 int sa = gdk_pixbuf_get_rowstride (a); 629 int sa = gdk_pixbuf_get_rowstride (a);
399 int sb = gdk_pixbuf_get_rowstride (b); 630 int sb = gdk_pixbuf_get_rowstride (b);
400 631
401 guchar *pa = gdk_pixbuf_get_pixels (a); 632 guchar *pa = gdk_pixbuf_get_pixels (a);
402 guchar *pb = gdk_pixbuf_get_pixels (b); 633 guchar *pb = gdk_pixbuf_get_pixels (b);
… …
426 d = ((int)*pa_++) - ((int)*pb_++); diff += d*d; peak = MAX (peak, abs (d)); 657 d = ((int)*pa_++) - ((int)*pb_++); diff += d*d; peak = MAX (peak, abs (d));
427 d = ((int)*pa_++) - ((int)*pb_++); diff += d*d; peak = MAX (peak, abs (d)); 658 d = ((int)*pa_++) - ((int)*pb_++); diff += d*d; peak = MAX (peak, abs (d));
428 } 659 }
429 } 660 }
430 661
662 perlinterp_acquire ();
663
431 EXTEND (SP, 2); 664 EXTEND (SP, 2);
432 PUSHs (sv_2mortal (newSVnv (sqrt (diff / (w * h * 3. * 255. * 255.))))); 665 PUSHs (sv_2mortal (newSVnv (sqrt (diff / (w * h * 3. * 255. * 255.)))));
433 PUSHs (sv_2mortal (newSVnv (peak / 255.))); 666 PUSHs (sv_2mortal (newSVnv (peak / 255.)));
434} 667}
435 668
436############################################################################# 669#############################################################################
437 670
438MODULE = Gtk2::CV PACKAGE = Gtk2::CV::Schnauzer 671MODULE = Gtk2::CV PACKAGE = Gtk2::CV::Schnauzer
439 672
673# currently only works for filenames (octet strings)
674
440SV * 675SV *
441foldcase (SV *pathsv) 676foldcase (SV *pathsv)
442 PROTOTYPE: $ 677 PROTOTYPE: $
443 CODE: 678 CODE:
444{ 679{
445 STRLEN plen; 680 STRLEN plen;
446 U8 *path = (U8 *)SvPVutf8 (pathsv, plen); 681 U8 *path = (U8 *)SvPV (pathsv, plen);
447 U8 *pend = path + plen; 682 U8 *pend = path + plen;
448 U8 dst [plen * 6 * 3], *dstp = dst; 683 U8 dst [plen * 6 * 3], *dstp = dst;
449 684
450 while (path < pend) 685 while (path < pend)
451 { 686 {
452 U8 ch = *path; 687 U8 ch = *path;
453 688
454 if (ch >= 'a' && ch <= 'z') 689 if (ch >= 'a' && ch <= 'z')
455 *dstp++ = *path++; 690 *dstp++ = *path++;
691 else if (ch >= 'A' && ch <= 'Z')
692 *dstp++ = *path++ + ('a' - 'A');
456 else if (ch >= '0' && ch <= '9') 693 else if (ch >= '0' && ch <= '9')
457 { 694 {
458 STRLEN el, nl = 0; 695 STRLEN el, nl = 0;
459 while (*path >= '0' && *path <= '9' && path < pend) 696 while (*path >= '0' && *path <= '9' && path < pend)
460 path++, nl++; 697 path++, nl++;
… …
463 *dstp++ = '0'; 700 *dstp++ = '0';
464 701
465 memcpy (dstp, path - nl, nl); 702 memcpy (dstp, path - nl, nl);
466 dstp += nl; 703 dstp += nl;
467 } 704 }
705 else
706 *dstp++ = *path++;
707#if 0
468 else 708 else
469 { 709 {
470 STRLEN cl; 710 STRLEN cl;
471 to_utf8_fold (path, dstp, &cl); 711 to_utf8_fold (path, dstp, &cl);
472 dstp += cl; 712 dstp += cl;
473 path += is_utf8_char (path); 713 path += is_utf8_char (path);
474 } 714 }
715#endif
475 } 716 }
476 717
477 RETVAL = newSVpvn ((const char *)dst, dstp - dst); 718 RETVAL = newSVpvn ((const char *)dst, dstp - dst);
478} 719}
479 OUTPUT: 720 OUTPUT:

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines