]> git.ipfire.org Git - thirdparty/cups.git/commitdiff
Update printer icon (not final)
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Thu, 21 Aug 2014 20:37:08 +0000 (20:37 +0000)
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Thu, 21 Aug 2014 20:37:08 +0000 (20:37 +0000)
Add some more raster "support".

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12111 a1ca3aef-8c08-0410-bb20-df032aa958be

test/ippserver.c
test/printer.opacity
test/printer.png

index ddcd23725662e8e0eae064590fca5e41c658a979..9ff96b614b4abccd96ccdf874f5fc4661dd3207e 100644 (file)
@@ -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),
index 595854a243b507b86b9cd5e6c3712a19900a106a..7cef77fa84906295e6d3ad20eebab1c0ebdaa077 100644 (file)
Binary files a/test/printer.opacity and b/test/printer.opacity differ
index 18c05db10775d7cb3fcf71b9b8a31795858a1995..771985a0eef669ac78a425172d19ec54c68809d3 100644 (file)
Binary files a/test/printer.png and b/test/printer.png differ