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.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>
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);
… …
207 } 324 }
208 325
209 OUTPUT: 326 OUTPUT:
210 RETVAL 327 RETVAL
211 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++;
337 OUTPUT:
338 RETVAL
339
212const char * 340const char *
213magic (octet_string path) 341magic (SV *path_or_data)
342 ALIAS:
343 magic = 0
344 magic_mime = 1
345 magic_buffer = 2
346 magic_buffer_mime = 3
214 CODE: 347 CODE:
215{ 348{
216 static magic_t cookie; 349 STRLEN len;
350 char *data = SvPVbyte (path_or_data, len);
217 351
218 if (!cookie) 352 if (!magic_cookie[0])
219 { 353 {
220 cookie = magic_open (MAGIC_SYMLINK); 354 magic_cookie[0] = magic_open (MAGIC_SYMLINK);
221 355 magic_cookie[1] = magic_open (MAGIC_SYMLINK | MAGIC_MIME_TYPE);
222 if (cookie)
223 magic_load (cookie, 0); 356 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); 357 magic_load (magic_cookie[1], 0);
245 else
246 XSRETURN_UNDEF;
247 } 358 }
248 359
249 perlinterp_release (); 360 perlinterp_release ();
250 RETVAL = magic_file (cookie, path); 361
362 RETVAL = ix & 2
363 ? magic_buffer (magic_cookie[ix & 1], data, len)
364 : magic_file (magic_cookie[ix & 1], data);
365
251 perlinterp_acquire (); 366 perlinterp_acquire ();
252} 367}
253 OUTPUT: 368 OUTPUT:
254 RETVAL 369 RETVAL
255 370
… …
310 : angle); 425 : angle);
311 perlinterp_acquire (); 426 perlinterp_acquire ();
312 OUTPUT: 427 OUTPUT:
313 RETVAL 428 RETVAL
314 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
315GdkPixbuf_noinc * 522GdkPixbuf_noinc *
316load_jpeg (SV *path, int thumbnail=0) 523decode_webp (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
524 CODE:
525{
526#if WEBP
527 STRLEN data_size;
528 int alpha;
529 WebPData data;
530 WebPDemuxer *demux;
531 WebPIterator iter;
532 WebPDecoderConfig config;
533 int inw, inh;
534
535 data.bytes = (uint8_t *)SvPVbyte (image_data, data_size);
536 data.size = data_size;
537
538 perlinterp_release ();
539
540 RETVAL = 0;
541
542 if (!(demux = WebPDemux (&data)))
543 goto err_demux;
544
545 if (!WebPDemuxGetFrame (demux, 1, &iter))
546 goto err_iter;
547
548 if (!WebPInitDecoderConfig (&config))
549 goto err_iter;
550
551 config.options.use_threads = 1;
552
553 if (WebPGetFeatures (iter.fragment.bytes, iter.fragment.size, &config.input) != VP8_STATUS_OK)
554 goto err_iter;
555
556 inw = config.input.width;
557 inh = config.input.height;
558
559 if (thumbnail)
560 {
561 if (inw * ih > inh * iw)
562 ih = (iw * inh + inw - 1) / inw;
563 else
564 iw = (ih * inw + inh - 1) / inh;
565
566 config.options.bypass_filtering = 1;
567 config.options.no_fancy_upsampling = 1;
568
569 config.options.use_scaling = 1;
570 config.options.scaled_width = iw;
571 config.options.scaled_height = ih;
572 }
573 else
574 {
575 iw = inw;
576 ih = inh;
577 }
578
579 alpha = !!config.input.has_alpha;
580
581 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, alpha, 8, iw, ih);
582 if (!RETVAL)
583 goto err_iter;
584
585 config.output.colorspace = alpha ? MODE_RGBA : MODE_RGB;
586 config.output.u.RGBA.rgba = gdk_pixbuf_get_pixels (RETVAL);
587 config.output.u.RGBA.stride = gdk_pixbuf_get_rowstride (RETVAL);
588 config.output.u.RGBA.size = gdk_pixbuf_get_byte_length (RETVAL);
589 config.output.is_external_memory = 1;
590
591 if (WebPDecode (iter.fragment.bytes, iter.fragment.size, &config) != VP8_STATUS_OK)
592 {
593 g_object_unref (RETVAL);
594 RETVAL = 0;
595 goto err_iter;
596 }
597
598 err_iter:
599 WebPDemuxReleaseIterator (&iter);
600 err_demux:
601 WebPDemuxDelete (demux);
602
603 perlinterp_acquire ();
604#else
605 croak ("load_webp: webp not enabled at compile time");
606#endif
607}
608 OUTPUT:
609 RETVAL
610
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 *
748decode_jpeg (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
317 CODE: 749 CODE:
318{ 750{
319 struct jpeg_decompress_struct cinfo; 751 struct jpeg_decompress_struct cinfo;
320 struct jpg_err_mgr jerr; 752 struct jpg_err_mgr jerr;
321 guchar *data;
322 int rs; 753 int rs;
323 FILE *fp;
324 volatile GdkPixbuf *pb = 0; 754 volatile GdkPixbuf *pb = 0;
755 STRLEN data_len;
756 guchar *data = SvPVbyte (image_data, data_len);
325 757
326 RETVAL = 0; 758 RETVAL = 0;
327
328 fp = fopen (SvPVbyte_nolen (path), "rb");
329
330 if (!fp)
331 XSRETURN_UNDEF;
332 759
333 perlinterp_release (); 760 perlinterp_release ();
334 761
335 cinfo.err = jpeg_std_error (&jerr.err); 762 cinfo.err = jpeg_std_error (&jerr.err);
336 763
337 jerr.err.error_exit = cv_error_exit; 764 jerr.err.error_exit = cv_error_exit;
338 jerr.err.output_message = cv_error_output; 765 jerr.err.output_message = cv_error_output;
339 766
340 if ((rs = setjmp (jerr.setjmp_buffer))) 767 if ((rs = setjmp (jerr.setjmp_buffer)))
341 { 768 {
342 fclose (fp);
343 jpeg_destroy_decompress (&cinfo); 769 jpeg_destroy_decompress (&cinfo);
344 770
345 if (pb) 771 if (pb)
346 g_object_unref ((gpointer)pb); 772 g_object_unref ((gpointer)pb);
347 773
348 perlinterp_acquire (); 774 perlinterp_acquire ();
349 XSRETURN_UNDEF; 775 XSRETURN_UNDEF;
350 } 776 }
351 777
778 if (!data_len)
779 longjmp (jerr.setjmp_buffer, 4);
780
352 jpeg_create_decompress (&cinfo); 781 jpeg_create_decompress (&cinfo);
782 cv_jpeg_mem_src (&cinfo, data, data_len);
353 783
354 jpeg_stdio_src (&cinfo, fp);
355 jpeg_read_header (&cinfo, TRUE); 784 jpeg_read_header (&cinfo, TRUE);
356 785
357 cinfo.dct_method = JDCT_DEFAULT; 786 cinfo.dct_method = JDCT_DEFAULT;
358 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 */
359 cinfo.do_block_smoothing = FALSE; 788 cinfo.do_block_smoothing = FALSE;
… …
369 { 798 {
370 cinfo.dct_method = JDCT_FASTEST; 799 cinfo.dct_method = JDCT_FASTEST;
371 cinfo.do_fancy_upsampling = FALSE; 800 cinfo.do_fancy_upsampling = FALSE;
372 801
373 while (cinfo.scale_denom < 8 802 while (cinfo.scale_denom < 8
374 && cinfo.output_width >= IW*4 803 && cinfo.output_width >= iw*4
375 && cinfo.output_height >= IH*4) 804 && cinfo.output_height >= ih*4)
376 { 805 {
377 cinfo.scale_denom <<= 1; 806 cinfo.scale_denom <<= 1;
378 jpeg_calc_output_dimensions (&cinfo); 807 jpeg_calc_output_dimensions (&cinfo);
379 } 808 }
380 } 809 }
381 810
811 if (cinfo.output_components != 3)
812 longjmp (jerr.setjmp_buffer, 3);
813
814 if (cinfo.jpeg_color_space == JCS_YCCK || cinfo.jpeg_color_space == JCS_CMYK)
815 {
816 cinfo.out_color_space = JCS_CMYK;
817 cinfo.output_components = 4;
818 }
819
382 pb = RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, 0, 8, cinfo.output_width, cinfo.output_height); 820 pb = RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, cinfo.output_components == 4, 8, cinfo.output_width, cinfo.output_height);
383 if (!RETVAL) 821 if (!RETVAL)
384 longjmp (jerr.setjmp_buffer, 2); 822 longjmp (jerr.setjmp_buffer, 2);
385 823
386 data = gdk_pixbuf_get_pixels (RETVAL); 824 data = gdk_pixbuf_get_pixels (RETVAL);
387 rs = gdk_pixbuf_get_rowstride (RETVAL); 825 rs = gdk_pixbuf_get_rowstride (RETVAL);
388
389 if (cinfo.output_components != 3)
390 longjmp (jerr.setjmp_buffer, 3);
391 826
392 jpeg_start_decompress (&cinfo); 827 jpeg_start_decompress (&cinfo);
393 828
394 while (cinfo.output_scanline < cinfo.output_height) 829 while (cinfo.output_scanline < cinfo.output_height)
395 { 830 {
… …
402 rp [3] = (guchar *)rp [2] + rs; 837 rp [3] = (guchar *)rp [2] + rs;
403 838
404 jpeg_read_scanlines (&cinfo, rp, remaining < 4 ? remaining : 4); 839 jpeg_read_scanlines (&cinfo, rp, remaining < 4 ? remaining : 4);
405 } 840 }
406 841
842 if (cinfo.out_color_space == JCS_CMYK)
843 {
844 guchar *end = data + cinfo.output_height * rs;
845
846 while (data < end)
847 {
848 U32 c = data [0];
849 U32 m = data [1];
850 U32 y = data [2];
851 U32 k = data [3];
852
853 if (0)
854 if (cinfo.Adobe_transform == 2)
855 {
856 c ^= 0xff;
857 m ^= 0xff;
858 y ^= 0xff;
859 k ^= 0xff;
860 }
861
862 data [0] = (c * k + 0x80) / 0xff;
863 data [1] = (m * k + 0x80) / 0xff;
864 data [2] = (y * k + 0x80) / 0xff;
865 data [3] = 0xff;
866
867 data += 4;
868 }
869 }
870
407 jpeg_finish_decompress (&cinfo); 871 jpeg_finish_decompress (&cinfo);
408 fclose (fp);
409 jpeg_destroy_decompress (&cinfo); 872 jpeg_destroy_decompress (&cinfo);
410 perlinterp_acquire (); 873 perlinterp_acquire ();
411} 874}
412 OUTPUT: 875 OUTPUT:
413 RETVAL 876 RETVAL
… …
472 CODE: 935 CODE:
473{ 936{
474 STRLEN plen; 937 STRLEN plen;
475 U8 *path = (U8 *)SvPV (pathsv, plen); 938 U8 *path = (U8 *)SvPV (pathsv, plen);
476 U8 *pend = path + plen; 939 U8 *pend = path + plen;
477 U8 dst [plen * 6 * 3], *dstp = dst; 940 U8 dst [plen * 8 * 3], *dstp = dst;
478 941
479 while (path < pend) 942 while (path < pend)
480 { 943 {
481 U8 ch = *path; 944 U8 ch = *path;
482 945
… …
484 *dstp++ = *path++; 947 *dstp++ = *path++;
485 else if (ch >= 'A' && ch <= 'Z') 948 else if (ch >= 'A' && ch <= 'Z')
486 *dstp++ = *path++ + ('a' - 'A'); 949 *dstp++ = *path++ + ('a' - 'A');
487 else if (ch >= '0' && ch <= '9') 950 else if (ch >= '0' && ch <= '9')
488 { 951 {
952 /* version sort, up to 8 digits */
489 STRLEN el, nl = 0; 953 STRLEN el, nl = 0;
490 while (*path >= '0' && *path <= '9' && path < pend) 954 while (*path >= '0' && *path <= '9' && path < pend)
491 path++, nl++; 955 path++, nl++;
492 956
493 for (el = nl; el < 6; el++) 957 for (el = nl; el < 8; el++)
494 *dstp++ = '0'; 958 *dstp++ = '0';
495 959
496 memcpy (dstp, path - nl, nl); 960 memcpy (dstp, path - nl, nl);
497 dstp += nl; 961 dstp += nl;
498 } 962 }

Diff Legend

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