diff options
Diffstat (limited to 'src/plugins/test_jpeg.c')
-rw-r--r-- | src/plugins/test_jpeg.c | 64 |
1 files changed, 31 insertions, 33 deletions
diff --git a/src/plugins/test_jpeg.c b/src/plugins/test_jpeg.c index f36c7ed..a8d693e 100644 --- a/src/plugins/test_jpeg.c +++ b/src/plugins/test_jpeg.c | |||
@@ -26,7 +26,6 @@ | |||
26 | #include "test_lib.h" | 26 | #include "test_lib.h" |
27 | 27 | ||
28 | 28 | ||
29 | |||
30 | /** | 29 | /** |
31 | * Main function for the JPEG testcase. | 30 | * Main function for the JPEG testcase. |
32 | * | 31 | * |
@@ -37,41 +36,40 @@ | |||
37 | int | 36 | int |
38 | main (int argc, char *argv[]) | 37 | main (int argc, char *argv[]) |
39 | { | 38 | { |
40 | struct SolutionData jpeg_image_sol[] = | 39 | struct SolutionData jpeg_image_sol[] = { |
40 | { | ||
41 | EXTRACTOR_METATYPE_MIMETYPE, | ||
42 | EXTRACTOR_METAFORMAT_UTF8, | ||
43 | "text/plain", | ||
44 | "image/jpeg", | ||
45 | strlen ("image/jpeg") + 1, | ||
46 | 0 | ||
47 | }, | ||
41 | { | 48 | { |
42 | { | 49 | EXTRACTOR_METATYPE_IMAGE_DIMENSIONS, |
43 | EXTRACTOR_METATYPE_MIMETYPE, | 50 | EXTRACTOR_METAFORMAT_UTF8, |
44 | EXTRACTOR_METAFORMAT_UTF8, | 51 | "text/plain", |
45 | "text/plain", | 52 | "3x3", |
46 | "image/jpeg", | 53 | strlen ("3x3") + 1, |
47 | strlen ("image/jpeg") + 1, | 54 | 0 |
48 | 0 | 55 | }, |
49 | }, | ||
50 | { | ||
51 | EXTRACTOR_METATYPE_IMAGE_DIMENSIONS, | ||
52 | EXTRACTOR_METAFORMAT_UTF8, | ||
53 | "text/plain", | ||
54 | "3x3", | ||
55 | strlen ("3x3") + 1, | ||
56 | 0 | ||
57 | }, | ||
58 | { | ||
59 | EXTRACTOR_METATYPE_COMMENT, | ||
60 | EXTRACTOR_METAFORMAT_C_STRING, | ||
61 | "text/plain", | ||
62 | "(C) 2001 by Christian Grothoff, using gimp 1.2 1", | ||
63 | strlen ("(C) 2001 by Christian Grothoff, using gimp 1.2 1"), | ||
64 | 0 | ||
65 | }, | ||
66 | { 0, 0, NULL, NULL, 0, -1 } | ||
67 | }; | ||
68 | struct ProblemSet ps[] = | ||
69 | { | 56 | { |
70 | { "testdata/jpeg_image.jpg", | 57 | EXTRACTOR_METATYPE_COMMENT, |
71 | jpeg_image_sol }, | 58 | EXTRACTOR_METAFORMAT_C_STRING, |
72 | { NULL, NULL } | 59 | "text/plain", |
73 | }; | 60 | "(C) 2001 by Christian Grothoff, using gimp 1.2 1", |
61 | strlen ("(C) 2001 by Christian Grothoff, using gimp 1.2 1"), | ||
62 | 0 | ||
63 | }, | ||
64 | { 0, 0, NULL, NULL, 0, -1 } | ||
65 | }; | ||
66 | struct ProblemSet ps[] = { | ||
67 | { "testdata/jpeg_image.jpg", | ||
68 | jpeg_image_sol }, | ||
69 | { NULL, NULL } | ||
70 | }; | ||
74 | return ET_main ("jpeg", ps); | 71 | return ET_main ("jpeg", ps); |
75 | } | 72 | } |
76 | 73 | ||
74 | |||
77 | /* end of test_jpeg.c */ | 75 | /* end of test_jpeg.c */ |