From: msweet Date: Thu, 21 Aug 2014 20:37:08 +0000 (+0000) Subject: Update printer icon (not final) X-Git-Tag: v2.2b1~514 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4403acbb9f363c248b29ed146e774e2c4b7ab453;p=thirdparty%2Fcups.git Update printer icon (not final) Add some more raster "support". git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12111 a1ca3aef-8c08-0410-bb20-df032aa958be --- diff --git a/test/ippserver.c b/test/ippserver.c index ddcd237256..9ff96b614b 100644 --- a/test/ippserver.c +++ b/test/ippserver.c @@ -1017,7 +1017,7 @@ static void create_job_filename( for (nameptr = name; *job_name && nameptr < (name + sizeof(name) - 1); job_name ++) if (isalnum(*job_name & 255) || *job_name == '-') - *nameptr++ = tolower(*job_name & 255); + *nameptr++ = (char)tolower(*job_name & 255); else *nameptr++ = '_'; @@ -1339,6 +1339,17 @@ create_printer(const char *servername, /* I - Server hostname (NULL for default) "two-sided-long-edge", "two-sided-short-edge" }; + static const char * const urf_supported[] = + { /* urf-supported values */ + "CP1", + "IS1-5-7", + "MT1-2-3-4-5-6-8-9-10-11-12-13", + "RS600", + "SRGB24", + "V1.4", + "W8", + "DM1" + }; static const char * const which_jobs[] = { /* which-jobs-supported values */ "completed", @@ -1977,6 +1988,14 @@ create_printer(const char *servername, /* I - Server hostname (NULL for default) IPP_CONST_TAG(IPP_TAG_KEYWORD), "sides-supported", duplex ? 3 : 1, NULL, sides_supported); + /* urf-supported */ + for (i = 0; i < num_formats; i ++) + if (!strcasecmp(formats[i], "image/urf")) + break; + + if (i < num_formats) + ippAddStrings(printer->attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, "urf-supported", (int)(sizeof(urf_supported) / sizeof(urf_supported[0])) - !duplex, NULL, urf_supported); + /* uri-authentication-supported */ ippAddString(printer->attrs, IPP_TAG_PRINTER, IPP_CONST_TAG(IPP_TAG_KEYWORD), diff --git a/test/printer.opacity b/test/printer.opacity index 595854a243..7cef77fa84 100644 Binary files a/test/printer.opacity and b/test/printer.opacity differ diff --git a/test/printer.png b/test/printer.png index 18c05db107..771985a0ee 100644 Binary files a/test/printer.png and b/test/printer.png differ