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

Comparing CV/CV.xs (file contents):
Revision 1.50 by root, Sat Dec 23 03:30:28 2017 UTC vs.
Revision 1.69 by root, Wed Jun 7 17:18:46 2023 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>
14#include <gdk/gdkx.h> 16#include <gdk/gdkx.h>
15#include <gdk-pixbuf/gdk-pixbuf.h> 17#include <gdk-pixbuf/gdk-pixbuf.h>
16 18
… …
18#include <gtk2perl.h> 20#include <gtk2perl.h>
19 21
20#include <assert.h> 22#include <assert.h>
21 23
22#if WEBP 24#if WEBP
25#include <webp/demux.h>
23#include <webp/decode.h> 26#include <webp/decode.h>
24#endif 27#endif
25 28
29#if JXL
30#include <jxl/decode.h>
31#include "jxl/thread_parallel_runner.h"
32#endif
33
26#include "perlmulticore.h" 34#include "perlmulticore.h"
27 35
28#define IW 80 /* MUST match Schnauzer.pm! */ 36#define IW 80 /* MUST match Schnauzer.pm! */
29#define IH 60 /* MUST match Schnauzer.pm! */ 37#define IH 60 /* MUST match Schnauzer.pm! */
30 38
31#define RAND (seed = (seed + 7141) * 54773 % 134456)
32
33#define LINELENGTH 240 39#define LINELENGTH 240
34 40
35#define ELLIPSIS "\xe2\x80\xa6" 41#define ELLIPSIS "\xe2\x80\xa6"
36 42
37typedef char *octet_string; 43typedef char *octet_string;
44
45static magic_t magic_cookie[2]; /* !mime, mime */
38 46
39struct jpg_err_mgr 47struct jpg_err_mgr
40{ 48{
41 struct jpeg_error_mgr err; 49 struct jpeg_error_mgr err;
42 jmp_buf setjmp_buffer; 50 jmp_buf setjmp_buffer;
… …
196 204
197 PerlIO_write (fp, a85_buf, a85_ptr - a85_buf); 205 PerlIO_write (fp, a85_buf, a85_ptr - a85_buf);
198} 206}
199 207
200///////////////////////////////////////////////////////////////////////////// 208/////////////////////////////////////////////////////////////////////////////
209// memory source for libjpeg
210
211static void cv_ms_init (j_decompress_ptr cinfo)
212{
213}
214
215static void cv_ms_term (j_decompress_ptr cinfo)
216{
217}
218
219static boolean cv_ms_fill (j_decompress_ptr cinfo)
220{
221 // unexpected EOF, warn and generate fake EOI marker
222
223 WARNMS (cinfo, JWRN_JPEG_EOF);
224
225 struct jpeg_source_mgr *src = (struct jpeg_source_mgr *)cinfo->src;
226
227 static const JOCTET eoi[] = { 0xFF, JPEG_EOI };
228
229 src->next_input_byte = eoi;
230 src->bytes_in_buffer = sizeof (eoi);
231
232 return TRUE;
233}
234
235static void cv_ms_skip (j_decompress_ptr cinfo, long num_bytes)
236{
237 struct jpeg_source_mgr *src = (struct jpeg_source_mgr *)cinfo->src;
238
239 src->next_input_byte += num_bytes;
240 src->bytes_in_buffer -= num_bytes;
241}
242
243static void cv_jpeg_mem_src (j_decompress_ptr cinfo, void *buf, size_t buflen)
244{
245 struct jpeg_source_mgr *src;
246
247 if (!cinfo->src)
248 cinfo->src = (struct jpeg_source_mgr *)
249 (*cinfo->mem->alloc_small) (
250 (j_common_ptr) cinfo, JPOOL_PERMANENT, sizeof (struct jpeg_source_mgr)
251 );
252
253 src = (struct jpeg_source_mgr *)cinfo->src;
254 src->init_source = cv_ms_init;
255 src->fill_input_buffer = cv_ms_fill;
256 src->skip_input_data = cv_ms_skip;
257 src->resync_to_restart = jpeg_resync_to_restart;
258 src->term_source = cv_ms_term;
259 src->next_input_byte = (JOCTET *)buf;
260 src->bytes_in_buffer = buflen;
261}
262
263/////////////////////////////////////////////////////////////////////////////
264
265/* great, the jpeg-xl reference implementaton requires us to parse bmff files */
266
267struct bmff_box
268{
269 char type[4];
270 const uint8_t *ptr;
271 size_t size;
272};
273
274static int
275bmff_parse_box (struct bmff_box *box, const uint8_t **next_in, size_t *avail_in)
276{
277 if (*avail_in < 8)
278 return 0;
279
280 box->size = ((*next_in)[0] << 24)
281 | ((*next_in)[1] << 16)
282 | ((*next_in)[2] << 8)
283 | ((*next_in)[3] );
284
285 if (box->size < 8)
286 return 0;
287
288 if (*avail_in < box->size)
289 return 0;
290
291 memcpy (box->type, *next_in + 4, 4);
292 box->ptr = *next_in + 8;
293
294 *next_in += box->size;
295 *avail_in -= box->size;
296
297 box->size -= 8;
298
299 return 1;
300}
301
302/////////////////////////////////////////////////////////////////////////////
201 303
202MODULE = Gtk2::CV PACKAGE = Gtk2::CV 304MODULE = Gtk2::CV PACKAGE = Gtk2::CV
203 305
204PROTOTYPES: ENABLE 306PROTOTYPES: ENABLE
205 307
308void
309_exit (int code)
310
311# calculate the common prefix length of two strings
206# missing function in perl. really :) 312# missing function in perl. really :)
207int 313int
208common_prefix_length (a, b) 314common_prefix_length (a, b)
209 unsigned char *a = (unsigned char *)SvPVutf8_nolen ($arg); 315 unsigned char *a = (unsigned char *)SvPVutf8_nolen ($arg);
210 unsigned char *b = (unsigned char *)SvPVutf8_nolen ($arg); 316 unsigned char *b = (unsigned char *)SvPVutf8_nolen ($arg);
… …
219 325
220 OUTPUT: 326 OUTPUT:
221 RETVAL 327 RETVAL
222 328
223const char * 329const char *
224magic (octet_string path) 330magic (SV *path_or_data)
331 ALIAS:
332 magic = 0
333 magic_mime = 1
334 magic_buffer = 2
335 magic_buffer_mime = 3
225 CODE: 336 CODE:
226{ 337{
227 static magic_t cookie; 338 STRLEN len;
339 char *data = SvPVbyte (path_or_data, len);
228 340
229 if (!cookie) 341 if (!magic_cookie[0])
230 { 342 {
231 cookie = magic_open (MAGIC_SYMLINK); 343 magic_cookie[0] = magic_open (MAGIC_SYMLINK);
232 344 magic_cookie[1] = magic_open (MAGIC_SYMLINK | MAGIC_MIME_TYPE);
233 if (cookie)
234 magic_load (cookie, 0); 345 magic_load (magic_cookie[0], 0);
235 else
236 XSRETURN_UNDEF;
237 }
238
239 RETVAL = magic_file (cookie, path);
240}
241 OUTPUT:
242 RETVAL
243
244const char *
245magic_mime (octet_string path)
246 CODE:
247{
248 static magic_t cookie;
249
250 if (!cookie)
251 {
252 cookie = magic_open (MAGIC_MIME | MAGIC_SYMLINK);
253
254 if (cookie)
255 magic_load (cookie, 0); 346 magic_load (magic_cookie[1], 0);
256 else
257 XSRETURN_UNDEF;
258 } 347 }
259 348
260 perlinterp_release (); 349 perlinterp_release ();
261 RETVAL = magic_file (cookie, path); 350
351 RETVAL = ix & 2
352 ? magic_buffer (magic_cookie[ix & 1], data, len)
353 : magic_file (magic_cookie[ix & 1], data);
354
262 perlinterp_acquire (); 355 perlinterp_acquire ();
263} 356}
264 OUTPUT: 357 OUTPUT:
265 RETVAL 358 RETVAL
266 359
… …
321 : angle); 414 : angle);
322 perlinterp_acquire (); 415 perlinterp_acquire ();
323 OUTPUT: 416 OUTPUT:
324 RETVAL 417 RETVAL
325 418
419const char *
420filetype (SV *image_data)
421 CODE:
422{
423 STRLEN data_len;
424 U8 *data = SvPVbyte (image_data, data_len);
425 static const unsigned char jxl_header[] = {
426 0, 0, 0, 0x0c, 0x4a, 0x58, 0x4c, 0x20, 0x0d, 0xa, 0x87, 0x0a
427 };
428
429 if (data_len >= 20
430 && data[0] == 0xff
431 && data[1] == 0xd8
432 && data[2] == 0xff)
433 RETVAL = "image/jpeg";
434 else if (data_len >= 12
435 && data[ 0] == (U8)'R'
436 && data[ 1] == (U8)'I'
437 && data[ 2] == (U8)'F'
438 && data[ 3] == (U8)'F'
439 && data[ 8] == (U8)'W'
440 && data[ 9] == (U8)'E'
441 && data[10] == (U8)'B'
442 && data[11] == (U8)'P')
443 RETVAL = "image/webp";
444 else if (data_len >= 16
445 && data[ 0] == 0x89
446 && data[ 1] == (U8)'P'
447 && data[ 2] == (U8)'N'
448 && data[ 3] == (U8)'G'
449 && data[ 4] == 0x0d
450 && data[ 5] == 0x0a
451 && data[ 6] == 0x1a
452 && data[ 7] == 0x0a)
453 RETVAL = "image/png";
454 else if (data_len >= sizeof (jxl_header) && memcmp (data, jxl_header, sizeof (jxl_header)) == 0)
455 RETVAL = "image/jxl"; // todo: might want to use JxlSignatureCheck
456 else if (data_len >= 2
457 && data[0] == 0xff
458 && data[1] == 0x0a)
459 RETVAL = "image/jxl";
460 else if (data_len >= 13
461 && data[0] == 'G'
462 && data[1] == 'I'
463 && data[2] == 'F'
464 && data[3] == '8'
465 //&& (data[4] == '7' || data[4] == '9')
466 && data[5] == 'a')
467 {
468 RETVAL = "image/gif";
469
470 // now see if its animated - we require the netscape application header for this
471 int ofs = 13;
472
473 if (data[10] & 0x80)
474 ofs += (1 << ((data[10] & 7) + 1)) * 3;
475
476 if (data_len >= ofs + 2 + 1 + 11)
477 {
478
479 // skip a graphic control extension block. we assume
480 // there is at most one such block - while the NAB
481 // has to come firstz, some files do not obey this
482 if (data[ofs] == 0x21 && data[ofs + 1] == 0xf9)
483 ofs += 3 + data[ofs + 2] + 1;
484
485 if (data_len >= ofs + 2 + 1 + 11)
486 if (!memcmp (data + ofs, "\x21\xff\x0bNETSCAPE2.0", sizeof ("\x21\xff\x0bNETSCAPE2.0") - 1))
487 RETVAL = "video/gif";
488 }
489 }
490 else if (data_len >= 0x8000 + 6
491 && data[0x8000+1] == (U8)'B'
492 && data[0x8000+2] == (U8)'E'
493 && data[0x8000+3] == (U8)'A'
494 && data[0x8000+4] == (U8)'0'
495 && data[0x8000+5] == (U8)'1')
496 RETVAL = "video/iso-bluray";
497 else if (data_len >= 0x8000 + 6
498 && data[0x8000+1] == (U8)'C'
499 && data[0x8000+2] == (U8)'D'
500 && data[0x8000+3] == (U8)'0'
501 && data[0x8000+4] == (U8)'0'
502 && data[0x8000+5] == (U8)'1')
503 RETVAL = "video/iso9660";
504
505 else
506 XSRETURN_UNDEF;
507}
508 OUTPUT:
509 RETVAL
510
326GdkPixbuf_noinc * 511GdkPixbuf_noinc *
327load_webp (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0) 512decode_webp (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
328 CODE: 513 CODE:
329{ 514{
330#if WEBP 515#if WEBP
331 STRLEN data_size; 516 STRLEN data_size;
332 guchar *data = SvPVbyte (image_data, data_size);
333 int alpha; 517 int alpha;
518 WebPData data;
519 WebPDemuxer *demux;
520 WebPIterator iter;
334 WebPDecoderConfig config; 521 WebPDecoderConfig config;
522 int inw, inh;
523
524 data.bytes = (uint8_t *)SvPVbyte (image_data, data_size);
525 data.size = data_size;
335 526
336 perlinterp_release (); 527 perlinterp_release ();
337 528
338 RETVAL = 0; 529 RETVAL = 0;
339 530
531 if (!(demux = WebPDemux (&data)))
532 goto err_demux;
533
534 if (!WebPDemuxGetFrame (demux, 1, &iter))
535 goto err_iter;
536
340 if (!WebPInitDecoderConfig (&config)) 537 if (!WebPInitDecoderConfig (&config))
341 goto err; 538 goto err_iter;
342 539
343 config.options.use_threads = 1; 540 config.options.use_threads = 1;
541
542 if (WebPGetFeatures (iter.fragment.bytes, iter.fragment.size, &config.input) != VP8_STATUS_OK)
543 goto err_iter;
544
545 inw = config.input.width;
546 inh = config.input.height;
344 547
345 if (thumbnail) 548 if (thumbnail)
346 { 549 {
550 if (inw * ih > inh * iw)
551 ih = (iw * inh + inw - 1) / inw;
552 else
553 iw = (ih * inw + inh - 1) / inh;
554
347 config.options.bypass_filtering = 1; 555 config.options.bypass_filtering = 1;
348 config.options.no_fancy_upsampling = 1; 556 config.options.no_fancy_upsampling = 1;
349 557
350 config.options.use_scaling = 1; 558 config.options.use_scaling = 1;
351 config.options.scaled_width = iw; 559 config.options.scaled_width = iw;
352 config.options.scaled_height = ih; 560 config.options.scaled_height = ih;
353 } 561 }
354 else 562 else
355 { 563 {
356 iw = config.input.width; 564 iw = inw;
357 ih = config.input.height; 565 ih = inh;
358 } 566 }
359 567
360 if (WebPGetFeatures (data, data_size, &config.input) != VP8_STATUS_OK)
361 goto err;
362
363 alpha = config.input.has_alpha; 568 alpha = !!config.input.has_alpha;
364 569
365 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, !!alpha, 8, iw, ih); 570 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, alpha, 8, iw, ih);
366 if (!RETVAL) 571 if (!RETVAL)
367 goto err; 572 goto err_iter;
368 573
369 config.output.colorspace = alpha ? MODE_RGBA : MODE_RGB; 574 config.output.colorspace = alpha ? MODE_RGBA : MODE_RGB;
370 config.output.u.RGBA.rgba = gdk_pixbuf_get_pixels (RETVAL); 575 config.output.u.RGBA.rgba = gdk_pixbuf_get_pixels (RETVAL);
371 config.output.u.RGBA.stride = gdk_pixbuf_get_rowstride (RETVAL); 576 config.output.u.RGBA.stride = gdk_pixbuf_get_rowstride (RETVAL);
372 config.output.u.RGBA.size = gdk_pixbuf_get_byte_length (RETVAL); 577 config.output.u.RGBA.size = gdk_pixbuf_get_byte_length (RETVAL);
373 config.output.is_external_memory = 1; 578 config.output.is_external_memory = 1;
374 579
375 if (WebPDecode (data, data_size, &config) != VP8_STATUS_OK) 580 if (WebPDecode (iter.fragment.bytes, iter.fragment.size, &config) != VP8_STATUS_OK)
376 { 581 {
377 g_object_unref (RETVAL); 582 g_object_unref (RETVAL);
378 RETVAL = 0; 583 RETVAL = 0;
379 goto err; 584 goto err_iter;
380 } 585 }
381 586
382 err: 587 err_iter:
588 WebPDemuxReleaseIterator (&iter);
589 err_demux:
590 WebPDemuxDelete (demux);
591
383 perlinterp_acquire (); 592 perlinterp_acquire ();
384#else 593#else
385 croak ("load_webp: webp not enabled at compile time"); 594 croak ("load_webp: webp not enabled at compile time");
386#endif 595#endif
387} 596}
388 OUTPUT: 597 OUTPUT:
389 RETVAL 598 RETVAL
390 599
391GdkPixbuf_noinc * 600GdkPixbuf_noinc *
601decode_jxl (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
602 CODE:
603{
604#if JXL
605 JxlDecoder *dec;
606 JxlBasicInfo info;
607 const uint8_t *next_in = (uint8_t *)SvPVbyte_nolen (image_data);
608 size_t avail_in = SvCUR (image_data);
609 const char *error = 0;
610 JxlDecoderStatus status;
611 static void *runner_cache;
612 void *runner = 0;
613
614 RETVAL = 0;
615
616 if (runner_cache)
617 runner = runner_cache;
618 else
619 runner = JxlThreadParallelRunnerCreate (0, JxlThreadParallelRunnerDefaultNumWorkerThreads ());
620
621 runner_cache = 0;
622
623 perlinterp_release ();
624
625 dec = JxlDecoderCreate (0);
626
627 error = "JxlDecoderCreate failed";
628 if (!dec)
629 goto done;
630
631 status = JxlDecoderSetParallelRunner (dec, JxlThreadParallelRunner, runner);
632 error = "JxlDecoderSetParallelRunner failed";
633 if (status != JXL_DEC_SUCCESS)
634 goto done;
635
636 error = "JxlDecoderSubscribeEvents failed";
637 status = JxlDecoderSubscribeEvents (dec, JXL_DEC_BASIC_INFO | JXL_DEC_FULL_IMAGE);
638 if (status != JXL_DEC_SUCCESS)
639 goto done;
640
641 status = JxlDecoderSetInput (dec, next_in, avail_in);
642 error = "JxlDecoderSetInput failed";
643 if (status != JXL_DEC_SUCCESS)
644 goto done;
645
646 for (;;)
647 {
648 status = JxlDecoderProcessInput (dec);
649
650 switch (status)
651 {
652 case JXL_DEC_FULL_IMAGE:
653 error = 0;
654 goto done;
655
656 case JXL_DEC_ERROR:
657 error = "JxlDecoderProcessInput failed";
658 goto done;
659
660 case JXL_DEC_NEED_MORE_INPUT:
661 error = "incomplete file";
662 goto done;
663
664 case JXL_DEC_SUCCESS:
665 error = "incomplete decode";
666 goto done;
667
668 case JXL_DEC_BASIC_INFO:
669 {
670 status = JxlDecoderGetBasicInfo (dec, &info);
671 error = "JxlDecoderGetBasicInfo failed";
672 if (status != JXL_DEC_SUCCESS)
673 goto done;
674
675 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, !!info.alpha_bits, 8, info.xsize, info.ysize);
676 error = "unable to allocate pixbuf";
677 if (!RETVAL)
678 goto done;
679
680 JxlPixelFormat format = {
681 info.alpha_bits ? 4 : 3,
682 JXL_TYPE_UINT8,
683 JXL_NATIVE_ENDIAN,
684 gdk_pixbuf_get_rowstride (RETVAL)
685 };
686
687 // cannot use gdk_pixbuf_get_byte_length because that does
688 // not return the size of the buffer, but the size of the buffer without
689 // the last padding bytes. the internal buffer is rowstride * ysize,
690 // and this is what the jxl decoder needs. none of this is documented
691 // in either library, of course.
692
693 status = JxlDecoderSetImageOutBuffer (
694 dec,
695 &format,
696 gdk_pixbuf_get_pixels (RETVAL),
697 gdk_pixbuf_get_rowstride (RETVAL) * info.ysize
698 );
699 error = "JxlDecoderSetImageOutBuffer failed";
700 if (status != JXL_DEC_SUCCESS)
701 goto done;
702 }
703 break;
704
705 default:
706 error = "unexpected event";
707 goto done;
708 }
709 }
710
711 done:
712 if (dec)
713 JxlDecoderDestroy (dec);
714
715 perlinterp_acquire ();
716
717 if (runner_cache)
718 JxlThreadParallelRunnerDestroy (runner);
719
720 runner_cache = runner;
721
722 if (error)
723 {
724 if (RETVAL)
725 g_object_unref (RETVAL);
726
727 croak ("load_jxl: %s (status %d)", error, status);
728 }
729#else
730 croak ("load_jxl: jpeg-xl not enabled at compile time");
731#endif
732}
733 OUTPUT:
734 RETVAL
735
736GdkPixbuf_noinc *
392load_jpeg (SV *path, int thumbnail = 0, int iw = 0, int ih = 0) 737decode_jpeg (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
393 CODE: 738 CODE:
394{ 739{
395 struct jpeg_decompress_struct cinfo; 740 struct jpeg_decompress_struct cinfo;
396 struct jpg_err_mgr jerr; 741 struct jpg_err_mgr jerr;
397 guchar *data;
398 int rs; 742 int rs;
399 FILE *fp;
400 volatile GdkPixbuf *pb = 0; 743 volatile GdkPixbuf *pb = 0;
744 STRLEN data_len;
745 guchar *data = SvPVbyte (image_data, data_len);
401 746
402 RETVAL = 0; 747 RETVAL = 0;
403
404 fp = fopen (SvPVbyte_nolen (path), "rb");
405
406 if (!fp)
407 XSRETURN_UNDEF;
408 748
409 perlinterp_release (); 749 perlinterp_release ();
410 750
411 cinfo.err = jpeg_std_error (&jerr.err); 751 cinfo.err = jpeg_std_error (&jerr.err);
412 752
413 jerr.err.error_exit = cv_error_exit; 753 jerr.err.error_exit = cv_error_exit;
414 jerr.err.output_message = cv_error_output; 754 jerr.err.output_message = cv_error_output;
415 755
416 if ((rs = setjmp (jerr.setjmp_buffer))) 756 if ((rs = setjmp (jerr.setjmp_buffer)))
417 { 757 {
418 fclose (fp);
419 jpeg_destroy_decompress (&cinfo); 758 jpeg_destroy_decompress (&cinfo);
420 759
421 if (pb) 760 if (pb)
422 g_object_unref ((gpointer)pb); 761 g_object_unref ((gpointer)pb);
423 762
424 perlinterp_acquire (); 763 perlinterp_acquire ();
425 XSRETURN_UNDEF; 764 XSRETURN_UNDEF;
426 } 765 }
427 766
767 if (!data_len)
768 longjmp (jerr.setjmp_buffer, 4);
769
428 jpeg_create_decompress (&cinfo); 770 jpeg_create_decompress (&cinfo);
771 cv_jpeg_mem_src (&cinfo, data, data_len);
429 772
430 jpeg_stdio_src (&cinfo, fp);
431 jpeg_read_header (&cinfo, TRUE); 773 jpeg_read_header (&cinfo, TRUE);
432 774
433 cinfo.dct_method = JDCT_DEFAULT; 775 cinfo.dct_method = JDCT_DEFAULT;
434 cinfo.do_fancy_upsampling = FALSE; /* worse quality, but nobody compained so far, and gdk-pixbuf does the same */ 776 cinfo.do_fancy_upsampling = FALSE; /* worse quality, but nobody compained so far, and gdk-pixbuf does the same */
435 cinfo.do_block_smoothing = FALSE; 777 cinfo.do_block_smoothing = FALSE;
… …
514 data += 4; 856 data += 4;
515 } 857 }
516 } 858 }
517 859
518 jpeg_finish_decompress (&cinfo); 860 jpeg_finish_decompress (&cinfo);
519 fclose (fp);
520 jpeg_destroy_decompress (&cinfo); 861 jpeg_destroy_decompress (&cinfo);
521 perlinterp_acquire (); 862 perlinterp_acquire ();
522} 863}
523 OUTPUT: 864 OUTPUT:
524 RETVAL 865 RETVAL
… …
583 CODE: 924 CODE:
584{ 925{
585 STRLEN plen; 926 STRLEN plen;
586 U8 *path = (U8 *)SvPV (pathsv, plen); 927 U8 *path = (U8 *)SvPV (pathsv, plen);
587 U8 *pend = path + plen; 928 U8 *pend = path + plen;
588 U8 dst [plen * 6 * 3], *dstp = dst; 929 U8 dst [plen * 8 * 3], *dstp = dst;
589 930
590 while (path < pend) 931 while (path < pend)
591 { 932 {
592 U8 ch = *path; 933 U8 ch = *path;
593 934
… …
595 *dstp++ = *path++; 936 *dstp++ = *path++;
596 else if (ch >= 'A' && ch <= 'Z') 937 else if (ch >= 'A' && ch <= 'Z')
597 *dstp++ = *path++ + ('a' - 'A'); 938 *dstp++ = *path++ + ('a' - 'A');
598 else if (ch >= '0' && ch <= '9') 939 else if (ch >= '0' && ch <= '9')
599 { 940 {
941 /* version sort, up to 8 digits */
600 STRLEN el, nl = 0; 942 STRLEN el, nl = 0;
601 while (*path >= '0' && *path <= '9' && path < pend) 943 while (*path >= '0' && *path <= '9' && path < pend)
602 path++, nl++; 944 path++, nl++;
603 945
604 for (el = nl; el < 6; el++) 946 for (el = nl; el < 8; el++)
605 *dstp++ = '0'; 947 *dstp++ = '0';
606 948
607 memcpy (dstp, path - nl, nl); 949 memcpy (dstp, path - nl, nl);
608 dstp += nl; 950 dstp += nl;
609 } 951 }

Diff Legend

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