From c13a09ddb411287224c15728b14f23fef472f7d0 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 4 Nov 2008 13:00:36 +0000 Subject: [PATCH] [test] Use a different jpeg image for mime-data Detect when we successfully encode the JPEG data from the mime-type by using a completely image. --- test/Makefile.am | 3 +++ test/mime-data.c | 6 +++++- test/mime-data.pdf.ref.png | Bin 0 -> 96 bytes test/mime-data.ps.ref.png | Bin 0 -> 368 bytes test/scarab.jpg | Bin 0 -> 9650 bytes 5 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 test/mime-data.pdf.ref.png create mode 100644 test/mime-data.ps.ref.png create mode 100644 test/scarab.jpg diff --git a/test/Makefile.am b/test/Makefile.am index bbf3970ff..1bc5c47b9 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -694,6 +694,8 @@ REFERENCE_IMAGES = \ meta-surface-pattern.svg12.argb32.ref.png \ meta-surface-pattern.svg12.rgb24.ref.png \ mime-data.ref.png \ + mime-data.ps.ref.png \ + mime-data.pdf.ref.png \ miter-precision.ref.png \ miter-precision.ps2.ref.png \ miter-precision.ps3.ref.png \ @@ -1002,6 +1004,7 @@ EXTRA_DIST += \ make-html.pl \ romedalen.jpg \ romedalen.png \ +scarab.jpg \ surface-source.c \ $(REFERENCE_IMAGES) diff --git a/test/mime-data.c b/test/mime-data.c index b36491539..dd1e0955f 100644 --- a/test/mime-data.c +++ b/test/mime-data.c @@ -35,7 +35,11 @@ read_jpg_file (const cairo_test_context_t *ctx, unsigned char **data_out, unsigned int *length_out) { - const char jpg_filename[] = "romedalen.jpg"; + /* Deliberately use a non-matching jpeg image, so that we can identify + * when the JPEG representation is used in preference to the image + * surface. + */ + const char jpg_filename[] = "scarab.jpg"; FILE *file; unsigned char *buf; unsigned int len; diff --git a/test/mime-data.pdf.ref.png b/test/mime-data.pdf.ref.png new file mode 100644 index 0000000000000000000000000000000000000000..f04fe6ce9bd8f6fa6eae90a1910242286effc3c1 GIT binary patch literal 96 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 literal 0 HcmV?d00001