[babl] babl: acknowledge some used trademarks
- From: Øyvind Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [babl] babl: acknowledge some used trademarks
- Date: Tue, 3 Oct 2017 15:06:47 +0000 (UTC)
commit 8811faa19ef0f75dd47ff0dd6181b0fafae3a118
Author: Øyvind Kolås <pippin gimp org>
Date: Tue Oct 3 17:06:06 2017 +0200
babl: acknowledge some used trademarks
babl/babl-icc.c | 6 ++++++
babl/babl-internal.h | 2 +-
babl/babl-space.c | 16 +++++++++++++++-
babl/babl.h | 13 ++++++++++++-
4 files changed, 34 insertions(+), 3 deletions(-)
---
diff --git a/babl/babl-icc.c b/babl/babl-icc.c
index 72572e2..45ba8fa 100644
--- a/babl/babl-icc.c
+++ b/babl/babl-icc.c
@@ -1116,3 +1116,9 @@ static int ConvertUTF16toUTF8 (const UTF16** sourceStart, const UTF16* sourceEnd
*targetStart = target;
return result;
}
+
+/* Trademarks:
+ *
+ * International Color Consortium is a registered trademarks of the.
+ * International Color Consortium.
+ */
diff --git a/babl/babl-internal.h b/babl/babl-internal.h
index 4a57932..3362563 100644
--- a/babl/babl-internal.h
+++ b/babl/babl-internal.h
@@ -445,7 +445,7 @@ const Babl * babl_trc (const char *name);
int _babl_file_get_contents (const char *path,
char **contents,
long *length,
- void *error);
+ void *error);
typedef enum {
BABL_ICC_DEFAULTS = 0,
diff --git a/babl/babl-space.c b/babl/babl-space.c
index a362521..adc9e7a 100644
--- a/babl/babl-space.c
+++ b/babl/babl-space.c
@@ -390,7 +390,11 @@ babl_space_class_init (void)
babl_trc("sRGB"), NULL, NULL);
babl_space_from_chromaticities (
- "Adobe",
+ "Adobish", /* a space that can be used as a place-holder for a sRGB like
+space with displaced green coordinates from a big graphics software vendor that
+would rather not it's name be directly used when referring to this color space,
+this color space isn't exactly like theirs but close enough with babls own
+computations of uniform gray axis */
0.3127, 0.3290, /* D65 */
0.6400, 0.3300,
0.2100, 0.7100,
@@ -972,3 +976,13 @@ const Babl *babl_space_match_trc_matrix (const Babl *trc_red,
}
return NULL;
}
+
+/* Trademarks:
+ *
+ * International Color Consortium is a registered trademarks of the.
+ * International Color Consortium.
+ * Apple is a trademark or registered trademark of Apple Inc in many countries.
+ * Adobish is meant to concisely convey resemblence/compatibility with Adobe
+ * RGB- without actualy being it, Adobe is a trademark or registered trademark
+ * of Adobe Systems Incorporated in many countires.
+ */
diff --git a/babl/babl.h b/babl/babl.h
index f97e036..5e299a7 100644
--- a/babl/babl.h
+++ b/babl/babl.h
@@ -86,7 +86,8 @@ const Babl * babl_model (const char *name);
*
* Returns the babl object representing the specific RGB matrix color
* working space referred to by name. Babl knows of:
- * sRGB, Rec2020, Adobe, Apple and ProPhoto
+ * sRGB, Rec2020, Adobish, Apple and ProPhoto
+ *
*/
const Babl * babl_space (const char *name);
@@ -436,3 +437,13 @@ void * babl_get_user_data (const Babl *babl);
#endif
#endif
+
+/* Trademarks:
+ *
+ * International Color Consortium is a registered trademarks of the.
+ * International Color Consortium.
+ * Apple is a trademark or registered trademark of Apple Inc in many countries.
+ * Adobish is meant to concisely convey resemblence/compatibility with Adobe
+ * RGB- without actualy being it, Adobe is a trademark or registered trademark
+ * of Adobe Systems Incorporated in many countires.
+ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]