[cairo-commit] 4 commits - src/cairo-xcb-surface-render.c test/create-from-png-16bit.c test/meson.build test/reference util/cairo-script
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sun Jan 15 19:54:06 UTC 2023
src/cairo-xcb-surface-render.c | 3
test/create-from-png-16bit.c | 80 +++++++++++++++++++
test/meson.build | 1
test/reference/create-from-png-16bit.base.png |binary
test/reference/create-from-png-16bit.image16.ref.png |binary
test/reference/create-from-png-16bit.ref.png |binary
util/cairo-script/cairo-script-operators.c | 3
7 files changed, 86 insertions(+), 1 deletion(-)
New commits:
commit b23ecf6322ab443d078d4d665127fe4c38fb0f9f
Merge: c80cd3a0c 39f8be09f
Author: Uli Schlachter <psychon at znc.in>
Date: Sun Jan 15 19:54:04 2023 +0000
Merge branch 'test-png16-load' into 'master'
Add test for loading 16 bit PNG images
See merge request cairo/cairo!241
commit 39f8be09f83b2c904c513fd0a7f28086cdc47689
Author: Manuel Stoeckl <code at mstoeckl.com>
Date: Sat Aug 21 09:26:21 2021 -0400
Add test for loading 16 bit PNG images
The base image has 16 bits per channel, with colors that do not
have an exact corresponding 8 bit representation. The reference
image uses 8bpc, like the rgb24/argb32 formatted images which
the test outputs.
diff --git a/test/create-from-png-16bit.c b/test/create-from-png-16bit.c
new file mode 100644
index 000000000..71c13ecd3
--- /dev/null
+++ b/test/create-from-png-16bit.c
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2005 Red Hat, Inc.
+ * Copyright © 2021 Manuel Stoeckl
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Red Hat, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior
+ * permission. Red Hat, Inc. makes no representations about the
+ * suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * RED HAT, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS, IN NO EVENT SHALL RED HAT, INC. BE LIABLE FOR ANY SPECIAL,
+ * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+ * IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: Carl Worth <cworth at cworth.org>
+ * Author: Manuel Stoeckl <code at mstoeckl.com>
+ */
+
+#include "cairo-test.h"
+
+#include <stdlib.h>
+
+#define WIDTH 2
+#define HEIGHT 2
+
+static cairo_test_status_t
+draw (cairo_t *cr, int width, int height)
+{
+ const cairo_test_context_t *ctx = cairo_test_get_context (cr);
+ char *filename;
+ cairo_surface_t *surface;
+
+ xasprintf (&filename, "%s/reference/%s",
+ ctx->srcdir, "create-from-png-16bit.base.png");
+
+ surface = cairo_image_surface_create_from_png (filename);
+ if (cairo_surface_status (surface)) {
+ cairo_test_status_t result;
+
+ result = cairo_test_status_from_status (ctx,
+ cairo_surface_status (surface));
+ if (result == CAIRO_TEST_FAILURE) {
+ cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
+ filename,
+ cairo_status_to_string (cairo_surface_status (surface)));
+ }
+
+ free (filename);
+ return result;
+ }
+
+ /* Pretend we modify the surface data (which detaches the PNG mime data) */
+ cairo_surface_flush (surface);
+ cairo_surface_mark_dirty (surface);
+
+ cairo_set_source_surface (cr, surface, 0, 0);
+ cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_NEAREST);
+ cairo_paint (cr);
+
+ cairo_surface_destroy (surface);
+
+ free (filename);
+ return CAIRO_TEST_SUCCESS;
+}
+
+CAIRO_TEST (create_from_png_16bit,
+ "Tests the creation of an image surface from a 16 bit PNG file",
+ "png", /* keywords */
+ NULL, /* requirements */
+ WIDTH, HEIGHT,
+ NULL, draw)
diff --git a/test/meson.build b/test/meson.build
index 28047cb04..e670a3937 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -96,6 +96,7 @@ test_sources = [
'create-for-stream.c',
'create-from-broken-png-stream.c',
'create-from-png.c',
+ 'create-from-png-16bit.c',
'create-from-png-stream.c',
'culled-glyphs.c',
'curve-to-as-line-to.c',
diff --git a/test/reference/create-from-png-16bit.base.png b/test/reference/create-from-png-16bit.base.png
new file mode 100644
index 000000000..7e0f00e33
Binary files /dev/null and b/test/reference/create-from-png-16bit.base.png differ
diff --git a/test/reference/create-from-png-16bit.image16.ref.png b/test/reference/create-from-png-16bit.image16.ref.png
new file mode 100644
index 000000000..9591a12dd
Binary files /dev/null and b/test/reference/create-from-png-16bit.image16.ref.png differ
diff --git a/test/reference/create-from-png-16bit.ref.png b/test/reference/create-from-png-16bit.ref.png
new file mode 100644
index 000000000..296c559bc
Binary files /dev/null and b/test/reference/create-from-png-16bit.ref.png differ
commit b0a5c3a11fdcca4460b7c4cd5dc711e8b1d16537
Author: Manuel Stoeckl <code at mstoeckl.com>
Date: Mon Aug 23 21:23:12 2021 -0400
Add remaining image formats to cairo-script constants table
This makes it possible to read cairo-script files which embed
RGB30/RGB96F/RGBA128F images.
diff --git a/util/cairo-script/cairo-script-operators.c b/util/cairo-script/cairo-script-operators.c
index d0452d338..21fba5cc7 100644
--- a/util/cairo-script/cairo-script-operators.c
+++ b/util/cairo-script/cairo-script-operators.c
@@ -6799,6 +6799,9 @@ _integer_constants[] = {
{ "RGB16_565", CAIRO_FORMAT_RGB16_565 },
{ "RGB24", CAIRO_FORMAT_RGB24 },
{ "ARGB32", CAIRO_FORMAT_ARGB32 },
+ { "RGB30", CAIRO_FORMAT_RGB30 },
+ { "RGB96F", CAIRO_FORMAT_RGB96F },
+ { "RGBA128F", CAIRO_FORMAT_RGBA128F },
{ "INVALID", CAIRO_FORMAT_INVALID },
{ NULL, 0 }
commit 39179681d4b3223533b083615347bd88aa0c0fd6
Author: Manuel Stoeckl <code at mstoeckl.com>
Date: Sun Aug 22 15:51:54 2021 -0400
Add array bounds check for xrender format lookup
Before this change, images with RGB30, RGB96F, and RGBA128F formats
would have been given garbage xrender formats; now such images
use the fallback path and are converted to formats with an xrender
equivalent.
diff --git a/src/cairo-xcb-surface-render.c b/src/cairo-xcb-surface-render.c
index 5993aa378..f0ec6d999 100644
--- a/src/cairo-xcb-surface-render.c
+++ b/src/cairo-xcb-surface-render.c
@@ -1266,7 +1266,8 @@ _cairo_xcb_surface_picture (cairo_xcb_surface_t *target,
if (unlikely (status))
return (cairo_xcb_picture_t *) _cairo_surface_create_in_error (status);
- if (image->format != CAIRO_FORMAT_INVALID) {
+ if (image->format != CAIRO_FORMAT_INVALID &&
+ image->format < ARRAY_LENGTH (target->screen->connection->standard_formats)) {
xcb_render_pictformat_t format;
format = target->screen->connection->standard_formats[image->format];
More information about the cairo-commit
mailing list