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.66 by root, Tue Mar 21 00:06:49 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>
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
308void
309_exit (int code)
310
311# calculate the common prefix length of two strings
195# missing function in perl. really :) 312# missing function in perl. really :)
196int 313int
197common_prefix_length (a, b) 314common_prefix_length (a, b)
198 unsigned char *a = (unsigned char *)SvPVutf8_nolen ($arg); 315 unsigned char *a = (unsigned char *)SvPVutf8_nolen ($arg);
199 unsigned char *b = (unsigned char *)SvPVutf8_nolen ($arg); 316 unsigned char *b = (unsigned char *)SvPVutf8_nolen ($arg);
… …
208 325
209 OUTPUT: 326 OUTPUT:
210 RETVAL 327 RETVAL
211 328
212const char * 329const char *
213magic (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
214 CODE: 336 CODE:
215{ 337{
216 static magic_t cookie; 338 STRLEN len;
339 char *data = SvPVbyte (path_or_data, len);
217 340
218 if (!cookie) 341 if (!magic_cookie[0])
219 { 342 {
220 cookie = magic_open (MAGIC_SYMLINK); 343 magic_cookie[0] = magic_open (MAGIC_SYMLINK);
221 344 magic_cookie[1] = magic_open (MAGIC_SYMLINK | MAGIC_MIME_TYPE);
222 if (cookie)
223 magic_load (cookie, 0); 345 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); 346 magic_load (magic_cookie[1], 0);
245 else
246 XSRETURN_UNDEF;
247 } 347 }
248 348
249 perlinterp_release (); 349 perlinterp_release ();
250 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
251 perlinterp_acquire (); 355 perlinterp_acquire ();
252} 356}
253 OUTPUT: 357 OUTPUT:
254 RETVAL 358 RETVAL
255 359
… …
310 : angle); 414 : angle);
311 perlinterp_acquire (); 415 perlinterp_acquire ();
312 OUTPUT: 416 OUTPUT:
313 RETVAL 417 RETVAL
314 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
491 else
492 XSRETURN_UNDEF;
493}
494 OUTPUT:
495 RETVAL
496
315GdkPixbuf_noinc * 497GdkPixbuf_noinc *
316load_jpeg (SV *path, int thumbnail=0) 498decode_webp (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
499 CODE:
500{
501#if WEBP
502 STRLEN data_size;
503 int alpha;
504 WebPData data;
505 WebPDemuxer *demux;
506 WebPIterator iter;
507 WebPDecoderConfig config;
508 int inw, inh;
509
510 data.bytes = (uint8_t *)SvPVbyte (image_data, data_size);
511 data.size = data_size;
512
513 perlinterp_release ();
514
515 RETVAL = 0;
516
517 if (!(demux = WebPDemux (&data)))
518 goto err_demux;
519
520 if (!WebPDemuxGetFrame (demux, 1, &iter))
521 goto err_iter;
522
523 if (!WebPInitDecoderConfig (&config))
524 goto err_iter;
525
526 config.options.use_threads = 1;
527
528 if (WebPGetFeatures (iter.fragment.bytes, iter.fragment.size, &config.input) != VP8_STATUS_OK)
529 goto err_iter;
530
531 inw = config.input.width;
532 inh = config.input.height;
533
534 if (thumbnail)
535 {
536 if (inw * ih > inh * iw)
537 ih = (iw * inh + inw - 1) / inw;
538 else
539 iw = (ih * inw + inh - 1) / inh;
540
541 config.options.bypass_filtering = 1;
542 config.options.no_fancy_upsampling = 1;
543
544 config.options.use_scaling = 1;
545 config.options.scaled_width = iw;
546 config.options.scaled_height = ih;
547 }
548 else
549 {
550 iw = inw;
551 ih = inh;
552 }
553
554 alpha = !!config.input.has_alpha;
555
556 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, alpha, 8, iw, ih);
557 if (!RETVAL)
558 goto err_iter;
559
560 config.output.colorspace = alpha ? MODE_RGBA : MODE_RGB;
561 config.output.u.RGBA.rgba = gdk_pixbuf_get_pixels (RETVAL);
562 config.output.u.RGBA.stride = gdk_pixbuf_get_rowstride (RETVAL);
563 config.output.u.RGBA.size = gdk_pixbuf_get_byte_length (RETVAL);
564 config.output.is_external_memory = 1;
565
566 if (WebPDecode (iter.fragment.bytes, iter.fragment.size, &config) != VP8_STATUS_OK)
567 {
568 g_object_unref (RETVAL);
569 RETVAL = 0;
570 goto err_iter;
571 }
572
573 err_iter:
574 WebPDemuxReleaseIterator (&iter);
575 err_demux:
576 WebPDemuxDelete (demux);
577
578 perlinterp_acquire ();
579#else
580 croak ("load_webp: webp not enabled at compile time");
581#endif
582}
583 OUTPUT:
584 RETVAL
585
586GdkPixbuf_noinc *
587decode_jxl (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
588 CODE:
589{
590#if JXL
591 JxlDecoder *dec;
592 JxlBasicInfo info;
593 const uint8_t *next_in = (uint8_t *)SvPVbyte_nolen (image_data);
594 size_t avail_in = SvCUR (image_data);
595 const char *error = 0;
596 JxlDecoderStatus status;
597 static void *runner_cache;
598 void *runner = 0;
599
600 RETVAL = 0;
601
602 if (runner_cache)
603 runner = runner_cache;
604 else
605 runner = JxlThreadParallelRunnerCreate (0, JxlThreadParallelRunnerDefaultNumWorkerThreads ());
606
607 runner_cache = 0;
608
609 perlinterp_release ();
610
611 dec = JxlDecoderCreate (0);
612
613 error = "JxlDecoderCreate failed";
614 if (!dec)
615 goto done;
616
617 status = JxlDecoderSetParallelRunner (dec, JxlThreadParallelRunner, runner);
618 error = "JxlDecoderSetParallelRunner failed";
619 if (status != JXL_DEC_SUCCESS)
620 goto done;
621
622 error = "JxlDecoderSubscribeEvents failed";
623 status = JxlDecoderSubscribeEvents (dec, JXL_DEC_BASIC_INFO | JXL_DEC_FULL_IMAGE);
624 if (status != JXL_DEC_SUCCESS)
625 goto done;
626
627 status = JxlDecoderSetInput (dec, next_in, avail_in);
628 error = "JxlDecoderSetInput failed";
629 if (status != JXL_DEC_SUCCESS)
630 goto done;
631
632 for (;;)
633 {
634 status = JxlDecoderProcessInput (dec);
635
636 switch (status)
637 {
638 case JXL_DEC_FULL_IMAGE:
639 error = 0;
640 goto done;
641
642 case JXL_DEC_ERROR:
643 error = "JxlDecoderProcessInput failed";
644 goto done;
645
646 case JXL_DEC_NEED_MORE_INPUT:
647 error = "incomplete file";
648 goto done;
649
650 case JXL_DEC_SUCCESS:
651 error = "incomplete decode";
652 goto done;
653
654 case JXL_DEC_BASIC_INFO:
655 {
656 status = JxlDecoderGetBasicInfo (dec, &info);
657 error = "JxlDecoderGetBasicInfo failed";
658 if (status != JXL_DEC_SUCCESS)
659 goto done;
660
661 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, !!info.alpha_bits, 8, info.xsize, info.ysize);
662 error = "unable to allocate pixbuf";
663 if (!RETVAL)
664 goto done;
665
666 JxlPixelFormat format = {
667 info.alpha_bits ? 4 : 3,
668 JXL_TYPE_UINT8,
669 JXL_NATIVE_ENDIAN,
670 gdk_pixbuf_get_rowstride (RETVAL)
671 };
672
673 // cannot use gdk_pixbuf_get_byte_length because that does
674 // not return the size of the buffer, but the size of the buffer without
675 // the last padding bytes. the internal buffer is rowstride * ysize,
676 // and this is what the jxl decoder needs. none of this is documented
677 // in either library, of course.
678
679 status = JxlDecoderSetImageOutBuffer (
680 dec,
681 &format,
682 gdk_pixbuf_get_pixels (RETVAL),
683 gdk_pixbuf_get_rowstride (RETVAL) * info.ysize
684 );
685 error = "JxlDecoderSetImageOutBuffer failed";
686 if (status != JXL_DEC_SUCCESS)
687 goto done;
688 }
689 break;
690
691 default:
692 error = "unexpected event";
693 goto done;
694 }
695 }
696
697 done:
698 if (dec)
699 JxlDecoderDestroy (dec);
700
701 perlinterp_acquire ();
702
703 if (runner_cache)
704 JxlThreadParallelRunnerDestroy (runner);
705
706 runner_cache = runner;
707
708 if (error)
709 {
710 if (RETVAL)
711 g_object_unref (RETVAL);
712
713 croak ("load_jxl: %s (status %d)", error, status);
714 }
715#else
716 croak ("load_jxl: jpeg-xl not enabled at compile time");
717#endif
718}
719 OUTPUT:
720 RETVAL
721
722GdkPixbuf_noinc *
723decode_jpeg (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
317 CODE: 724 CODE:
318{ 725{
319 struct jpeg_decompress_struct cinfo; 726 struct jpeg_decompress_struct cinfo;
320 struct jpg_err_mgr jerr; 727 struct jpg_err_mgr jerr;
321 guchar *data;
322 int rs; 728 int rs;
323 FILE *fp;
324 volatile GdkPixbuf *pb = 0; 729 volatile GdkPixbuf *pb = 0;
730 STRLEN data_len;
731 guchar *data = SvPVbyte (image_data, data_len);
325 732
326 RETVAL = 0; 733 RETVAL = 0;
327
328 fp = fopen (SvPVbyte_nolen (path), "rb");
329
330 if (!fp)
331 XSRETURN_UNDEF;
332 734
333 perlinterp_release (); 735 perlinterp_release ();
334 736
335 cinfo.err = jpeg_std_error (&jerr.err); 737 cinfo.err = jpeg_std_error (&jerr.err);
336 738
337 jerr.err.error_exit = cv_error_exit; 739 jerr.err.error_exit = cv_error_exit;
338 jerr.err.output_message = cv_error_output; 740 jerr.err.output_message = cv_error_output;
339 741
340 if ((rs = setjmp (jerr.setjmp_buffer))) 742 if ((rs = setjmp (jerr.setjmp_buffer)))
341 { 743 {
342 fclose (fp);
343 jpeg_destroy_decompress (&cinfo); 744 jpeg_destroy_decompress (&cinfo);
344 745
345 if (pb) 746 if (pb)
346 g_object_unref ((gpointer)pb); 747 g_object_unref ((gpointer)pb);
347 748
348 perlinterp_acquire (); 749 perlinterp_acquire ();
349 XSRETURN_UNDEF; 750 XSRETURN_UNDEF;
350 } 751 }
351 752
753 if (!data_len)
754 longjmp (jerr.setjmp_buffer, 4);
755
352 jpeg_create_decompress (&cinfo); 756 jpeg_create_decompress (&cinfo);
757 cv_jpeg_mem_src (&cinfo, data, data_len);
353 758
354 jpeg_stdio_src (&cinfo, fp);
355 jpeg_read_header (&cinfo, TRUE); 759 jpeg_read_header (&cinfo, TRUE);
356 760
357 cinfo.dct_method = JDCT_DEFAULT; 761 cinfo.dct_method = JDCT_DEFAULT;
358 cinfo.do_fancy_upsampling = FALSE; /* worse quality, but nobody compained so far, and gdk-pixbuf does the same */ 762 cinfo.do_fancy_upsampling = FALSE; /* worse quality, but nobody compained so far, and gdk-pixbuf does the same */
359 cinfo.do_block_smoothing = FALSE; 763 cinfo.do_block_smoothing = FALSE;
… …
369 { 773 {
370 cinfo.dct_method = JDCT_FASTEST; 774 cinfo.dct_method = JDCT_FASTEST;
371 cinfo.do_fancy_upsampling = FALSE; 775 cinfo.do_fancy_upsampling = FALSE;
372 776
373 while (cinfo.scale_denom < 8 777 while (cinfo.scale_denom < 8
374 && cinfo.output_width >= IW*4 778 && cinfo.output_width >= iw*4
375 && cinfo.output_height >= IH*4) 779 && cinfo.output_height >= ih*4)
376 { 780 {
377 cinfo.scale_denom <<= 1; 781 cinfo.scale_denom <<= 1;
378 jpeg_calc_output_dimensions (&cinfo); 782 jpeg_calc_output_dimensions (&cinfo);
379 } 783 }
380 } 784 }
381 785
786 if (cinfo.output_components != 3)
787 longjmp (jerr.setjmp_buffer, 3);
788
789 if (cinfo.jpeg_color_space == JCS_YCCK || cinfo.jpeg_color_space == JCS_CMYK)
790 {
791 cinfo.out_color_space = JCS_CMYK;
792 cinfo.output_components = 4;
793 }
794
382 pb = RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, 0, 8, cinfo.output_width, cinfo.output_height); 795 pb = RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, cinfo.output_components == 4, 8, cinfo.output_width, cinfo.output_height);
383 if (!RETVAL) 796 if (!RETVAL)
384 longjmp (jerr.setjmp_buffer, 2); 797 longjmp (jerr.setjmp_buffer, 2);
385 798
386 data = gdk_pixbuf_get_pixels (RETVAL); 799 data = gdk_pixbuf_get_pixels (RETVAL);
387 rs = gdk_pixbuf_get_rowstride (RETVAL); 800 rs = gdk_pixbuf_get_rowstride (RETVAL);
388
389 if (cinfo.output_components != 3)
390 longjmp (jerr.setjmp_buffer, 3);
391 801
392 jpeg_start_decompress (&cinfo); 802 jpeg_start_decompress (&cinfo);
393 803
394 while (cinfo.output_scanline < cinfo.output_height) 804 while (cinfo.output_scanline < cinfo.output_height)
395 { 805 {
… …
402 rp [3] = (guchar *)rp [2] + rs; 812 rp [3] = (guchar *)rp [2] + rs;
403 813
404 jpeg_read_scanlines (&cinfo, rp, remaining < 4 ? remaining : 4); 814 jpeg_read_scanlines (&cinfo, rp, remaining < 4 ? remaining : 4);
405 } 815 }
406 816
817 if (cinfo.out_color_space == JCS_CMYK)
818 {
819 guchar *end = data + cinfo.output_height * rs;
820
821 while (data < end)
822 {
823 U32 c = data [0];
824 U32 m = data [1];
825 U32 y = data [2];
826 U32 k = data [3];
827
828 if (0)
829 if (cinfo.Adobe_transform == 2)
830 {
831 c ^= 0xff;
832 m ^= 0xff;
833 y ^= 0xff;
834 k ^= 0xff;
835 }
836
837 data [0] = (c * k + 0x80) / 0xff;
838 data [1] = (m * k + 0x80) / 0xff;
839 data [2] = (y * k + 0x80) / 0xff;
840 data [3] = 0xff;
841
842 data += 4;
843 }
844 }
845
407 jpeg_finish_decompress (&cinfo); 846 jpeg_finish_decompress (&cinfo);
408 fclose (fp);
409 jpeg_destroy_decompress (&cinfo); 847 jpeg_destroy_decompress (&cinfo);
410 perlinterp_acquire (); 848 perlinterp_acquire ();
411} 849}
412 OUTPUT: 850 OUTPUT:
413 RETVAL 851 RETVAL
… …
472 CODE: 910 CODE:
473{ 911{
474 STRLEN plen; 912 STRLEN plen;
475 U8 *path = (U8 *)SvPV (pathsv, plen); 913 U8 *path = (U8 *)SvPV (pathsv, plen);
476 U8 *pend = path + plen; 914 U8 *pend = path + plen;
477 U8 dst [plen * 6 * 3], *dstp = dst; 915 U8 dst [plen * 8 * 3], *dstp = dst;
478 916
479 while (path < pend) 917 while (path < pend)
480 { 918 {
481 U8 ch = *path; 919 U8 ch = *path;
482 920
… …
484 *dstp++ = *path++; 922 *dstp++ = *path++;
485 else if (ch >= 'A' && ch <= 'Z') 923 else if (ch >= 'A' && ch <= 'Z')
486 *dstp++ = *path++ + ('a' - 'A'); 924 *dstp++ = *path++ + ('a' - 'A');
487 else if (ch >= '0' && ch <= '9') 925 else if (ch >= '0' && ch <= '9')
488 { 926 {
927 /* version sort, up to 8 digits */
489 STRLEN el, nl = 0; 928 STRLEN el, nl = 0;
490 while (*path >= '0' && *path <= '9' && path < pend) 929 while (*path >= '0' && *path <= '9' && path < pend)
491 path++, nl++; 930 path++, nl++;
492 931
493 for (el = nl; el < 6; el++) 932 for (el = nl; el < 8; el++)
494 *dstp++ = '0'; 933 *dstp++ = '0';
495 934
496 memcpy (dstp, path - nl, nl); 935 memcpy (dstp, path - nl, nl);
497 dstp += nl; 936 dstp += nl;
498 } 937 }

Diff Legend

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