rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix the cups-icc.patch to send the colorspace of the virtual profile

Browse Source 
This allows us to make the GUI not suck if using colord >= 0.1.8 -- for older
releases of colord this new functionality does nothing.
This commit is contained in:
Richard Hughes 2011-05-19 09:27:39 +01:00
parent b22ac0a5be
commit 46d60c6dcb
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cups-icc.patch
View File

@ -15,7 +15,7 @@ new file mode 100644
index 0000000..7428bf7 index 0000000..7428bf7
--- /dev/null --- /dev/null
+++ b/scheduler/colord.c +++ b/scheduler/colord.c
@@ -0,0 +1,668 @@ @@ -0,0 +1,676 @@
+/* +/*
+ * "$Id$" + * "$Id$"
+ * + *
@ -64,6 +64,7 @@ index 0000000..7428bf7
+#define COLORD_SPACE_RGB "rgb" /* RGB colorspace */ +#define COLORD_SPACE_RGB "rgb" /* RGB colorspace */
+#define COLORD_SPACE_CMYK "cmyk" /* CMYK colorspace */ +#define COLORD_SPACE_CMYK "cmyk" /* CMYK colorspace */
+#define COLORD_SPACE_GRAY "gray" /* Gray colorspace */ +#define COLORD_SPACE_GRAY "gray" /* Gray colorspace */
+#define COLORD_SPACE_UNKNOWN "unknown" /* Unknown colorspace */
+ +
+#define COLORD_MODE_PHYSICAL "physical" /* Actual device */ +#define COLORD_MODE_PHYSICAL "physical" /* Actual device */
+#define COLORD_MODE_VIRTUAL "virtual" /* Virtual device with no hardware */ +#define COLORD_MODE_VIRTUAL "virtual" /* Virtual device with no hardware */
@ -131,6 +132,7 @@ index 0000000..7428bf7
+colordCreateProfile (cups_array_t *profiles, /* I - Profiles array */ +colordCreateProfile (cups_array_t *profiles, /* I - Profiles array */
+ const char *printer_name, /* I - Printer name */ + const char *printer_name, /* I - Printer name */
+ const char *qualifier, /* I - Profile qualifier */ + const char *qualifier, /* I - Profile qualifier */
+ const char *colorspace, /* I - Profile colorspace */
+ const char **format, /* I - Profile qualifier format */ + const char **format, /* I - Profile qualifier format */
+ const char *iccfile, /* I - ICC filename */ + const char *iccfile, /* I - ICC filename */
+ const char *scope) /* I - The scope of the profile, e.g. + const char *scope) /* I - The scope of the profile, e.g.
@ -181,6 +183,7 @@ index 0000000..7428bf7
+ &dict); + &dict);
+ message_dict_add_strings(&dict, "Qualifier", qualifier); + message_dict_add_strings(&dict, "Qualifier", qualifier);
+ message_dict_add_strings(&dict, "Format", format_str); + message_dict_add_strings(&dict, "Format", format_str);
+ message_dict_add_strings(&dict, "Colorspace", colorspace);
+ if (iccfile != NULL) + if (iccfile != NULL)
+ message_dict_add_strings(&dict, "Filename", iccfile); + message_dict_add_strings(&dict, "Filename", iccfile);
+ dbus_message_iter_close_container(&args, &dict); + dbus_message_iter_close_container(&args, &dict);
@ -570,6 +573,7 @@ index 0000000..7428bf7
+ colordCreateProfile(profiles, + colordCreateProfile(profiles,
+ p->name, + p->name,
+ attr->spec, + attr->spec,
+ COLORD_SPACE_UNKNOWN,
+ (const char **)format, + (const char **)format,
+ iccfile, + iccfile,
+ COLORD_SCOPE_TEMP); + COLORD_SCOPE_TEMP);
@ -582,6 +586,7 @@ index 0000000..7428bf7
+ colordCreateProfile(profiles, + colordCreateProfile(profiles,
+ p->name, + p->name,
+ "Gray..", + "Gray..",
+ COLORD_SPACE_GRAY,
+ (const char **)format, + (const char **)format,
+ NULL, + NULL,
+ COLORD_SCOPE_TEMP); + COLORD_SCOPE_TEMP);
@ -599,6 +604,7 @@ index 0000000..7428bf7
+ colordCreateProfile(profiles, + colordCreateProfile(profiles,
+ p->name, + p->name,
+ "RGB..", + "RGB..",
+ COLORD_SPACE_RGB,
+ (const char **)format, + (const char **)format,
+ NULL, + NULL,
+ COLORD_SCOPE_TEMP); + COLORD_SCOPE_TEMP);
@ -609,6 +615,7 @@ index 0000000..7428bf7
+ colordCreateProfile(profiles, + colordCreateProfile(profiles,
+ p->name, + p->name,
+ "CMYK..", + "CMYK..",
+ COLORD_SPACE_CMYK,
+ (const char **)format, + (const char **)format,
+ NULL, + NULL,
+ COLORD_SCOPE_TEMP); + COLORD_SCOPE_TEMP);
@ -620,6 +627,7 @@ index 0000000..7428bf7
+ colordCreateProfile(profiles, + colordCreateProfile(profiles,
+ p->name, + p->name,
+ "DeviceN..", + "DeviceN..",
+ COLORD_SPACE_UNKNOWN,
+ (const char **)format, + (const char **)format,
+ NULL, + NULL,
+ COLORD_SCOPE_TEMP); + COLORD_SCOPE_TEMP);