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

Comparing CV/CV.xs (file contents):
Revision 1.47 by root, Tue Jun 7 06:59:57 2016 UTC vs.
Revision 1.65 by root, Thu Dec 2 03:11:45 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, 0x0d, 0xa, 0x87, 0x0a
424 };
425
426 if (data_len >= 20
427 && data[0] == 0xff
428 && data[1] == 0xd8
429 && data[2] == 0xff)
430 RETVAL = "image/jpeg";
431 else if (data_len >= 12
432 && data[ 0] == (U8)'R'
433 && data[ 1] == (U8)'I'
434 && data[ 2] == (U8)'F'
435 && data[ 3] == (U8)'F'
436 && data[ 8] == (U8)'W'
437 && data[ 9] == (U8)'E'
438 && data[10] == (U8)'B'
439 && data[11] == (U8)'P')
440 RETVAL = "image/webp";
441 else if (data_len >= 16
442 && data[ 0] == 0x89
443 && data[ 1] == (U8)'P'
444 && data[ 2] == (U8)'N'
445 && data[ 3] == (U8)'G'
446 && data[ 4] == 0x0d
447 && data[ 5] == 0x0a
448 && data[ 6] == 0x1a
449 && data[ 7] == 0x0a)
450 RETVAL = "image/png";
451 else if (data_len >= sizeof (jxl_header) && memcmp (data, jxl_header, sizeof (jxl_header)) == 0)
452 RETVAL = "image/jxl"; // todo: might want to use JxlSignatureCheck
453 else if (data_len >= 2
454 && data[0] == 0xff
455 && data[1] == 0x0a)
456 RETVAL = "image/jxl";
457 else if (data_len >= 13
458 && data[0] == 'G'
459 && data[1] == 'I'
460 && data[2] == 'F'
461 && data[3] == '8'
462 //&& (data[4] == '7' || data[4] == '9')
463 && data[5] == 'a')
464 {
465 RETVAL = "image/gif";
466
467 // now see if its animated - we require the netscape application header for this
468 int ofs = 13;
469
470 if (data[10] & 0x80)
471 ofs += (1 << ((data[10] & 7) + 1)) * 3;
472
473 if (data_len >= ofs + 2 + 1 + 11)
474 {
475
476 // skip a graphic control extension block. we assume
477 // there is at most one such block - while the NAB
478 // has to come firstz, some files do not obey this
479 if (data[ofs] == 0x21 && data[ofs + 1] == 0xf9)
480 ofs += 3 + data[ofs + 2] + 1;
481
482 if (data_len >= ofs + 2 + 1 + 11)
483 if (!memcmp (data + ofs, "\x21\xff\x0bNETSCAPE2.0", sizeof ("\x21\xff\x0bNETSCAPE2.0") - 1))
484 RETVAL = "video/gif";
485 }
486 }
487
488 else
489 XSRETURN_UNDEF;
490}
491 OUTPUT:
492 RETVAL
493
315GdkPixbuf_noinc * 494GdkPixbuf_noinc *
495decode_webp (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
496 CODE:
497{
498#if WEBP
499 STRLEN data_size;
500 int alpha;
501 WebPData data;
502 WebPDemuxer *demux;
503 WebPIterator iter;
504 WebPDecoderConfig config;
505 int inw, inh;
506
507 data.bytes = (uint8_t *)SvPVbyte (image_data, data_size);
508 data.size = data_size;
509
510 perlinterp_release ();
511
512 RETVAL = 0;
513
514 if (!(demux = WebPDemux (&data)))
515 goto err_demux;
516
517 if (!WebPDemuxGetFrame (demux, 1, &iter))
518 goto err_iter;
519
520 if (!WebPInitDecoderConfig (&config))
521 goto err_iter;
522
523 config.options.use_threads = 1;
524
525 if (WebPGetFeatures (iter.fragment.bytes, iter.fragment.size, &config.input) != VP8_STATUS_OK)
526 goto err_iter;
527
528 inw = config.input.width;
529 inh = config.input.height;
530
531 if (thumbnail)
532 {
533 if (inw * ih > inh * iw)
534 ih = (iw * inh + inw - 1) / inw;
535 else
536 iw = (ih * inw + inh - 1) / inh;
537
538 config.options.bypass_filtering = 1;
539 config.options.no_fancy_upsampling = 1;
540
541 config.options.use_scaling = 1;
542 config.options.scaled_width = iw;
543 config.options.scaled_height = ih;
544 }
545 else
546 {
547 iw = inw;
548 ih = inh;
549 }
550
551 alpha = !!config.input.has_alpha;
552
553 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, alpha, 8, iw, ih);
554 if (!RETVAL)
555 goto err_iter;
556
557 config.output.colorspace = alpha ? MODE_RGBA : MODE_RGB;
558 config.output.u.RGBA.rgba = gdk_pixbuf_get_pixels (RETVAL);
559 config.output.u.RGBA.stride = gdk_pixbuf_get_rowstride (RETVAL);
560 config.output.u.RGBA.size = gdk_pixbuf_get_byte_length (RETVAL);
561 config.output.is_external_memory = 1;
562
563 if (WebPDecode (iter.fragment.bytes, iter.fragment.size, &config) != VP8_STATUS_OK)
564 {
565 g_object_unref (RETVAL);
566 RETVAL = 0;
567 goto err_iter;
568 }
569
570 err_iter:
571 WebPDemuxReleaseIterator (&iter);
572 err_demux:
573 WebPDemuxDelete (demux);
574
575 perlinterp_acquire ();
576#else
577 croak ("load_webp: webp not enabled at compile time");
578#endif
579}
580 OUTPUT:
581 RETVAL
582
583GdkPixbuf_noinc *
584decode_jxl (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
585 CODE:
586{
587#if JXL
588 JxlDecoder *dec;
589 JxlBasicInfo info;
590 const uint8_t *next_in = (uint8_t *)SvPVbyte_nolen (image_data);
591 size_t avail_in = SvCUR (image_data);
592 const char *error = 0;
593 JxlDecoderStatus status;
594 static void *runner_cache;
595 void *runner = 0;
596
597 RETVAL = 0;
598
599 if (runner_cache)
600 runner = runner_cache;
601 else
602 runner = JxlThreadParallelRunnerCreate (0, JxlThreadParallelRunnerDefaultNumWorkerThreads ());
603
604 runner_cache = 0;
605
606 perlinterp_release ();
607
608 dec = JxlDecoderCreate (0);
609
610 error = "JxlDecoderCreate failed";
611 if (!dec)
612 goto done;
613
614 status = JxlDecoderSetParallelRunner (dec, JxlThreadParallelRunner, runner);
615 error = "JxlDecoderSetParallelRunner failed";
616 if (status != JXL_DEC_SUCCESS)
617 goto done;
618
619 error = "JxlDecoderSubscribeEvents failed";
620 status = JxlDecoderSubscribeEvents (dec, JXL_DEC_BASIC_INFO | JXL_DEC_FULL_IMAGE);
621 if (status != JXL_DEC_SUCCESS)
622 goto done;
623
624 status = JxlDecoderSetInput (dec, next_in, avail_in);
625 error = "JxlDecoderSetInput failed";
626 if (status != JXL_DEC_SUCCESS)
627 goto done;
628
629 for (;;)
630 {
631 status = JxlDecoderProcessInput (dec);
632
633 switch (status)
634 {
635 case JXL_DEC_FULL_IMAGE:
636 error = 0;
637 goto done;
638
639 case JXL_DEC_ERROR:
640 error = "JxlDecoderProcessInput failed";
641 goto done;
642
643 case JXL_DEC_NEED_MORE_INPUT:
644 error = "incomplete file";
645 goto done;
646
647 case JXL_DEC_SUCCESS:
648 error = "incomplete decode";
649 goto done;
650
651 case JXL_DEC_BASIC_INFO:
652 {
653 status = JxlDecoderGetBasicInfo (dec, &info);
654 error = "JxlDecoderGetBasicInfo failed";
655 if (status != JXL_DEC_SUCCESS)
656 goto done;
657
658 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, !!info.alpha_bits, 8, info.xsize, info.ysize);
659 error = "unable to allocate pixbuf";
660 if (!RETVAL)
661 goto done;
662
663 JxlPixelFormat format = {
664 info.alpha_bits ? 4 : 3,
665 JXL_TYPE_UINT8,
666 JXL_NATIVE_ENDIAN,
667 gdk_pixbuf_get_rowstride (RETVAL)
668 };
669
670 // cannot use gdk_pixbuf_get_byte_length because that does
671 // not return the size of the buffer, but the size of the buffer without
672 // the last padding bytes. the internal buffer is rowstride * ysize,
673 // and this is what the jxl decoder needs. none of this is documented
674 // in either library, of course.
675
676 status = JxlDecoderSetImageOutBuffer (
677 dec,
678 &format,
679 gdk_pixbuf_get_pixels (RETVAL),
680 gdk_pixbuf_get_rowstride (RETVAL) * info.ysize
681 );
682 error = "JxlDecoderSetImageOutBuffer failed";
683 if (status != JXL_DEC_SUCCESS)
684 goto done;
685 }
686 break;
687
688 default:
689 error = "unexpected event";
690 goto done;
691 }
692 }
693
694 done:
695 if (dec)
696 JxlDecoderDestroy (dec);
697
698 perlinterp_acquire ();
699
700 if (runner_cache)
701 JxlThreadParallelRunnerDestroy (runner);
702
703 runner_cache = runner;
704
705 if (error)
706 {
707 if (RETVAL)
708 g_object_unref (RETVAL);
709
710 croak ("load_jxl: %s (status %d)", error, status);
711 }
712#else
713 croak ("load_jxl: jpeg-xl not enabled at compile time");
714#endif
715}
716 OUTPUT:
717 RETVAL
718
719GdkPixbuf_noinc *
316load_jpeg (SV *path, int thumbnail = 0, int iw = 0, int ih = 0) 720decode_jpeg (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
317 CODE: 721 CODE:
318{ 722{
319 struct jpeg_decompress_struct cinfo; 723 struct jpeg_decompress_struct cinfo;
320 struct jpg_err_mgr jerr; 724 struct jpg_err_mgr jerr;
321 guchar *data;
322 int rs; 725 int rs;
323 FILE *fp;
324 volatile GdkPixbuf *pb = 0; 726 volatile GdkPixbuf *pb = 0;
727 STRLEN data_len;
728 guchar *data = SvPVbyte (image_data, data_len);
325 729
326 RETVAL = 0; 730 RETVAL = 0;
327
328 fp = fopen (SvPVbyte_nolen (path), "rb");
329
330 if (!fp)
331 XSRETURN_UNDEF;
332 731
333 perlinterp_release (); 732 perlinterp_release ();
334 733
335 cinfo.err = jpeg_std_error (&jerr.err); 734 cinfo.err = jpeg_std_error (&jerr.err);
336 735
337 jerr.err.error_exit = cv_error_exit; 736 jerr.err.error_exit = cv_error_exit;
338 jerr.err.output_message = cv_error_output; 737 jerr.err.output_message = cv_error_output;
339 738
340 if ((rs = setjmp (jerr.setjmp_buffer))) 739 if ((rs = setjmp (jerr.setjmp_buffer)))
341 { 740 {
342 fclose (fp);
343 jpeg_destroy_decompress (&cinfo); 741 jpeg_destroy_decompress (&cinfo);
344 742
345 if (pb) 743 if (pb)
346 g_object_unref ((gpointer)pb); 744 g_object_unref ((gpointer)pb);
347 745
348 perlinterp_acquire (); 746 perlinterp_acquire ();
349 XSRETURN_UNDEF; 747 XSRETURN_UNDEF;
350 } 748 }
351 749
750 if (!data_len)
751 longjmp (jerr.setjmp_buffer, 4);
752
352 jpeg_create_decompress (&cinfo); 753 jpeg_create_decompress (&cinfo);
754 cv_jpeg_mem_src (&cinfo, data, data_len);
353 755
354 jpeg_stdio_src (&cinfo, fp);
355 jpeg_read_header (&cinfo, TRUE); 756 jpeg_read_header (&cinfo, TRUE);
356 757
357 cinfo.dct_method = JDCT_DEFAULT; 758 cinfo.dct_method = JDCT_DEFAULT;
358 cinfo.do_fancy_upsampling = FALSE; /* worse quality, but nobody compained so far, and gdk-pixbuf does the same */ 759 cinfo.do_fancy_upsampling = FALSE; /* worse quality, but nobody compained so far, and gdk-pixbuf does the same */
359 cinfo.do_block_smoothing = FALSE; 760 cinfo.do_block_smoothing = FALSE;
377 cinfo.scale_denom <<= 1; 778 cinfo.scale_denom <<= 1;
378 jpeg_calc_output_dimensions (&cinfo); 779 jpeg_calc_output_dimensions (&cinfo);
379 } 780 }
380 } 781 }
381 782
783 if (cinfo.output_components != 3)
784 longjmp (jerr.setjmp_buffer, 3);
785
786 if (cinfo.jpeg_color_space == JCS_YCCK || cinfo.jpeg_color_space == JCS_CMYK)
787 {
788 cinfo.out_color_space = JCS_CMYK;
789 cinfo.output_components = 4;
790 }
791
382 pb = RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, 0, 8, cinfo.output_width, cinfo.output_height); 792 pb = RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, cinfo.output_components == 4, 8, cinfo.output_width, cinfo.output_height);
383 if (!RETVAL) 793 if (!RETVAL)
384 longjmp (jerr.setjmp_buffer, 2); 794 longjmp (jerr.setjmp_buffer, 2);
385 795
386 data = gdk_pixbuf_get_pixels (RETVAL); 796 data = gdk_pixbuf_get_pixels (RETVAL);
387 rs = gdk_pixbuf_get_rowstride (RETVAL); 797 rs = gdk_pixbuf_get_rowstride (RETVAL);
388
389 if (cinfo.output_components != 3)
390 longjmp (jerr.setjmp_buffer, 3);
391 798
392 jpeg_start_decompress (&cinfo); 799 jpeg_start_decompress (&cinfo);
393 800
394 while (cinfo.output_scanline < cinfo.output_height) 801 while (cinfo.output_scanline < cinfo.output_height)
395 { 802 {
402 rp [3] = (guchar *)rp [2] + rs; 809 rp [3] = (guchar *)rp [2] + rs;
403 810
404 jpeg_read_scanlines (&cinfo, rp, remaining < 4 ? remaining : 4); 811 jpeg_read_scanlines (&cinfo, rp, remaining < 4 ? remaining : 4);
405 } 812 }
406 813
814 if (cinfo.out_color_space == JCS_CMYK)
815 {
816 guchar *end = data + cinfo.output_height * rs;
817
818 while (data < end)
819 {
820 U32 c = data [0];
821 U32 m = data [1];
822 U32 y = data [2];
823 U32 k = data [3];
824
825 if (0)
826 if (cinfo.Adobe_transform == 2)
827 {
828 c ^= 0xff;
829 m ^= 0xff;
830 y ^= 0xff;
831 k ^= 0xff;
832 }
833
834 data [0] = (c * k + 0x80) / 0xff;
835 data [1] = (m * k + 0x80) / 0xff;
836 data [2] = (y * k + 0x80) / 0xff;
837 data [3] = 0xff;
838
839 data += 4;
840 }
841 }
842
407 jpeg_finish_decompress (&cinfo); 843 jpeg_finish_decompress (&cinfo);
408 fclose (fp);
409 jpeg_destroy_decompress (&cinfo); 844 jpeg_destroy_decompress (&cinfo);
410 perlinterp_acquire (); 845 perlinterp_acquire ();
411} 846}
412 OUTPUT: 847 OUTPUT:
413 RETVAL 848 RETVAL
472 CODE: 907 CODE:
473{ 908{
474 STRLEN plen; 909 STRLEN plen;
475 U8 *path = (U8 *)SvPV (pathsv, plen); 910 U8 *path = (U8 *)SvPV (pathsv, plen);
476 U8 *pend = path + plen; 911 U8 *pend = path + plen;
477 U8 dst [plen * 6 * 3], *dstp = dst; 912 U8 dst [plen * 8 * 3], *dstp = dst;
478 913
479 while (path < pend) 914 while (path < pend)
480 { 915 {
481 U8 ch = *path; 916 U8 ch = *path;
482 917
484 *dstp++ = *path++; 919 *dstp++ = *path++;
485 else if (ch >= 'A' && ch <= 'Z') 920 else if (ch >= 'A' && ch <= 'Z')
486 *dstp++ = *path++ + ('a' - 'A'); 921 *dstp++ = *path++ + ('a' - 'A');
487 else if (ch >= '0' && ch <= '9') 922 else if (ch >= '0' && ch <= '9')
488 { 923 {
924 /* version sort, up to 8 digits */
489 STRLEN el, nl = 0; 925 STRLEN el, nl = 0;
490 while (*path >= '0' && *path <= '9' && path < pend) 926 while (*path >= '0' && *path <= '9' && path < pend)
491 path++, nl++; 927 path++, nl++;
492 928
493 for (el = nl; el < 6; el++) 929 for (el = nl; el < 8; el++)
494 *dstp++ = '0'; 930 *dstp++ = '0';
495 931
496 memcpy (dstp, path - nl, nl); 932 memcpy (dstp, path - nl, nl);
497 dstp += nl; 933 dstp += nl;
498 } 934 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines