diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-12-02 10:19:36 -0500 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-12-02 10:19:36 -0500 |
| commit | e6330cabb85bed745891e21530765f5a337dce58 (patch) | |
| tree | 44fe4dfef0d660d2740f7fa74ecc72aa5cdcefdc /cups/testraster.c | |
| parent | 1a3915dded85df1f6ab6c0546ecfbb403d1b1fd8 (diff) | |
| download | cups-e6330cabb85bed745891e21530765f5a337dce58.tar.gz | |
Fix a few issues with Apple Raster support (rdar://55301114)
Diffstat (limited to 'cups/testraster.c')
| -rw-r--r-- | cups/testraster.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cups/testraster.c b/cups/testraster.c index d3dab4bbc..de72a4bfb 100644 --- a/cups/testraster.c +++ b/cups/testraster.c @@ -1,7 +1,7 @@ /* * Raster test program routines for CUPS. * - * Copyright © 2007-2018 by Apple Inc. + * Copyright © 2007-2019 by Apple Inc. * Copyright © 1997-2007 by Easy Software Products. * * Licensed under Apache License v2.0. See the file "LICENSE" for more @@ -22,8 +22,7 @@ static int do_ras_file(const char *filename); static int do_raster_tests(cups_mode_t mode); -static void print_changes(cups_page_header2_t *header, - cups_page_header2_t *expected); +static void print_changes(cups_page_header2_t *header, cups_page_header2_t *expected); /* @@ -174,6 +173,8 @@ do_raster_tests(cups_mode_t mode) /* O - Write mode */ header.cupsPageSize[0] = 288.0f; header.cupsPageSize[1] = 288.0f; + strlcpy(header.MediaType, "auto", sizeof(header.MediaType)); + if (page & 1) { header.cupsBytesPerLine *= 4; @@ -308,6 +309,8 @@ do_raster_tests(cups_mode_t mode) /* O - Write mode */ expected.PageSize[0] = 288; expected.PageSize[1] = 288; + strlcpy(expected.MediaType, "auto", sizeof(expected.MediaType)); + if (mode != CUPS_RASTER_WRITE_PWG) { expected.cupsPageSize[0] = 288.0f; |