[babl] babl: rename babl_space_from_icc to babl_icc_make_space
- From: Øyvind Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [babl] babl: rename babl_space_from_icc to babl_icc_make_space
- Date: Tue, 3 Oct 2017 14:16:54 +0000 (UTC)
commit 1ad47571209012d3ae7869f85bc7d4f0ebebf9d5
Author: Øyvind Kolås <pippin gimp org>
Date: Tue Oct 3 15:54:19 2017 +0200
babl: rename babl_space_from_icc to babl_icc_make_space
Thus being more consistent that functions that take icc_data + length have the
prefix babl_icc_, since each icc space in the future potentially can have more
spaces than the relative-colorimetric space defined, _make_ seems better than
_to_ or _new_.
babl/babl-icc.c | 4 +++-
babl/babl.h | 5 +++--
export-symbols | 2 +-
tools/babl-icc-rewrite.c | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/babl/babl-icc.c b/babl/babl-icc.c
index 0f05c90..72572e2 100644
--- a/babl/babl-icc.c
+++ b/babl/babl-icc.c
@@ -194,6 +194,7 @@ static double read_u8f8 (ICC *state, int offset)
return u8f8_to_d (read_u8f8_ (state, offset));
}
+#if 0
static inline void print_u8f8 (u8f8_t fix)
{
int i;
@@ -237,6 +238,7 @@ static inline void print_s15f16 (s15f16_t fix)
}
}
}
+#endif
static void write_u32 (ICC *state, int offset, uint32_t value)
{
@@ -698,7 +700,7 @@ static char *decode_string (ICC *state, const char *tag, const char *lang, const
}
const Babl *
-babl_space_from_icc (const char *icc_data,
+babl_icc_make_space (const char *icc_data,
int icc_length,
BablIccIntent intent,
const char **error)
diff --git a/babl/babl.h b/babl/babl.h
index 16574cf..ac83fd7 100644
--- a/babl/babl.h
+++ b/babl/babl.h
@@ -98,7 +98,7 @@ typedef enum {
} BablIccIntent;
/**
- * babl_space_from_icc:
+ * babl_icc_make_space:
*
* @icc_data: pointer to icc profile in memory
* @icc_length: length of icc profile in bytes
@@ -120,11 +120,12 @@ typedef enum {
* containing a message describing why the provided data does not yield a babl
* space.
*/
-const Babl *babl_space_from_icc (const char *icc_data,
+const Babl *babl_icc_make_space (const char *icc_data,
int icc_length,
BablIccIntent intent,
const char **error);
+
/* babl_icc_get_key:
*
* @icc_data: pointer to in-memory icc profile
diff --git a/export-symbols b/export-symbols
index a0b28c4..28b3104 100644
--- a/export-symbols
+++ b/export-symbols
@@ -24,6 +24,7 @@ babl_get_name
babl_get_name
babl_get_user_data
babl_get_version
+babl_icc_make_space
babl_icc_get_key
babl_init
babl_introspect
@@ -38,7 +39,6 @@ babl_process
babl_sampling
babl_set_user_data
babl_space
-babl_space_from_icc
babl_space_from_xyz
babl_space_get_rgbtoxyz
babl_space_to_xyz
diff --git a/tools/babl-icc-rewrite.c b/tools/babl-icc-rewrite.c
index e01994e..bc83b25 100644
--- a/tools/babl-icc-rewrite.c
+++ b/tools/babl-icc-rewrite.c
@@ -122,7 +122,7 @@ main (int argc,
free (str);
}
}
- babl = babl_space_from_icc (icc_data, icc_len, 0, &error);
+ babl = babl_icc_make_space (icc_data, icc_len, 0, &error);
free (icc_data);
if (error || !babl)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]