[babl] babl: clarify internal gray babl-id enums
- From: Øyvind "pippin" Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [babl] babl: clarify internal gray babl-id enums
- Date: Wed, 20 Jun 2018 19:24:01 +0000 (UTC)
commit 53a18b5a5dabcfd5228e6ae587f9d41360248396
Author: Øyvind Kolås <pippin gimp org>
Date: Wed Jun 20 19:35:43 2018 +0200
babl: clarify internal gray babl-id enums
Use GRAY_LINEAR and GRAY_NONLINEAR making the introduction of PERCEPTUAL
easier.
babl/babl-fish-reference.c | 16 +++++-----
babl/babl-ids.h | 12 +++----
babl/base/formats.c | 58 +++++++++++++++++-----------------
babl/base/model-gray.c | 78 +++++++++++++++++++++++-----------------------
babl/base/model-ycbcr.c | 12 +++----
5 files changed, 88 insertions(+), 88 deletions(-)
---
diff --git a/babl/babl-fish-reference.c b/babl/babl-fish-reference.c
index 54ca110..5ae3cd3 100644
--- a/babl/babl-fish-reference.c
+++ b/babl/babl-fish-reference.c
@@ -163,9 +163,9 @@ convert_to_double (BablFormat *source_fmt,
BablImage *dst_img;
src_img = (BablImage *) babl_image_new (
- babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL);
+ babl_component_from_id (BABL_GRAY_LINEAR), NULL, 1, 0, NULL);
dst_img = (BablImage *) babl_image_new (
- babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL);
+ babl_component_from_id (BABL_GRAY_LINEAR), NULL, 1, 0, NULL);
dst_img->type[0] = (BablType *) babl_type_from_id (BABL_DOUBLE);
dst_img->pitch[0] =
@@ -239,9 +239,9 @@ convert_from_double (BablFormat *destination_fmt,
BablImage *dst_img;
src_img = (BablImage *) babl_image_new (
- babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL);
+ babl_component_from_id (BABL_GRAY_LINEAR), NULL, 1, 0, NULL);
dst_img = (BablImage *) babl_image_new (
- babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL);
+ babl_component_from_id (BABL_GRAY_LINEAR), NULL, 1, 0, NULL);
src_img->type[0] = (BablType *) babl_type_from_id (BABL_DOUBLE);
src_img->pitch[0] = (src_img->type[0]->bits / 8) * destination_fmt->model->components;
@@ -290,9 +290,9 @@ ncomponent_convert_to_double (BablFormat *source_fmt,
BablImage *dst_img;
src_img = (BablImage *) babl_image_new (
- babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL);
+ babl_component_from_id (BABL_GRAY_LINEAR), NULL, 1, 0, NULL);
dst_img = (BablImage *) babl_image_new (
- babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL);
+ babl_component_from_id (BABL_GRAY_LINEAR), NULL, 1, 0, NULL);
dst_img->type[0] = (BablType *) babl_type_from_id (BABL_DOUBLE);
dst_img->pitch[0] = (dst_img->type[0]->bits / 8);
@@ -323,9 +323,9 @@ ncomponent_convert_from_double (BablFormat *destination_fmt,
BablImage *dst_img;
src_img = (BablImage *) babl_image_new (
- babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL);
+ babl_component_from_id (BABL_GRAY_LINEAR), NULL, 1, 0, NULL);
dst_img = (BablImage *) babl_image_new (
- babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL);
+ babl_component_from_id (BABL_GRAY_LINEAR), NULL, 1, 0, NULL);
src_img->type[0] = (BablType *) babl_type_from_id (BABL_DOUBLE);
src_img->pitch[0] = (src_img->type[0]->bits / 8);
diff --git a/babl/babl-ids.h b/babl/babl-ids.h
index 48e8da1..e8eb2ca 100644
--- a/babl/babl-ids.h
+++ b/babl/babl-ids.h
@@ -45,8 +45,8 @@ enum {
BABL_RGB,
BABL_RGBA,
BABL_RGBA_PREMULTIPLIED,
- BABL_GRAY_NONLINEAR,
- BABL_GRAY_NONLINEAR_ALPHA,
+ BABL_MODEL_GRAY_NONLINEAR,
+ BABL_MODEL_GRAY_NONLINEAR_ALPHA,
BABL_GRAY_NONLINEAR_ALPHA_PREMULTIPLIED,
BABL_RGB_NONLINEAR,
BABL_RGBA_NONLINEAR,
@@ -58,8 +58,8 @@ enum {
BABL_MODEL_LAST_INTERNAL,
BABL_COMPONENT_BASE = 10000,
- BABL_LUMINANCE,
- BABL_LUMINANCE_MUL_ALPHA,
+ BABL_GRAY_LINEAR,
+ BABL_GRAY_LINEAR_MUL_ALPHA,
BABL_RED,
BABL_GREEN,
BABL_BLUE,
@@ -67,8 +67,8 @@ enum {
BABL_RED_MUL_ALPHA,
BABL_GREEN_MUL_ALPHA,
BABL_BLUE_MUL_ALPHA,
- BABL_LUMA,
- BABL_LUMA_MUL_ALPHA,
+ BABL_GRAY_NONLINEAR,
+ BABL_GRAY_NONLINEAR_MUL_ALPHA,
BABL_RED_NONLINEAR,
BABL_GREEN_NONLINEAR,
BABL_BLUE_NONLINEAR,
diff --git a/babl/base/formats.c b/babl/base/formats.c
index dc9f423..97e6e8b 100644
--- a/babl/base/formats.c
+++ b/babl/base/formats.c
@@ -105,55 +105,55 @@ babl_formats_init (void)
babl_component_from_id (BABL_BLUE_NONLINEAR),
NULL);
babl_format_new (
- babl_model_from_id (BABL_GRAY_NONLINEAR_ALPHA),
+ babl_model_from_id (BABL_MODEL_GRAY_NONLINEAR_ALPHA),
babl_type_from_id (BABL_FLOAT),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY_NONLINEAR_ALPHA_PREMULTIPLIED),
babl_type_from_id (BABL_FLOAT),
- babl_component_from_id (BABL_LUMA_MUL_ALPHA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR_MUL_ALPHA),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_from_id (BABL_GRAY_NONLINEAR),
+ babl_model_from_id (BABL_MODEL_GRAY_NONLINEAR),
babl_type_from_id (BABL_FLOAT),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
NULL);
babl_format_new (
- babl_model_from_id (BABL_GRAY_NONLINEAR_ALPHA),
+ babl_model_from_id (BABL_MODEL_GRAY_NONLINEAR_ALPHA),
babl_type_from_id (BABL_U16),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY_NONLINEAR_ALPHA_PREMULTIPLIED),
babl_type_from_id (BABL_U16),
- babl_component_from_id (BABL_LUMA_MUL_ALPHA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR_MUL_ALPHA),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_from_id (BABL_GRAY_NONLINEAR),
+ babl_model_from_id (BABL_MODEL_GRAY_NONLINEAR),
babl_type_from_id (BABL_U16),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
NULL);
babl_format_new (
- babl_model_from_id (BABL_GRAY_NONLINEAR_ALPHA),
+ babl_model_from_id (BABL_MODEL_GRAY_NONLINEAR_ALPHA),
babl_type_from_id (BABL_U8),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY_NONLINEAR_ALPHA_PREMULTIPLIED),
babl_type_from_id (BABL_U8),
- babl_component_from_id (BABL_LUMA_MUL_ALPHA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR_MUL_ALPHA),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_from_id (BABL_GRAY_NONLINEAR),
+ babl_model_from_id (BABL_MODEL_GRAY_NONLINEAR),
babl_type_from_id (BABL_U8),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
NULL);
/* overriding name, since the generated name would be wrong due
@@ -165,7 +165,7 @@ babl_formats_init (void)
babl_model_from_id (BABL_YCBCR),
babl_type_from_id (BABL_U8_LUMA),
babl_sampling (1, 1),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
babl_type_from_id (BABL_U8_CHROMA),
babl_sampling (2, 2),
babl_component_from_id (BABL_CB),
@@ -175,7 +175,7 @@ babl_formats_init (void)
babl_format_new (
babl_model_from_id (BABL_YCBCR),
babl_type_from_id (BABL_FLOAT),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
babl_type_from_id (BABL_FLOAT),
babl_component_from_id (BABL_CB),
babl_component_from_id (BABL_CR),
@@ -183,7 +183,7 @@ babl_formats_init (void)
babl_format_new (
babl_model_from_id (BABL_YCBCR_ALPHA),
babl_type_from_id (BABL_FLOAT),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
babl_type_from_id (BABL_FLOAT),
babl_component_from_id (BABL_CB),
babl_component_from_id (BABL_CR),
@@ -269,59 +269,59 @@ babl_formats_init (void)
babl_format_new (
babl_model_from_id (BABL_GRAY_ALPHA),
babl_type_from_id (BABL_FLOAT),
- babl_component_from_id (BABL_LUMINANCE),
+ babl_component_from_id (BABL_GRAY_LINEAR),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED),
babl_type_from_id (BABL_FLOAT),
- babl_component_from_id (BABL_LUMINANCE_MUL_ALPHA),
+ babl_component_from_id (BABL_GRAY_LINEAR_MUL_ALPHA),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY),
babl_type_from_id (BABL_FLOAT),
- babl_component_from_id (BABL_LUMINANCE),
+ babl_component_from_id (BABL_GRAY_LINEAR),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY_ALPHA),
babl_type_from_id (BABL_U16),
- babl_component_from_id (BABL_LUMINANCE),
+ babl_component_from_id (BABL_GRAY_LINEAR),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED),
babl_type_from_id (BABL_U16),
- babl_component_from_id (BABL_LUMINANCE_MUL_ALPHA),
+ babl_component_from_id (BABL_GRAY_LINEAR_MUL_ALPHA),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY),
babl_type_from_id (BABL_U16),
- babl_component_from_id (BABL_LUMINANCE),
+ babl_component_from_id (BABL_GRAY_LINEAR),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY_ALPHA),
babl_type_from_id (BABL_U8),
- babl_component_from_id (BABL_LUMINANCE),
+ babl_component_from_id (BABL_GRAY_LINEAR),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED),
babl_type_from_id (BABL_U8),
- babl_component_from_id (BABL_LUMINANCE_MUL_ALPHA),
+ babl_component_from_id (BABL_GRAY_LINEAR_MUL_ALPHA),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY),
babl_type_from_id (BABL_U8),
- babl_component_from_id (BABL_LUMINANCE),
+ babl_component_from_id (BABL_GRAY_LINEAR),
NULL);
babl_format_new (
babl_model_from_id (BABL_YCBCR),
babl_type_from_id (BABL_FLOAT),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
babl_type_from_id (BABL_FLOAT),
babl_component_from_id (BABL_CB),
babl_component_from_id (BABL_CR),
@@ -329,7 +329,7 @@ babl_formats_init (void)
babl_format_new (
babl_model_from_id (BABL_YCBCR_ALPHA),
babl_type_from_id (BABL_FLOAT),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
babl_type_from_id (BABL_FLOAT),
babl_component_from_id (BABL_CB),
babl_component_from_id (BABL_CR),
diff --git a/babl/base/model-gray.c b/babl/base/model-gray.c
index 5db405b..47a875b 100644
--- a/babl/base/model-gray.c
+++ b/babl/base/model-gray.c
@@ -43,25 +43,25 @@ components (void)
{
babl_component_new (
"Y",
- "id", BABL_LUMINANCE,
+ "id", BABL_GRAY_LINEAR,
"luma",
NULL);
babl_component_new (
"Ya",
- "id", BABL_LUMINANCE_MUL_ALPHA,
+ "id", BABL_GRAY_LINEAR_MUL_ALPHA,
"luma",
NULL);
babl_component_new (
"Y'",
- "id", BABL_LUMA,
+ "id", BABL_GRAY_NONLINEAR,
"luma",
NULL);
babl_component_new (
"Y'a",
- "id", BABL_LUMA_MUL_ALPHA,
+ "id", BABL_GRAY_NONLINEAR_MUL_ALPHA,
"luma",
NULL);
}
@@ -71,37 +71,37 @@ models (void)
{
babl_model_new (
"id", BABL_GRAY,
- babl_component_from_id (BABL_LUMINANCE),
+ babl_component_from_id (BABL_GRAY_LINEAR),
NULL);
babl_model_new (
"id", BABL_GRAY_ALPHA,
- babl_component_from_id (BABL_LUMINANCE),
+ babl_component_from_id (BABL_GRAY_LINEAR),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_model_new (
"id", BABL_GRAY_ALPHA_PREMULTIPLIED,
- babl_component_from_id (BABL_LUMINANCE_MUL_ALPHA),
+ babl_component_from_id (BABL_GRAY_LINEAR_MUL_ALPHA),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_model_new (
"id", BABL_GRAY_NONLINEAR,
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
NULL);
babl_model_new (
- "id", BABL_GRAY_NONLINEAR_ALPHA,
- babl_component_from_id (BABL_LUMA),
+ "id", BABL_MODEL_GRAY_NONLINEAR_ALPHA,
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_model_new (
"id", BABL_GRAY_NONLINEAR_ALPHA_PREMULTIPLIED,
- babl_component_from_id (BABL_LUMA_MUL_ALPHA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR_MUL_ALPHA),
babl_component_from_id (BABL_ALPHA),
NULL);
}
@@ -521,7 +521,7 @@ static void
conversions (void)
{
babl_conversion_new (
- babl_model_from_id (BABL_GRAY_NONLINEAR),
+ babl_model_from_id (BABL_MODEL_GRAY_NONLINEAR),
babl_model_from_id (BABL_RGBA),
"planar", gray_nonlinear_to_rgb,
NULL
@@ -529,13 +529,13 @@ conversions (void)
babl_conversion_new (
babl_model_from_id (BABL_RGBA),
- babl_model_from_id (BABL_GRAY_NONLINEAR),
+ babl_model_from_id (BABL_MODEL_GRAY_NONLINEAR),
"planar", rgb_to_gray_nonlinear,
NULL
);
babl_conversion_new (
- babl_model_from_id (BABL_GRAY_NONLINEAR_ALPHA),
+ babl_model_from_id (BABL_MODEL_GRAY_NONLINEAR_ALPHA),
babl_model_from_id (BABL_RGBA),
"planar", gray_nonlinear_to_rgb,
NULL
@@ -543,7 +543,7 @@ conversions (void)
babl_conversion_new (
babl_model_from_id (BABL_RGBA),
- babl_model_from_id (BABL_GRAY_NONLINEAR_ALPHA),
+ babl_model_from_id (BABL_MODEL_GRAY_NONLINEAR_ALPHA),
"planar", rgb_to_gray_nonlinear,
NULL
);
@@ -626,106 +626,106 @@ formats (void)
babl_format_new (
babl_model_from_id (BABL_GRAY_ALPHA),
babl_type_from_id (BABL_HALF),
- babl_component_from_id (BABL_LUMINANCE),
+ babl_component_from_id (BABL_GRAY_LINEAR),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED),
babl_type_from_id (BABL_HALF),
- babl_component_from_id (BABL_LUMINANCE_MUL_ALPHA),
+ babl_component_from_id (BABL_GRAY_LINEAR_MUL_ALPHA),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY),
babl_type_from_id (BABL_HALF),
- babl_component_from_id (BABL_LUMINANCE),
+ babl_component_from_id (BABL_GRAY_LINEAR),
NULL);
babl_format_new (
- babl_model_from_id (BABL_GRAY_NONLINEAR_ALPHA),
+ babl_model_from_id (BABL_MODEL_GRAY_NONLINEAR_ALPHA),
babl_type_from_id (BABL_HALF),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY_NONLINEAR_ALPHA_PREMULTIPLIED),
babl_type_from_id (BABL_HALF),
- babl_component_from_id (BABL_LUMA_MUL_ALPHA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR_MUL_ALPHA),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_from_id (BABL_GRAY_NONLINEAR),
+ babl_model_from_id (BABL_MODEL_GRAY_NONLINEAR),
babl_type_from_id (BABL_HALF),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
NULL);
/***********/
babl_format_new (
babl_model_from_id (BABL_GRAY_ALPHA),
babl_type ("u15"),
- babl_component_from_id (BABL_LUMINANCE),
+ babl_component_from_id (BABL_GRAY_LINEAR),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED),
babl_type ("u15"),
- babl_component_from_id (BABL_LUMINANCE_MUL_ALPHA),
+ babl_component_from_id (BABL_GRAY_LINEAR_MUL_ALPHA),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY),
babl_type ("u15"),
- babl_component_from_id (BABL_LUMINANCE),
+ babl_component_from_id (BABL_GRAY_LINEAR),
NULL);
babl_format_new (
- babl_model_from_id (BABL_GRAY_NONLINEAR_ALPHA),
+ babl_model_from_id (BABL_MODEL_GRAY_NONLINEAR_ALPHA),
babl_type ("u15"),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY_NONLINEAR_ALPHA_PREMULTIPLIED),
babl_type ("u15"),
- babl_component_from_id (BABL_LUMA_MUL_ALPHA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR_MUL_ALPHA),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_from_id (BABL_GRAY_NONLINEAR),
+ babl_model_from_id (BABL_MODEL_GRAY_NONLINEAR),
babl_type ("u15"),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY_ALPHA),
babl_type_from_id (BABL_U32),
- babl_component_from_id (BABL_LUMINANCE),
+ babl_component_from_id (BABL_GRAY_LINEAR),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED),
babl_type_from_id (BABL_U32),
- babl_component_from_id (BABL_LUMINANCE_MUL_ALPHA),
+ babl_component_from_id (BABL_GRAY_LINEAR_MUL_ALPHA),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY),
babl_type_from_id (BABL_U32),
- babl_component_from_id (BABL_LUMINANCE),
+ babl_component_from_id (BABL_GRAY_LINEAR),
NULL);
babl_format_new (
- babl_model_from_id (BABL_GRAY_NONLINEAR_ALPHA),
+ babl_model_from_id (BABL_MODEL_GRAY_NONLINEAR_ALPHA),
babl_type_from_id (BABL_U32),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
babl_model_from_id (BABL_GRAY_NONLINEAR_ALPHA_PREMULTIPLIED),
babl_type_from_id (BABL_U32),
- babl_component_from_id (BABL_LUMA_MUL_ALPHA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR_MUL_ALPHA),
babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_from_id (BABL_GRAY_NONLINEAR),
+ babl_model_from_id (BABL_MODEL_GRAY_NONLINEAR),
babl_type_from_id (BABL_U32),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
NULL);
}
diff --git a/babl/base/model-ycbcr.c b/babl/base/model-ycbcr.c
index 6b34d20..44f6cce 100644
--- a/babl/base/model-ycbcr.c
+++ b/babl/base/model-ycbcr.c
@@ -63,14 +63,14 @@ models (void)
{
babl_model_new (
"id", BABL_YCBCR,
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
babl_component_from_id (BABL_CB),
babl_component_from_id (BABL_CR),
NULL);
babl_model_new (
"id", BABL_YCBCR_ALPHA,
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
babl_component_from_id (BABL_CB),
babl_component_from_id (BABL_CR),
babl_component_from_id (BABL_ALPHA),
@@ -245,7 +245,7 @@ formats (void)
babl_model_from_id (BABL_YCBCR),
babl_type_from_id (BABL_U8_LUMA),
babl_sampling (1, 1),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
babl_type_from_id (BABL_U8_CHROMA),
babl_sampling (2, 2),
babl_component_from_id (BABL_CB),
@@ -263,7 +263,7 @@ if (0)
babl_model_from_id (BABL_YCBCR),
babl_type_from_id (BABL_U8_LUMA),
babl_sampling (1, 1),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
babl_type_from_id (BABL_U8_CHROMA),
babl_sampling (2, 2),
babl_component_from_id (BABL_CB),
@@ -279,7 +279,7 @@ if (0)
babl_model_from_id (BABL_YCBCR),
babl_type_from_id (BABL_U8_LUMA),
babl_sampling (1, 1),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
babl_type_from_id (BABL_U8_CHROMA),
babl_sampling (2, 1),
babl_component_from_id (BABL_CB),
@@ -294,7 +294,7 @@ if (0)
babl_model_from_id (BABL_YCBCR),
babl_type_from_id (BABL_U8_LUMA),
babl_sampling (1, 1),
- babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_GRAY_NONLINEAR),
babl_type_from_id (BABL_U8_CHROMA),
babl_sampling (4, 1),
babl_component_from_id (BABL_CB),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
