[ViewVC] Diff of: cvs/CV/CV.xs

Comparing CV/CV.xs (file contents):
Revision 1.46 by root, Sat Jul 4 05:31:17 2015 UTC vs.
Revision 1.50 by root, Sat Dec 23 03:30:28 2017 UTC

…		…
9	#include <magic.h>	9	#include <magic.h>
10		10
11	#include <jpeglib.h>	11	#include <jpeglib.h>
12	#include <glib.h>	12	#include <glib.h>
13	#include <gtk/gtk.h>	13	#include <gtk/gtk.h>
		14	#include <gdk/gdkx.h>
14	#include <gdk-pixbuf/gdk-pixbuf.h>	15	#include <gdk-pixbuf/gdk-pixbuf.h>
15		16
16	#include <gperl.h>	17	#include <gperl.h>
17	#include <gtk2perl.h>	18	#include <gtk2perl.h>
18		19
19	#include <assert.h>	20	#include <assert.h>
		21
		22	#if WEBP
		23	#include <webp/decode.h>
		24	#endif
20		25
21	#include "perlmulticore.h"	26	#include "perlmulticore.h"
22		27
23	#define IW 80 /* MUST match Schnauzer.pm! */	28	#define IW 80 /* MUST match Schnauzer.pm! */
24	#define IH 60 /* MUST match Schnauzer.pm! */	29	#define IH 60 /* MUST match Schnauzer.pm! */
…		…
38	};	43	};
39		44
40	static void	45	static void
41	cv_error_exit (j_common_ptr cinfo)	46	cv_error_exit (j_common_ptr cinfo)
42	{	47	{
		48	cinfo->err->output_message (cinfo);
43	longjmp (((struct jpg_err_mgr *)cinfo->err)->setjmp_buffer, 99);	49	longjmp (((struct jpg_err_mgr *)cinfo->err)->setjmp_buffer, 99);
44	}	50	}
45		51
46	static void	52	static void
47	cv_error_output (j_common_ptr cinfo)	53	cv_error_output (j_common_ptr cinfo)
48	{	54	{
		55	char msg[JMSG_LENGTH_MAX];
		56
		57	cinfo->err->format_message (cinfo, msg);
		58
		59	fprintf (stderr, "JPEG decoding error: %s\n", msg);
49	return;	60	return;
50	}	61	}
51		62
52	static void	63	static void
53	rgb_to_hsv (unsigned int r, unsigned int g, unsigned int b,	64	rgb_to_hsv (unsigned int r, unsigned int g, unsigned int b,
…		…
150	if (!--a85_cnt)	161	if (!--a85_cnt)
151	{	162	{
152	a85_cnt = 4;	163	a85_cnt = 4;
153	if (a85_val)	164	if (a85_val)
154	{	165	{
155	a85_ptr[4] = (a85_val % 85) + 33; a85_val /= 85;	166	a85_ptr[4] = (a85_val % 85) + 33; a85_val /= 85;
156	a85_ptr[3] = (a85_val % 85) + 33; a85_val /= 85;	167	a85_ptr[3] = (a85_val % 85) + 33; a85_val /= 85;
157	a85_ptr[2] = (a85_val % 85) + 33; a85_val /= 85;	168	a85_ptr[2] = (a85_val % 85) + 33; a85_val /= 85;
158	a85_ptr[1] = (a85_val % 85) + 33; a85_val /= 85;	169	a85_ptr[1] = (a85_val % 85) + 33; a85_val /= 85;
159	a85_ptr[0] = (a85_val ) + 33;	170	a85_ptr[0] = (a85_val ) + 33;
160		171
161	a85_ptr += 5;	172	a85_ptr += 5;
162	}	173	}
…		…
311	perlinterp_acquire ();	322	perlinterp_acquire ();
312	OUTPUT:	323	OUTPUT:
313	RETVAL	324	RETVAL
314		325
315	GdkPixbuf_noinc *	326	GdkPixbuf_noinc *
316	load_jpeg (SV *path, int thumbnail=0)	327	load_webp (SV *image_data, int thumbnail = 0, int iw = 0, int ih = 0)
		328	CODE:
		329	{
		330	#if WEBP
		331	STRLEN data_size;
		332	guchar *data = SvPVbyte (image_data, data_size);
		333	int alpha;
		334	WebPDecoderConfig config;
		335
		336	perlinterp_release ();
		337
		338	RETVAL = 0;
		339
		340	if (!WebPInitDecoderConfig (&config))
		341	goto err;
		342
		343	config.options.use_threads = 1;
		344
		345	if (thumbnail)
		346	{
		347	config.options.bypass_filtering = 1;
		348	config.options.no_fancy_upsampling = 1;
		349
		350	config.options.use_scaling = 1;
		351	config.options.scaled_width = iw;
		352	config.options.scaled_height = ih;
		353	}
		354	else
		355	{
		356	iw = config.input.width;
		357	ih = config.input.height;
		358	}
		359
		360	if (WebPGetFeatures (data, data_size, &config.input) != VP8_STATUS_OK)
		361	goto err;
		362
		363	alpha = config.input.has_alpha;
		364
		365	RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, !!alpha, 8, iw, ih);
		366	if (!RETVAL)
		367	goto err;
		368
		369	config.output.colorspace = alpha ? MODE_RGBA : MODE_RGB;
		370	config.output.u.RGBA.rgba = gdk_pixbuf_get_pixels (RETVAL);
		371	config.output.u.RGBA.stride = gdk_pixbuf_get_rowstride (RETVAL);
		372	config.output.u.RGBA.size = gdk_pixbuf_get_byte_length (RETVAL);
		373	config.output.is_external_memory = 1;
		374
		375	if (WebPDecode (data, data_size, &config) != VP8_STATUS_OK)
		376	{
		377	g_object_unref (RETVAL);
		378	RETVAL = 0;
		379	goto err;
		380	}
		381
		382	err:
		383	perlinterp_acquire ();
		384	#else
		385	croak ("load_webp: webp not enabled at compile time");
		386	#endif
		387	}
		388	OUTPUT:
		389	RETVAL
		390
		391	GdkPixbuf_noinc *
		392	load_jpeg (SV *path, int thumbnail = 0, int iw = 0, int ih = 0)
317	CODE:	393	CODE:
318	{	394	{
319	struct jpeg_decompress_struct cinfo;	395	struct jpeg_decompress_struct cinfo;
320	struct jpg_err_mgr jerr;	396	struct jpg_err_mgr jerr;
321	guchar *data;	397	guchar *data;
…		…
369	{	445	{
370	cinfo.dct_method = JDCT_FASTEST;	446	cinfo.dct_method = JDCT_FASTEST;
371	cinfo.do_fancy_upsampling = FALSE;	447	cinfo.do_fancy_upsampling = FALSE;
372		448
373	while (cinfo.scale_denom < 8	449	while (cinfo.scale_denom < 8
374	&& cinfo.output_width >= IW*4	450	&& cinfo.output_width >= iw*4
375	&& cinfo.output_height >= IH*4)	451	&& cinfo.output_height >= ih*4)
376	{	452	{
377	cinfo.scale_denom <<= 1;	453	cinfo.scale_denom <<= 1;
378	jpeg_calc_output_dimensions (&cinfo);	454	jpeg_calc_output_dimensions (&cinfo);
379	}	455	}
380	}	456	}
381		457
		458	if (cinfo.output_components != 3)
		459	longjmp (jerr.setjmp_buffer, 3);
		460
		461	if (cinfo.jpeg_color_space == JCS_YCCK \|\| cinfo.jpeg_color_space == JCS_CMYK)
		462	{
		463	cinfo.out_color_space = JCS_CMYK;
		464	cinfo.output_components = 4;
		465	}
		466
382	pb = RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, 0, 8, cinfo.output_width, cinfo.output_height);	467	pb = RETVAL = gdk_pixbuf_new (GDK_COLORSPACE_RGB, cinfo.output_components == 4, 8, cinfo.output_width, cinfo.output_height);
383	if (!RETVAL)	468	if (!RETVAL)
384	longjmp (jerr.setjmp_buffer, 2);	469	longjmp (jerr.setjmp_buffer, 2);
385		470
386	data = gdk_pixbuf_get_pixels (RETVAL);	471	data = gdk_pixbuf_get_pixels (RETVAL);
387	rs = gdk_pixbuf_get_rowstride (RETVAL);	472	rs = gdk_pixbuf_get_rowstride (RETVAL);
388
389	if (cinfo.output_components != 3)
390	longjmp (jerr.setjmp_buffer, 3);
391		473
392	jpeg_start_decompress (&cinfo);	474	jpeg_start_decompress (&cinfo);
393		475
394	while (cinfo.output_scanline < cinfo.output_height)	476	while (cinfo.output_scanline < cinfo.output_height)
395	{	477	{
…		…
400	rp [1] = (guchar *)rp [0] + rs;	482	rp [1] = (guchar *)rp [0] + rs;
401	rp [2] = (guchar *)rp [1] + rs;	483	rp [2] = (guchar *)rp [1] + rs;
402	rp [3] = (guchar *)rp [2] + rs;	484	rp [3] = (guchar *)rp [2] + rs;
403		485
404	jpeg_read_scanlines (&cinfo, rp, remaining < 4 ? remaining : 4);	486	jpeg_read_scanlines (&cinfo, rp, remaining < 4 ? remaining : 4);
		487	}
		488
		489	if (cinfo.out_color_space == JCS_CMYK)
		490	{
		491	guchar end = data + cinfo.output_height rs;
		492
		493	while (data < end)
		494	{
		495	U32 c = data [0];
		496	U32 m = data [1];
		497	U32 y = data [2];
		498	U32 k = data [3];
		499
		500	if (0)
		501	if (cinfo.Adobe_transform == 2)
		502	{
		503	c ^= 0xff;
		504	m ^= 0xff;
		505	y ^= 0xff;
		506	k ^= 0xff;
		507	}
		508
		509	data [0] = (c * k + 0x80) / 0xff;
		510	data [1] = (m * k + 0x80) / 0xff;
		511	data [2] = (y * k + 0x80) / 0xff;
		512	data [3] = 0xff;
		513
		514	data += 4;
		515	}
405	}	516	}
406		517
407	jpeg_finish_decompress (&cinfo);	518	jpeg_finish_decompress (&cinfo);
408	fclose (fp);	519	fclose (fp);
409	jpeg_destroy_decompress (&cinfo);	520	jpeg_destroy_decompress (&cinfo);

Diff Legend

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

Comparing CV/CV.xs (file contents): Revision 1.46 by root, Sat Jul 4 05:31:17 2015 UTC vs. Revision 1.50 by root, Sat Dec 23 03:30:28 2017 UTC

Diff Legend

Comparing CV/CV.xs (file contents):
Revision 1.46 by root, Sat Jul 4 05:31:17 2015 UTC vs.
Revision 1.50 by root, Sat Dec 23 03:30:28 2017 UTC