babl r389 - in trunk: . babl extensions tests
- From: martinn svn gnome org
- To: svn-commits-list gnome org
- Subject: babl r389 - in trunk: . babl extensions tests
- Date: Tue, 20 Jan 2009 19:29:49 +0000 (UTC)
Author: martinn
Date: Tue Jan 20 19:29:49 2009
New Revision: 389
URL: http://svn.gnome.org/viewvc/babl?rev=389&view=rev
Log:
Since babl_foo_from_id() will not be part of the public API we can
revert to having the short variant babl_foo() instead of
babl_foo_from_name().
* babl/babl-class.h
* babl/babl-component.h
* babl/babl-conversion.c
* babl/babl-conversion.h
* babl/babl-extension.h
* babl/babl-fish-path.c
* babl/babl-fish.c
* babl/babl-format.c
* babl/babl-format.h
* babl/babl-image.c
* babl/babl-internal.h
* babl/babl-model.c
* babl/babl-model.h
* babl/babl-type.c
* babl/babl-type.h
* extensions/CIE-Lab.c
* extensions/frequency.c
* extensions/gegl-fixups.c
* extensions/gggl-lies.c
* extensions/gggl.c
* extensions/gimp-8bit.c
* extensions/naive-CMYK.c
* extensions/sse-fixups.c
* tests/grayscale_to_rgb.c
* tests/rgb_to_bgr.c
* tests/rgb_to_ycbcr.c
Modified:
trunk/ChangeLog
trunk/babl/babl-class.h
trunk/babl/babl-component.h
trunk/babl/babl-conversion.c
trunk/babl/babl-conversion.h
trunk/babl/babl-extension.h
trunk/babl/babl-fish-path.c
trunk/babl/babl-fish.c
trunk/babl/babl-format.c
trunk/babl/babl-format.h
trunk/babl/babl-image.c
trunk/babl/babl-internal.h
trunk/babl/babl-model.c
trunk/babl/babl-model.h
trunk/babl/babl-type.c
trunk/babl/babl-type.h
trunk/extensions/CIE-Lab.c
trunk/extensions/frequency.c
trunk/extensions/gegl-fixups.c
trunk/extensions/gggl-lies.c
trunk/extensions/gggl.c
trunk/extensions/gimp-8bit.c
trunk/extensions/naive-CMYK.c
trunk/extensions/sse-fixups.c
trunk/tests/grayscale_to_rgb.c
trunk/tests/rgb_to_bgr.c
trunk/tests/rgb_to_ycbcr.c
Modified: trunk/babl/babl-class.h
==============================================================================
--- trunk/babl/babl-class.h (original)
+++ trunk/babl/babl-class.h Tue Jan 20 19:29:49 2009
@@ -51,7 +51,7 @@
#define BABL_NAMED_CLASS_DECLARE(klass) \
\
BABL_CLASS_DECLARE (klass); \
-Babl * babl_##klass##_from_name (const char *name); \
+Babl * babl_##klass (const char *name); \
Babl * babl_##klass##_new (void *first_arg, \
...) BABL_ARG_NULL_TERMINATED
Modified: trunk/babl/babl-component.h
==============================================================================
--- trunk/babl/babl-component.h (original)
+++ trunk/babl/babl-component.h Tue Jan 20 19:29:49 2009
@@ -32,12 +32,6 @@
* NULL);
*/
-#ifndef BABL_DISABLE_DEPRECATED
-
-#define babl_component babl_component_from_name
-
-#endif /* BABL_DISABLE_DEPRECATED */
-
typedef struct
{
Modified: trunk/babl/babl-conversion.c
==============================================================================
--- trunk/babl/babl-conversion.c (original)
+++ trunk/babl/babl-conversion.c Tue Jan 20 19:29:49 2009
@@ -450,12 +450,12 @@
Babl *fmt_source;
Babl *fmt_destination;
- Babl *fmt_rgba_double = babl_format_new (babl_model_from_name ("RGBA"),
- babl_type_from_name ("double"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
- babl_component_from_name ("A"),
+ Babl *fmt_rgba_double = babl_format_new (babl_model ("RGBA"),
+ babl_type ("double"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
+ babl_component ("A"),
NULL);
double error = 0.0;
Modified: trunk/babl/babl-conversion.h
==============================================================================
--- trunk/babl/babl-conversion.h (original)
+++ trunk/babl/babl-conversion.h Tue Jan 20 19:29:49 2009
@@ -34,12 +34,6 @@
* NULL);
*/
-#ifndef BABL_DISABLE_DEPRECATED
-
-#define babl_conversion babl_conversion_from_name
-
-#endif /* BABL_DISABLE_DEPRECATED */
-
/* Type and Format */
typedef long (*BablFuncLinear) (char *src,
Modified: trunk/babl/babl-extension.h
==============================================================================
--- trunk/babl/babl-extension.h (original)
+++ trunk/babl/babl-extension.h Tue Jan 20 19:29:49 2009
@@ -30,12 +30,6 @@
* BablExtension objects are only used internally in babl.
*/
-#ifndef BABL_DISABLE_DEPRECATED
-
-#define babl_extension babl_extension_from_name
-
-#endif /* BABL_DISABLE_DEPRECATED */
-
typedef struct
{
Modified: trunk/babl/babl-fish-path.c
==============================================================================
--- trunk/babl/babl-fish-path.c (original)
+++ trunk/babl/babl-fish-path.c Tue Jan 20 19:29:49 2009
@@ -397,12 +397,12 @@
if (!fmt_rgba_double)
{
fmt_rgba_double = babl_format_new (
- babl_model_from_name ("RGBA"),
- babl_type_from_name ("double"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
- babl_component_from_name ("A"),
+ babl_model ("RGBA"),
+ babl_type ("double"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
+ babl_component ("A"),
NULL);
}
Modified: trunk/babl/babl-fish.c
==============================================================================
--- trunk/babl/babl-fish.c (original)
+++ trunk/babl/babl-fish.c Tue Jan 20 19:29:49 2009
@@ -165,7 +165,7 @@
source_format = source;
if (!source_format)
- source_format = babl_format_from_name ((char *) source);
+ source_format = babl_format ((char *) source);
if (!source_format)
{
@@ -177,7 +177,7 @@
destination_format = destination;
if (!destination_format)
- destination_format = babl_format_from_name ((char *) destination);
+ destination_format = babl_format ((char *) destination);
if (!destination_format)
{
Modified: trunk/babl/babl-format.c
==============================================================================
--- trunk/babl/babl-format.c (original)
+++ trunk/babl/babl-format.c Tue Jan 20 19:29:49 2009
@@ -393,12 +393,12 @@
Babl *fish_from;
ref_fmt = babl_format_new (
- babl_model_from_name ("RGBA"),
- babl_type_from_name ("double"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
- babl_component_from_name ("A"),
+ babl_model ("RGBA"),
+ babl_type ("double"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
+ babl_component ("A"),
NULL);
if (babl->format.loss != -1.0)
Modified: trunk/babl/babl-format.h
==============================================================================
--- trunk/babl/babl-format.h (original)
+++ trunk/babl/babl-format.h Tue Jan 20 19:29:49 2009
@@ -44,12 +44,6 @@
* name is used.
*/
-#ifndef BABL_DISABLE_DEPRECATED
-
-#define babl_format babl_format_from_name
-
-#endif /* BABL_DISABLE_DEPRECATED */
-
typedef struct
{
Modified: trunk/babl/babl-image.c
==============================================================================
--- trunk/babl/babl-image.c (original)
+++ trunk/babl/babl-image.c Tue Jan 20 19:29:49 2009
@@ -198,7 +198,7 @@
}
else
{
- new_component = (BablComponent *) babl_component_from_name (arg);
+ new_component = (BablComponent *) babl_component (arg);
}
/* FIXME: add error checking */
Modified: trunk/babl/babl-internal.h
==============================================================================
--- trunk/babl/babl-internal.h (original)
+++ trunk/babl/babl-internal.h Tue Jan 20 19:29:49 2009
@@ -239,7 +239,7 @@
BABL_CLASS_MINIMAL_IMPLEMENT(klass) \
\
Babl * \
-babl_##klass##_from_name (const char *name) \
+babl_##klass (const char *name) \
{ \
Babl *babl; \
\
Modified: trunk/babl/babl-model.c
==============================================================================
--- trunk/babl/babl-model.c (original)
+++ trunk/babl/babl-model.c Tue Jan 20 19:29:49 2009
@@ -209,12 +209,12 @@
if (!self)
self = babl_format_new (
- babl_model_from_name ("RGBA"),
- babl_type_from_name ("double"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
- babl_component_from_name ("A"),
+ babl_model ("RGBA"),
+ babl_type ("double"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
+ babl_component ("A"),
NULL);
return self;
}
@@ -226,7 +226,7 @@
int i;
argument[args++] = model;
- argument[args++] = babl_type_from_name ("double");
+ argument[args++] = babl_type ("double");
for (i = 0; i < model->model.components; i++)
{
Modified: trunk/babl/babl-model.h
==============================================================================
--- trunk/babl/babl-model.h (original)
+++ trunk/babl/babl-model.h Tue Jan 20 19:29:49 2009
@@ -37,12 +37,6 @@
*
*/
-#ifndef BABL_DISABLE_DEPRECATED
-
-#define babl_model babl_model_from_name
-
-#endif /* BABL_DISABLE_DEPRECATED */
-
typedef struct
{
Modified: trunk/babl/babl-type.c
==============================================================================
--- trunk/babl/babl-type.c (original)
+++ trunk/babl/babl-type.c Tue Jan 20 19:29:49 2009
@@ -182,9 +182,9 @@
if (!self)
self = babl_format_new (
- babl_model_from_name ("Y"),
- babl_type_from_name ("double"),
- babl_component_from_name ("Y"),
+ babl_model ("Y"),
+ babl_type ("double"),
+ babl_component ("Y"),
NULL);
return self;
}
@@ -206,9 +206,9 @@
test_init (0.0, 182.0);
ref_fmt = double_vector_format ();
- fmt = babl_format_new (babl_model_from_name ("Y"),
+ fmt = babl_format_new (babl_model ("Y"),
babl,
- babl_component_from_name ("Y"),
+ babl_component ("Y"),
NULL);
fish_to = babl_fish_reference (ref_fmt, fmt);
fish_from = babl_fish_reference (fmt, ref_fmt);
Modified: trunk/babl/babl-type.h
==============================================================================
--- trunk/babl/babl-type.h (original)
+++ trunk/babl/babl-type.h Tue Jan 20 19:29:49 2009
@@ -38,12 +38,6 @@
* NULL);
*/
-#ifndef BABL_DISABLE_DEPRECATED
-
-#define babl_type babl_type_from_name
-
-#endif /* BABL_DISABLE_DEPRECATED */
-
typedef struct
{
Modified: trunk/extensions/CIE-Lab.c
==============================================================================
--- trunk/extensions/CIE-Lab.c (original)
+++ trunk/extensions/CIE-Lab.c Tue Jan 20 19:29:49 2009
@@ -55,17 +55,17 @@
{
babl_model_new (
"name", "CIE Lab",
- babl_component_from_name ("CIE L"),
- babl_component_from_name ("CIE a"),
- babl_component_from_name ("CIE b"),
+ babl_component ("CIE L"),
+ babl_component ("CIE a"),
+ babl_component ("CIE b"),
NULL);
babl_model_new (
"name", "CIE Lab alpha",
- babl_component_from_name ("CIE L"),
- babl_component_from_name ("CIE a"),
- babl_component_from_name ("CIE b"),
- babl_component_from_name ("A"),
+ babl_component ("CIE L"),
+ babl_component ("CIE a"),
+ babl_component ("CIE b"),
+ babl_component ("A"),
NULL);
}
@@ -232,26 +232,26 @@
conversions (void)
{
babl_conversion_new (
- babl_model_from_name ("RGBA"),
- babl_model_from_name ("CIE Lab"),
+ babl_model ("RGBA"),
+ babl_model ("CIE Lab"),
"linear", rgba_to_lab,
NULL
);
babl_conversion_new (
- babl_model_from_name ("CIE Lab"),
- babl_model_from_name ("RGBA"),
+ babl_model ("CIE Lab"),
+ babl_model ("RGBA"),
"linear", lab_to_rgba,
NULL
);
babl_conversion_new (
- babl_model_from_name ("RGBA"),
- babl_model_from_name ("CIE Lab alpha"),
+ babl_model ("RGBA"),
+ babl_model ("CIE Lab alpha"),
"linear", rgba_to_laba,
NULL
);
babl_conversion_new (
- babl_model_from_name ("CIE Lab alpha"),
- babl_model_from_name ("RGBA"),
+ babl_model ("CIE Lab alpha"),
+ babl_model ("RGBA"),
"linear", laba_to_rgba,
NULL
);
@@ -264,47 +264,47 @@
{
babl_format_new (
"name", "CIE Lab float",
- babl_model_from_name ("CIE Lab"),
+ babl_model ("CIE Lab"),
- babl_type_from_name ("float"),
- babl_component_from_name ("CIE L"),
- babl_component_from_name ("CIE a"),
- babl_component_from_name ("CIE b"),
+ babl_type ("float"),
+ babl_component ("CIE L"),
+ babl_component ("CIE a"),
+ babl_component ("CIE b"),
NULL);
babl_format_new (
"name", "CIE Lab alpha float",
- babl_model_from_name ("CIE Lab alpha"),
+ babl_model ("CIE Lab alpha"),
- babl_type_from_name ("double"),
- babl_component_from_name ("CIE L"),
- babl_component_from_name ("CIE a"),
- babl_component_from_name ("CIE b"),
- babl_component_from_name ("A"),
+ babl_type ("double"),
+ babl_component ("CIE L"),
+ babl_component ("CIE a"),
+ babl_component ("CIE b"),
+ babl_component ("A"),
NULL);
babl_format_new (
"name", "CIE Lab u8",
- babl_model_from_name ("CIE Lab"),
+ babl_model ("CIE Lab"),
- babl_type_from_name ("CIE u8 L"),
- babl_component_from_name ("CIE L"),
- babl_type_from_name ("CIE u8 ab"),
- babl_component_from_name ("CIE a"),
- babl_type_from_name ("CIE u8 ab"),
- babl_component_from_name ("CIE b"),
+ babl_type ("CIE u8 L"),
+ babl_component ("CIE L"),
+ babl_type ("CIE u8 ab"),
+ babl_component ("CIE a"),
+ babl_type ("CIE u8 ab"),
+ babl_component ("CIE b"),
NULL);
babl_format_new (
"name", "CIE Lab u16",
- babl_model_from_name ("CIE Lab"),
+ babl_model ("CIE Lab"),
- babl_type_from_name ("CIE u16 L"),
- babl_component_from_name ("CIE L"),
- babl_type_from_name ("CIE u16 ab"),
- babl_component_from_name ("CIE a"),
- babl_type_from_name ("CIE u16 ab"),
- babl_component_from_name ("CIE b"),
+ babl_type ("CIE u16 L"),
+ babl_component ("CIE L"),
+ babl_type ("CIE u16 ab"),
+ babl_component ("CIE a"),
+ babl_type ("CIE u16 ab"),
+ babl_component ("CIE b"),
NULL);
}
@@ -423,27 +423,27 @@
);
babl_conversion_new (
- babl_type_from_name ("CIE u8 L"),
- babl_type_from_name ("double"),
+ babl_type ("CIE u8 L"),
+ babl_type ("double"),
"plane", convert_u8_l_double,
NULL
);
babl_conversion_new (
- babl_type_from_name ("double"),
- babl_type_from_name ("CIE u8 L"),
+ babl_type ("double"),
+ babl_type ("CIE u8 L"),
"plane", convert_double_u8_l,
NULL
);
babl_conversion_new (
- babl_type_from_name ("CIE u8 ab"),
- babl_type_from_name ("double"),
+ babl_type ("CIE u8 ab"),
+ babl_type ("double"),
"plane", convert_u8_ab_double,
NULL
);
babl_conversion_new (
- babl_type_from_name ("double"),
- babl_type_from_name ("CIE u8 ab"),
+ babl_type ("double"),
+ babl_type ("CIE u8 ab"),
"plane", convert_double_u8_ab,
NULL
);
@@ -562,27 +562,27 @@
babl_conversion_new (
- babl_type_from_name ("CIE u16 L"),
- babl_type_from_name ("double"),
+ babl_type ("CIE u16 L"),
+ babl_type ("double"),
"plane", convert_u16_l_double,
NULL
);
babl_conversion_new (
- babl_type_from_name ("double"),
- babl_type_from_name ("CIE u16 L"),
+ babl_type ("double"),
+ babl_type ("CIE u16 L"),
"plane", convert_double_u16_l,
NULL
);
babl_conversion_new (
- babl_type_from_name ("CIE u16 ab"),
- babl_type_from_name ("double"),
+ babl_type ("CIE u16 ab"),
+ babl_type ("double"),
"plane", convert_u16_ab_double,
NULL
);
babl_conversion_new (
- babl_type_from_name ("double"),
- babl_type_from_name ("CIE u16 ab"),
+ babl_type ("double"),
+ babl_type ("CIE u16 ab"),
"plane", convert_double_u16_ab,
NULL
);
Modified: trunk/extensions/frequency.c
==============================================================================
--- trunk/extensions/frequency.c (original)
+++ trunk/extensions/frequency.c Tue Jan 20 19:29:49 2009
@@ -59,57 +59,57 @@
babl_model_new (
"name", "frequency",
- babl_component_from_name ("Rr"),
- babl_component_from_name ("Gr"),
- babl_component_from_name ("Br"),
- babl_component_from_name ("Ar"),
- babl_component_from_name ("Ri"),
- babl_component_from_name ("Gi"),
- babl_component_from_name ("Bi"),
- babl_component_from_name ("Ai"),
+ babl_component ("Rr"),
+ babl_component ("Gr"),
+ babl_component ("Br"),
+ babl_component ("Ar"),
+ babl_component ("Ri"),
+ babl_component ("Gi"),
+ babl_component ("Bi"),
+ babl_component ("Ai"),
NULL
);
babl_conversion_new (
- babl_model_from_name ("RGBA"),
- babl_model_from_name ("frequency"),
+ babl_model ("RGBA"),
+ babl_model ("frequency"),
"linear", rgba_to_frequency,
NULL
);
babl_conversion_new (
- babl_model_from_name ("frequency"),
- babl_model_from_name ("RGBA"),
+ babl_model ("frequency"),
+ babl_model ("RGBA"),
"linear", frequency_to_rgba,
NULL
);
babl_format_new (
"name", "frequency float",
- babl_model_from_name ("frequency"),
- babl_component_from_name ("Rr"),
- babl_component_from_name ("Gr"),
- babl_component_from_name ("Br"),
- babl_component_from_name ("Ar"),
- babl_component_from_name ("Ri"),
- babl_component_from_name ("Gi"),
- babl_component_from_name ("Bi"),
- babl_component_from_name ("Ai"),
+ babl_model ("frequency"),
+ babl_component ("Rr"),
+ babl_component ("Gr"),
+ babl_component ("Br"),
+ babl_component ("Ar"),
+ babl_component ("Ri"),
+ babl_component ("Gi"),
+ babl_component ("Bi"),
+ babl_component ("Ai"),
NULL
);
babl_format_new (
"name", "frequency double",
- babl_model_from_name ("frequency"),
- babl_type_from_name ("double"),
- babl_component_from_name ("Rr"),
- babl_component_from_name ("Gr"),
- babl_component_from_name ("Br"),
- babl_component_from_name ("Ar"),
- babl_component_from_name ("Ri"),
- babl_component_from_name ("Gi"),
- babl_component_from_name ("Bi"),
- babl_component_from_name ("Ai"),
+ babl_model ("frequency"),
+ babl_type ("double"),
+ babl_component ("Rr"),
+ babl_component ("Gr"),
+ babl_component ("Br"),
+ babl_component ("Ar"),
+ babl_component ("Ri"),
+ babl_component ("Gi"),
+ babl_component ("Bi"),
+ babl_component ("Ai"),
NULL
);
Modified: trunk/extensions/gegl-fixups.c
==============================================================================
--- trunk/extensions/gegl-fixups.c (original)
+++ trunk/extensions/gegl-fixups.c Tue Jan 20 19:29:49 2009
@@ -527,63 +527,63 @@
init (void)
{
Babl *rgbaF = babl_format_new (
- babl_model_from_name ("RGBA"),
- babl_type_from_name ("float"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
- babl_component_from_name ("A"),
+ babl_model ("RGBA"),
+ babl_type ("float"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
+ babl_component ("A"),
NULL);
Babl *rgbAF = babl_format_new (
- babl_model_from_name ("RaGaBaA"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Ra"),
- babl_component_from_name ("Ga"),
- babl_component_from_name ("Ba"),
- babl_component_from_name ("A"),
+ babl_model ("RaGaBaA"),
+ babl_type ("float"),
+ babl_component ("Ra"),
+ babl_component ("Ga"),
+ babl_component ("Ba"),
+ babl_component ("A"),
NULL);
Babl *lrgba8 = babl_format_new (
- babl_model_from_name ("RGBA"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
- babl_component_from_name ("A"),
+ babl_model ("RGBA"),
+ babl_type ("u8"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
+ babl_component ("A"),
NULL);
Babl *rgba8 = babl_format_new (
- babl_model_from_name ("R'G'B'A"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("R'"),
- babl_component_from_name ("G'"),
- babl_component_from_name ("B'"),
- babl_component_from_name ("A"),
+ babl_model ("R'G'B'A"),
+ babl_type ("u8"),
+ babl_component ("R'"),
+ babl_component ("G'"),
+ babl_component ("B'"),
+ babl_component ("A"),
NULL);
Babl *bgrA8 = babl_format_new (
"name", "B'aG'aR'aA u8",
- babl_model_from_name ("R'aG'aB'aA"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("B'a"),
- babl_component_from_name ("G'a"),
- babl_component_from_name ("R'a"),
- babl_component_from_name ("A"),
+ babl_model ("R'aG'aB'aA"),
+ babl_type ("u8"),
+ babl_component ("B'a"),
+ babl_component ("G'a"),
+ babl_component ("R'a"),
+ babl_component ("A"),
NULL);
Babl *rgb8 = babl_format_new (
- babl_model_from_name ("R'G'B'"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("R'"),
- babl_component_from_name ("G'"),
- babl_component_from_name ("B'"),
+ babl_model ("R'G'B'"),
+ babl_type ("u8"),
+ babl_component ("R'"),
+ babl_component ("G'"),
+ babl_component ("B'"),
NULL);
Babl *sdl32 = babl_format_new (
"name", "B'aG'aR'aPAD u8",
- babl_model_from_name ("R'G'B'"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("B'"),
- babl_component_from_name ("G'"),
- babl_component_from_name ("R'"),
- babl_component_from_name ("PAD"),
+ babl_model ("R'G'B'"),
+ babl_type ("u8"),
+ babl_component ("B'"),
+ babl_component ("G'"),
+ babl_component ("R'"),
+ babl_component ("PAD"),
NULL);
table_init ();
Modified: trunk/extensions/gggl-lies.c
==============================================================================
--- trunk/extensions/gggl-lies.c (original)
+++ trunk/extensions/gggl-lies.c Tue Jan 20 19:29:49 2009
@@ -1796,158 +1796,158 @@
init (void)
{
Babl *rgbaF = babl_format_new (
- babl_model_from_name ("RGBA"),
- babl_type_from_name ("float"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
- babl_component_from_name ("A"),
+ babl_model ("RGBA"),
+ babl_type ("float"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
+ babl_component ("A"),
NULL);
Babl *rgba16 = babl_format_new (
- babl_model_from_name ("RGBA"),
- babl_type_from_name ("u16"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
- babl_component_from_name ("A"),
+ babl_model ("RGBA"),
+ babl_type ("u16"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
+ babl_component ("A"),
NULL);
Babl *rgbaD = babl_format_new (
- babl_model_from_name ("RGBA"),
- babl_type_from_name ("double"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
- babl_component_from_name ("A"),
+ babl_model ("RGBA"),
+ babl_type ("double"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
+ babl_component ("A"),
NULL);
Babl *rgba8 = babl_format_new (
- babl_model_from_name ("RGBA"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
- babl_component_from_name ("A"),
+ babl_model ("RGBA"),
+ babl_type ("u8"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
+ babl_component ("A"),
NULL);
Babl *rgbAF = babl_format_new (
- babl_model_from_name ("RaGaBaA"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Ra"),
- babl_component_from_name ("Ga"),
- babl_component_from_name ("Ba"),
- babl_component_from_name ("A"),
+ babl_model ("RaGaBaA"),
+ babl_type ("float"),
+ babl_component ("Ra"),
+ babl_component ("Ga"),
+ babl_component ("Ba"),
+ babl_component ("A"),
NULL);
Babl *rgbA16 = babl_format_new (
- babl_model_from_name ("RaGaBaA"),
- babl_type_from_name ("u16"),
- babl_component_from_name ("Ra"),
- babl_component_from_name ("Ga"),
- babl_component_from_name ("Ba"),
- babl_component_from_name ("A"),
+ babl_model ("RaGaBaA"),
+ babl_type ("u16"),
+ babl_component ("Ra"),
+ babl_component ("Ga"),
+ babl_component ("Ba"),
+ babl_component ("A"),
NULL);
Babl *rgbA8 = babl_format_new (
- babl_model_from_name ("RaGaBaA"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("Ra"),
- babl_component_from_name ("Ga"),
- babl_component_from_name ("Ba"),
- babl_component_from_name ("A"),
+ babl_model ("RaGaBaA"),
+ babl_type ("u8"),
+ babl_component ("Ra"),
+ babl_component ("Ga"),
+ babl_component ("Ba"),
+ babl_component ("A"),
NULL);
Babl *rgbF = babl_format_new (
- babl_model_from_name ("RGB"),
- babl_type_from_name ("float"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
+ babl_model ("RGB"),
+ babl_type ("float"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
NULL);
Babl *rgb16 = babl_format_new (
- babl_model_from_name ("RGB"),
- babl_type_from_name ("u16"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
+ babl_model ("RGB"),
+ babl_type ("u16"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
NULL);
Babl *rgb8 = babl_format_new (
- babl_model_from_name ("RGB"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
+ babl_model ("RGB"),
+ babl_type ("u8"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
NULL);
Babl *gaF = babl_format_new (
- babl_model_from_name ("YA"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Y"),
- babl_component_from_name ("A"),
+ babl_model ("YA"),
+ babl_type ("float"),
+ babl_component ("Y"),
+ babl_component ("A"),
NULL);
Babl *gAF = babl_format_new (
- babl_model_from_name ("YaA"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Ya"),
- babl_component_from_name ("A"),
+ babl_model ("YaA"),
+ babl_type ("float"),
+ babl_component ("Ya"),
+ babl_component ("A"),
NULL);
Babl *gF = babl_format_new (
- babl_model_from_name ("Y"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Y"),
+ babl_model ("Y"),
+ babl_type ("float"),
+ babl_component ("Y"),
NULL);
Babl *ga16 = babl_format_new (
- babl_model_from_name ("YA"),
- babl_type_from_name ("u16"),
- babl_component_from_name ("Y"),
- babl_component_from_name ("A"),
+ babl_model ("YA"),
+ babl_type ("u16"),
+ babl_component ("Y"),
+ babl_component ("A"),
NULL);
Babl *gA16 = babl_format_new (
- babl_model_from_name ("YaA"),
- babl_type_from_name ("u16"),
- babl_component_from_name ("Ya"),
- babl_component_from_name ("A"),
+ babl_model ("YaA"),
+ babl_type ("u16"),
+ babl_component ("Ya"),
+ babl_component ("A"),
NULL);
Babl *g16 = babl_format_new (
- babl_model_from_name ("Y"),
- babl_type_from_name ("u16"),
- babl_component_from_name ("Y"),
+ babl_model ("Y"),
+ babl_type ("u16"),
+ babl_component ("Y"),
NULL);
Babl *ga8 = babl_format_new (
- babl_model_from_name ("YA"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("Y"),
- babl_component_from_name ("A"),
+ babl_model ("YA"),
+ babl_type ("u8"),
+ babl_component ("Y"),
+ babl_component ("A"),
NULL);
Babl *gA8 = babl_format_new (
- babl_model_from_name ("YaA"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("Ya"),
- babl_component_from_name ("A"),
+ babl_model ("YaA"),
+ babl_type ("u8"),
+ babl_component ("Ya"),
+ babl_component ("A"),
NULL);
Babl *g8 = babl_format_new (
- babl_model_from_name ("Y"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("Y"),
+ babl_model ("Y"),
+ babl_type ("u8"),
+ babl_component ("Y"),
NULL);
Babl *yuv8 = babl_format_new (
"name", "Y'CbCr u8",
- babl_model_from_name ("Y'CbCr"),
- babl_type_from_name ("u8-luma"),
- babl_component_from_name ("Y'"),
- babl_type_from_name ("u8-chroma"),
- babl_component_from_name ("Cb"),
- babl_component_from_name ("Cr"),
+ babl_model ("Y'CbCr"),
+ babl_type ("u8-luma"),
+ babl_component ("Y'"),
+ babl_type ("u8-chroma"),
+ babl_component ("Cb"),
+ babl_component ("Cr"),
NULL);
Babl *yuvF = babl_format_new (
- babl_model_from_name ("Y'CbCr"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Y'"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Cb"),
- babl_component_from_name ("Cr"),
+ babl_model ("Y'CbCr"),
+ babl_type ("float"),
+ babl_component ("Y'"),
+ babl_type ("float"),
+ babl_component ("Cb"),
+ babl_component ("Cr"),
NULL);
Babl *yuvaF = babl_format_new (
- babl_model_from_name ("Y'CbCrA"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Y'"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Cb"),
- babl_component_from_name ("Cr"),
- babl_component_from_name ("A"),
+ babl_model ("Y'CbCrA"),
+ babl_type ("float"),
+ babl_component ("Y'"),
+ babl_type ("float"),
+ babl_component ("Cb"),
+ babl_component ("Cr"),
+ babl_component ("A"),
NULL);
#define o(src, dst) \
Modified: trunk/extensions/gggl.c
==============================================================================
--- trunk/extensions/gggl.c (original)
+++ trunk/extensions/gggl.c Tue Jan 20 19:29:49 2009
@@ -1887,158 +1887,158 @@
init (void)
{
Babl *rgbaD = babl_format_new (
- babl_model_from_name ("R'G'B'A"),
- babl_type_from_name ("double"),
- babl_component_from_name ("R'"),
- babl_component_from_name ("G'"),
- babl_component_from_name ("B'"),
- babl_component_from_name ("A"),
+ babl_model ("R'G'B'A"),
+ babl_type ("double"),
+ babl_component ("R'"),
+ babl_component ("G'"),
+ babl_component ("B'"),
+ babl_component ("A"),
NULL);
Babl *rgbaF = babl_format_new (
- babl_model_from_name ("R'G'B'A"),
- babl_type_from_name ("float"),
- babl_component_from_name ("R'"),
- babl_component_from_name ("G'"),
- babl_component_from_name ("B'"),
- babl_component_from_name ("A"),
+ babl_model ("R'G'B'A"),
+ babl_type ("float"),
+ babl_component ("R'"),
+ babl_component ("G'"),
+ babl_component ("B'"),
+ babl_component ("A"),
NULL);
Babl *rgba16 = babl_format_new (
- babl_model_from_name ("R'G'B'A"),
- babl_type_from_name ("u16"),
- babl_component_from_name ("R'"),
- babl_component_from_name ("G'"),
- babl_component_from_name ("B'"),
- babl_component_from_name ("A"),
+ babl_model ("R'G'B'A"),
+ babl_type ("u16"),
+ babl_component ("R'"),
+ babl_component ("G'"),
+ babl_component ("B'"),
+ babl_component ("A"),
NULL);
Babl *rgba8 = babl_format_new (
- babl_model_from_name ("R'G'B'A"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("R'"),
- babl_component_from_name ("G'"),
- babl_component_from_name ("B'"),
- babl_component_from_name ("A"),
+ babl_model ("R'G'B'A"),
+ babl_type ("u8"),
+ babl_component ("R'"),
+ babl_component ("G'"),
+ babl_component ("B'"),
+ babl_component ("A"),
NULL);
Babl *rgbAF = babl_format_new (
- babl_model_from_name ("R'aG'aB'aA"),
- babl_type_from_name ("float"),
- babl_component_from_name ("R'a"),
- babl_component_from_name ("G'a"),
- babl_component_from_name ("B'a"),
- babl_component_from_name ("A"),
+ babl_model ("R'aG'aB'aA"),
+ babl_type ("float"),
+ babl_component ("R'a"),
+ babl_component ("G'a"),
+ babl_component ("B'a"),
+ babl_component ("A"),
NULL);
Babl *rgbA16 = babl_format_new (
- babl_model_from_name ("R'aG'aB'aA"),
- babl_type_from_name ("u16"),
- babl_component_from_name ("R'a"),
- babl_component_from_name ("G'a"),
- babl_component_from_name ("B'a"),
- babl_component_from_name ("A"),
+ babl_model ("R'aG'aB'aA"),
+ babl_type ("u16"),
+ babl_component ("R'a"),
+ babl_component ("G'a"),
+ babl_component ("B'a"),
+ babl_component ("A"),
NULL);
Babl *rgbA8 = babl_format_new (
- babl_model_from_name ("R'aG'aB'aA"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("R'a"),
- babl_component_from_name ("G'a"),
- babl_component_from_name ("B'a"),
- babl_component_from_name ("A"),
+ babl_model ("R'aG'aB'aA"),
+ babl_type ("u8"),
+ babl_component ("R'a"),
+ babl_component ("G'a"),
+ babl_component ("B'a"),
+ babl_component ("A"),
NULL);
Babl *rgbF = babl_format_new (
- babl_model_from_name ("R'G'B'"),
- babl_type_from_name ("float"),
- babl_component_from_name ("R'"),
- babl_component_from_name ("G'"),
- babl_component_from_name ("B'"),
+ babl_model ("R'G'B'"),
+ babl_type ("float"),
+ babl_component ("R'"),
+ babl_component ("G'"),
+ babl_component ("B'"),
NULL);
Babl *rgb16 = babl_format_new (
- babl_model_from_name ("R'G'B'"),
- babl_type_from_name ("u16"),
- babl_component_from_name ("R'"),
- babl_component_from_name ("G'"),
- babl_component_from_name ("B'"),
+ babl_model ("R'G'B'"),
+ babl_type ("u16"),
+ babl_component ("R'"),
+ babl_component ("G'"),
+ babl_component ("B'"),
NULL);
Babl *rgb8 = babl_format_new (
- babl_model_from_name ("R'G'B'"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("R'"),
- babl_component_from_name ("G'"),
- babl_component_from_name ("B'"),
+ babl_model ("R'G'B'"),
+ babl_type ("u8"),
+ babl_component ("R'"),
+ babl_component ("G'"),
+ babl_component ("B'"),
NULL);
Babl *gaF = babl_format_new (
- babl_model_from_name ("Y'A"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Y'"),
- babl_component_from_name ("A"),
+ babl_model ("Y'A"),
+ babl_type ("float"),
+ babl_component ("Y'"),
+ babl_component ("A"),
NULL);
Babl *gAF = babl_format_new (
- babl_model_from_name ("Y'aA"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Y'a"),
- babl_component_from_name ("A"),
+ babl_model ("Y'aA"),
+ babl_type ("float"),
+ babl_component ("Y'a"),
+ babl_component ("A"),
NULL);
Babl *gF = babl_format_new (
- babl_model_from_name ("Y'"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Y'"),
+ babl_model ("Y'"),
+ babl_type ("float"),
+ babl_component ("Y'"),
NULL);
Babl *ga16 = babl_format_new (
- babl_model_from_name ("Y'A"),
- babl_type_from_name ("u16"),
- babl_component_from_name ("Y'"),
- babl_component_from_name ("A"),
+ babl_model ("Y'A"),
+ babl_type ("u16"),
+ babl_component ("Y'"),
+ babl_component ("A"),
NULL);
Babl *gA16 = babl_format_new (
- babl_model_from_name ("Y'aA"),
- babl_type_from_name ("u16"),
- babl_component_from_name ("Y'a"),
- babl_component_from_name ("A"),
+ babl_model ("Y'aA"),
+ babl_type ("u16"),
+ babl_component ("Y'a"),
+ babl_component ("A"),
NULL);
Babl *g16 = babl_format_new (
- babl_model_from_name ("Y'"),
- babl_type_from_name ("u16"),
- babl_component_from_name ("Y'"),
+ babl_model ("Y'"),
+ babl_type ("u16"),
+ babl_component ("Y'"),
NULL);
Babl *ga8 = babl_format_new (
- babl_model_from_name ("Y'A"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("Y'"),
- babl_component_from_name ("A"),
+ babl_model ("Y'A"),
+ babl_type ("u8"),
+ babl_component ("Y'"),
+ babl_component ("A"),
NULL);
Babl *gA8 = babl_format_new (
- babl_model_from_name ("Y'aA"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("Y'a"),
- babl_component_from_name ("A"),
+ babl_model ("Y'aA"),
+ babl_type ("u8"),
+ babl_component ("Y'a"),
+ babl_component ("A"),
NULL);
Babl *g8 = babl_format_new (
- babl_model_from_name ("Y'"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("Y'"),
+ babl_model ("Y'"),
+ babl_type ("u8"),
+ babl_component ("Y'"),
NULL);
Babl *yuv8 = babl_format_new (
"name", "Y'CbCr u8",
- babl_model_from_name ("Y'CbCr"),
- babl_type_from_name ("u8-luma"),
- babl_component_from_name ("Y'"),
- babl_type_from_name ("u8-chroma"),
- babl_component_from_name ("Cb"),
- babl_component_from_name ("Cr"),
+ babl_model ("Y'CbCr"),
+ babl_type ("u8-luma"),
+ babl_component ("Y'"),
+ babl_type ("u8-chroma"),
+ babl_component ("Cb"),
+ babl_component ("Cr"),
NULL);
Babl *yuvF = babl_format_new (
- babl_model_from_name ("Y'CbCr"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Y'"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Cb"),
- babl_component_from_name ("Cr"),
+ babl_model ("Y'CbCr"),
+ babl_type ("float"),
+ babl_component ("Y'"),
+ babl_type ("float"),
+ babl_component ("Cb"),
+ babl_component ("Cr"),
NULL);
Babl *yuvaF = babl_format_new (
- babl_model_from_name ("Y'CbCrA"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Y'"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Cb"),
- babl_component_from_name ("Cr"),
- babl_component_from_name ("A"),
+ babl_model ("Y'CbCrA"),
+ babl_type ("float"),
+ babl_component ("Y'"),
+ babl_type ("float"),
+ babl_component ("Cb"),
+ babl_component ("Cr"),
+ babl_component ("A"),
NULL);
#define o(src, dst) \
Modified: trunk/extensions/gimp-8bit.c
==============================================================================
--- trunk/extensions/gimp-8bit.c (original)
+++ trunk/extensions/gimp-8bit.c Tue Jan 20 19:29:49 2009
@@ -354,82 +354,82 @@
init (void)
{
Babl *rgbaF_linear = babl_format_new (
- babl_model_from_name ("RGBA"),
- babl_type_from_name ("float"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
- babl_component_from_name ("A"),
+ babl_model ("RGBA"),
+ babl_type ("float"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
+ babl_component ("A"),
NULL);
Babl *rgba8_linear = babl_format_new (
- babl_model_from_name ("RGBA"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
- babl_component_from_name ("A"),
+ babl_model ("RGBA"),
+ babl_type ("u8"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
+ babl_component ("A"),
NULL);
Babl *rgba8_gamma_2_2 = babl_format_new (
- babl_model_from_name ("R'G'B'A"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("R'"),
- babl_component_from_name ("G'"),
- babl_component_from_name ("B'"),
- babl_component_from_name ("A"),
+ babl_model ("R'G'B'A"),
+ babl_type ("u8"),
+ babl_component ("R'"),
+ babl_component ("G'"),
+ babl_component ("B'"),
+ babl_component ("A"),
NULL);
Babl *rgbF_linear = babl_format_new (
- babl_model_from_name ("RGB"),
- babl_type_from_name ("float"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
+ babl_model ("RGB"),
+ babl_type ("float"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
NULL);
Babl *rgb8_linear = babl_format_new (
- babl_model_from_name ("RGB"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
+ babl_model ("RGB"),
+ babl_type ("u8"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
NULL);
Babl *rgb8_gamma_2_2 = babl_format_new (
- babl_model_from_name ("R'G'B'"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("R'"),
- babl_component_from_name ("G'"),
- babl_component_from_name ("B'"),
+ babl_model ("R'G'B'"),
+ babl_type ("u8"),
+ babl_component ("R'"),
+ babl_component ("G'"),
+ babl_component ("B'"),
NULL);
Babl *gaF_linear = babl_format_new (
- babl_model_from_name ("YA"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Y"),
- babl_component_from_name ("A"),
+ babl_model ("YA"),
+ babl_type ("float"),
+ babl_component ("Y"),
+ babl_component ("A"),
NULL);
Babl *ga8_linear = babl_format_new (
- babl_model_from_name ("YA"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("Y"),
- babl_component_from_name ("A"),
+ babl_model ("YA"),
+ babl_type ("u8"),
+ babl_component ("Y"),
+ babl_component ("A"),
NULL);
Babl *ga8_gamma_2_2 = babl_format_new (
- babl_model_from_name ("Y'A"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("Y'"),
- babl_component_from_name ("A"),
+ babl_model ("Y'A"),
+ babl_type ("u8"),
+ babl_component ("Y'"),
+ babl_component ("A"),
NULL);
Babl *gF_linear = babl_format_new (
- babl_model_from_name ("Y"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Y"),
+ babl_model ("Y"),
+ babl_type ("float"),
+ babl_component ("Y"),
NULL);
Babl *g8_linear = babl_format_new (
- babl_model_from_name ("Y"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("Y"),
+ babl_model ("Y"),
+ babl_type ("u8"),
+ babl_component ("Y"),
NULL);
Babl *g8_gamma_2_2 = babl_format_new (
- babl_model_from_name ("Y'"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("Y'"),
+ babl_model ("Y'"),
+ babl_type ("u8"),
+ babl_component ("Y'"),
NULL);
tables_init ();
Modified: trunk/extensions/naive-CMYK.c
==============================================================================
--- trunk/extensions/naive-CMYK.c (original)
+++ trunk/extensions/naive-CMYK.c Tue Jan 20 19:29:49 2009
@@ -44,34 +44,34 @@
babl_model_new (
"name", "CMYK",
- babl_component_from_name ("cyan"),
- babl_component_from_name ("magenta"),
- babl_component_from_name ("yellow"),
- babl_component_from_name ("key"),
+ babl_component ("cyan"),
+ babl_component ("magenta"),
+ babl_component ("yellow"),
+ babl_component ("key"),
NULL
);
babl_conversion_new (
- babl_model_from_name ("RGBA"),
- babl_model_from_name ("CMYK"),
+ babl_model ("RGBA"),
+ babl_model ("CMYK"),
"linear", rgba_to_cmyk,
NULL
);
babl_conversion_new (
- babl_model_from_name ("CMYK"),
- babl_model_from_name ("RGBA"),
+ babl_model ("CMYK"),
+ babl_model ("RGBA"),
"linear", cmyk_to_rgba,
NULL
);
babl_format_new (
"name", "CMYK float",
- babl_model_from_name ("CMYK"),
- babl_type_from_name ("float"),
- babl_component_from_name ("cyan"),
- babl_component_from_name ("yellow"),
- babl_component_from_name ("magenta"),
- babl_component_from_name ("key"),
+ babl_model ("CMYK"),
+ babl_type ("float"),
+ babl_component ("cyan"),
+ babl_component ("yellow"),
+ babl_component ("magenta"),
+ babl_component ("key"),
NULL
);
Modified: trunk/extensions/sse-fixups.c
==============================================================================
--- trunk/extensions/sse-fixups.c (original)
+++ trunk/extensions/sse-fixups.c Tue Jan 20 19:29:49 2009
@@ -175,27 +175,27 @@
#if defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX)
Babl *rgbaF_linear = babl_format_new (
- babl_model_from_name ("RGBA"),
- babl_type_from_name ("float"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
- babl_component_from_name ("A"),
+ babl_model ("RGBA"),
+ babl_type ("float"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
+ babl_component ("A"),
NULL);
Babl *rgba8_linear = babl_format_new (
- babl_model_from_name ("RGBA"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
- babl_component_from_name ("A"),
+ babl_model ("RGBA"),
+ babl_type ("u8"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
+ babl_component ("A"),
NULL);
Babl *rgb8_linear = babl_format_new (
- babl_model_from_name ("RGB"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
+ babl_model ("RGB"),
+ babl_type ("u8"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
NULL);
if ((babl_cpu_accel_get_support () & BABL_CPU_ACCEL_X86_MMX) &&
Modified: trunk/tests/grayscale_to_rgb.c
==============================================================================
--- trunk/tests/grayscale_to_rgb.c (original)
+++ trunk/tests/grayscale_to_rgb.c Tue Jan 20 19:29:49 2009
@@ -37,17 +37,17 @@
fish = babl_fish (
babl_format_new (
- babl_model_from_name ("Y"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Y"),
+ babl_model ("Y"),
+ babl_type ("float"),
+ babl_component ("Y"),
NULL
),
babl_format_new (
- babl_model_from_name ("RGB"),
- babl_type_from_name ("float"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
+ babl_model ("RGB"),
+ babl_type ("float"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
NULL
)
);
Modified: trunk/tests/rgb_to_bgr.c
==============================================================================
--- trunk/tests/rgb_to_bgr.c (original)
+++ trunk/tests/rgb_to_bgr.c Tue Jan 20 19:29:49 2009
@@ -44,19 +44,19 @@
fish = babl_fish (
babl_format_new (
- babl_model_from_name ("RGB"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
+ babl_model ("RGB"),
+ babl_type ("u8"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
NULL
),
babl_format_new (
- babl_model_from_name ("RGB"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("B"),
- babl_component_from_name ("G"),
- babl_component_from_name ("R"),
+ babl_model ("RGB"),
+ babl_type ("u8"),
+ babl_component ("B"),
+ babl_component ("G"),
+ babl_component ("R"),
NULL
)
);
Modified: trunk/tests/rgb_to_ycbcr.c
==============================================================================
--- trunk/tests/rgb_to_ycbcr.c (original)
+++ trunk/tests/rgb_to_ycbcr.c Tue Jan 20 19:29:49 2009
@@ -51,19 +51,19 @@
fish = babl_fish (
babl_format_new (
- babl_model_from_name ("RGB"),
- babl_type_from_name ("float"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
+ babl_model ("RGB"),
+ babl_type ("float"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
NULL
),
babl_format_new (
- babl_model_from_name ("Y'CbCr"),
- babl_type_from_name ("float"),
- babl_component_from_name ("Y'"),
- babl_component_from_name ("Cb"),
- babl_component_from_name ("Cr"),
+ babl_model ("Y'CbCr"),
+ babl_type ("float"),
+ babl_component ("Y'"),
+ babl_component ("Cb"),
+ babl_component ("Cr"),
NULL
)
);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
