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

Comparing CV/CV.xs (file contents):
Revision 1.51 by root, Sat Dec 23 04:11:49 2017 UTC vs.
Revision 1.70 by root, Thu Jun 8 15:42:03 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
31#define RAND (seed = (seed + 7141) * 54773 % 134456)
32 38
33#define LINELENGTH 240 39#define LINELENGTH 240
34 40
35#define ELLIPSIS "\xe2\x80\xa6" 41#define ELLIPSIS "\xe2\x80\xa6"
36 42
… …
198 204
199 PerlIO_write (fp, a85_buf, a85_ptr - a85_buf); 205 PerlIO_write (fp, a85_buf, a85_ptr - a85_buf);
200} 206}
201 207
202///////////////////////////////////////////////////////////////////////////// 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/////////////////////////////////////////////////////////////////////////////
203 303
204MODULE = Gtk2::CV PACKAGE = Gtk2::CV 304MODULE = Gtk2::CV PACKAGE = Gtk2::CV
205 305
206PROTOTYPES: ENABLE 306PROTOTYPES: ENABLE
207 307
308void
309_exit (int code)
310
311# calculate the common prefix length of two strings
208# missing function in perl. really :) 312# missing function in perl. really :)
209int 313int
210common_prefix_length (a, b) 314common_prefix_length (a, b)
211 unsigned char *a = (unsigned char *)SvPVutf8_nolen ($arg); 315 unsigned char *a = (unsigned char *)SvPVutf8_nolen ($arg);
212 unsigned char *b = (unsigned char *)SvPVutf8_nolen ($arg); 316 unsigned char *b = (unsigned char *)SvPVutf8_nolen ($arg);
… …
217 { 321 {
218 RETVAL += (*a & 0xc0) != 0x80; 322 RETVAL += (*a & 0xc0) != 0x80;
219 a++, b++; 323 a++, b++;
220 } 324 }
221 325
326 OUTPUT:
327 RETVAL
328
329int
330common_prefix_length_byte (a, b)
331 unsigned char *a = (unsigned char *)SvPVbyte_nolen ($arg);
332 unsigned char *b = (unsigned char *)SvPVbyte_nolen ($arg);
333 CODE:
334 RETVAL = 0;
335 while (*a == *b && *a)
336 a++, b++, RETVAL++;
222 OUTPUT: 337 OUTPUT:
223 RETVAL 338 RETVAL
224 339
225const char * 340const char *
226magic (SV *path_or_data) 341magic (SV *path_or_data)
… …
232 CODE: 347 CODE:
233{ 348{
234 STRLEN len; 349 STRLEN len;
235 char *data = SvPVbyte (path_or_data, len); 350 char *data = SvPVbyte (path_or_data, len);
236 351
237 perlinterp_release ();
238
239 if (!magic_cookie[0]) 352 if (!magic_cookie[0])
240 { 353 {
241 magic_cookie[0] = magic_open (MAGIC_SYMLINK); 354 magic_cookie[0] = magic_open (MAGIC_SYMLINK);
242 magic_cookie[1] = magic_open (MAGIC_SYMLINK | MAGIC_MIME); 355 magic_cookie[1] = magic_open (MAGIC_SYMLINK | MAGIC_MIME_TYPE);
356 magic_load (magic_cookie[0], 0);
357 magic_load (magic_cookie[1], 0);
243 } 358 }
359
360 perlinterp_release ();
244 361
245 RETVAL = ix & 2 362 RETVAL = ix & 2
246 ? magic_buffer (magic_cookie[ix], data, len) 363 ? magic_buffer (magic_cookie[ix & 1], data, len)
247 : magic_file (magic_cookie[ix], data); 364 : magic_file (magic_cookie[ix & 1], data);
248 365
249 perlinterp_acquire (); 366 perlinterp_acquire ();
250} 367}
251 OUTPUT: 368 OUTPUT:
252 RETVAL 369 RETVAL
… …
308 : angle); 425 : angle);
309 perlinterp_acquire (); 426 perlinterp_acquire ();
310 OUTPUT: 427 OUTPUT:
311 RETVAL 428 RETVAL
312 429
430const char *
431filetype (SV *image_data)
432 CODE:
433{
434 STRLEN data_len;
435 U8 *data = SvPVbyte (image_data, data_len);
436 static const unsigned char jxl_header[] = {
437 0, 0, 0, 0x0c, 0x4a, 0x58, 0x4c, 0x20, 0x0d, 0xa, 0x87, 0x0a
438 };
439
440 if (data_len >= 20
441 && data[0] == 0xff
442 && data[1] == 0xd8
443 && data[2] == 0xff)
444 RETVAL = "image/jpeg";
445 else if (data_len >= 12
446 && data[ 0] == (U8)'R'
447 && data[ 1] == (U8)'I'
448 && data[ 2] == (U8)'F'
449 && data[ 3] == (U8)'F'
450 && data[ 8] == (U8)'W'
451 && data[ 9] == (U8)'E'
452 && data[10] == (U8)'B'
453 && data[11] == (U8)'P')
454 RETVAL = "image/webp";
455 else if (data_len >= 16
456 && data[ 0] == 0x89
457 && data[ 1] == (U8)'P'
458 && data[ 2] == (U8)'N'
459 && data[ 3] == (U8)'G'
460 && data[ 4] == 0x0d
461 && data[ 5] == 0x0a
462 && data[ 6] == 0x1a
463 && data[ 7] == 0x0a)
464 RETVAL = "image/png";
465 else if (data_len >= sizeof (jxl_header) && memcmp (data, jxl_header, sizeof (jxl_header)) == 0)
466 RETVAL = "image/jxl"; // todo: might want to use JxlSignatureCheck
467 else if (data_len >= 2
468 && data[0] == 0xff
469 && data[1] == 0x0a)
470 RETVAL = "image/jxl";
471 else if (data_len >= 13
472 && data[0] == 'G'
473 && data[1] == 'I'
474 && data[2] == 'F'
475 && data[3] == '8'
476 //&& (data[4] == '7' || data[4] == '9')
477 && data[5] == 'a')
478 {
479 RETVAL = "image/gif";
480
481 // now see if its animated - we require the netscape application header for this
482 int ofs = 13;
483
484 if (data[10] & 0x80)
485 ofs += (1 << ((data[10] & 7) + 1)) * 3;
486
487 if (data_len >= ofs + 2 + 1 + 11)
488 {
489
490 // skip a graphic control extension block. we assume
491 // there is at most one such block - while the NAB
492 // has to come firstz, some files do not obey this
493 if (data[ofs] == 0x21 && data[ofs + 1] == 0xf9)
494 ofs += 3 + data[ofs + 2] + 1;
495
496 if (data_len >= ofs + 2 + 1 + 11)
497 if (!memcmp (data + ofs, "\x21\xff\x0bNETSCAPE2.0", sizeof ("\x21\xff\x0bNETSCAPE2.0") - 1))
498 RETVAL = "video/gif";
499 }
500 }
501 else if (data_len >= 0x8000 + 6
502 && data[0x8000+1] == (U8)'B'
503 && data[0x8000+2] == (U8)'E'
504 && data[0x8000+3] == (U8)'A'
505 && data[0x8000+4] == (U8)'0'
506 && data[0x8000+5] == (U8)'1')
507 RETVAL = "video/iso-bluray";
508 else if (data_len >= 0x8000 + 6
509 && data[0x8000+1] == (U8)'C'
510 && data[0x8000+2] == (U8)'D'
511 && data[0x8000+3] == (U8)'0'
512 && data[0x8000+4] == (U8)'0'
513 && data[0x8000+5] == (U8)'1')
514 RETVAL = "video/iso9660";
515
516 else
517 XSRETURN_UNDEF;
518}
519 OUTPUT:
520 RETVAL
521
313GdkPixbuf_noinc * 522GdkPixbuf_noinc *
314decode_webp (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0) 523decode_webp (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
315 CODE: 524 CODE:
316{ 525{
317#if WEBP 526#if WEBP
318 guchar *data;
319 STRLEN data_size; 527 STRLEN data_size;
320 int alpha; 528 int alpha;
529 WebPData data;
530 WebPDemuxer *demux;
531 WebPIterator iter;
321 WebPDecoderConfig config; 532 WebPDecoderConfig config;
322 int inw, inh; 533 int inw, inh;
323 534
324 data = SvPVbyte (image_data, data_size); 535 data.bytes = (uint8_t *)SvPVbyte (image_data, data_size);
536 data.size = data_size;
325 537
326 perlinterp_release (); 538 perlinterp_release ();
327 539
328 RETVAL = 0; 540 RETVAL = 0;
329 541
542 if (!(demux = WebPDemux (&data)))
543 goto err_demux;
544
545 if (!WebPDemuxGetFrame (demux, 1, &iter))
546 goto err_iter;
547
330 if (!WebPInitDecoderConfig (&config)) 548 if (!WebPInitDecoderConfig (&config))
331 goto err; 549 goto err_iter;
332 550
333 config.options.use_threads = 1; 551 config.options.use_threads = 1;
334 552
335 if (WebPGetFeatures (data, data_size, &config.input) != VP8_STATUS_OK) 553 if (WebPGetFeatures (iter.fragment.bytes, iter.fragment.size, &config.input) != VP8_STATUS_OK)
336 goto err; 554 goto err_iter;
337 555
338 inw = config.input.width; 556 inw = config.input.width;
339 inh = config.input.height; 557 inh = config.input.height;
340 558
341 if (thumbnail) 559 if (thumbnail)
… …
356 { 574 {
357 iw = inw; 575 iw = inw;
358 ih = inh; 576 ih = inh;
359 } 577 }
360 578
361 alpha = config.input.has_alpha; 579 alpha = !!config.input.has_alpha;
362 580
363 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, !!alpha, 8, iw, ih); 581 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, alpha, 8, iw, ih);
364 if (!RETVAL) 582 if (!RETVAL)
365 goto err; 583 goto err_iter;
366 584
367 config.output.colorspace = alpha ? MODE_RGBA : MODE_RGB; 585 config.output.colorspace = alpha ? MODE_RGBA : MODE_RGB;
368 config.output.u.RGBA.rgba = gdk_pixbuf_get_pixels (RETVAL); 586 config.output.u.RGBA.rgba = gdk_pixbuf_get_pixels (RETVAL);
369 config.output.u.RGBA.stride = gdk_pixbuf_get_rowstride (RETVAL); 587 config.output.u.RGBA.stride = gdk_pixbuf_get_rowstride (RETVAL);
370 config.output.u.RGBA.size = gdk_pixbuf_get_byte_length (RETVAL); 588 config.output.u.RGBA.size = gdk_pixbuf_get_byte_length (RETVAL);
371 config.output.is_external_memory = 1; 589 config.output.is_external_memory = 1;
372 590
373 if (WebPDecode (data, data_size, &config) != VP8_STATUS_OK) 591 if (WebPDecode (iter.fragment.bytes, iter.fragment.size, &config) != VP8_STATUS_OK)
374 { 592 {
375 g_object_unref (RETVAL); 593 g_object_unref (RETVAL);
376 RETVAL = 0; 594 RETVAL = 0;
377 goto err; 595 goto err_iter;
378 } 596 }
379 597
380 err: 598 err_iter:
599 WebPDemuxReleaseIterator (&iter);
600 err_demux:
601 WebPDemuxDelete (demux);
602
381 perlinterp_acquire (); 603 perlinterp_acquire ();
382#else 604#else
383 croak ("load_webp: webp not enabled at compile time"); 605 croak ("load_webp: webp not enabled at compile time");
384#endif 606#endif
385} 607}
386 OUTPUT: 608 OUTPUT:
387 RETVAL 609 RETVAL
388 610
389GdkPixbuf_noinc * 611GdkPixbuf_noinc *
612decode_jxl (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
613 CODE:
614{
615#if JXL
616 JxlDecoder *dec;
617 JxlBasicInfo info;
618 const uint8_t *next_in = (uint8_t *)SvPVbyte_nolen (image_data);
619 size_t avail_in = SvCUR (image_data);
620 const char *error = 0;
621 JxlDecoderStatus status;
622 static void *runner_cache;
623 void *runner = 0;
624
625 RETVAL = 0;
626
627 if (runner_cache)
628 runner = runner_cache;
629 else
630 runner = JxlThreadParallelRunnerCreate (0, JxlThreadParallelRunnerDefaultNumWorkerThreads ());
631
632 runner_cache = 0;
633
634 perlinterp_release ();
635
636 dec = JxlDecoderCreate (0);
637
638 error = "JxlDecoderCreate failed";
639 if (!dec)
640 goto done;
641
642 status = JxlDecoderSetParallelRunner (dec, JxlThreadParallelRunner, runner);
643 error = "JxlDecoderSetParallelRunner failed";
644 if (status != JXL_DEC_SUCCESS)
645 goto done;
646
647 error = "JxlDecoderSubscribeEvents failed";
648 status = JxlDecoderSubscribeEvents (dec, JXL_DEC_BASIC_INFO | JXL_DEC_FULL_IMAGE);
649 if (status != JXL_DEC_SUCCESS)
650 goto done;
651
652 status = JxlDecoderSetInput (dec, next_in, avail_in);
653 error = "JxlDecoderSetInput failed";
654 if (status != JXL_DEC_SUCCESS)
655 goto done;
656
657 for (;;)
658 {
659 status = JxlDecoderProcessInput (dec);
660
661 switch (status)
662 {
663 case JXL_DEC_FULL_IMAGE:
664 error = 0;
665 goto done;
666
667 case JXL_DEC_ERROR:
668 error = "JxlDecoderProcessInput failed";
669 goto done;
670
671 case JXL_DEC_NEED_MORE_INPUT:
672 error = "incomplete file";
673 goto done;
674
675 case JXL_DEC_SUCCESS:
676 error = "incomplete decode";
677 goto done;
678
679 case JXL_DEC_BASIC_INFO:
680 {
681 status = JxlDecoderGetBasicInfo (dec, &info);
682 error = "JxlDecoderGetBasicInfo failed";
683 if (status != JXL_DEC_SUCCESS)
684 goto done;
685
686 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, !!info.alpha_bits, 8, info.xsize, info.ysize);
687 error = "unable to allocate pixbuf";
688 if (!RETVAL)
689 goto done;
690
691 JxlPixelFormat format = {
692 info.alpha_bits ? 4 : 3,
693 JXL_TYPE_UINT8,
694 JXL_NATIVE_ENDIAN,
695 gdk_pixbuf_get_rowstride (RETVAL)
696 };
697
698 // cannot use gdk_pixbuf_get_byte_length because that does
699 // not return the size of the buffer, but the size of the buffer without
700 // the last padding bytes. the internal buffer is rowstride * ysize,
701 // and this is what the jxl decoder needs. none of this is documented
702 // in either library, of course.
703
704 status = JxlDecoderSetImageOutBuffer (
705 dec,
706 &format,
707 gdk_pixbuf_get_pixels (RETVAL),
708 gdk_pixbuf_get_rowstride (RETVAL) * info.ysize
709 );
710 error = "JxlDecoderSetImageOutBuffer failed";
711 if (status != JXL_DEC_SUCCESS)
712 goto done;
713 }
714 break;
715
716 default:
717 error = "unexpected event";
718 goto done;
719 }
720 }
721
722 done:
723 if (dec)
724 JxlDecoderDestroy (dec);
725
726 perlinterp_acquire ();
727
728 if (runner_cache)
729 JxlThreadParallelRunnerDestroy (runner);
730
731 runner_cache = runner;
732
733 if (error)
734 {
735 if (RETVAL)
736 g_object_unref (RETVAL);
737
738 croak ("load_jxl: %s (status %d)", error, status);
739 }
740#else
741 croak ("load_jxl: jpeg-xl not enabled at compile time");
742#endif
743}
744 OUTPUT:
745 RETVAL
746
747GdkPixbuf_noinc *
390load_jpeg (SV *path, int thumbnail = 0, int iw = 0, int ih = 0) 748decode_jpeg (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
391 CODE: 749 CODE:
392{ 750{
393 struct jpeg_decompress_struct cinfo; 751 struct jpeg_decompress_struct cinfo;
394 struct jpg_err_mgr jerr; 752 struct jpg_err_mgr jerr;
395 guchar *data;
396 int rs; 753 int rs;
397 FILE *fp;
398 volatile GdkPixbuf *pb = 0; 754 volatile GdkPixbuf *pb = 0;
755 STRLEN data_len;
756 guchar *data = SvPVbyte (image_data, data_len);
399 757
400 RETVAL = 0; 758 RETVAL = 0;
401
402 fp = fopen (SvPVbyte_nolen (path), "rb");
403
404 if (!fp)
405 XSRETURN_UNDEF;
406 759
407 perlinterp_release (); 760 perlinterp_release ();
408 761
409 cinfo.err = jpeg_std_error (&jerr.err); 762 cinfo.err = jpeg_std_error (&jerr.err);
410 763
411 jerr.err.error_exit = cv_error_exit; 764 jerr.err.error_exit = cv_error_exit;
412 jerr.err.output_message = cv_error_output; 765 jerr.err.output_message = cv_error_output;
413 766
414 if ((rs = setjmp (jerr.setjmp_buffer))) 767 if ((rs = setjmp (jerr.setjmp_buffer)))
415 { 768 {
416 fclose (fp);
417 jpeg_destroy_decompress (&cinfo); 769 jpeg_destroy_decompress (&cinfo);
418 770
419 if (pb) 771 if (pb)
420 g_object_unref ((gpointer)pb); 772 g_object_unref ((gpointer)pb);
421 773
422 perlinterp_acquire (); 774 perlinterp_acquire ();
423 XSRETURN_UNDEF; 775 XSRETURN_UNDEF;
424 } 776 }
425 777
778 if (!data_len)
779 longjmp (jerr.setjmp_buffer, 4);
780
426 jpeg_create_decompress (&cinfo); 781 jpeg_create_decompress (&cinfo);
782 cv_jpeg_mem_src (&cinfo, data, data_len);
427 783
428 jpeg_stdio_src (&cinfo, fp);
429 jpeg_read_header (&cinfo, TRUE); 784 jpeg_read_header (&cinfo, TRUE);
430 785
431 cinfo.dct_method = JDCT_DEFAULT; 786 cinfo.dct_method = JDCT_DEFAULT;
432 cinfo.do_fancy_upsampling = FALSE; /* worse quality, but nobody compained so far, and gdk-pixbuf does the same */ 787 cinfo.do_fancy_upsampling = FALSE; /* worse quality, but nobody compained so far, and gdk-pixbuf does the same */
433 cinfo.do_block_smoothing = FALSE; 788 cinfo.do_block_smoothing = FALSE;
… …
512 data += 4; 867 data += 4;
513 } 868 }
514 } 869 }
515 870
516 jpeg_finish_decompress (&cinfo); 871 jpeg_finish_decompress (&cinfo);
517 fclose (fp);
518 jpeg_destroy_decompress (&cinfo); 872 jpeg_destroy_decompress (&cinfo);
519 perlinterp_acquire (); 873 perlinterp_acquire ();
520} 874}
521 OUTPUT: 875 OUTPUT:
522 RETVAL 876 RETVAL
… …
581 CODE: 935 CODE:
582{ 936{
583 STRLEN plen; 937 STRLEN plen;
584 U8 *path = (U8 *)SvPV (pathsv, plen); 938 U8 *path = (U8 *)SvPV (pathsv, plen);
585 U8 *pend = path + plen; 939 U8 *pend = path + plen;
586 U8 dst [plen * 6 * 3], *dstp = dst; 940 U8 dst [plen * 8 * 3], *dstp = dst;
587 941
588 while (path < pend) 942 while (path < pend)
589 { 943 {
590 U8 ch = *path; 944 U8 ch = *path;
591 945
… …
593 *dstp++ = *path++; 947 *dstp++ = *path++;
594 else if (ch >= 'A' && ch <= 'Z') 948 else if (ch >= 'A' && ch <= 'Z')
595 *dstp++ = *path++ + ('a' - 'A'); 949 *dstp++ = *path++ + ('a' - 'A');
596 else if (ch >= '0' && ch <= '9') 950 else if (ch >= '0' && ch <= '9')
597 { 951 {
952 /* version sort, up to 8 digits */
598 STRLEN el, nl = 0; 953 STRLEN el, nl = 0;
599 while (*path >= '0' && *path <= '9' && path < pend) 954 while (*path >= '0' && *path <= '9' && path < pend)
600 path++, nl++; 955 path++, nl++;
601 956
602 for (el = nl; el < 6; el++) 957 for (el = nl; el < 8; el++)
603 *dstp++ = '0'; 958 *dstp++ = '0';
604 959
605 memcpy (dstp, path - nl, nl); 960 memcpy (dstp, path - nl, nl);
606 dstp += nl; 961 dstp += nl;
607 } 962 }

Diff Legend

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