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

Comparing CV/CV.xs (file contents):
Revision 1.46 by root, Sat Jul 4 05:31:17 2015 UTC vs.
Revision 1.60 by root, Thu Jul 15 00:41:44 2021 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
19#include <assert.h> 22#include <assert.h>
20 23
24#if WEBP
25#include <webp/demux.h>
26#include <webp/decode.h>
27#endif
28
29#if JXL
30#include <jxl/decode.h>
31#include "jxl/thread_parallel_runner.h"
32#endif
33
21#include "perlmulticore.h" 34#include "perlmulticore.h"
22 35
23#define IW 80 /* MUST match Schnauzer.pm! */ 36#define IW 80 /* MUST match Schnauzer.pm! */
24#define IH 60 /* MUST match Schnauzer.pm! */ 37#define IH 60 /* MUST match Schnauzer.pm! */
25 38
26#define RAND (seed = (seed + 7141) * 54773 % 134456)
27
28#define LINELENGTH 240 39#define LINELENGTH 240
29 40
30#define ELLIPSIS "\xe2\x80\xa6" 41#define ELLIPSIS "\xe2\x80\xa6"
31 42
32typedef char *octet_string; 43typedef char *octet_string;
44
45static magic_t magic_cookie[2]; /* !mime, mime */
33 46
34struct jpg_err_mgr 47struct jpg_err_mgr
35{ 48{
36 struct jpeg_error_mgr err; 49 struct jpeg_error_mgr err;
37 jmp_buf setjmp_buffer; 50 jmp_buf setjmp_buffer;
38}; 51};
39 52
40static void 53static void
41cv_error_exit (j_common_ptr cinfo) 54cv_error_exit (j_common_ptr cinfo)
42{ 55{
56 cinfo->err->output_message (cinfo);
43 longjmp (((struct jpg_err_mgr *)cinfo->err)->setjmp_buffer, 99); 57 longjmp (((struct jpg_err_mgr *)cinfo->err)->setjmp_buffer, 99);
44} 58}
45 59
46static void 60static void
47cv_error_output (j_common_ptr cinfo) 61cv_error_output (j_common_ptr cinfo)
48{ 62{
63 char msg[JMSG_LENGTH_MAX];
64
65 cinfo->err->format_message (cinfo, msg);
66
67 fprintf (stderr, "JPEG decoding error: %s\n", msg);
49 return; 68 return;
50} 69}
51 70
52static void 71static void
53rgb_to_hsv (unsigned int r, unsigned int g, unsigned int b, 72rgb_to_hsv (unsigned int r, unsigned int g, unsigned int b,
150 if (!--a85_cnt) 169 if (!--a85_cnt)
151 { 170 {
152 a85_cnt = 4; 171 a85_cnt = 4;
153 if (a85_val) 172 if (a85_val)
154 { 173 {
155 a85_ptr[4] = (a85_val % 85) + 33; a85_val /= 85; 174 a85_ptr[4] = (a85_val % 85) + 33; a85_val /= 85;
156 a85_ptr[3] = (a85_val % 85) + 33; a85_val /= 85; 175 a85_ptr[3] = (a85_val % 85) + 33; a85_val /= 85;
157 a85_ptr[2] = (a85_val % 85) + 33; a85_val /= 85; 176 a85_ptr[2] = (a85_val % 85) + 33; a85_val /= 85;
158 a85_ptr[1] = (a85_val % 85) + 33; a85_val /= 85; 177 a85_ptr[1] = (a85_val % 85) + 33; a85_val /= 85;
159 a85_ptr[0] = (a85_val ) + 33; 178 a85_ptr[0] = (a85_val ) + 33;
160 179
161 a85_ptr += 5; 180 a85_ptr += 5;
162 } 181 }
185 204
186 PerlIO_write (fp, a85_buf, a85_ptr - a85_buf); 205 PerlIO_write (fp, a85_buf, a85_ptr - a85_buf);
187} 206}
188 207
189///////////////////////////////////////////////////////////////////////////// 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/////////////////////////////////////////////////////////////////////////////
190 303
191MODULE = Gtk2::CV PACKAGE = Gtk2::CV 304MODULE = Gtk2::CV PACKAGE = Gtk2::CV
192 305
193PROTOTYPES: ENABLE 306PROTOTYPES: ENABLE
194 307
308# calculate the common prefix length of two strings
195# missing function in perl. really :) 309# missing function in perl. really :)
196int 310int
197common_prefix_length (a, b) 311common_prefix_length (a, b)
198 unsigned char *a = (unsigned char *)SvPVutf8_nolen ($arg); 312 unsigned char *a = (unsigned char *)SvPVutf8_nolen ($arg);
199 unsigned char *b = (unsigned char *)SvPVutf8_nolen ($arg); 313 unsigned char *b = (unsigned char *)SvPVutf8_nolen ($arg);
208 322
209 OUTPUT: 323 OUTPUT:
210 RETVAL 324 RETVAL
211 325
212const char * 326const char *
213magic (octet_string path) 327magic (SV *path_or_data)
328 ALIAS:
329 magic = 0
330 magic_mime = 1
331 magic_buffer = 2
332 magic_buffer_mime = 3
214 CODE: 333 CODE:
215{ 334{
216 static magic_t cookie; 335 STRLEN len;
336 char *data = SvPVbyte (path_or_data, len);
217 337
218 if (!cookie) 338 if (!magic_cookie[0])
219 { 339 {
220 cookie = magic_open (MAGIC_SYMLINK); 340 magic_cookie[0] = magic_open (MAGIC_SYMLINK);
221 341 magic_cookie[1] = magic_open (MAGIC_SYMLINK | MAGIC_MIME_TYPE);
222 if (cookie)
223 magic_load (cookie, 0); 342 magic_load (magic_cookie[0], 0);
224 else
225 XSRETURN_UNDEF;
226 }
227
228 RETVAL = magic_file (cookie, path);
229}
230 OUTPUT:
231 RETVAL
232
233const char *
234magic_mime (octet_string path)
235 CODE:
236{
237 static magic_t cookie;
238
239 if (!cookie)
240 {
241 cookie = magic_open (MAGIC_MIME | MAGIC_SYMLINK);
242
243 if (cookie)
244 magic_load (cookie, 0); 343 magic_load (magic_cookie[1], 0);
245 else
246 XSRETURN_UNDEF;
247 } 344 }
248 345
249 perlinterp_release (); 346 perlinterp_release ();
250 RETVAL = magic_file (cookie, path); 347
348 RETVAL = ix & 2
349 ? magic_buffer (magic_cookie[ix & 1], data, len)
350 : magic_file (magic_cookie[ix & 1], data);
351
251 perlinterp_acquire (); 352 perlinterp_acquire ();
252} 353}
253 OUTPUT: 354 OUTPUT:
254 RETVAL 355 RETVAL
255 356
310 : angle); 411 : angle);
311 perlinterp_acquire (); 412 perlinterp_acquire ();
312 OUTPUT: 413 OUTPUT:
313 RETVAL 414 RETVAL
314 415
416const char *
417filetype (SV *image_data)
418 CODE:
419{
420 STRLEN data_len;
421 U8 *data = SvPVbyte (image_data, data_len);
422 static const unsigned char jxl_header[] = {
423 0, 0, 0, 0x0c, 0x4a, 0x58, 0x4c, 0x20,
424 0x0d, 0xa, 0x87, 0x0a, 0, 0, 0, 0x14,
425 0x66, 0x74, 0x79, 0x70, 0x6a, 0x78, 0x6c, 0x20,
426 0, 0, 0, 0, 0x6a, 0x78, 0x6c, 0x20,
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";
456 else
457 XSRETURN_UNDEF;
458}
459 OUTPUT:
460 RETVAL
461
315GdkPixbuf_noinc * 462GdkPixbuf_noinc *
316load_jpeg (SV *path, int thumbnail=0) 463decode_webp (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
464 CODE:
465{
466#if WEBP
467 STRLEN data_size;
468 int alpha;
469 WebPData data;
470 WebPDemuxer *demux;
471 WebPIterator iter;
472 WebPDecoderConfig config;
473 int inw, inh;
474
475 data.bytes = (uint8_t *)SvPVbyte (image_data, data_size);
476 data.size = data_size;
477
478 perlinterp_release ();
479
480 RETVAL = 0;
481
482 if (!(demux = WebPDemux (&data)))
483 goto err_demux;
484
485 if (!WebPDemuxGetFrame (demux, 1, &iter))
486 goto err_iter;
487
488 if (!WebPInitDecoderConfig (&config))
489 goto err_iter;
490
491 config.options.use_threads = 1;
492
493 if (WebPGetFeatures (iter.fragment.bytes, iter.fragment.size, &config.input) != VP8_STATUS_OK)
494 goto err_iter;
495
496 inw = config.input.width;
497 inh = config.input.height;
498
499 if (thumbnail)
500 {
501 if (inw * ih > inh * iw)
502 ih = (iw * inh + inw - 1) / inw;
503 else
504 iw = (ih * inw + inh - 1) / inh;
505
506 config.options.bypass_filtering = 1;
507 config.options.no_fancy_upsampling = 1;
508
509 config.options.use_scaling = 1;
510 config.options.scaled_width = iw;
511 config.options.scaled_height = ih;
512 }
513 else
514 {
515 iw = inw;
516 ih = inh;
517 }
518
519 alpha = !!config.input.has_alpha;
520
521 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, alpha, 8, iw, ih);
522 if (!RETVAL)
523 goto err_iter;
524
525 config.output.colorspace = alpha ? MODE_RGBA : MODE_RGB;
526 config.output.u.RGBA.rgba = gdk_pixbuf_get_pixels (RETVAL);
527 config.output.u.RGBA.stride = gdk_pixbuf_get_rowstride (RETVAL);
528 config.output.u.RGBA.size = gdk_pixbuf_get_byte_length (RETVAL);
529 config.output.is_external_memory = 1;
530
531 if (WebPDecode (iter.fragment.bytes, iter.fragment.size, &config) != VP8_STATUS_OK)
532 {
533 g_object_unref (RETVAL);
534 RETVAL = 0;
535 goto err_iter;
536 }
537
538 err_iter:
539 WebPDemuxReleaseIterator (&iter);
540 err_demux:
541 WebPDemuxDelete (demux);
542
543 perlinterp_acquire ();
544#else
545 croak ("load_webp: webp not enabled at compile time");
546#endif
547}
548 OUTPUT:
549 RETVAL
550
551GdkPixbuf_noinc *
552decode_jxl (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
553 CODE:
554{
555#if JXL
556 JxlDecoder *dec = JxlDecoderCreate (0);
557 JxlBasicInfo info;
558 const uint8_t *next_in = (uint8_t *)SvPVbyte_nolen (image_data);
559 size_t avail_in = SvCUR (image_data);
560 const char *error = 0;
561 void *runner = 0;
562 struct bmff_box box;
563
564 perlinterp_release ();
565
566 RETVAL = 0;
567
568 error = "JxlDecoderCreate failed";
569 if (!dec)
570 goto done;
571
572 runner = JxlThreadParallelRunnerCreate (0, JxlThreadParallelRunnerDefaultNumWorkerThreads ());
573
574 error = "JxlDecoderSetParallelRunner failed";
575 if (JxlDecoderSetParallelRunner (dec, JxlThreadParallelRunner, runner) != JXL_DEC_SUCCESS)
576 goto done;
577
578 error = "JxlDecoderSubscribeEvents failed";
579 if (JxlDecoderSubscribeEvents (dec, JXL_DEC_FULL_IMAGE | JXL_DEC_BASIC_INFO) != JXL_DEC_SUCCESS)
580 goto done;
581
582 error = "JxlDecoderSetInput failed";
583 if (JxlDecoderSetInput (dec, next_in, avail_in) != JXL_DEC_SUCCESS)
584 goto done;
585
586 for (;;)
587 {
588 JxlDecoderStatus status = JxlDecoderProcessInput (dec);
589
590 printf ("status %d\n",status);
591
592 switch (status)
593 {
594 case JXL_DEC_ERROR:
595 error = "JxlDecoderProcessInput failed";
596 goto done;
597
598 case JXL_DEC_NEED_MORE_INPUT:
599 error = "incomplete file";
600 goto done;
601
602 case JXL_DEC_SUCCESS:
603 goto done;
604
605 case JXL_DEC_NEED_IMAGE_OUT_BUFFER:
606 {
607 error = "JxlDecoderGetBasicInfo failed";
608 if (JxlDecoderGetBasicInfo (dec, &info) != JXL_DEC_SUCCESS)
609 goto done;
610
611 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, !!info.alpha_bits, 8, info.xsize, info.ysize);
612 error = "unable to allocate pixbuf";
613 if (!RETVAL)
614 goto done;
615
616 JxlPixelFormat format = {
617 info.alpha_bits ? 4 : 3,
618 JXL_TYPE_UINT8,
619 JXL_NATIVE_ENDIAN,
620 gdk_pixbuf_get_rowstride (RETVAL)
621 };
622
623 error = "JxlDecoderSetImageOutBuffer failed";
624 if (JxlDecoderSetImageOutBuffer (
625 dec,
626 &format,
627 gdk_pixbuf_get_pixels (RETVAL),
628 gdk_pixbuf_get_byte_length (RETVAL)
629 ) != JXL_DEC_SUCCESS)
630 goto done;
631 }
632 break;
633
634 default:
635 error = "unexpected event";
636 goto done;
637 }
638 }
639
640 done:
641 if (dec)
642 JxlDecoderDestroy (dec);
643
644 if (runner)
645 JxlThreadParallelRunnerDestroy (runner);
646
647 perlinterp_acquire ();
648
649 if (error)
650 {
651 if (RETVAL)
652 g_object_unref (RETVAL);
653
654 croak ("load_jxl: %s", error);
655 }
656#else
657 croak ("load_jxl: jpeg-xl not enabled at compile time");
658#endif
659}
660 OUTPUT:
661 RETVAL
662
663GdkPixbuf_noinc *
664decode_jpeg (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
317 CODE: 665 CODE:
318{ 666{
319 struct jpeg_decompress_struct cinfo; 667 struct jpeg_decompress_struct cinfo;
320 struct jpg_err_mgr jerr; 668 struct jpg_err_mgr jerr;
321 guchar *data;
322 int rs; 669 int rs;
323 FILE *fp;
324 volatile GdkPixbuf *pb = 0; 670 volatile GdkPixbuf *pb = 0;
671 STRLEN data_len;
672 guchar *data = SvPVbyte (image_data, data_len);
325 673
326 RETVAL = 0; 674 RETVAL = 0;
327
328 fp = fopen (SvPVbyte_nolen (path), "rb");
329
330 if (!fp)
331 XSRETURN_UNDEF;
332 675
333 perlinterp_release (); 676 perlinterp_release ();
334 677
335 cinfo.err = jpeg_std_error (&jerr.err); 678 cinfo.err = jpeg_std_error (&jerr.err);
336 679
337 jerr.err.error_exit = cv_error_exit; 680 jerr.err.error_exit = cv_error_exit;
338 jerr.err.output_message = cv_error_output; 681 jerr.err.output_message = cv_error_output;
339 682
340 if ((rs = setjmp (jerr.setjmp_buffer))) 683 if ((rs = setjmp (jerr.setjmp_buffer)))
341 { 684 {
342 fclose (fp);
343 jpeg_destroy_decompress (&cinfo); 685 jpeg_destroy_decompress (&cinfo);
344 686
345 if (pb) 687 if (pb)
346 g_object_unref ((gpointer)pb); 688 g_object_unref ((gpointer)pb);
347 689
348 perlinterp_acquire (); 690 perlinterp_acquire ();
349 XSRETURN_UNDEF; 691 XSRETURN_UNDEF;
350 } 692 }
351 693
694 if (!data_len)
695 longjmp (jerr.setjmp_buffer, 4);
696
352 jpeg_create_decompress (&cinfo); 697 jpeg_create_decompress (&cinfo);
698 cv_jpeg_mem_src (&cinfo, data, data_len);
353 699
354 jpeg_stdio_src (&cinfo, fp);
355 jpeg_read_header (&cinfo, TRUE); 700 jpeg_read_header (&cinfo, TRUE);
356 701
357 cinfo.dct_method = JDCT_DEFAULT; 702 cinfo.dct_method = JDCT_DEFAULT;
358 cinfo.do_fancy_upsampling = FALSE; /* worse quality, but nobody compained so far, and gdk-pixbuf does the same */ 703 cinfo.do_fancy_upsampling = FALSE; /* worse quality, but nobody compained so far, and gdk-pixbuf does the same */
359 cinfo.do_block_smoothing = FALSE; 704 cinfo.do_block_smoothing = FALSE;
369 { 714 {
370 cinfo.dct_method = JDCT_FASTEST; 715 cinfo.dct_method = JDCT_FASTEST;
371 cinfo.do_fancy_upsampling = FALSE; 716 cinfo.do_fancy_upsampling = FALSE;
372 717
373 while (cinfo.scale_denom < 8 718 while (cinfo.scale_denom < 8
374 && cinfo.output_width >= IW*4 719 && cinfo.output_width >= iw*4
375 && cinfo.output_height >= IH*4) 720 && cinfo.output_height >= ih*4)
376 { 721 {
377 cinfo.scale_denom <<= 1; 722 cinfo.scale_denom <<= 1;
378 jpeg_calc_output_dimensions (&cinfo); 723 jpeg_calc_output_dimensions (&cinfo);
379 } 724 }
380 } 725 }
381 726
727 if (cinfo.output_components != 3)
728 longjmp (jerr.setjmp_buffer, 3);
729
730 if (cinfo.jpeg_color_space == JCS_YCCK || cinfo.jpeg_color_space == JCS_CMYK)
731 {
732 cinfo.out_color_space = JCS_CMYK;
733 cinfo.output_components = 4;
734 }
735
382 pb = RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, 0, 8, cinfo.output_width, cinfo.output_height); 736 pb = RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, cinfo.output_components == 4, 8, cinfo.output_width, cinfo.output_height);
383 if (!RETVAL) 737 if (!RETVAL)
384 longjmp (jerr.setjmp_buffer, 2); 738 longjmp (jerr.setjmp_buffer, 2);
385 739
386 data = gdk_pixbuf_get_pixels (RETVAL); 740 data = gdk_pixbuf_get_pixels (RETVAL);
387 rs = gdk_pixbuf_get_rowstride (RETVAL); 741 rs = gdk_pixbuf_get_rowstride (RETVAL);
388
389 if (cinfo.output_components != 3)
390 longjmp (jerr.setjmp_buffer, 3);
391 742
392 jpeg_start_decompress (&cinfo); 743 jpeg_start_decompress (&cinfo);
393 744
394 while (cinfo.output_scanline < cinfo.output_height) 745 while (cinfo.output_scanline < cinfo.output_height)
395 { 746 {
402 rp [3] = (guchar *)rp [2] + rs; 753 rp [3] = (guchar *)rp [2] + rs;
403 754
404 jpeg_read_scanlines (&cinfo, rp, remaining < 4 ? remaining : 4); 755 jpeg_read_scanlines (&cinfo, rp, remaining < 4 ? remaining : 4);
405 } 756 }
406 757
758 if (cinfo.out_color_space == JCS_CMYK)
759 {
760 guchar *end = data + cinfo.output_height * rs;
761
762 while (data < end)
763 {
764 U32 c = data [0];
765 U32 m = data [1];
766 U32 y = data [2];
767 U32 k = data [3];
768
769 if (0)
770 if (cinfo.Adobe_transform == 2)
771 {
772 c ^= 0xff;
773 m ^= 0xff;
774 y ^= 0xff;
775 k ^= 0xff;
776 }
777
778 data [0] = (c * k + 0x80) / 0xff;
779 data [1] = (m * k + 0x80) / 0xff;
780 data [2] = (y * k + 0x80) / 0xff;
781 data [3] = 0xff;
782
783 data += 4;
784 }
785 }
786
407 jpeg_finish_decompress (&cinfo); 787 jpeg_finish_decompress (&cinfo);
408 fclose (fp);
409 jpeg_destroy_decompress (&cinfo); 788 jpeg_destroy_decompress (&cinfo);
410 perlinterp_acquire (); 789 perlinterp_acquire ();
411} 790}
412 OUTPUT: 791 OUTPUT:
413 RETVAL 792 RETVAL
472 CODE: 851 CODE:
473{ 852{
474 STRLEN plen; 853 STRLEN plen;
475 U8 *path = (U8 *)SvPV (pathsv, plen); 854 U8 *path = (U8 *)SvPV (pathsv, plen);
476 U8 *pend = path + plen; 855 U8 *pend = path + plen;
477 U8 dst [plen * 6 * 3], *dstp = dst; 856 U8 dst [plen * 8 * 3], *dstp = dst;
478 857
479 while (path < pend) 858 while (path < pend)
480 { 859 {
481 U8 ch = *path; 860 U8 ch = *path;
482 861
484 *dstp++ = *path++; 863 *dstp++ = *path++;
485 else if (ch >= 'A' && ch <= 'Z') 864 else if (ch >= 'A' && ch <= 'Z')
486 *dstp++ = *path++ + ('a' - 'A'); 865 *dstp++ = *path++ + ('a' - 'A');
487 else if (ch >= '0' && ch <= '9') 866 else if (ch >= '0' && ch <= '9')
488 { 867 {
868 /* version sort, up to 8 digits */
489 STRLEN el, nl = 0; 869 STRLEN el, nl = 0;
490 while (*path >= '0' && *path <= '9' && path < pend) 870 while (*path >= '0' && *path <= '9' && path < pend)
491 path++, nl++; 871 path++, nl++;
492 872
493 for (el = nl; el < 6; el++) 873 for (el = nl; el < 8; el++)
494 *dstp++ = '0'; 874 *dstp++ = '0';
495 875
496 memcpy (dstp, path - nl, nl); 876 memcpy (dstp, path - nl, nl);
497 dstp += nl; 877 dstp += nl;
498 } 878 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines