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

Comparing CV/CV.xs (file contents):
Revision 1.26 by root, Sun Aug 21 02:18:30 2005 UTC vs.
Revision 1.63 by root, Sun Nov 28 23:26:51 2021 UTC

2#include "perl.h" 2#include "perl.h"
3#include "XSUB.h" 3#include "XSUB.h"
4 4
5#include <string.h> 5#include <string.h>
6#include <setjmp.h> 6#include <setjmp.h>
7#include <math.h>
8
9#include <magic.h>
7 10
8#include <jpeglib.h> 11#include <jpeglib.h>
12#include <jerror.h>
13
9#include <glib.h> 14#include <glib.h>
10#include <gtk/gtk.h> 15#include <gtk/gtk.h>
16#include <gdk/gdkx.h>
11#include <gdk-pixbuf/gdk-pixbuf.h> 17#include <gdk-pixbuf/gdk-pixbuf.h>
12 18
13#include <gperl.h> 19#include <gperl.h>
14#include <gtk2perl.h> 20#include <gtk2perl.h>
15 21
22#include <assert.h>
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
16#define IW 80 /* MUST match Schnauer.pm! */ 36#define IW 80 /* MUST match Schnauzer.pm! */
17#define IH 60 /* MUST match Schnauer.pm! */ 37#define IH 60 /* MUST match Schnauzer.pm! */
18
19#define RAND (seed = (seed + 7141) * 54773 % 134456)
20 38
21#define LINELENGTH 240 39#define LINELENGTH 240
22 40
23#define ELLIPSIS "\xe2\x80\xa6" 41#define ELLIPSIS "\xe2\x80\xa6"
42
43typedef char *octet_string;
44
45static magic_t magic_cookie[2]; /* !mime, mime */
24 46
25struct jpg_err_mgr 47struct jpg_err_mgr
26{ 48{
27 struct jpeg_error_mgr err; 49 struct jpeg_error_mgr err;
28 jmp_buf setjmp_buffer; 50 jmp_buf setjmp_buffer;
29}; 51};
30 52
31static void 53static void
32cv_error_exit (j_common_ptr cinfo) 54cv_error_exit (j_common_ptr cinfo)
33{ 55{
56 cinfo->err->output_message (cinfo);
34 longjmp (((struct jpg_err_mgr *)cinfo->err)->setjmp_buffer, 99); 57 longjmp (((struct jpg_err_mgr *)cinfo->err)->setjmp_buffer, 99);
35} 58}
36 59
37static void 60static void
38cv_error_output (j_common_ptr cinfo) 61cv_error_output (j_common_ptr cinfo)
39{ 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);
40 return; 68 return;
41} 69}
42 70
43static void 71static void
44rgb_to_hsv (unsigned int r, unsigned int g, unsigned int b, 72rgb_to_hsv (unsigned int r, unsigned int g, unsigned int b,
65 93
66 *h &= 255; 94 *h &= 255;
67 } 95 }
68} 96}
69 97
98struct feature {
99 float v1, v2, v3; // mean, square, cube
100 int n;
101};
102
103static void
104feature_init (struct feature *f)
105{
106 f->v1 = 0.;
107 f->v2 = 0.;
108 f->v3 = 0.;
109 f->n = 0;
110}
111
112// didn't find an algorithm to neatly do mean, variance and skew in one pass.
113// elmex ist schuld.
114static void
115feature_update_pass_1 (struct feature *f, unsigned int v)
116{
117 f->v1 += v;
118 f->n += 1;
119}
120
121static void
122feature_finish_pass_1 (struct feature *f)
123{
124 if (f->n < 1)
125 return;
126
127 f->v1 /= f->n;
128}
129
130static void
131feature_update_pass_2 (struct feature *f, unsigned int v)
132{
133 float d = v - f->v1;
134
135 f->v2 += d * d;
136 f->v3 += d * d * d;
137}
138
139static void
140feature_finish_pass_2 (struct feature *f)
141{
142 if (f->n < 1)
143 return;
144
145 f->v2 /= f->n;
146 f->v3 /= f->n;
147
148 f->v1 /= 255.;
149 f->v2 /= 255. * 255.; f->v2 = sqrtf (f->v2);
150 f->v3 /= 255. * 255. * 255.; f->v3 = powf (fabsf (f->v3), 1./3.);
151}
152
70static guint32 a85_val; 153static guint32 a85_val;
71static guint a85_cnt; 154static guint a85_cnt;
72static guchar a85_buf[LINELENGTH], *a85_ptr; 155static guchar a85_buf[LINELENGTH], *a85_ptr;
73 156
74static void 157static void
86 if (!--a85_cnt) 169 if (!--a85_cnt)
87 { 170 {
88 a85_cnt = 4; 171 a85_cnt = 4;
89 if (a85_val) 172 if (a85_val)
90 { 173 {
91 a85_ptr[4] = (a85_val % 85) + 33; a85_val /= 85; 174 a85_ptr[4] = (a85_val % 85) + 33; a85_val /= 85;
92 a85_ptr[3] = (a85_val % 85) + 33; a85_val /= 85; 175 a85_ptr[3] = (a85_val % 85) + 33; a85_val /= 85;
93 a85_ptr[2] = (a85_val % 85) + 33; a85_val /= 85; 176 a85_ptr[2] = (a85_val % 85) + 33; a85_val /= 85;
94 a85_ptr[1] = (a85_val % 85) + 33; a85_val /= 85; 177 a85_ptr[1] = (a85_val % 85) + 33; a85_val /= 85;
95 a85_ptr[0] = (a85_val ) + 33; 178 a85_ptr[0] = (a85_val ) + 33;
96 179
97 a85_ptr += 5; 180 a85_ptr += 5;
98 } 181 }
121 204
122 PerlIO_write (fp, a85_buf, a85_ptr - a85_buf); 205 PerlIO_write (fp, a85_buf, a85_ptr - a85_buf);
123} 206}
124 207
125///////////////////////////////////////////////////////////////////////////// 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/////////////////////////////////////////////////////////////////////////////
126 303
127MODULE = Gtk2::CV PACKAGE = Gtk2::CV 304MODULE = Gtk2::CV PACKAGE = Gtk2::CV
128 305
129PROTOTYPES: ENABLE 306PROTOTYPES: ENABLE
130 307
308# calculate the common prefix length of two strings
309# missing function in perl. really :)
310int
311common_prefix_length (a, b)
312 unsigned char *a = (unsigned char *)SvPVutf8_nolen ($arg);
313 unsigned char *b = (unsigned char *)SvPVutf8_nolen ($arg);
314 CODE:
315 RETVAL = 0;
316
317 while (*a == *b && *a)
318 {
319 RETVAL += (*a & 0xc0) != 0x80;
320 a++, b++;
321 }
322
323 OUTPUT:
324 RETVAL
325
326const char *
327magic (SV *path_or_data)
328 ALIAS:
329 magic = 0
330 magic_mime = 1
331 magic_buffer = 2
332 magic_buffer_mime = 3
333 CODE:
334{
335 STRLEN len;
336 char *data = SvPVbyte (path_or_data, len);
337
338 if (!magic_cookie[0])
339 {
340 magic_cookie[0] = magic_open (MAGIC_SYMLINK);
341 magic_cookie[1] = magic_open (MAGIC_SYMLINK | MAGIC_MIME_TYPE);
342 magic_load (magic_cookie[0], 0);
343 magic_load (magic_cookie[1], 0);
344 }
345
346 perlinterp_release ();
347
348 RETVAL = ix & 2
349 ? magic_buffer (magic_cookie[ix & 1], data, len)
350 : magic_file (magic_cookie[ix & 1], data);
351
352 perlinterp_acquire ();
353}
354 OUTPUT:
355 RETVAL
356
131# missing in Gtk2 perl module 357# missing/broken in Gtk2 perl module
358
359void
360gdk_window_clear_hints (GdkWindow *window)
361 CODE:
362 gdk_window_set_geometry_hints (window, 0, 0);
132 363
133gboolean 364gboolean
134gdk_net_wm_supports (GdkAtom property) 365gdk_net_wm_supports (GdkAtom property)
135 CODE: 366 CODE:
136#if defined(GDK_WINDOWING_X11) && !defined(GDK_MULTIHEAD_SAFE) 367#if defined(GDK_WINDOWING_X11) && !defined(GDK_MULTIHEAD_SAFE)
142 RETVAL 373 RETVAL
143 374
144GdkPixbuf_noinc * 375GdkPixbuf_noinc *
145dealpha_expose (GdkPixbuf *pb) 376dealpha_expose (GdkPixbuf *pb)
146 CODE: 377 CODE:
147{ 378 perlinterp_release ();
148 int w = gdk_pixbuf_get_width (pb);
149 int h = gdk_pixbuf_get_height (pb);
150 fprintf (stderr, "new %d %d\n", w, h);
151 int bpp = gdk_pixbuf_get_n_channels (pb);
152 int x, y, i;
153 guchar *src = gdk_pixbuf_get_pixels (pb), *dst;
154 int sstr = gdk_pixbuf_get_rowstride (pb), dstr;
155
156 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, 0, 8, w, h);
157
158 dst = gdk_pixbuf_get_pixels (RETVAL);
159 dstr = gdk_pixbuf_get_rowstride (RETVAL);
160
161 for (x = 0; x < w; x++)
162 for (y = 0; y < h; y++)
163 for (i = 0; i < 3; i++)
164 dst[x * 3 + y * dstr + i] = src[x * bpp + y * sstr + i];
165}
166 OUTPUT:
167 RETVAL
168
169GdkPixbuf_noinc *
170transpose (GdkPixbuf *pb)
171 CODE:
172{ 379{
173 int w = gdk_pixbuf_get_width (pb); 380 int w = gdk_pixbuf_get_width (pb);
174 int h = gdk_pixbuf_get_height (pb); 381 int h = gdk_pixbuf_get_height (pb);
175 int bpp = gdk_pixbuf_get_n_channels (pb); 382 int bpp = gdk_pixbuf_get_n_channels (pb);
176 int x, y, i; 383 int x, y, i;
177 guchar *src = gdk_pixbuf_get_pixels (pb), *dst; 384 guchar *src = gdk_pixbuf_get_pixels (pb), *dst;
178 int sstr = gdk_pixbuf_get_rowstride (pb), dstr; 385 int sstr = gdk_pixbuf_get_rowstride (pb), dstr;
179 386
180 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, bpp == 4, 8, h, w); 387 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, 0, 8, w, h);
181 388
182 dst = gdk_pixbuf_get_pixels (RETVAL); 389 dst = gdk_pixbuf_get_pixels (RETVAL);
183 dstr = gdk_pixbuf_get_rowstride (RETVAL); 390 dstr = gdk_pixbuf_get_rowstride (RETVAL);
184 391
185 for (y = 0; y < h; y++)
186 for (x = 0; x < w; x++) 392 for (x = 0; x < w; x++)
393 for (y = 0; y < h; y++)
187 for (i = 0; i < bpp; i++) 394 for (i = 0; i < 3; i++)
188 dst[y * bpp + x * dstr + i] = src[x * bpp + y * sstr + i]; 395 dst[x * 3 + y * dstr + i] = src[x * bpp + y * sstr + i];
189} 396}
397 perlinterp_acquire ();
190 OUTPUT: 398 OUTPUT:
191 RETVAL 399 RETVAL
192 400
193GdkPixbuf_noinc * 401GdkPixbuf_noinc *
194flop (GdkPixbuf *pb) 402rotate (GdkPixbuf *pb, int angle)
195 CODE: 403 CODE:
196{ 404 perlinterp_release ();
197 int w = gdk_pixbuf_get_width (pb); 405 if (angle < 0)
198 int h = gdk_pixbuf_get_height (pb); 406 angle += 360;
199 int bpp = gdk_pixbuf_get_n_channels (pb); 407 RETVAL = gdk_pixbuf_rotate_simple (pb, angle == 0 ? GDK_PIXBUF_ROTATE_NONE
200 int x, y, i; 408 : angle == 90 ? GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE
201 guchar *src = gdk_pixbuf_get_pixels (pb), *dst; 409 : angle == 180 ? GDK_PIXBUF_ROTATE_UPSIDEDOWN
202 int sstr = gdk_pixbuf_get_rowstride (pb), dstr; 410 : angle == 270 ? GDK_PIXBUF_ROTATE_CLOCKWISE
203 411 : angle);
204 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, bpp == 4, 8, w, h); 412 perlinterp_acquire ();
205
206 dst = gdk_pixbuf_get_pixels (RETVAL);
207 dstr = gdk_pixbuf_get_rowstride (RETVAL);
208
209 for (y = 0; y < h; y++)
210 for (x = 0; x < w; x++)
211 for (i = 0; i < bpp; i++)
212 dst[(w - 1 - x) * bpp + y * dstr + i] = src[x * bpp + y * sstr + i];
213}
214 OUTPUT: 413 OUTPUT:
215 RETVAL 414 RETVAL
216 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
217GdkPixbuf_noinc * 494GdkPixbuf_noinc *
218load_jpeg (SV *path, int thumbnail=0) 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 void *runner = 0;
595 struct bmff_box box;
596
597 RETVAL = 0;
598
599 perlinterp_release ();
600
601 dec = JxlDecoderCreate (0);
602
603 error = "JxlDecoderCreate failed";
604 if (!dec)
605 goto done;
606
607 runner = JxlThreadParallelRunnerCreate (0, JxlThreadParallelRunnerDefaultNumWorkerThreads ());
608
609 status = JxlDecoderSetParallelRunner (dec, JxlThreadParallelRunner, runner);
610 error = "JxlDecoderSetParallelRunner failed";
611 if (status != JXL_DEC_SUCCESS)
612 goto done;
613
614 error = "JxlDecoderSubscribeEvents failed";
615 status = JxlDecoderSubscribeEvents (dec, JXL_DEC_BASIC_INFO | JXL_DEC_FULL_IMAGE);
616 if (status != JXL_DEC_SUCCESS)
617 goto done;
618
619 status = JxlDecoderSetInput (dec, next_in, avail_in);
620 error = "JxlDecoderSetInput failed";
621 if (status != JXL_DEC_SUCCESS)
622 goto done;
623
624 for (;;)
625 {
626 status = JxlDecoderProcessInput (dec);
627
628 switch (status)
629 {
630 case JXL_DEC_FULL_IMAGE:
631 error = 0;
632 goto done;
633
634 case JXL_DEC_ERROR:
635 error = "JxlDecoderProcessInput failed";
636 goto done;
637
638 case JXL_DEC_NEED_MORE_INPUT:
639 error = "incomplete file";
640 goto done;
641
642 case JXL_DEC_SUCCESS:
643 error = "incomplete decode";
644 goto done;
645
646 case JXL_DEC_BASIC_INFO:
647 {
648 status = JxlDecoderGetBasicInfo (dec, &info);
649 error = "JxlDecoderGetBasicInfo failed";
650 if (status != JXL_DEC_SUCCESS)
651 goto done;
652
653 RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, !!info.alpha_bits, 8, info.xsize, info.ysize);
654 error = "unable to allocate pixbuf";
655 if (!RETVAL)
656 goto done;
657
658 JxlPixelFormat format = {
659 info.alpha_bits ? 4 : 3,
660 JXL_TYPE_UINT8,
661 JXL_NATIVE_ENDIAN,
662 gdk_pixbuf_get_rowstride (RETVAL)
663 };
664
665 // cannot use gdk_pixbuf_get_byte_length because that does
666 // not return the size of the buffer, but the size of the buffer without
667 // the last padding bytes. the internal buffer is rowstride * ysize,
668 // and this is what the jxl decoder needs. none of this is documented
669 // in either library, of course.
670
671 status = JxlDecoderSetImageOutBuffer (
672 dec,
673 &format,
674 gdk_pixbuf_get_pixels (RETVAL),
675 gdk_pixbuf_get_rowstride (RETVAL) * info.ysize
676 );
677 error = "JxlDecoderSetImageOutBuffer failed";
678 if (status != JXL_DEC_SUCCESS)
679 goto done;
680 }
681 break;
682
683 default:
684 error = "unexpected event";
685 goto done;
686 }
687 }
688
689 done:
690 if (dec)
691 JxlDecoderDestroy (dec);
692
693 if (runner)
694 JxlThreadParallelRunnerDestroy (runner);
695
696 perlinterp_acquire ();
697
698 if (error)
699 {
700 if (RETVAL)
701 g_object_unref (RETVAL);
702
703 croak ("load_jxl: %s (status %d)", error, status);
704 }
705#else
706 croak ("load_jxl: jpeg-xl not enabled at compile time");
707#endif
708}
709 OUTPUT:
710 RETVAL
711
712GdkPixbuf_noinc *
713decode_jpeg (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
219 CODE: 714 CODE:
220{ 715{
221 struct jpeg_decompress_struct cinfo; 716 struct jpeg_decompress_struct cinfo;
222 struct jpg_err_mgr jerr; 717 struct jpg_err_mgr jerr;
223 guchar *data;
224 int rs; 718 int rs;
225 FILE *fp;
226 volatile GdkPixbuf *pb = 0; 719 volatile GdkPixbuf *pb = 0;
227 gchar *filename; 720 STRLEN data_len;
721 guchar *data = SvPVbyte (image_data, data_len);
228 722
229 RETVAL = 0; 723 RETVAL = 0;
230 724
231 filename = g_filename_from_utf8 (SvPVutf8_nolen (path), -1, 0, 0, 0); 725 perlinterp_release ();
232 fp = fopen (filename, "rb");
233 g_free (filename);
234
235 if (!fp)
236 XSRETURN_UNDEF;
237 726
238 cinfo.err = jpeg_std_error (&jerr.err); 727 cinfo.err = jpeg_std_error (&jerr.err);
239 728
240 jerr.err.error_exit = cv_error_exit; 729 jerr.err.error_exit = cv_error_exit;
241 jerr.err.output_message = cv_error_output; 730 jerr.err.output_message = cv_error_output;
242 731
243 if ((rs = setjmp (jerr.setjmp_buffer))) 732 if ((rs = setjmp (jerr.setjmp_buffer)))
244 { 733 {
245 fclose (fp);
246 jpeg_destroy_decompress (&cinfo); 734 jpeg_destroy_decompress (&cinfo);
247 735
248 if (pb) 736 if (pb)
249 g_object_unref ((gpointer)pb); 737 g_object_unref ((gpointer)pb);
250 738
739 perlinterp_acquire ();
251 XSRETURN_UNDEF; 740 XSRETURN_UNDEF;
252 } 741 }
253 742
743 if (!data_len)
744 longjmp (jerr.setjmp_buffer, 4);
745
254 jpeg_create_decompress (&cinfo); 746 jpeg_create_decompress (&cinfo);
747 cv_jpeg_mem_src (&cinfo, data, data_len);
255 748
256 jpeg_stdio_src (&cinfo, fp);
257 jpeg_read_header (&cinfo, TRUE); 749 jpeg_read_header (&cinfo, TRUE);
258 750
259 cinfo.dct_method = JDCT_DEFAULT; 751 cinfo.dct_method = JDCT_DEFAULT;
260 cinfo.do_fancy_upsampling = FALSE; /* worse quality, but nobody compained so far, and gdk-pixbuf does the same */ 752 cinfo.do_fancy_upsampling = FALSE; /* worse quality, but nobody compained so far, and gdk-pixbuf does the same */
261 cinfo.do_block_smoothing = FALSE; 753 cinfo.do_block_smoothing = FALSE;
271 { 763 {
272 cinfo.dct_method = JDCT_FASTEST; 764 cinfo.dct_method = JDCT_FASTEST;
273 cinfo.do_fancy_upsampling = FALSE; 765 cinfo.do_fancy_upsampling = FALSE;
274 766
275 while (cinfo.scale_denom < 8 767 while (cinfo.scale_denom < 8
276 && cinfo.output_width >= IW*4 768 && cinfo.output_width >= iw*4
277 && cinfo.output_height >= IH*4) 769 && cinfo.output_height >= ih*4)
278 { 770 {
279 cinfo.scale_denom <<= 1; 771 cinfo.scale_denom <<= 1;
280 jpeg_calc_output_dimensions (&cinfo); 772 jpeg_calc_output_dimensions (&cinfo);
281 } 773 }
282 } 774 }
283 775
776 if (cinfo.output_components != 3)
777 longjmp (jerr.setjmp_buffer, 3);
778
779 if (cinfo.jpeg_color_space == JCS_YCCK || cinfo.jpeg_color_space == JCS_CMYK)
780 {
781 cinfo.out_color_space = JCS_CMYK;
782 cinfo.output_components = 4;
783 }
784
284 pb = RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, 0, 8, cinfo.output_width, cinfo.output_height); 785 pb = RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, cinfo.output_components == 4, 8, cinfo.output_width, cinfo.output_height);
285 if (!RETVAL) 786 if (!RETVAL)
286 longjmp (jerr.setjmp_buffer, 2); 787 longjmp (jerr.setjmp_buffer, 2);
287 788
288 data = gdk_pixbuf_get_pixels (RETVAL); 789 data = gdk_pixbuf_get_pixels (RETVAL);
289 rs = gdk_pixbuf_get_rowstride (RETVAL); 790 rs = gdk_pixbuf_get_rowstride (RETVAL);
290
291 if (cinfo.output_components != 3)
292 longjmp (jerr.setjmp_buffer, 3);
293 791
294 jpeg_start_decompress (&cinfo); 792 jpeg_start_decompress (&cinfo);
295 793
296 while (cinfo.output_scanline < cinfo.output_height) 794 while (cinfo.output_scanline < cinfo.output_height)
297 { 795 {
304 rp [3] = (guchar *)rp [2] + rs; 802 rp [3] = (guchar *)rp [2] + rs;
305 803
306 jpeg_read_scanlines (&cinfo, rp, remaining < 4 ? remaining : 4); 804 jpeg_read_scanlines (&cinfo, rp, remaining < 4 ? remaining : 4);
307 } 805 }
308 806
807 if (cinfo.out_color_space == JCS_CMYK)
808 {
809 guchar *end = data + cinfo.output_height * rs;
810
811 while (data < end)
812 {
813 U32 c = data [0];
814 U32 m = data [1];
815 U32 y = data [2];
816 U32 k = data [3];
817
818 if (0)
819 if (cinfo.Adobe_transform == 2)
820 {
821 c ^= 0xff;
822 m ^= 0xff;
823 y ^= 0xff;
824 k ^= 0xff;
825 }
826
827 data [0] = (c * k + 0x80) / 0xff;
828 data [1] = (m * k + 0x80) / 0xff;
829 data [2] = (y * k + 0x80) / 0xff;
830 data [3] = 0xff;
831
832 data += 4;
833 }
834 }
835
309 jpeg_finish_decompress (&cinfo); 836 jpeg_finish_decompress (&cinfo);
310 fclose (fp);
311 jpeg_destroy_decompress (&cinfo); 837 jpeg_destroy_decompress (&cinfo);
838 perlinterp_acquire ();
312} 839}
313 OUTPUT: 840 OUTPUT:
314 RETVAL 841 RETVAL
315 842
843void
844compare (GdkPixbuf *a, GdkPixbuf *b)
845 PPCODE:
846 perlinterp_release ();
847{
848 int w = gdk_pixbuf_get_width (a);
849 int h = gdk_pixbuf_get_height (a);
850
851 int sa = gdk_pixbuf_get_rowstride (a);
852 int sb = gdk_pixbuf_get_rowstride (b);
853
854 guchar *pa = gdk_pixbuf_get_pixels (a);
855 guchar *pb = gdk_pixbuf_get_pixels (b);
856
857 int x, y;
858
859 assert (w == gdk_pixbuf_get_width (b));
860 assert (h == gdk_pixbuf_get_height (b));
861
862 assert (gdk_pixbuf_get_n_channels (a) == 3);
863 assert (gdk_pixbuf_get_n_channels (b) == 3);
864
865 double diff = 0.;
866 int peak = 0;
867
868 if (w && h)
869 for (y = 0; y < h; y++)
870 {
871 guchar *pa_ = pa + y * sa;
872 guchar *pb_ = pb + y * sb;
873
874 for (x = 0; x < w; x++)
875 {
876 int d;
877
878 d = ((int)*pa_++) - ((int)*pb_++); diff += d*d; peak = MAX (peak, abs (d));
879 d = ((int)*pa_++) - ((int)*pb_++); diff += d*d; peak = MAX (peak, abs (d));
880 d = ((int)*pa_++) - ((int)*pb_++); diff += d*d; peak = MAX (peak, abs (d));
881 }
882 }
883
884 perlinterp_acquire ();
885
886 EXTEND (SP, 2);
887 PUSHs (sv_2mortal (newSVnv (sqrt (diff / (w * h * 3. * 255. * 255.)))));
888 PUSHs (sv_2mortal (newSVnv (peak / 255.)));
889}
890
316############################################################################# 891#############################################################################
317 892
318MODULE = Gtk2::CV PACKAGE = Gtk2::CV::Schnauzer 893MODULE = Gtk2::CV PACKAGE = Gtk2::CV::Schnauzer
894
895# currently only works for filenames (octet strings)
319 896
320SV * 897SV *
321foldcase (SV *pathsv) 898foldcase (SV *pathsv)
322 PROTOTYPE: $ 899 PROTOTYPE: $
323 CODE: 900 CODE:
324{ 901{
325 STRLEN plen; 902 STRLEN plen;
326 U8 *path = (U8 *)SvPVutf8 (pathsv, plen); 903 U8 *path = (U8 *)SvPV (pathsv, plen);
327 U8 *pend = path + plen; 904 U8 *pend = path + plen;
328 U8 dst [plen * 6 * 3], *dstp = dst; 905 U8 dst [plen * 8 * 3], *dstp = dst;
329 906
330 while (path < pend) 907 while (path < pend)
331 { 908 {
332 U8 ch = *path; 909 U8 ch = *path;
333 910
334 if (ch >= 'a' && ch <= 'z') 911 if (ch >= 'a' && ch <= 'z')
335 *dstp++ = *path++; 912 *dstp++ = *path++;
913 else if (ch >= 'A' && ch <= 'Z')
914 *dstp++ = *path++ + ('a' - 'A');
336 else if (ch >= '0' && ch <= '9') 915 else if (ch >= '0' && ch <= '9')
337 { 916 {
917 /* version sort, up to 8 digits */
338 STRLEN el, nl = 0; 918 STRLEN el, nl = 0;
339 while (*path >= '0' && *path <= '9' && path < pend) 919 while (*path >= '0' && *path <= '9' && path < pend)
340 path++, nl++; 920 path++, nl++;
341 921
342 for (el = nl; el < 6; el++) 922 for (el = nl; el < 8; el++)
343 *dstp++ = '0'; 923 *dstp++ = '0';
344 924
345 memcpy (dstp, path - nl, nl); 925 memcpy (dstp, path - nl, nl);
346 dstp += nl; 926 dstp += nl;
347 } 927 }
928 else
929 *dstp++ = *path++;
930#if 0
348 else 931 else
349 { 932 {
350 STRLEN cl; 933 STRLEN cl;
351 to_utf8_fold (path, dstp, &cl); 934 to_utf8_fold (path, dstp, &cl);
352 dstp += cl; 935 dstp += cl;
353 path += is_utf8_char (path); 936 path += is_utf8_char (path);
354 } 937 }
938#endif
355 } 939 }
356 940
357 RETVAL = newSVpvn ((const char *)dst, dstp - dst); 941 RETVAL = newSVpvn ((const char *)dst, dstp - dst);
358} 942}
359 OUTPUT: 943 OUTPUT:
384 } 968 }
385} 969}
386 OUTPUT: 970 OUTPUT:
387 RETVAL 971 RETVAL
388 972
973#############################################################################
974
975MODULE = Gtk2::CV PACKAGE = Gtk2::CV::PostScript
976
977void
978dump_ascii85 (PerlIO *fp, GdkPixbuf *pb)
979 CODE:
980{
981 int w = gdk_pixbuf_get_width (pb);
982 int h = gdk_pixbuf_get_height (pb);
983 int x, y, i;
984 guchar *dst;
985 int bpp = gdk_pixbuf_get_n_channels (pb);
986 guchar *src = gdk_pixbuf_get_pixels (pb);
987 int sstr = gdk_pixbuf_get_rowstride (pb);
988
989 a85_init ();
990
991 for (y = 0; y < h; y++)
992 for (x = 0; x < w; x++)
993 for (i = 0; i < (bpp < 3 ? 1 : 3); i++)
994 a85_push (fp, src [x * bpp + y * sstr + i]);
995
996 a85_finish (fp);
997}
998
999void
1000dump_binary (PerlIO *fp, GdkPixbuf *pb)
1001 CODE:
1002{
1003 int w = gdk_pixbuf_get_width (pb);
1004 int h = gdk_pixbuf_get_height (pb);
1005 int x, y, i;
1006 guchar *dst;
1007 int bpp = gdk_pixbuf_get_n_channels (pb);
1008 guchar *src = gdk_pixbuf_get_pixels (pb);
1009 int sstr = gdk_pixbuf_get_rowstride (pb);
1010
1011 for (y = 0; y < h; y++)
1012 for (x = 0; x < w; x++)
1013 for (i = 0; i < (bpp < 3 ? 1 : 3); i++)
1014 PerlIO_putc (fp, src [x * bpp + y * sstr + i]);
1015}
1016
1017#############################################################################
1018
1019MODULE = Gtk2::CV PACKAGE = Gtk2::CV
1020
389SV * 1021SV *
390pb_to_p7 (GdkPixbuf *pb) 1022pb_to_hv84 (GdkPixbuf *pb)
391 CODE: 1023 CODE:
392{ 1024{
393 int w = gdk_pixbuf_get_width (pb); 1025 int w = gdk_pixbuf_get_width (pb);
394 int h = gdk_pixbuf_get_height (pb); 1026 int h = gdk_pixbuf_get_height (pb);
395 int x, y; 1027 int x, y;
396 guchar *dst; 1028 guchar *dst;
397 int bpp = gdk_pixbuf_get_n_channels (pb); 1029 int bpp = gdk_pixbuf_get_n_channels (pb);
398 guchar *src = gdk_pixbuf_get_pixels (pb); 1030 guchar *src = gdk_pixbuf_get_pixels (pb);
399 int sstr = gdk_pixbuf_get_rowstride (pb); 1031 int sstr = gdk_pixbuf_get_rowstride (pb);
400 int Er[IW], Eg[IW], Eb[IW];
401 int seed = 77;
402
403 RETVAL = newSV (w * h);
404 SvPOK_only (RETVAL);
405 SvCUR_set (RETVAL, w * h);
406
407 dst = (guchar *)SvPVX (RETVAL);
408
409 memset (Er, 0, sizeof (int) * IW);
410 memset (Eg, 0, sizeof (int) * IW);
411 memset (Eb, 0, sizeof (int) * IW);
412
413 /* some primitive error distribution + random dithering */
414
415 for (y = 0; y < h; y++)
416 {
417 int er = 0, eg = 0, eb = 0;
418
419 for (x = 0; x < w; x++)
420 {
421 int r, g, b;
422 guchar *p = src + x * bpp + y * sstr;
423
424 r = ((p[0] + er + Er[x]) * 7 + (RAND & 127) + 64) / 255;
425 g = ((p[1] + eg + Eg[x]) * 7 + (RAND & 127) + 64) / 255;
426 b = ((p[2] + eb + Eb[x]) * 3 + (RAND & 127) + 64) / 255;
427
428 r = r > 7 ? 7 : r < 0 ? 0 : r;
429 g = g > 7 ? 7 : g < 0 ? 0 : g;
430 b = b > 3 ? 3 : b < 0 ? 0 : b;
431
432 er += p[0] - (r * 255 + 4) / 7;
433 eg += p[1] - (g * 255 + 4) / 7;
434 eb += p[2] - (b * 255 + 2) / 3;
435
436 Er[x] = er >> 1; er -= (er + 1) >> 1;
437 Eg[x] = eg >> 1; eg -= (eg + 1) >> 1;
438 Eb[x] = eb >> 1; eb -= (eb + 1) >> 1;
439
440 *dst++ = r << 5 | g << 2 | b;
441 }
442 }
443}
444 OUTPUT:
445 RETVAL
446
447#############################################################################
448
449MODULE = Gtk2::CV PACKAGE = Gtk2::CV::PostScript
450
451void
452dump_ascii85 (PerlIO *fp, GdkPixbuf *pb)
453 CODE:
454{
455 int w = gdk_pixbuf_get_width (pb);
456 int h = gdk_pixbuf_get_height (pb);
457 int x, y, i;
458 guchar *dst;
459 int bpp = gdk_pixbuf_get_n_channels (pb);
460 guchar *src = gdk_pixbuf_get_pixels (pb);
461 int sstr = gdk_pixbuf_get_rowstride (pb);
462
463 a85_init ();
464
465 for (y = 0; y < h; y++)
466 for (x = 0; x < w; x++)
467 for (i = 0; i < (bpp < 3 ? 1 : 3); i++)
468 a85_push (fp, src [x * bpp + y * sstr + i]);
469
470 a85_finish (fp);
471}
472
473void
474dump_binary (PerlIO *fp, GdkPixbuf *pb)
475 CODE:
476{
477 int w = gdk_pixbuf_get_width (pb);
478 int h = gdk_pixbuf_get_height (pb);
479 int x, y, i;
480 guchar *dst;
481 int bpp = gdk_pixbuf_get_n_channels (pb);
482 guchar *src = gdk_pixbuf_get_pixels (pb);
483 int sstr = gdk_pixbuf_get_rowstride (pb);
484
485 for (y = 0; y < h; y++)
486 for (x = 0; x < w; x++)
487 for (i = 0; i < (bpp < 3 ? 1 : 3); i++)
488 PerlIO_putc (fp, src [x * bpp + y * sstr + i]);
489}
490
491#############################################################################
492
493MODULE = Gtk2::CV PACKAGE = Gtk2::CV
494
495SV *
496pb_to_hv84 (GdkPixbuf *pb)
497 CODE:
498{
499 int w = gdk_pixbuf_get_width (pb);
500 int h = gdk_pixbuf_get_height (pb);
501 int x, y;
502 guchar *dst;
503 int bpp = gdk_pixbuf_get_n_channels (pb);
504 guchar *src = gdk_pixbuf_get_pixels (pb);
505 int sstr = gdk_pixbuf_get_rowstride (pb);
506 1032
507 RETVAL = newSV (6 * 8 * 12 / 8); 1033 RETVAL = newSV (6 * 8 * 12 / 8);
508 SvPOK_only (RETVAL); 1034 SvPOK_only (RETVAL);
509 SvCUR_set (RETVAL, 6 * 8 * 12 / 8); 1035 SvCUR_set (RETVAL, 6 * 8 * 12 / 8);
510 1036
579############################################################################# 1105#############################################################################
580 1106
581MODULE = Gtk2::CV PACKAGE = Gtk2::CV::Plugin::RCluster 1107MODULE = Gtk2::CV PACKAGE = Gtk2::CV::Plugin::RCluster
582 1108
583SV * 1109SV *
584make_histograms (SV *ar) 1110extract_features (SV *ar)
585 CODE: 1111 CODE:
586{ 1112{
587 int i; 1113 int i;
588 AV *av, *result; 1114 AV *av, *result;
589 1115
590 if (!SvROK (ar) || SvTYPE (SvRV (ar)) != SVt_PVAV) 1116 if (!SvROK (ar) || SvTYPE (SvRV (ar)) != SVt_PVAV)
591 croak ("Not an array ref as first argument to make_histogram"); 1117 croak ("Not an array ref as first argument to extract_features");
592 1118
593 av = (AV *) SvRV (ar); 1119 av = (AV *) SvRV (ar);
594 result = newAV (); 1120 result = newAV ();
595 1121
596 for (i = 0; i <= av_len (av); ++i) 1122 for (i = 0; i <= av_len (av); ++i)
597 { 1123 {
598 const int HISTSIZE = 64;
599
600 int j;
601 SV *sv = *av_fetch (av, i, 1); 1124 SV *sv = *av_fetch (av, i, 1);
602 STRLEN len;
603 char *buf = SvPVbyte (sv, len);
604
605 int tmphist[HISTSIZE];
606 float *hist;
607
608 SV *histsv = newSV (HISTSIZE * sizeof (float) + 1); 1125 SV *histsv = newSV (9 * sizeof (float) + 1);
1126
609 SvPOK_on (histsv); 1127 SvPOK_on (histsv);
610 SvCUR_set (histsv, HISTSIZE * sizeof (float)); 1128 SvCUR_set (histsv, 9 * sizeof (float));
611 hist = (float *)SvPVX (histsv); 1129 float *hist = (float *)SvPVX (histsv);
612 1130
613 Zero (tmphist, sizeof (tmphist), char); 1131 struct feature f_h, f_s, f_v;
1132 feature_init (&f_h);
1133 feature_init (&f_s);
1134 feature_init (&f_v);
614 1135
615 for (j = len; j--; )
616 {
617 unsigned int idx
618 = ((*buf & 0xc0) >> 2)
619 | ((*buf & 0x18) >> 1)
620 | (*buf & 0x03);
621
622 ++tmphist[idx];
623 ++buf;
624 }
625 1136 {
626 for (j = 0; j < HISTSIZE; ++j) 1137 STRLEN len;
627 hist[j] = (float)tmphist[j] / (len + 1e-30); 1138 unsigned char *buf = (unsigned char *)SvPVbyte (sv, len);
1139 while (len >= 3)
1140 {
1141 unsigned int r, g, b, h, s, v;
1142 r = *buf++; g = *buf++; b = *buf++;
1143 rgb_to_hsv (r, g, b, &h, &s, &v);
1144
1145 feature_update_pass_1 (&f_h, h);
1146 feature_update_pass_1 (&f_s, s);
1147 feature_update_pass_1 (&f_v, v);
1148
1149 len -= 3;
1150 }
1151
1152 feature_finish_pass_1 (&f_h);
1153 feature_finish_pass_1 (&f_s);
1154 feature_finish_pass_1 (&f_v);
1155 }
1156
1157 {
1158 STRLEN len;
1159 unsigned char *buf = (unsigned char *)SvPVbyte (sv, len);
1160 while (len >= 3)
1161 {
1162 unsigned int r, g, b, h, s, v;
1163 r = *buf++; g = *buf++; b = *buf++;
1164 rgb_to_hsv (r, g, b, &h, &s, &v);
1165
1166 feature_update_pass_2 (&f_h, h);
1167 feature_update_pass_2 (&f_s, s);
1168 feature_update_pass_2 (&f_v, v);
1169
1170 len -= 3;
1171 }
1172
1173 feature_finish_pass_2 (&f_h);
1174 feature_finish_pass_2 (&f_s);
1175 feature_finish_pass_2 (&f_v);
1176 }
1177
1178 hist [0] = f_h.v1 * 2.; hist [1] = f_h.v2 * 2.; hist [2] = f_h.v3 * 2.;
1179 hist [3] = f_s.v1 ; hist [4] = f_s.v2 ; hist [5] = f_s.v3 ;
1180 hist [6] = f_v.v1 * .5; hist [7] = f_v.v2 * .5; hist [8] = f_v.v3 * .5;
628 1181
629 av_push (result, histsv); 1182 av_push (result, histsv);
630 } 1183 }
631 1184
632 RETVAL = newRV_noinc ((SV *)result); 1185 RETVAL = newRV_noinc ((SV *)result);
633} 1186}
634 OUTPUT: 1187 OUTPUT:
635 RETVAL 1188 RETVAL
636 1189
637

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines