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

Comparing CV/CV.xs (file contents):
Revision 1.44 by root, Sun Dec 30 16:23:23 2012 UTC vs.
Revision 1.67 by root, Fri May 12 01:23:57 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
34#include "perlmulticore.h"
35
21#define IW 80 /* MUST match Schnauzer.pm! */ 36#define IW 80 /* MUST match Schnauzer.pm! */
22#define IH 60 /* MUST match Schnauzer.pm! */ 37#define IH 60 /* MUST match Schnauzer.pm! */
23 38
24#define RAND (seed = (seed + 7141) * 54773 % 134456)
25
26#define LINELENGTH 240 39#define LINELENGTH 240
27 40
28#define ELLIPSIS "\xe2\x80\xa6" 41#define ELLIPSIS "\xe2\x80\xa6"
29 42
30typedef char *octet_string; 43typedef char *octet_string;
44
45static magic_t magic_cookie[2]; /* !mime, mime */
31 46
32struct jpg_err_mgr 47struct jpg_err_mgr
33{ 48{
34 struct jpeg_error_mgr err; 49 struct jpeg_error_mgr err;
35 jmp_buf setjmp_buffer; 50 jmp_buf setjmp_buffer;
36}; 51};
37 52
38static void 53static void
39cv_error_exit (j_common_ptr cinfo) 54cv_error_exit (j_common_ptr cinfo)
40{ 55{
56 cinfo->err->output_message (cinfo);
41 longjmp (((struct jpg_err_mgr *)cinfo->err)->setjmp_buffer, 99); 57 longjmp (((struct jpg_err_mgr *)cinfo->err)->setjmp_buffer, 99);
42} 58}
43 59
44static void 60static void
45cv_error_output (j_common_ptr cinfo) 61cv_error_output (j_common_ptr cinfo)
46{ 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);
47 return; 68 return;
48} 69}
49 70
50static void 71static void
51rgb_to_hsv (unsigned int r, unsigned int g, unsigned int b, 72rgb_to_hsv (unsigned int r, unsigned int g, unsigned int b,
… …
148 if (!--a85_cnt) 169 if (!--a85_cnt)
149 { 170 {
150 a85_cnt = 4; 171 a85_cnt = 4;
151 if (a85_val) 172 if (a85_val)
152 { 173 {
153 a85_ptr[4] = (a85_val % 85) + 33; a85_val /= 85; 174 a85_ptr[4] = (a85_val % 85) + 33; a85_val /= 85;
154 a85_ptr[3] = (a85_val % 85) + 33; a85_val /= 85; 175 a85_ptr[3] = (a85_val % 85) + 33; a85_val /= 85;
155 a85_ptr[2] = (a85_val % 85) + 33; a85_val /= 85; 176 a85_ptr[2] = (a85_val % 85) + 33; a85_val /= 85;
156 a85_ptr[1] = (a85_val % 85) + 33; a85_val /= 85; 177 a85_ptr[1] = (a85_val % 85) + 33; a85_val /= 85;
157 a85_ptr[0] = (a85_val ) + 33; 178 a85_ptr[0] = (a85_val ) + 33;
158 179
159 a85_ptr += 5; 180 a85_ptr += 5;
160 } 181 }
… …
183 204
184 PerlIO_write (fp, a85_buf, a85_ptr - a85_buf); 205 PerlIO_write (fp, a85_buf, a85_ptr - a85_buf);
185} 206}
186 207
187///////////////////////////////////////////////////////////////////////////// 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/////////////////////////////////////////////////////////////////////////////
188 303
189MODULE = Gtk2::CV PACKAGE = Gtk2::CV 304MODULE = Gtk2::CV PACKAGE = Gtk2::CV
190 305
191PROTOTYPES: ENABLE 306PROTOTYPES: ENABLE
192 307
308void
309_exit (int code)
310
311# calculate the common prefix length of two strings
193# missing function in perl. really :) 312# missing function in perl. really :)
194int 313int
195common_prefix_length (a, b) 314common_prefix_length (a, b)
196 unsigned char *a = (unsigned char *)SvPVutf8_nolen ($arg); 315 unsigned char *a = (unsigned char *)SvPVutf8_nolen ($arg);
197 unsigned char *b = (unsigned char *)SvPVutf8_nolen ($arg); 316 unsigned char *b = (unsigned char *)SvPVutf8_nolen ($arg);
… …
206 325
207 OUTPUT: 326 OUTPUT:
208 RETVAL 327 RETVAL
209 328
210const char * 329const char *
211magic (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
212 CODE: 336 CODE:
213{ 337{
214 static magic_t cookie; 338 STRLEN len;
339 char *data = SvPVbyte (path_or_data, len);
215 340
216 if (!cookie) 341 if (!magic_cookie[0])
342 {
343 magic_cookie[0] = magic_open (MAGIC_SYMLINK);
344 magic_cookie[1] = magic_open (MAGIC_SYMLINK | MAGIC_MIME_TYPE);
345 magic_load (magic_cookie[0], 0);
346 magic_load (magic_cookie[1], 0);
217 { 347 }
218 cookie = magic_open (MAGIC_NONE);
219 348
220 if (cookie) 349 perlinterp_release ();
221 magic_load (cookie, 0);
222 else
223 XSRETURN_UNDEF;
224 }
225 350
226 RETVAL = magic_file (cookie, path);
227}
228 OUTPUT:
229 RETVAL 351 RETVAL = ix & 2
352 ? magic_buffer (magic_cookie[ix & 1], data, len)
353 : magic_file (magic_cookie[ix & 1], data);
230 354
231const char * 355 perlinterp_acquire ();
232magic_mime (octet_string path)
233 CODE:
234{
235 static magic_t cookie;
236
237 if (!cookie)
238 {
239 cookie = magic_open (MAGIC_MIME);
240
241 if (cookie)
242 magic_load (cookie, 0);
243 else
244 XSRETURN_UNDEF;
245 }
246
247 RETVAL = magic_file (cookie, path);
248} 356}
249 OUTPUT: 357 OUTPUT:
250 RETVAL 358 RETVAL
251 359
252# missing/broken in Gtk2 perl module 360# missing/broken in Gtk2 perl module
… …
268 RETVAL 376 RETVAL
269 377
270GdkPixbuf_noinc * 378GdkPixbuf_noinc *
271dealpha_expose (GdkPixbuf *pb) 379dealpha_expose (GdkPixbuf *pb)
272 CODE: 380 CODE:
381 perlinterp_release ();
273{ 382{
274 int w = gdk_pixbuf_get_width (pb); 383 int w = gdk_pixbuf_get_width (pb);
275 int h = gdk_pixbuf_get_height (pb); 384 int h = gdk_pixbuf_get_height (pb);
276 int bpp = gdk_pixbuf_get_n_channels (pb); 385 int bpp = gdk_pixbuf_get_n_channels (pb);
277 int x, y, i; 386 int x, y, i;
… …
286 for (x = 0; x < w; x++) 395 for (x = 0; x < w; x++)
287 for (y = 0; y < h; y++) 396 for (y = 0; y < h; y++)
288 for (i = 0; i < 3; i++) 397 for (i = 0; i < 3; i++)
289 dst[x * 3 + y * dstr + i] = src[x * bpp + y * sstr + i]; 398 dst[x * 3 + y * dstr + i] = src[x * bpp + y * sstr + i];
290} 399}
400 perlinterp_acquire ();
291 OUTPUT: 401 OUTPUT:
292 RETVAL 402 RETVAL
293 403
294GdkPixbuf_noinc * 404GdkPixbuf_noinc *
295rotate (GdkPixbuf *pb, int angle) 405rotate (GdkPixbuf *pb, int angle)
296 CODE: 406 CODE:
407 perlinterp_release ();
297 if (angle < 0) 408 if (angle < 0)
298 angle += 360; 409 angle += 360;
299 RETVAL = gdk_pixbuf_rotate_simple (pb, angle == 0 ? GDK_PIXBUF_ROTATE_NONE 410 RETVAL = gdk_pixbuf_rotate_simple (pb, angle == 0 ? GDK_PIXBUF_ROTATE_NONE
300 : angle == 90 ? GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE 411 : angle == 90 ? GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE
301 : angle == 180 ? GDK_PIXBUF_ROTATE_UPSIDEDOWN 412 : angle == 180 ? GDK_PIXBUF_ROTATE_UPSIDEDOWN
302 : angle == 270 ? GDK_PIXBUF_ROTATE_CLOCKWISE 413 : angle == 270 ? GDK_PIXBUF_ROTATE_CLOCKWISE
303 : angle); 414 : angle);
415 perlinterp_acquire ();
304 OUTPUT: 416 OUTPUT:
305 RETVAL 417 RETVAL
306 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 else if (data_len >= 0x8000 + 6
491 && data[0x8000+0] == 0
492 && data[0x8000+1] == (U8)'B'
493 && data[0x8000+2] == (U8)'E'
494 && data[0x8000+3] == (U8)'A'
495 && data[0x8000+4] == (U8)'0'
496 && data[0x8000+5] == (U8)'1')
497 RETVAL = "video/iso-bluray";
498
499 else
500 XSRETURN_UNDEF;
501}
502 OUTPUT:
503 RETVAL
504
307GdkPixbuf_noinc * 505GdkPixbuf_noinc *
308load_jpeg (SV *path, int thumbnail=0) 506decode_webp (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
507 CODE:
508{
509#if WEBP
510 STRLEN data_size;
511 int alpha;
512 WebPData data;
513 WebPDemuxer *demux;
514 WebPIterator iter;
515 WebPDecoderConfig config;
516 int inw, inh;
517
518 data.bytes = (uint8_t *)SvPVbyte (image_data, data_size);
519 data.size = data_size;
520
521 perlinterp_release ();
522
523 RETVAL = 0;
524
525 if (!(demux = WebPDemux (&data)))
526 goto err_demux;
527
528 if (!WebPDemuxGetFrame (demux, 1, &iter))
529 goto err_iter;
530
531 if (!WebPInitDecoderConfig (&config))
532 goto err_iter;
533
534 config.options.use_threads = 1;
535
536 if (WebPGetFeatures (iter.fragment.bytes, iter.fragment.size, &config.input) != VP8_STATUS_OK)
537 goto err_iter;
538
539 inw = config.input.width;
540 inh = config.input.height;
541
542 if (thumbnail)
543 {
544 if (inw * ih > inh * iw)
545 ih = (iw * inh + inw - 1) / inw;
546 else
547 iw = (ih * inw + inh - 1) / inh;
548
549 config.options.bypass_filtering = 1;
550 config.options.no_fancy_upsampling = 1;
551
552 config.options.use_scaling = 1;
553 config.options.scaled_width = iw;
554 config.options.scaled_height = ih;
555 }
556 else
557 {
558 iw = inw;
559 ih = inh;
560 }
561
562 alpha = !!config.input.has_alpha;
563
564 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, alpha, 8, iw, ih);
565 if (!RETVAL)
566 goto err_iter;
567
568 config.output.colorspace = alpha ? MODE_RGBA : MODE_RGB;
569 config.output.u.RGBA.rgba = gdk_pixbuf_get_pixels (RETVAL);
570 config.output.u.RGBA.stride = gdk_pixbuf_get_rowstride (RETVAL);
571 config.output.u.RGBA.size = gdk_pixbuf_get_byte_length (RETVAL);
572 config.output.is_external_memory = 1;
573
574 if (WebPDecode (iter.fragment.bytes, iter.fragment.size, &config) != VP8_STATUS_OK)
575 {
576 g_object_unref (RETVAL);
577 RETVAL = 0;
578 goto err_iter;
579 }
580
581 err_iter:
582 WebPDemuxReleaseIterator (&iter);
583 err_demux:
584 WebPDemuxDelete (demux);
585
586 perlinterp_acquire ();
587#else
588 croak ("load_webp: webp not enabled at compile time");
589#endif
590}
591 OUTPUT:
592 RETVAL
593
594GdkPixbuf_noinc *
595decode_jxl (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
596 CODE:
597{
598#if JXL
599 JxlDecoder *dec;
600 JxlBasicInfo info;
601 const uint8_t *next_in = (uint8_t *)SvPVbyte_nolen (image_data);
602 size_t avail_in = SvCUR (image_data);
603 const char *error = 0;
604 JxlDecoderStatus status;
605 static void *runner_cache;
606 void *runner = 0;
607
608 RETVAL = 0;
609
610 if (runner_cache)
611 runner = runner_cache;
612 else
613 runner = JxlThreadParallelRunnerCreate (0, JxlThreadParallelRunnerDefaultNumWorkerThreads ());
614
615 runner_cache = 0;
616
617 perlinterp_release ();
618
619 dec = JxlDecoderCreate (0);
620
621 error = "JxlDecoderCreate failed";
622 if (!dec)
623 goto done;
624
625 status = JxlDecoderSetParallelRunner (dec, JxlThreadParallelRunner, runner);
626 error = "JxlDecoderSetParallelRunner failed";
627 if (status != JXL_DEC_SUCCESS)
628 goto done;
629
630 error = "JxlDecoderSubscribeEvents failed";
631 status = JxlDecoderSubscribeEvents (dec, JXL_DEC_BASIC_INFO | JXL_DEC_FULL_IMAGE);
632 if (status != JXL_DEC_SUCCESS)
633 goto done;
634
635 status = JxlDecoderSetInput (dec, next_in, avail_in);
636 error = "JxlDecoderSetInput failed";
637 if (status != JXL_DEC_SUCCESS)
638 goto done;
639
640 for (;;)
641 {
642 status = JxlDecoderProcessInput (dec);
643
644 switch (status)
645 {
646 case JXL_DEC_FULL_IMAGE:
647 error = 0;
648 goto done;
649
650 case JXL_DEC_ERROR:
651 error = "JxlDecoderProcessInput failed";
652 goto done;
653
654 case JXL_DEC_NEED_MORE_INPUT:
655 error = "incomplete file";
656 goto done;
657
658 case JXL_DEC_SUCCESS:
659 error = "incomplete decode";
660 goto done;
661
662 case JXL_DEC_BASIC_INFO:
663 {
664 status = JxlDecoderGetBasicInfo (dec, &info);
665 error = "JxlDecoderGetBasicInfo failed";
666 if (status != JXL_DEC_SUCCESS)
667 goto done;
668
669 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, !!info.alpha_bits, 8, info.xsize, info.ysize);
670 error = "unable to allocate pixbuf";
671 if (!RETVAL)
672 goto done;
673
674 JxlPixelFormat format = {
675 info.alpha_bits ? 4 : 3,
676 JXL_TYPE_UINT8,
677 JXL_NATIVE_ENDIAN,
678 gdk_pixbuf_get_rowstride (RETVAL)
679 };
680
681 // cannot use gdk_pixbuf_get_byte_length because that does
682 // not return the size of the buffer, but the size of the buffer without
683 // the last padding bytes. the internal buffer is rowstride * ysize,
684 // and this is what the jxl decoder needs. none of this is documented
685 // in either library, of course.
686
687 status = JxlDecoderSetImageOutBuffer (
688 dec,
689 &format,
690 gdk_pixbuf_get_pixels (RETVAL),
691 gdk_pixbuf_get_rowstride (RETVAL) * info.ysize
692 );
693 error = "JxlDecoderSetImageOutBuffer failed";
694 if (status != JXL_DEC_SUCCESS)
695 goto done;
696 }
697 break;
698
699 default:
700 error = "unexpected event";
701 goto done;
702 }
703 }
704
705 done:
706 if (dec)
707 JxlDecoderDestroy (dec);
708
709 perlinterp_acquire ();
710
711 if (runner_cache)
712 JxlThreadParallelRunnerDestroy (runner);
713
714 runner_cache = runner;
715
716 if (error)
717 {
718 if (RETVAL)
719 g_object_unref (RETVAL);
720
721 croak ("load_jxl: %s (status %d)", error, status);
722 }
723#else
724 croak ("load_jxl: jpeg-xl not enabled at compile time");
725#endif
726}
727 OUTPUT:
728 RETVAL
729
730GdkPixbuf_noinc *
731decode_jpeg (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
309 CODE: 732 CODE:
310{ 733{
311 struct jpeg_decompress_struct cinfo; 734 struct jpeg_decompress_struct cinfo;
312 struct jpg_err_mgr jerr; 735 struct jpg_err_mgr jerr;
313 guchar *data;
314 int rs; 736 int rs;
315 FILE *fp;
316 volatile GdkPixbuf *pb = 0; 737 volatile GdkPixbuf *pb = 0;
738 STRLEN data_len;
739 guchar *data = SvPVbyte (image_data, data_len);
317 740
318 RETVAL = 0; 741 RETVAL = 0;
319 742
320 fp = fopen (SvPVbyte_nolen (path), "rb"); 743 perlinterp_release ();
321
322 if (!fp)
323 XSRETURN_UNDEF;
324 744
325 cinfo.err = jpeg_std_error (&jerr.err); 745 cinfo.err = jpeg_std_error (&jerr.err);
326 746
327 jerr.err.error_exit = cv_error_exit; 747 jerr.err.error_exit = cv_error_exit;
328 jerr.err.output_message = cv_error_output; 748 jerr.err.output_message = cv_error_output;
329 749
330 if ((rs = setjmp (jerr.setjmp_buffer))) 750 if ((rs = setjmp (jerr.setjmp_buffer)))
331 { 751 {
332 fclose (fp);
333 jpeg_destroy_decompress (&cinfo); 752 jpeg_destroy_decompress (&cinfo);
334 753
335 if (pb) 754 if (pb)
336 g_object_unref ((gpointer)pb); 755 g_object_unref ((gpointer)pb);
337 756
757 perlinterp_acquire ();
338 XSRETURN_UNDEF; 758 XSRETURN_UNDEF;
339 } 759 }
340 760
761 if (!data_len)
762 longjmp (jerr.setjmp_buffer, 4);
763
341 jpeg_create_decompress (&cinfo); 764 jpeg_create_decompress (&cinfo);
765 cv_jpeg_mem_src (&cinfo, data, data_len);
342 766
343 jpeg_stdio_src (&cinfo, fp);
344 jpeg_read_header (&cinfo, TRUE); 767 jpeg_read_header (&cinfo, TRUE);
345 768
346 cinfo.dct_method = JDCT_DEFAULT; 769 cinfo.dct_method = JDCT_DEFAULT;
347 cinfo.do_fancy_upsampling = FALSE; /* worse quality, but nobody compained so far, and gdk-pixbuf does the same */ 770 cinfo.do_fancy_upsampling = FALSE; /* worse quality, but nobody compained so far, and gdk-pixbuf does the same */
348 cinfo.do_block_smoothing = FALSE; 771 cinfo.do_block_smoothing = FALSE;
… …
358 { 781 {
359 cinfo.dct_method = JDCT_FASTEST; 782 cinfo.dct_method = JDCT_FASTEST;
360 cinfo.do_fancy_upsampling = FALSE; 783 cinfo.do_fancy_upsampling = FALSE;
361 784
362 while (cinfo.scale_denom < 8 785 while (cinfo.scale_denom < 8
363 && cinfo.output_width >= IW*4 786 && cinfo.output_width >= iw*4
364 && cinfo.output_height >= IH*4) 787 && cinfo.output_height >= ih*4)
365 { 788 {
366 cinfo.scale_denom <<= 1; 789 cinfo.scale_denom <<= 1;
367 jpeg_calc_output_dimensions (&cinfo); 790 jpeg_calc_output_dimensions (&cinfo);
368 } 791 }
369 } 792 }
370 793
794 if (cinfo.output_components != 3)
795 longjmp (jerr.setjmp_buffer, 3);
796
797 if (cinfo.jpeg_color_space == JCS_YCCK || cinfo.jpeg_color_space == JCS_CMYK)
798 {
799 cinfo.out_color_space = JCS_CMYK;
800 cinfo.output_components = 4;
801 }
802
371 pb = RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, 0, 8, cinfo.output_width, cinfo.output_height); 803 pb = RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, cinfo.output_components == 4, 8, cinfo.output_width, cinfo.output_height);
372 if (!RETVAL) 804 if (!RETVAL)
373 longjmp (jerr.setjmp_buffer, 2); 805 longjmp (jerr.setjmp_buffer, 2);
374 806
375 data = gdk_pixbuf_get_pixels (RETVAL); 807 data = gdk_pixbuf_get_pixels (RETVAL);
376 rs = gdk_pixbuf_get_rowstride (RETVAL); 808 rs = gdk_pixbuf_get_rowstride (RETVAL);
377
378 if (cinfo.output_components != 3)
379 longjmp (jerr.setjmp_buffer, 3);
380 809
381 jpeg_start_decompress (&cinfo); 810 jpeg_start_decompress (&cinfo);
382 811
383 while (cinfo.output_scanline < cinfo.output_height) 812 while (cinfo.output_scanline < cinfo.output_height)
384 { 813 {
… …
391 rp [3] = (guchar *)rp [2] + rs; 820 rp [3] = (guchar *)rp [2] + rs;
392 821
393 jpeg_read_scanlines (&cinfo, rp, remaining < 4 ? remaining : 4); 822 jpeg_read_scanlines (&cinfo, rp, remaining < 4 ? remaining : 4);
394 } 823 }
395 824
825 if (cinfo.out_color_space == JCS_CMYK)
826 {
827 guchar *end = data + cinfo.output_height * rs;
828
829 while (data < end)
830 {
831 U32 c = data [0];
832 U32 m = data [1];
833 U32 y = data [2];
834 U32 k = data [3];
835
836 if (0)
837 if (cinfo.Adobe_transform == 2)
838 {
839 c ^= 0xff;
840 m ^= 0xff;
841 y ^= 0xff;
842 k ^= 0xff;
843 }
844
845 data [0] = (c * k + 0x80) / 0xff;
846 data [1] = (m * k + 0x80) / 0xff;
847 data [2] = (y * k + 0x80) / 0xff;
848 data [3] = 0xff;
849
850 data += 4;
851 }
852 }
853
396 jpeg_finish_decompress (&cinfo); 854 jpeg_finish_decompress (&cinfo);
397 fclose (fp);
398 jpeg_destroy_decompress (&cinfo); 855 jpeg_destroy_decompress (&cinfo);
856 perlinterp_acquire ();
399} 857}
400 OUTPUT: 858 OUTPUT:
401 RETVAL 859 RETVAL
402 860
403void 861void
404compare (GdkPixbuf *a, GdkPixbuf *b) 862compare (GdkPixbuf *a, GdkPixbuf *b)
405 PPCODE: 863 PPCODE:
864 perlinterp_release ();
406{ 865{
407 int w = gdk_pixbuf_get_width (a); 866 int w = gdk_pixbuf_get_width (a);
408 int h = gdk_pixbuf_get_height (a); 867 int h = gdk_pixbuf_get_height (a);
409 868
410 int sa = gdk_pixbuf_get_rowstride (a); 869 int sa = gdk_pixbuf_get_rowstride (a);
… …
438 d = ((int)*pa_++) - ((int)*pb_++); diff += d*d; peak = MAX (peak, abs (d)); 897 d = ((int)*pa_++) - ((int)*pb_++); diff += d*d; peak = MAX (peak, abs (d));
439 d = ((int)*pa_++) - ((int)*pb_++); diff += d*d; peak = MAX (peak, abs (d)); 898 d = ((int)*pa_++) - ((int)*pb_++); diff += d*d; peak = MAX (peak, abs (d));
440 } 899 }
441 } 900 }
442 901
902 perlinterp_acquire ();
903
443 EXTEND (SP, 2); 904 EXTEND (SP, 2);
444 PUSHs (sv_2mortal (newSVnv (sqrt (diff / (w * h * 3. * 255. * 255.))))); 905 PUSHs (sv_2mortal (newSVnv (sqrt (diff / (w * h * 3. * 255. * 255.)))));
445 PUSHs (sv_2mortal (newSVnv (peak / 255.))); 906 PUSHs (sv_2mortal (newSVnv (peak / 255.)));
446} 907}
447 908
… …
457 CODE: 918 CODE:
458{ 919{
459 STRLEN plen; 920 STRLEN plen;
460 U8 *path = (U8 *)SvPV (pathsv, plen); 921 U8 *path = (U8 *)SvPV (pathsv, plen);
461 U8 *pend = path + plen; 922 U8 *pend = path + plen;
462 U8 dst [plen * 6 * 3], *dstp = dst; 923 U8 dst [plen * 8 * 3], *dstp = dst;
463 924
464 while (path < pend) 925 while (path < pend)
465 { 926 {
466 U8 ch = *path; 927 U8 ch = *path;
467 928
… …
469 *dstp++ = *path++; 930 *dstp++ = *path++;
470 else if (ch >= 'A' && ch <= 'Z') 931 else if (ch >= 'A' && ch <= 'Z')
471 *dstp++ = *path++ + ('a' - 'A'); 932 *dstp++ = *path++ + ('a' - 'A');
472 else if (ch >= '0' && ch <= '9') 933 else if (ch >= '0' && ch <= '9')
473 { 934 {
935 /* version sort, up to 8 digits */
474 STRLEN el, nl = 0; 936 STRLEN el, nl = 0;
475 while (*path >= '0' && *path <= '9' && path < pend) 937 while (*path >= '0' && *path <= '9' && path < pend)
476 path++, nl++; 938 path++, nl++;
477 939
478 for (el = nl; el < 6; el++) 940 for (el = nl; el < 8; el++)
479 *dstp++ = '0'; 941 *dstp++ = '0';
480 942
481 memcpy (dstp, path - nl, nl); 943 memcpy (dstp, path - nl, nl);
482 dstp += nl; 944 dstp += nl;
483 } 945 }

Diff Legend

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