babl r381 - in trunk: . babl babl/base extensions tests
- From: martinn svn gnome org
- To: svn-commits-list gnome org
- Subject: babl r381 - in trunk: . babl babl/base extensions tests
- Date: Sat, 17 Jan 2009 19:30:40 +0000 (UTC)
Author: martinn
Date: Sat Jan 17 19:30:40 2009
New Revision: 381
URL: http://svn.gnome.org/viewvc/babl?rev=381&view=rev
Log:
s/babl_foo_init/babl_foo_class_init/
s/babl_foo_destroy/babl_foo_class_destroy/
s/babl_foo_each/babl_foo_class_for_each/
s/babl_foo/babl_foo_from_name/
s/babl_foo_id/babl_foo_from_id/
* babl/babl-class.h
* babl/babl-conversion.c
* babl/babl-core.c
* babl/babl-fish-path.c
* babl/babl-fish-reference.c
* babl/babl-fish-stats.c
* babl/babl-fish.c
* babl/babl-format.c
* babl/babl-image.c
* babl/babl-internal.h
* babl/babl-introspect.c
* babl/babl-model.c
* babl/babl-sampling.c
* babl/babl-sanity.c
* babl/babl-type.c
* babl/babl.c
* babl/base/formats.c
* babl/base/model-gray.c
* babl/base/model-rgb.c
* babl/base/model-ycbcr.c
* babl/base/type-float.c
* babl/base/type-u16.c
* babl/base/type-u32.c
* babl/base/type-u8.c
* 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/babl-html-dump.c
* tests/babl_fish_path_fitness.c
* tests/conversions.c
* tests/formats.c
* tests/grayscale_to_rgb.c
* tests/models.c
* tests/rgb_to_bgr.c
* tests/rgb_to_ycbcr.c
* tests/types.c
Modified:
trunk/ChangeLog
trunk/babl/babl-class.h
trunk/babl/babl-conversion.c
trunk/babl/babl-core.c
trunk/babl/babl-fish-path.c
trunk/babl/babl-fish-reference.c
trunk/babl/babl-fish-stats.c
trunk/babl/babl-fish.c
trunk/babl/babl-format.c
trunk/babl/babl-image.c
trunk/babl/babl-internal.h
trunk/babl/babl-introspect.c
trunk/babl/babl-model.c
trunk/babl/babl-sampling.c
trunk/babl/babl-sanity.c
trunk/babl/babl-type.c
trunk/babl/babl.c
trunk/babl/base/formats.c
trunk/babl/base/model-gray.c
trunk/babl/base/model-rgb.c
trunk/babl/base/model-ycbcr.c
trunk/babl/base/type-float.c
trunk/babl/base/type-u16.c
trunk/babl/base/type-u32.c
trunk/babl/base/type-u8.c
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/babl-html-dump.c
trunk/tests/babl_fish_path_fitness.c
trunk/tests/conversions.c
trunk/tests/formats.c
trunk/tests/grayscale_to_rgb.c
trunk/tests/models.c
trunk/tests/rgb_to_bgr.c
trunk/tests/rgb_to_ycbcr.c
trunk/tests/types.c
Modified: trunk/babl/babl-class.h
==============================================================================
--- trunk/babl/babl-class.h (original)
+++ trunk/babl/babl-class.h Sat Jan 17 19:30:40 2009
@@ -66,13 +66,13 @@
* to be iterated over, common functionality is defined through these
* macros.
*/
-#define BABL_CLASS_DECLARE(klass) \
- \
-void babl_##klass##_init (void); \
-void babl_##klass##_destroy (void); \
-Babl * babl_##klass##_id (int id); \
-void babl_##klass##_each (BablEachFunction each_fun, \
- void *user_data)
+#define BABL_CLASS_DECLARE(klass) \
+ \
+Babl * babl_##klass##_from_id (int id); \
+void babl_##klass##_class_init (void); \
+void babl_##klass##_class_destroy (void); \
+void babl_##klass##_class_for_each (BablEachFunction each_fun, \
+ void *user_data)
/* creates a class that has a specific name connected to it, that
* also allows defining a new instance. These classes share common
@@ -80,12 +80,12 @@
* the means to lookup by name, as well as to create new named objects
* that later can be looked up.
*/
-#define BABL_NAMED_CLASS_DECLARE(klass) \
- \
-BABL_CLASS_DECLARE (klass); \
-Babl * babl_##klass (const char *name); \
-Babl * babl_##klass##_new (void *first_arg, \
- ...) BABL_ARG_NULL_TERMINATED
+#define BABL_NAMED_CLASS_DECLARE(klass) \
+ \
+BABL_CLASS_DECLARE (klass); \
+Babl * babl_##klass##_from_name (const char *name); \
+Babl * babl_##klass##_new (void *first_arg, \
+ ...) BABL_ARG_NULL_TERMINATED
/* common header for any item inserted into database, the actual
* implementation of babl-instance is in babl-internal
Modified: trunk/babl/babl-conversion.c
==============================================================================
--- trunk/babl/babl-conversion.c (original)
+++ trunk/babl/babl-conversion.c Sat Jan 17 19:30:40 2009
@@ -114,19 +114,19 @@
{
Babl *src_format = NULL;
Babl *dst_format = NULL;
- if (BABL (babl->conversion.source) == babl_model_id (BABL_RGBA))
+ if (BABL (babl->conversion.source) == babl_model_from_id (BABL_RGBA))
{
- src_format = babl_format_id (BABL_RGBA_DOUBLE);
+ src_format = babl_format_from_id (BABL_RGBA_DOUBLE);
dst_format = babl_format_with_model_as_type (
BABL (babl->conversion.destination),
- babl_type_id (BABL_DOUBLE));
+ babl_type_from_id (BABL_DOUBLE));
}
- else if (BABL (babl->conversion.destination) == babl_model_id (BABL_RGBA))
+ else if (BABL (babl->conversion.destination) == babl_model_from_id (BABL_RGBA))
{
src_format = babl_format_with_model_as_type (
BABL (babl->conversion.source),
- babl_type_id (BABL_DOUBLE));
- dst_format = babl_format_id (BABL_RGBA_DOUBLE);
+ babl_type_from_id (BABL_DOUBLE));
+ dst_format = babl_format_from_id (BABL_RGBA_DOUBLE);
}
else
{
@@ -450,12 +450,12 @@
Babl *fmt_source;
Babl *fmt_destination;
- 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"),
+ 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"),
NULL);
double error = 0.0;
Modified: trunk/babl/babl-core.c
==============================================================================
--- trunk/babl/babl-core.c (original)
+++ trunk/babl/babl-core.c Sat Jan 17 19:30:40 2009
@@ -126,41 +126,41 @@
babl_model_new (
"id", BABL_RGBA,
- babl_component_id (BABL_RED),
- babl_component_id (BABL_GREEN),
- babl_component_id (BABL_BLUE),
- babl_component_id (BABL_ALPHA),
+ babl_component_from_id (BABL_RED),
+ babl_component_from_id (BABL_GREEN),
+ babl_component_from_id (BABL_BLUE),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
"id", BABL_RGBA_DOUBLE,
- babl_model_id (BABL_RGBA),
- babl_type_id (BABL_DOUBLE),
- babl_component_id (BABL_RED),
- babl_component_id (BABL_GREEN),
- babl_component_id (BABL_BLUE),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_RGBA),
+ babl_type_from_id (BABL_DOUBLE),
+ babl_component_from_id (BABL_RED),
+ babl_component_from_id (BABL_GREEN),
+ babl_component_from_id (BABL_BLUE),
+ babl_component_from_id (BABL_ALPHA),
NULL);
/*
babl_conversion_new (
- babl_model_id (BABL_RGBA),
- babl_model_id (BABL_RGBA),
+ babl_model_from_id (BABL_RGBA),
+ babl_model_from_id (BABL_RGBA),
"planar", copy_strip_1,
NULL
);
*/
babl_conversion_new (
- babl_type_id (BABL_DOUBLE),
- babl_type_id (BABL_DOUBLE),
+ babl_type_from_id (BABL_DOUBLE),
+ babl_type_from_id (BABL_DOUBLE),
"plane", convert_double_double,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_RGBA),
- babl_model_id (BABL_RGBA),
+ babl_model_from_id (BABL_RGBA),
+ babl_model_from_id (BABL_RGBA),
"linear", rgba_to_rgba,
NULL
);
Modified: trunk/babl/babl-fish-path.c
==============================================================================
--- trunk/babl/babl-fish-path.c (original)
+++ trunk/babl/babl-fish-path.c Sat Jan 17 19:30:40 2009
@@ -397,12 +397,12 @@
if (!fmt_rgba_double)
{
fmt_rgba_double = babl_format_new (
- babl_model ("RGBA"),
- babl_type ("double"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
- babl_component ("A"),
+ 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"),
NULL);
}
Modified: trunk/babl/babl-fish-reference.c
==============================================================================
--- trunk/babl/babl-fish-reference.c (original)
+++ trunk/babl/babl-fish-reference.c Sat Jan 17 19:30:40 2009
@@ -102,18 +102,18 @@
BablImage *dst_img;
src_img = (BablImage *) babl_image (
- babl_component_id (BABL_LUMINANCE), NULL, 1, 0, NULL);
+ babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL);
dst_img = (BablImage *) babl_image (
- babl_component_id (BABL_LUMINANCE), NULL, 1, 0, NULL);
+ babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL);
- dst_img->type[0] = (BablType *) babl_type_id (BABL_DOUBLE);
+ dst_img->type[0] = (BablType *) babl_type_from_id (BABL_DOUBLE);
dst_img->pitch[0] =
(dst_img->type[0]->bits / 8) * source_fmt->model->components;
dst_img->stride[0] = 0;
src_img->data[0] = source_buf;
- src_img->type[0] = (BablType *) babl_type_id (BABL_DOUBLE);
+ src_img->type[0] = (BablType *) babl_type_from_id (BABL_DOUBLE);
src_img->pitch[0] = source_fmt->bytes_per_pixel;
src_img->stride[0] = 0;
@@ -159,16 +159,16 @@
BablImage *dst_img;
src_img = (BablImage *) babl_image (
- babl_component_id (BABL_LUMINANCE), NULL, 1, 0, NULL);
+ babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL);
dst_img = (BablImage *) babl_image (
- babl_component_id (BABL_LUMINANCE), NULL, 1, 0, NULL);
+ babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL);
- src_img->type[0] = (BablType *) babl_type_id (BABL_DOUBLE);
+ 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;
src_img->stride[0] = 0;
dst_img->data[0] = destination_buf;
- dst_img->type[0] = (BablType *) babl_type_id (BABL_DOUBLE);
+ dst_img->type[0] = (BablType *) babl_type_from_id (BABL_DOUBLE);
dst_img->pitch[0] = destination_fmt->bytes_per_pixel;
dst_img->stride[0] = 0;
@@ -272,7 +272,7 @@
source_image = babl_image_from_linear (
source_double_buf, BABL (BABL ((babl->fish.source))->format.model));
rgba_image = babl_image_from_linear (
- rgba_double_buf, babl_model_id (BABL_RGBA));
+ rgba_double_buf, babl_model_from_id (BABL_RGBA));
destination_image = babl_image_from_linear (
destination_double_buf, BABL (BABL ((babl->fish.destination))->format.model));
@@ -288,7 +288,7 @@
Babl *conv =
assert_conversion_find (
BABL (babl->fish.source)->format.model,
- babl_model_id (BABL_RGBA)
+ babl_model_from_id (BABL_RGBA)
);
if (conv->class_type == BABL_CONVERSION_PLANAR)
{
@@ -310,7 +310,7 @@
{
Babl *conv =
assert_conversion_find (
- babl_model_id (BABL_RGBA),
+ babl_model_from_id (BABL_RGBA),
BABL (babl->fish.destination)->format.model);
if (conv->class_type == BABL_CONVERSION_PLANAR)
{
Modified: trunk/babl/babl-fish-stats.c
==============================================================================
--- trunk/babl/babl-fish-stats.c (original)
+++ trunk/babl/babl-fish-stats.c Sat Jan 17 19:30:40 2009
@@ -196,7 +196,7 @@
}
fprintf (output_file, "</a></td>");
- babl_format_each (table_destination_each, babl);
+ babl_format_class_for_each (table_destination_each, babl);
fprintf (output_file, "</tr>\n");
source_no++;
return 0;
@@ -252,7 +252,7 @@
conversions (void)
{
fprintf (output_file, "<h2>Conversions</h2><dl>\n");
- babl_conversion_each (each_conv, NULL);
+ babl_conversion_class_for_each (each_conv, NULL);
fprintf (output_file, "</dl>\n");
}
@@ -380,7 +380,7 @@
fprintf (output_file, "<table cellspacing='0'><tr><td>Source format</td><td colspan='32'>Destination formats</td></tr>\n");
- babl_format_each (table_source_each, NULL);
+ babl_format_class_for_each (table_source_each, NULL);
fprintf (output_file, "</table>");
Modified: trunk/babl/babl-fish.c
==============================================================================
--- trunk/babl/babl-fish.c (original)
+++ trunk/babl/babl-fish.c Sat Jan 17 19:30:40 2009
@@ -165,7 +165,7 @@
source_format = source;
if (!source_format)
- source_format = babl_format ((char *) source);
+ source_format = babl_format_from_name ((char *) source);
if (!source_format)
{
@@ -177,7 +177,7 @@
destination_format = destination;
if (!destination_format)
- destination_format = babl_format ((char *) destination);
+ destination_format = babl_format_from_name ((char *) destination);
if (!destination_format)
{
Modified: trunk/babl/babl-format.c
==============================================================================
--- trunk/babl/babl-format.c (original)
+++ trunk/babl/babl-format.c Sat Jan 17 19:30:40 2009
@@ -194,7 +194,7 @@
BablType *type [BABL_MAX_COMPONENTS];
BablSampling *current_sampling = (BablSampling *) babl_sampling (1, 1);
- BablType *current_type = (BablType *) babl_type_id (BABL_DOUBLE);
+ BablType *current_type = (BablType *) babl_type_from_id (BABL_DOUBLE);
char *name = NULL;
void *arg = first_arg;
@@ -393,12 +393,12 @@
Babl *fish_from;
ref_fmt = babl_format_new (
- babl_model ("RGBA"),
- babl_type ("double"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
- babl_component ("A"),
+ 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"),
NULL);
if (babl->format.loss != -1.0)
Modified: trunk/babl/babl-image.c
==============================================================================
--- trunk/babl/babl-image.c (original)
+++ trunk/babl/babl-image.c Sat Jan 17 19:30:40 2009
@@ -135,7 +135,7 @@
for (i = 0; i < components; i++)
{
sampling[i] = (BablSampling *) babl_sampling (1, 1);
- type[i] = (BablType *) babl_type_id (BABL_DOUBLE);
+ type[i] = (BablType *) babl_type_from_id (BABL_DOUBLE);
pitch[i] = calc_pitch;
stride[i] = 0;
data[i] = buffer + offset;
@@ -198,7 +198,7 @@
}
else
{
- new_component = (BablComponent *) babl_component (arg);
+ new_component = (BablComponent *) babl_component_from_name (arg);
}
/* FIXME: add error checking */
@@ -226,13 +226,13 @@
}
void
-babl_image_destroy (void)
+babl_image_class_destroy (void)
{
/* nothing to do */
}
void
-babl_image_init (void)
+babl_image_class_init (void)
{
/* nothing to do */
}
Modified: trunk/babl/babl-internal.h
==============================================================================
--- trunk/babl/babl-internal.h (original)
+++ trunk/babl/babl-internal.h Sat Jan 17 19:30:40 2009
@@ -211,7 +211,7 @@
#define BABL_CLASS_MINIMAL_IMPLEMENT(klass) \
void \
-babl_##klass##_init (void) \
+babl_##klass##_class_init (void) \
{ \
BABL_PRE_INIT_HOOK; \
if (!db) \
@@ -220,7 +220,7 @@
} \
\
void \
-babl_##klass##_destroy (void) \
+babl_##klass##_class_destroy (void) \
{ \
BABL_DESTROY_PRE_HOOK; \
babl_db_each (db,each_babl_##klass##_destroy, NULL); \
@@ -229,8 +229,8 @@
} \
\
void \
-babl_##klass##_each (BablEachFunction each_fun, \
- void *user_data) \
+babl_##klass##_class_for_each (BablEachFunction each_fun, \
+ void *user_data) \
{ \
babl_db_each (db, each_fun, user_data); \
} \
@@ -239,7 +239,7 @@
BABL_CLASS_MINIMAL_IMPLEMENT(klass) \
\
Babl * \
-babl_##klass (const char *name) \
+babl_##klass##_from_name (const char *name) \
{ \
Babl *babl; \
\
@@ -257,7 +257,7 @@
} \
\
Babl * \
-babl_##klass##_id (int id) \
+babl_##klass##_from_id (int id) \
{ \
Babl *babl; \
babl = babl_db_exist_by_id (db, id); \
Modified: trunk/babl/babl-introspect.c
==============================================================================
--- trunk/babl/babl-introspect.c (original)
+++ trunk/babl/babl-introspect.c Sat Jan 17 19:30:40 2009
@@ -49,28 +49,28 @@
babl_log ("");
babl_log ("Data Types:");
- babl_type_each (each_introspect, NULL);
+ babl_type_class_for_each (each_introspect, NULL);
babl_log ("");
babl_log ("Sampling (chroma subsampling) factors:");
- babl_sampling_each (each_introspect, NULL);
+ babl_sampling_class_for_each (each_introspect, NULL);
babl_log ("");
babl_log ("Components:");
- babl_component_each (each_introspect, NULL);
+ babl_component_class_for_each (each_introspect, NULL);
babl_log ("");
babl_log ("Models (of components):");
- babl_model_each (each_introspect, NULL);
+ babl_model_class_for_each (each_introspect, NULL);
babl_log ("");
babl_log ("Pixel formats:");
- babl_format_each (each_introspect, NULL);
+ babl_format_class_for_each (each_introspect, NULL);
babl_log ("");
babl_log ("conversions:");
- babl_conversion_each (each_introspect, NULL);
+ babl_conversion_class_for_each (each_introspect, NULL);
babl_log ("");
babl_log ("extensions:");
- babl_extension_each (each_introspect, NULL);
+ babl_extension_class_for_each (each_introspect, NULL);
babl_log ("");
babl_log ("fishes");
- babl_fish_each (each_introspect, NULL);
+ babl_fish_class_for_each (each_introspect, NULL);
babl_log ("");
babl_set_extender (extender_backup);
Modified: trunk/babl/babl-model.c
==============================================================================
--- trunk/babl/babl-model.c (original)
+++ trunk/babl/babl-model.c Sat Jan 17 19:30:40 2009
@@ -209,12 +209,12 @@
if (!self)
self = babl_format_new (
- babl_model ("RGBA"),
- babl_type ("double"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
- babl_component ("A"),
+ 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"),
NULL);
return self;
}
@@ -226,7 +226,7 @@
int i;
argument[args++] = model;
- argument[args++] = babl_type ("double");
+ argument[args++] = babl_type_from_name ("double");
for (i = 0; i < model->model.components; i++)
{
Modified: trunk/babl/babl-sampling.c
==============================================================================
--- trunk/babl/babl-sampling.c (original)
+++ trunk/babl/babl-sampling.c Sat Jan 17 19:30:40 2009
@@ -52,8 +52,8 @@
}
void
-babl_sampling_each (BablEachFunction each_fun,
- void *user_data)
+babl_sampling_class_for_each (BablEachFunction each_fun,
+ void *user_data)
{
int horizontal;
int vertical;
@@ -69,13 +69,13 @@
void
-babl_sampling_destroy (void)
+babl_sampling_class_destroy (void)
{
- babl_sampling_each (each_babl_sampling_destroy, NULL);
+ babl_sampling_class_for_each (each_babl_sampling_destroy, NULL);
}
void
-babl_sampling_init (void)
+babl_sampling_class_init (void)
{
int horizontal;
int vertical;
Modified: trunk/babl/babl-sanity.c
==============================================================================
--- trunk/babl/babl-sanity.c (original)
+++ trunk/babl/babl-sanity.c Sat Jan 17 19:30:40 2009
@@ -45,7 +45,7 @@
{
for (i = 0; i < babl_list_size (list); i++)
{
- if (babl_conversion_destination ((Babl *) list->items[i]) == babl_type_id (BABL_DOUBLE))
+ if (babl_conversion_destination ((Babl *) list->items[i]) == babl_type_from_id (BABL_DOUBLE))
{
ok = 1;
break;
@@ -78,7 +78,7 @@
{
for (i = 0; i < babl_list_size (list); i++)
{
- if (babl_conversion_destination ((Babl *) list->items[i]) == babl_model_id (BABL_RGBA))
+ if (babl_conversion_destination ((Babl *) list->items[i]) == babl_model_from_id (BABL_RGBA))
{
ok = 1;
break;
@@ -115,17 +115,17 @@
{
OK=1;
- babl_type_each (id_sanity, NULL);
- babl_component_each (id_sanity, NULL);
- babl_model_each (id_sanity, NULL);
- babl_format_each (id_sanity, NULL);
-
- babl_type_each (type_sanity, NULL);
- babl_sampling_each (foo, NULL);
- babl_component_each (foo, NULL);
- babl_model_each (model_sanity, NULL);
- babl_format_each (foo, NULL);
- babl_conversion_each (foo, NULL);
+ babl_type_class_for_each (id_sanity, NULL);
+ babl_component_class_for_each (id_sanity, NULL);
+ babl_model_class_for_each (id_sanity, NULL);
+ babl_format_class_for_each (id_sanity, NULL);
+
+ babl_type_class_for_each (type_sanity, NULL);
+ babl_sampling_class_for_each (foo, NULL);
+ babl_component_class_for_each (foo, NULL);
+ babl_model_class_for_each (model_sanity, NULL);
+ babl_format_class_for_each (foo, NULL);
+ babl_conversion_class_for_each (foo, NULL);
return OK;
}
Modified: trunk/babl/babl-type.c
==============================================================================
--- trunk/babl/babl-type.c (original)
+++ trunk/babl/babl-type.c Sat Jan 17 19:30:40 2009
@@ -182,9 +182,9 @@
if (!self)
self = babl_format_new (
- babl_model ("Y"),
- babl_type ("double"),
- babl_component ("Y"),
+ babl_model_from_name ("Y"),
+ babl_type_from_name ("double"),
+ babl_component_from_name ("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 ("Y"),
+ fmt = babl_format_new (babl_model_from_name ("Y"),
babl,
- babl_component ("Y"),
+ babl_component_from_name ("Y"),
NULL);
fish_to = babl_fish_reference (ref_fmt, fmt);
fish_from = babl_fish_reference (fmt, ref_fmt);
Modified: trunk/babl/babl.c
==============================================================================
--- trunk/babl/babl.c (original)
+++ trunk/babl/babl.c Sat Jan 17 19:30:40 2009
@@ -28,19 +28,19 @@
if (ref_count++ == 0)
{
babl_internal_init ();
- babl_type_init ();
- babl_sampling_init ();
- babl_component_init ();
- babl_model_init ();
- babl_format_init ();
- babl_conversion_init ();
+ babl_type_class_init ();
+ babl_sampling_class_init ();
+ babl_component_class_init ();
+ babl_model_class_init ();
+ babl_format_class_init ();
+ babl_conversion_class_init ();
babl_core_init ();
babl_sanity ();
babl_extension_base ();
babl_sanity ();
- babl_extension_init ();
+ babl_extension_class_init ();
babl_sanity ();
- babl_fish_init ();
+ babl_fish_class_init ();
babl_sanity ();
}
}
@@ -62,14 +62,14 @@
}
}
- babl_extension_destroy ();
- babl_fish_destroy ();
- babl_conversion_destroy ();
- babl_format_destroy ();
- babl_model_destroy ();
- babl_component_destroy ();
- babl_sampling_destroy ();
- babl_type_destroy ();
+ babl_extension_class_destroy ();
+ babl_fish_class_destroy ();
+ babl_conversion_class_destroy ();
+ babl_format_class_destroy ();
+ babl_model_class_destroy ();
+ babl_component_class_destroy ();
+ babl_sampling_class_destroy ();
+ babl_type_class_destroy ();
babl_internal_destroy ();
babl_memory_sanity ();
}
Modified: trunk/babl/base/formats.c
==============================================================================
--- trunk/babl/base/formats.c (original)
+++ trunk/babl/base/formats.c Sat Jan 17 19:30:40 2009
@@ -26,286 +26,286 @@
babl_formats_init (void)
{
babl_format_new (
- babl_model_id (BABL_RGBA_GAMMA_2_2),
- babl_type_id (BABL_DOUBLE),
- babl_component_id (BABL_RED_GAMMA_2_2),
- babl_component_id (BABL_GREEN_GAMMA_2_2),
- babl_component_id (BABL_BLUE_GAMMA_2_2),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_RGBA_GAMMA_2_2),
+ babl_type_from_id (BABL_DOUBLE),
+ babl_component_from_id (BABL_RED_GAMMA_2_2),
+ babl_component_from_id (BABL_GREEN_GAMMA_2_2),
+ babl_component_from_id (BABL_BLUE_GAMMA_2_2),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_RGBA_GAMMA_2_2),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_RED_GAMMA_2_2),
- babl_component_id (BABL_GREEN_GAMMA_2_2),
- babl_component_id (BABL_BLUE_GAMMA_2_2),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_RGBA_GAMMA_2_2),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_RED_GAMMA_2_2),
+ babl_component_from_id (BABL_GREEN_GAMMA_2_2),
+ babl_component_from_id (BABL_BLUE_GAMMA_2_2),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_RGBA_GAMMA_2_2),
- babl_type_id (BABL_U16),
- babl_component_id (BABL_RED_GAMMA_2_2),
- babl_component_id (BABL_GREEN_GAMMA_2_2),
- babl_component_id (BABL_BLUE_GAMMA_2_2),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_RGBA_GAMMA_2_2),
+ babl_type_from_id (BABL_U16),
+ babl_component_from_id (BABL_RED_GAMMA_2_2),
+ babl_component_from_id (BABL_GREEN_GAMMA_2_2),
+ babl_component_from_id (BABL_BLUE_GAMMA_2_2),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_RGBA_GAMMA_2_2),
- babl_type_id (BABL_U8),
- babl_component_id (BABL_RED_GAMMA_2_2),
- babl_component_id (BABL_GREEN_GAMMA_2_2),
- babl_component_id (BABL_BLUE_GAMMA_2_2),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_RGBA_GAMMA_2_2),
+ babl_type_from_id (BABL_U8),
+ babl_component_from_id (BABL_RED_GAMMA_2_2),
+ babl_component_from_id (BABL_GREEN_GAMMA_2_2),
+ babl_component_from_id (BABL_BLUE_GAMMA_2_2),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_RED_GAMMA_2_2_MUL_ALPHA),
- babl_component_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA),
- babl_component_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_RED_GAMMA_2_2_MUL_ALPHA),
+ babl_component_from_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA),
+ babl_component_from_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED),
- babl_type_id (BABL_U16),
- babl_component_id (BABL_RED_GAMMA_2_2_MUL_ALPHA),
- babl_component_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA),
- babl_component_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED),
+ babl_type_from_id (BABL_U16),
+ babl_component_from_id (BABL_RED_GAMMA_2_2_MUL_ALPHA),
+ babl_component_from_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA),
+ babl_component_from_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED),
- babl_type_id (BABL_U8),
- babl_component_id (BABL_RED_GAMMA_2_2_MUL_ALPHA),
- babl_component_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA),
- babl_component_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED),
+ babl_type_from_id (BABL_U8),
+ babl_component_from_id (BABL_RED_GAMMA_2_2_MUL_ALPHA),
+ babl_component_from_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA),
+ babl_component_from_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_RGB_GAMMA_2_2),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_RED_GAMMA_2_2),
- babl_component_id (BABL_GREEN_GAMMA_2_2),
- babl_component_id (BABL_BLUE_GAMMA_2_2),
+ babl_model_from_id (BABL_RGB_GAMMA_2_2),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_RED_GAMMA_2_2),
+ babl_component_from_id (BABL_GREEN_GAMMA_2_2),
+ babl_component_from_id (BABL_BLUE_GAMMA_2_2),
NULL);
babl_format_new (
- babl_model_id (BABL_RGB_GAMMA_2_2),
- babl_type_id (BABL_U16),
- babl_component_id (BABL_RED_GAMMA_2_2),
- babl_component_id (BABL_GREEN_GAMMA_2_2),
- babl_component_id (BABL_BLUE_GAMMA_2_2),
+ babl_model_from_id (BABL_RGB_GAMMA_2_2),
+ babl_type_from_id (BABL_U16),
+ babl_component_from_id (BABL_RED_GAMMA_2_2),
+ babl_component_from_id (BABL_GREEN_GAMMA_2_2),
+ babl_component_from_id (BABL_BLUE_GAMMA_2_2),
NULL);
babl_format_new (
- babl_model_id (BABL_RGB_GAMMA_2_2),
- babl_type_id (BABL_U8),
- babl_component_id (BABL_RED_GAMMA_2_2),
- babl_component_id (BABL_GREEN_GAMMA_2_2),
- babl_component_id (BABL_BLUE_GAMMA_2_2),
+ babl_model_from_id (BABL_RGB_GAMMA_2_2),
+ babl_type_from_id (BABL_U8),
+ babl_component_from_id (BABL_RED_GAMMA_2_2),
+ babl_component_from_id (BABL_GREEN_GAMMA_2_2),
+ babl_component_from_id (BABL_BLUE_GAMMA_2_2),
NULL);
babl_format_new (
- babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_LUMA),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_LUMA_MUL_ALPHA),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_LUMA_MUL_ALPHA),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_GRAY_GAMMA_2_2),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_LUMA),
+ babl_model_from_id (BABL_GRAY_GAMMA_2_2),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_LUMA),
NULL);
babl_format_new (
- babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA),
- babl_type_id (BABL_U16),
- babl_component_id (BABL_LUMA),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA),
+ babl_type_from_id (BABL_U16),
+ babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED),
- babl_type_id (BABL_U16),
- babl_component_id (BABL_LUMA_MUL_ALPHA),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED),
+ babl_type_from_id (BABL_U16),
+ babl_component_from_id (BABL_LUMA_MUL_ALPHA),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_GRAY_GAMMA_2_2),
- babl_type_id (BABL_U16),
- babl_component_id (BABL_LUMA),
+ babl_model_from_id (BABL_GRAY_GAMMA_2_2),
+ babl_type_from_id (BABL_U16),
+ babl_component_from_id (BABL_LUMA),
NULL);
babl_format_new (
- babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA),
- babl_type_id (BABL_U8),
- babl_component_id (BABL_LUMA),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA),
+ babl_type_from_id (BABL_U8),
+ babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED),
- babl_type_id (BABL_U8),
- babl_component_id (BABL_LUMA_MUL_ALPHA),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED),
+ babl_type_from_id (BABL_U8),
+ babl_component_from_id (BABL_LUMA_MUL_ALPHA),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_GRAY_GAMMA_2_2),
- babl_type_id (BABL_U8),
- babl_component_id (BABL_LUMA),
+ babl_model_from_id (BABL_GRAY_GAMMA_2_2),
+ babl_type_from_id (BABL_U8),
+ babl_component_from_id (BABL_LUMA),
NULL);
babl_format_new (
"name", "Y'CbCr u8",
- babl_model_id (BABL_YCBCR),
- babl_type_id (BABL_U8_LUMA),
- babl_component_id (BABL_LUMA),
- babl_type_id (BABL_U8_CHROMA),
- babl_component_id (BABL_CB),
- babl_component_id (BABL_CR),
+ babl_model_from_id (BABL_YCBCR),
+ babl_type_from_id (BABL_U8_LUMA),
+ babl_component_from_id (BABL_LUMA),
+ babl_type_from_id (BABL_U8_CHROMA),
+ babl_component_from_id (BABL_CB),
+ babl_component_from_id (BABL_CR),
NULL);
babl_format_new (
- babl_model_id (BABL_YCBCR),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_LUMA),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_CB),
- babl_component_id (BABL_CR),
+ babl_model_from_id (BABL_YCBCR),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_LUMA),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_CB),
+ babl_component_from_id (BABL_CR),
NULL);
babl_format_new (
- babl_model_id (BABL_YCBCR_ALPHA),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_LUMA),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_CB),
- babl_component_id (BABL_CR),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_YCBCR_ALPHA),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_LUMA),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_CB),
+ babl_component_from_id (BABL_CR),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_RGBA),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_RED),
- babl_component_id (BABL_GREEN),
- babl_component_id (BABL_BLUE),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_RGBA),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_RED),
+ babl_component_from_id (BABL_GREEN),
+ babl_component_from_id (BABL_BLUE),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_RGBA),
- babl_type_id (BABL_U16),
- babl_component_id (BABL_RED),
- babl_component_id (BABL_GREEN),
- babl_component_id (BABL_BLUE),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_RGBA),
+ babl_type_from_id (BABL_U16),
+ babl_component_from_id (BABL_RED),
+ babl_component_from_id (BABL_GREEN),
+ babl_component_from_id (BABL_BLUE),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_RGBA),
- babl_type_id (BABL_DOUBLE),
- babl_component_id (BABL_RED),
- babl_component_id (BABL_GREEN),
- babl_component_id (BABL_BLUE),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_RGBA),
+ babl_type_from_id (BABL_DOUBLE),
+ babl_component_from_id (BABL_RED),
+ babl_component_from_id (BABL_GREEN),
+ babl_component_from_id (BABL_BLUE),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_RGBA),
- babl_type_id (BABL_U8),
- babl_component_id (BABL_RED),
- babl_component_id (BABL_GREEN),
- babl_component_id (BABL_BLUE),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_RGBA),
+ babl_type_from_id (BABL_U8),
+ babl_component_from_id (BABL_RED),
+ babl_component_from_id (BABL_GREEN),
+ babl_component_from_id (BABL_BLUE),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_RGBA_PREMULTIPLIED),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_RED_MUL_ALPHA),
- babl_component_id (BABL_GREEN_MUL_ALPHA),
- babl_component_id (BABL_BLUE_MUL_ALPHA),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_RGBA_PREMULTIPLIED),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_RED_MUL_ALPHA),
+ babl_component_from_id (BABL_GREEN_MUL_ALPHA),
+ babl_component_from_id (BABL_BLUE_MUL_ALPHA),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_RGBA_PREMULTIPLIED),
- babl_type_id (BABL_U16),
- babl_component_id (BABL_RED_MUL_ALPHA),
- babl_component_id (BABL_GREEN_MUL_ALPHA),
- babl_component_id (BABL_BLUE_MUL_ALPHA),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_RGBA_PREMULTIPLIED),
+ babl_type_from_id (BABL_U16),
+ babl_component_from_id (BABL_RED_MUL_ALPHA),
+ babl_component_from_id (BABL_GREEN_MUL_ALPHA),
+ babl_component_from_id (BABL_BLUE_MUL_ALPHA),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_RGBA_PREMULTIPLIED),
- babl_type_id (BABL_U8),
- babl_component_id (BABL_RED_MUL_ALPHA),
- babl_component_id (BABL_GREEN_MUL_ALPHA),
- babl_component_id (BABL_BLUE_MUL_ALPHA),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_RGBA_PREMULTIPLIED),
+ babl_type_from_id (BABL_U8),
+ babl_component_from_id (BABL_RED_MUL_ALPHA),
+ babl_component_from_id (BABL_GREEN_MUL_ALPHA),
+ babl_component_from_id (BABL_BLUE_MUL_ALPHA),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_RGB),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_RED),
- babl_component_id (BABL_GREEN),
- babl_component_id (BABL_BLUE),
+ babl_model_from_id (BABL_RGB),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_RED),
+ babl_component_from_id (BABL_GREEN),
+ babl_component_from_id (BABL_BLUE),
NULL);
babl_format_new (
- babl_model_id (BABL_RGB),
- babl_type_id (BABL_U16),
- babl_component_id (BABL_RED),
- babl_component_id (BABL_GREEN),
- babl_component_id (BABL_BLUE),
+ babl_model_from_id (BABL_RGB),
+ babl_type_from_id (BABL_U16),
+ babl_component_from_id (BABL_RED),
+ babl_component_from_id (BABL_GREEN),
+ babl_component_from_id (BABL_BLUE),
NULL);
babl_format_new (
- babl_model_id (BABL_RGB),
- babl_type_id (BABL_U8),
- babl_component_id (BABL_RED),
- babl_component_id (BABL_GREEN),
- babl_component_id (BABL_BLUE),
+ babl_model_from_id (BABL_RGB),
+ babl_type_from_id (BABL_U8),
+ babl_component_from_id (BABL_RED),
+ babl_component_from_id (BABL_GREEN),
+ babl_component_from_id (BABL_BLUE),
NULL);
babl_format_new (
- babl_model_id (BABL_GRAY_ALPHA),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_LUMINANCE),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_GRAY_ALPHA),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_LUMINANCE),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_LUMINANCE_MUL_ALPHA),
- babl_component_id (BABL_ALPHA),
+ 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_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_GRAY),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_LUMINANCE),
+ babl_model_from_id (BABL_GRAY),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_LUMINANCE),
NULL);
babl_format_new (
- babl_model_id (BABL_GRAY_ALPHA),
- babl_type_id (BABL_U16),
- babl_component_id (BABL_LUMINANCE),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_GRAY_ALPHA),
+ babl_type_from_id (BABL_U16),
+ babl_component_from_id (BABL_LUMINANCE),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED),
- babl_type_id (BABL_U16),
- babl_component_id (BABL_LUMINANCE_MUL_ALPHA),
- babl_component_id (BABL_ALPHA),
+ 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_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_GRAY),
- babl_type_id (BABL_U16),
- babl_component_id (BABL_LUMINANCE),
+ babl_model_from_id (BABL_GRAY),
+ babl_type_from_id (BABL_U16),
+ babl_component_from_id (BABL_LUMINANCE),
NULL);
babl_format_new (
- babl_model_id (BABL_GRAY_ALPHA),
- babl_type_id (BABL_U8),
- babl_component_id (BABL_LUMINANCE),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_GRAY_ALPHA),
+ babl_type_from_id (BABL_U8),
+ babl_component_from_id (BABL_LUMINANCE),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED),
- babl_type_id (BABL_U8),
- babl_component_id (BABL_LUMINANCE_MUL_ALPHA),
- babl_component_id (BABL_ALPHA),
+ 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_ALPHA),
NULL);
babl_format_new (
- babl_model_id (BABL_GRAY),
- babl_type_id (BABL_U8),
- babl_component_id (BABL_LUMINANCE),
+ babl_model_from_id (BABL_GRAY),
+ babl_type_from_id (BABL_U8),
+ babl_component_from_id (BABL_LUMINANCE),
NULL);
/* overriding name, since the generated name would be wrong due
@@ -313,28 +313,28 @@
*/
babl_format_new (
"name", "Y'CbCr u8",
- babl_model_id (BABL_YCBCR),
- babl_type_id (BABL_U8_LUMA),
- babl_component_id (BABL_LUMA),
- babl_type_id (BABL_U8_CHROMA),
- babl_component_id (BABL_CB),
- babl_component_id (BABL_CR),
- NULL);
- babl_format_new (
- babl_model_id (BABL_YCBCR),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_LUMA),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_CB),
- babl_component_id (BABL_CR),
- NULL);
- babl_format_new (
- babl_model_id (BABL_YCBCR_ALPHA),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_LUMA),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_CB),
- babl_component_id (BABL_CR),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_YCBCR),
+ babl_type_from_id (BABL_U8_LUMA),
+ babl_component_from_id (BABL_LUMA),
+ babl_type_from_id (BABL_U8_CHROMA),
+ babl_component_from_id (BABL_CB),
+ babl_component_from_id (BABL_CR),
+ NULL);
+ babl_format_new (
+ babl_model_from_id (BABL_YCBCR),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_LUMA),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_CB),
+ babl_component_from_id (BABL_CR),
+ NULL);
+ babl_format_new (
+ babl_model_from_id (BABL_YCBCR_ALPHA),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_LUMA),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_CB),
+ babl_component_from_id (BABL_CR),
+ babl_component_from_id (BABL_ALPHA),
NULL);
}
Modified: trunk/babl/base/model-gray.c
==============================================================================
--- trunk/babl/base/model-gray.c (original)
+++ trunk/babl/base/model-gray.c Sat Jan 17 19:30:40 2009
@@ -69,38 +69,38 @@
{
babl_model_new (
"id", BABL_GRAY,
- babl_component_id (BABL_LUMINANCE),
+ babl_component_from_id (BABL_LUMINANCE),
NULL);
babl_model_new (
"id", BABL_GRAY_ALPHA,
- babl_component_id (BABL_LUMINANCE),
- babl_component_id (BABL_ALPHA),
+ babl_component_from_id (BABL_LUMINANCE),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_model_new (
"id", BABL_GRAY_ALPHA_PREMULTIPLIED,
- babl_component_id (BABL_LUMINANCE_MUL_ALPHA),
- babl_component_id (BABL_ALPHA),
+ babl_component_from_id (BABL_LUMINANCE_MUL_ALPHA),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_model_new (
"id", BABL_GRAY_GAMMA_2_2,
- babl_component_id (BABL_LUMA),
+ babl_component_from_id (BABL_LUMA),
NULL);
babl_model_new (
"id", BABL_GRAY_GAMMA_2_2_ALPHA,
- babl_component_id (BABL_LUMA),
- babl_component_id (BABL_ALPHA),
+ babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_model_new (
"id", BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED,
- babl_component_id (BABL_LUMA_MUL_ALPHA),
- babl_component_id (BABL_ALPHA),
+ babl_component_from_id (BABL_LUMA_MUL_ALPHA),
+ babl_component_from_id (BABL_ALPHA),
NULL);
}
@@ -486,100 +486,100 @@
conversions (void)
{
babl_conversion_new (
- babl_model_id (BABL_GRAY_GAMMA_2_2),
- babl_model_id (BABL_RGBA),
+ babl_model_from_id (BABL_GRAY_GAMMA_2_2),
+ babl_model_from_id (BABL_RGBA),
"planar", gray_2_2_to_rgb,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_RGBA),
- babl_model_id (BABL_GRAY_GAMMA_2_2),
+ babl_model_from_id (BABL_RGBA),
+ babl_model_from_id (BABL_GRAY_GAMMA_2_2),
"planar", rgb_to_gray_2_2,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA),
- babl_model_id (BABL_RGBA),
+ babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA),
+ babl_model_from_id (BABL_RGBA),
"planar", gray_2_2_to_rgb,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_RGBA),
- babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA),
+ babl_model_from_id (BABL_RGBA),
+ babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA),
"planar", rgb_to_gray_2_2,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED),
- babl_model_id (BABL_RGBA),
+ babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED),
+ babl_model_from_id (BABL_RGBA),
"linear", gray_gamma_2_2_premultiplied2rgba,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_RGBA),
- babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED),
+ babl_model_from_id (BABL_RGBA),
+ babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED),
"linear", rgba2gray_gamma_2_2_premultiplied,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_GRAY),
- babl_model_id (BABL_RGBA),
+ babl_model_from_id (BABL_GRAY),
+ babl_model_from_id (BABL_RGBA),
"linear", gray_to_rgba,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_GRAY_ALPHA),
- babl_model_id (BABL_RGBA),
+ babl_model_from_id (BABL_GRAY_ALPHA),
+ babl_model_from_id (BABL_RGBA),
"linear", graya_to_rgba,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_RGBA),
- babl_model_id (BABL_GRAY_ALPHA),
+ babl_model_from_id (BABL_RGBA),
+ babl_model_from_id (BABL_GRAY_ALPHA),
"linear", rgba_to_graya,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_RGBA),
- babl_model_id (BABL_GRAY),
+ babl_model_from_id (BABL_RGBA),
+ babl_model_from_id (BABL_GRAY),
"linear", rgba_to_gray,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_GRAY_ALPHA),
- babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED),
+ babl_model_from_id (BABL_GRAY_ALPHA),
+ babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED),
"planar", non_premultiplied_to_premultiplied,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED),
- babl_model_id (BABL_GRAY_ALPHA),
+ babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED),
+ babl_model_from_id (BABL_GRAY_ALPHA),
"planar", premultiplied_to_non_premultiplied,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED),
- babl_model_id (BABL_RGBA),
+ babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED),
+ babl_model_from_id (BABL_RGBA),
"planar", gray_alpha_premultiplied_to_rgba,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_RGBA),
- babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED),
+ babl_model_from_id (BABL_RGBA),
+ babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED),
"planar", rgba_to_gray_alpha_premultiplied,
NULL
);
Modified: trunk/babl/base/model-rgb.c
==============================================================================
--- trunk/babl/base/model-rgb.c (original)
+++ trunk/babl/base/model-rgb.c Sat Jan 17 19:30:40 2009
@@ -111,40 +111,40 @@
{
babl_model_new (
"id", BABL_RGB,
- babl_component_id (BABL_RED),
- babl_component_id (BABL_GREEN),
- babl_component_id (BABL_BLUE),
+ babl_component_from_id (BABL_RED),
+ babl_component_from_id (BABL_GREEN),
+ babl_component_from_id (BABL_BLUE),
NULL);
babl_model_new (
"id", BABL_RGBA_PREMULTIPLIED,
- babl_component_id (BABL_RED_MUL_ALPHA),
- babl_component_id (BABL_GREEN_MUL_ALPHA),
- babl_component_id (BABL_BLUE_MUL_ALPHA),
- babl_component_id (BABL_ALPHA),
+ babl_component_from_id (BABL_RED_MUL_ALPHA),
+ babl_component_from_id (BABL_GREEN_MUL_ALPHA),
+ babl_component_from_id (BABL_BLUE_MUL_ALPHA),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_model_new (
"id", BABL_RGB_GAMMA_2_2,
- babl_component_id (BABL_RED_GAMMA_2_2),
- babl_component_id (BABL_GREEN_GAMMA_2_2),
- babl_component_id (BABL_BLUE_GAMMA_2_2),
+ babl_component_from_id (BABL_RED_GAMMA_2_2),
+ babl_component_from_id (BABL_GREEN_GAMMA_2_2),
+ babl_component_from_id (BABL_BLUE_GAMMA_2_2),
NULL);
babl_model_new (
"id", BABL_RGBA_GAMMA_2_2,
- babl_component_id (BABL_RED_GAMMA_2_2),
- babl_component_id (BABL_GREEN_GAMMA_2_2),
- babl_component_id (BABL_BLUE_GAMMA_2_2),
- babl_component_id (BABL_ALPHA),
+ babl_component_from_id (BABL_RED_GAMMA_2_2),
+ babl_component_from_id (BABL_GREEN_GAMMA_2_2),
+ babl_component_from_id (BABL_BLUE_GAMMA_2_2),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_model_new (
"id", BABL_RGBA_GAMMA_2_2_PREMULTIPLIED,
- babl_component_id (BABL_RED_GAMMA_2_2_MUL_ALPHA),
- babl_component_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA),
- babl_component_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA),
- babl_component_id (BABL_ALPHA),
+ babl_component_from_id (BABL_RED_GAMMA_2_2_MUL_ALPHA),
+ babl_component_from_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA),
+ babl_component_from_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA),
+ babl_component_from_id (BABL_ALPHA),
NULL);
}
@@ -401,73 +401,73 @@
conversions (void)
{
babl_conversion_new (
- babl_model_id (BABL_RGBA),
- babl_model_id (BABL_RGBA),
+ babl_model_from_id (BABL_RGBA),
+ babl_model_from_id (BABL_RGBA),
"planar", copy_strip_1,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_RGB),
- babl_model_id (BABL_RGBA),
+ babl_model_from_id (BABL_RGB),
+ babl_model_from_id (BABL_RGBA),
"planar", copy_strip_1,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_RGBA),
- babl_model_id (BABL_RGB),
+ babl_model_from_id (BABL_RGBA),
+ babl_model_from_id (BABL_RGB),
"planar", copy_strip_1,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_RGBA),
- babl_model_id (BABL_RGBA_PREMULTIPLIED),
+ babl_model_from_id (BABL_RGBA),
+ babl_model_from_id (BABL_RGBA_PREMULTIPLIED),
"planar", non_premultiplied_to_premultiplied,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_RGBA_PREMULTIPLIED),
- babl_model_id (BABL_RGBA),
+ babl_model_from_id (BABL_RGBA_PREMULTIPLIED),
+ babl_model_from_id (BABL_RGBA),
"planar", premultiplied_to_non_premultiplied,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_RGBA),
- babl_model_id (BABL_RGB_GAMMA_2_2),
+ babl_model_from_id (BABL_RGBA),
+ babl_model_from_id (BABL_RGB_GAMMA_2_2),
"planar", g3_gamma_2_2,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_RGB_GAMMA_2_2),
- babl_model_id (BABL_RGBA),
+ babl_model_from_id (BABL_RGB_GAMMA_2_2),
+ babl_model_from_id (BABL_RGBA),
"planar", g3_inv_gamma_2_2,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_RGBA),
- babl_model_id (BABL_RGBA_GAMMA_2_2),
+ babl_model_from_id (BABL_RGBA),
+ babl_model_from_id (BABL_RGBA_GAMMA_2_2),
"linear", rgba2rgba_gamma_2_2,
NULL);
babl_conversion_new (
- babl_model_id (BABL_RGBA_GAMMA_2_2),
- babl_model_id (BABL_RGBA),
+ babl_model_from_id (BABL_RGBA_GAMMA_2_2),
+ babl_model_from_id (BABL_RGBA),
"linear", rgba_gamma_2_22rgba,
NULL);
babl_conversion_new (
- babl_model_id (BABL_RGBA),
- babl_model_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED),
+ babl_model_from_id (BABL_RGBA),
+ babl_model_from_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED),
"linear", rgba2rgba_gamma_2_2_premultiplied,
NULL);
babl_conversion_new (
- babl_model_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED),
- babl_model_id (BABL_RGBA),
+ babl_model_from_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED),
+ babl_model_from_id (BABL_RGBA),
"linear", rgba_gamma_2_2_premultiplied2rgba,
NULL);
}
@@ -478,49 +478,49 @@
babl_format_new (
//"name", "srgb",
"id", BABL_SRGB,
- babl_model_id (BABL_RGB_GAMMA_2_2),
- babl_type_id (BABL_U8),
- babl_component_id (BABL_RED_GAMMA_2_2),
- babl_component_id (BABL_GREEN_GAMMA_2_2),
- babl_component_id (BABL_BLUE_GAMMA_2_2),
+ babl_model_from_id (BABL_RGB_GAMMA_2_2),
+ babl_type_from_id (BABL_U8),
+ babl_component_from_id (BABL_RED_GAMMA_2_2),
+ babl_component_from_id (BABL_GREEN_GAMMA_2_2),
+ babl_component_from_id (BABL_BLUE_GAMMA_2_2),
NULL);
babl_format_new (
"id", BABL_SRGBA,
- babl_model_id (BABL_RGBA_GAMMA_2_2),
- babl_type_id (BABL_U8),
- babl_component_id (BABL_RED_GAMMA_2_2),
- babl_component_id (BABL_GREEN_GAMMA_2_2),
- babl_component_id (BABL_BLUE_GAMMA_2_2),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_RGBA_GAMMA_2_2),
+ babl_type_from_id (BABL_U8),
+ babl_component_from_id (BABL_RED_GAMMA_2_2),
+ babl_component_from_id (BABL_GREEN_GAMMA_2_2),
+ babl_component_from_id (BABL_BLUE_GAMMA_2_2),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
"id", BABL_RGBA_FLOAT,
- babl_model_id (BABL_RGBA),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_RED),
- babl_component_id (BABL_GREEN),
- babl_component_id (BABL_BLUE),
- babl_component_id (BABL_ALPHA),
+ babl_model_from_id (BABL_RGBA),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_RED),
+ babl_component_from_id (BABL_GREEN),
+ babl_component_from_id (BABL_BLUE),
+ babl_component_from_id (BABL_ALPHA),
NULL);
babl_format_new (
"id", BABL_RGB_FLOAT,
- babl_model_id (BABL_RGB),
- babl_type_id (BABL_FLOAT),
- babl_component_id (BABL_RED),
- babl_component_id (BABL_GREEN),
- babl_component_id (BABL_BLUE),
+ babl_model_from_id (BABL_RGB),
+ babl_type_from_id (BABL_FLOAT),
+ babl_component_from_id (BABL_RED),
+ babl_component_from_id (BABL_GREEN),
+ babl_component_from_id (BABL_BLUE),
NULL);
#ifdef XXXX
babl_format_new (
"id", BABL_RGB565,
- babl_model_id (BABL_RGB),
- babl_component_id (BABL_RED),
- babl_component_id (BABL_GREEN),
- babl_component_id (BABL_BLUE),
+ babl_model_from_id (BABL_RGB),
+ babl_component_from_id (BABL_RED),
+ babl_component_from_id (BABL_GREEN),
+ babl_component_from_id (BABL_BLUE),
);
#endif
Modified: trunk/babl/base/model-ycbcr.c
==============================================================================
--- trunk/babl/base/model-ycbcr.c (original)
+++ trunk/babl/base/model-ycbcr.c Sat Jan 17 19:30:40 2009
@@ -60,17 +60,17 @@
{
babl_model_new (
"id", BABL_YCBCR,
- babl_component_id (BABL_LUMA),
- babl_component_id (BABL_CB),
- babl_component_id (BABL_CR),
+ babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_CB),
+ babl_component_from_id (BABL_CR),
NULL);
babl_model_new (
"id", BABL_YCBCR_ALPHA,
- babl_component_id (BABL_LUMA),
- babl_component_id (BABL_CB),
- babl_component_id (BABL_CR),
- babl_component_id (BABL_ALPHA),
+ babl_component_from_id (BABL_LUMA),
+ babl_component_from_id (BABL_CB),
+ babl_component_from_id (BABL_CR),
+ babl_component_from_id (BABL_ALPHA),
NULL);
}
@@ -209,26 +209,26 @@
conversions (void)
{
babl_conversion_new (
- babl_model_id (BABL_RGBA),
- babl_model_id (BABL_YCBCR),
+ babl_model_from_id (BABL_RGBA),
+ babl_model_from_id (BABL_YCBCR),
"linear", rgba_to_ycbcr,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_YCBCR),
- babl_model_id (BABL_RGBA),
+ babl_model_from_id (BABL_YCBCR),
+ babl_model_from_id (BABL_RGBA),
"linear", ycbcr_to_rgba,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_RGBA),
- babl_model_id (BABL_YCBCR_ALPHA),
+ babl_model_from_id (BABL_RGBA),
+ babl_model_from_id (BABL_YCBCR_ALPHA),
"linear", rgba_to_ycbcra,
NULL
);
babl_conversion_new (
- babl_model_id (BABL_YCBCR_ALPHA),
- babl_model_id (BABL_RGBA),
+ babl_model_from_id (BABL_YCBCR_ALPHA),
+ babl_model_from_id (BABL_RGBA),
"linear", ycbcra_to_rgba,
NULL
);
@@ -241,15 +241,15 @@
"name", "Y'CbCr u8",
"id", BABL_YCBCR420,
"planar",
- babl_model_id (BABL_YCBCR),
- babl_type_id (BABL_U8_LUMA),
+ babl_model_from_id (BABL_YCBCR),
+ babl_type_from_id (BABL_U8_LUMA),
babl_sampling (1, 1),
- babl_component_id (BABL_LUMA),
- babl_type_id (BABL_U8_CHROMA),
+ babl_component_from_id (BABL_LUMA),
+ babl_type_from_id (BABL_U8_CHROMA),
babl_sampling (2, 2),
- babl_component_id (BABL_CB),
+ babl_component_from_id (BABL_CB),
babl_sampling (2, 2),
- babl_component_id (BABL_CR),
+ babl_component_from_id (BABL_CR),
NULL);
return;
@@ -257,15 +257,15 @@
"name", "y'cbcr420",
"id", BABL_YCBCR420,
"planar",
- babl_model_id (BABL_YCBCR),
- babl_type_id (BABL_U8_LUMA),
+ babl_model_from_id (BABL_YCBCR),
+ babl_type_from_id (BABL_U8_LUMA),
babl_sampling (1, 1),
- babl_component_id (BABL_LUMA),
- babl_type_id (BABL_U8_CHROMA),
+ babl_component_from_id (BABL_LUMA),
+ babl_type_from_id (BABL_U8_CHROMA),
babl_sampling (2, 2),
- babl_component_id (BABL_CB),
+ babl_component_from_id (BABL_CB),
babl_sampling (2, 2),
- babl_component_id (BABL_CR),
+ babl_component_from_id (BABL_CR),
NULL);
@@ -273,29 +273,29 @@
"name", "y'cbcr422",
"id", BABL_YCBCR422,
"planar",
- babl_model_id (BABL_YCBCR),
- babl_type_id (BABL_U8_LUMA),
+ babl_model_from_id (BABL_YCBCR),
+ babl_type_from_id (BABL_U8_LUMA),
babl_sampling (1, 1),
- babl_component_id (BABL_LUMA),
- babl_type_id (BABL_U8_CHROMA),
+ babl_component_from_id (BABL_LUMA),
+ babl_type_from_id (BABL_U8_CHROMA),
babl_sampling (2, 1),
- babl_component_id (BABL_CB),
+ babl_component_from_id (BABL_CB),
babl_sampling (2, 1),
- babl_component_id (BABL_CR),
+ babl_component_from_id (BABL_CR),
NULL);
babl_format_new (
"name", "y'cbcr411",
"id", BABL_YCBCR411,
"planar",
- babl_model_id (BABL_YCBCR),
- babl_type_id (BABL_U8_LUMA),
+ babl_model_from_id (BABL_YCBCR),
+ babl_type_from_id (BABL_U8_LUMA),
babl_sampling (1, 1),
- babl_component_id (BABL_LUMA),
- babl_type_id (BABL_U8_CHROMA),
+ babl_component_from_id (BABL_LUMA),
+ babl_type_from_id (BABL_U8_CHROMA),
babl_sampling (4, 1),
- babl_component_id (BABL_CB),
+ babl_component_from_id (BABL_CB),
babl_sampling (4, 1),
- babl_component_id (BABL_CR),
+ babl_component_from_id (BABL_CR),
NULL);
}
Modified: trunk/babl/base/type-float.c
==============================================================================
--- trunk/babl/base/type-float.c (original)
+++ trunk/babl/base/type-float.c Sat Jan 17 19:30:40 2009
@@ -65,15 +65,15 @@
NULL);
babl_conversion_new (
- babl_type_id (BABL_FLOAT),
- babl_type_id (BABL_DOUBLE),
+ babl_type_from_id (BABL_FLOAT),
+ babl_type_from_id (BABL_DOUBLE),
"plane", convert_float_double,
NULL
);
babl_conversion_new (
- babl_type_id (BABL_DOUBLE),
- babl_type_id (BABL_FLOAT),
+ babl_type_from_id (BABL_DOUBLE),
+ babl_type_from_id (BABL_FLOAT),
"plane", convert_double_float,
NULL
);
Modified: trunk/babl/base/type-u16.c
==============================================================================
--- trunk/babl/base/type-u16.c (original)
+++ trunk/babl/base/type-u16.c Sat Jan 17 19:30:40 2009
@@ -119,15 +119,15 @@
NULL);
babl_conversion_new (
- babl_type_id (BABL_U16),
- babl_type_id (BABL_DOUBLE),
+ babl_type_from_id (BABL_U16),
+ babl_type_from_id (BABL_DOUBLE),
"plane", convert_u16_double,
NULL
);
babl_conversion_new (
- babl_type_id (BABL_DOUBLE),
- babl_type_id (BABL_U16),
+ babl_type_from_id (BABL_DOUBLE),
+ babl_type_from_id (BABL_U16),
"plane", convert_double_u16,
NULL
);
Modified: trunk/babl/base/type-u32.c
==============================================================================
--- trunk/babl/base/type-u32.c (original)
+++ trunk/babl/base/type-u32.c Sat Jan 17 19:30:40 2009
@@ -118,15 +118,15 @@
NULL);
babl_conversion_new (
- babl_type_id (BABL_U32),
- babl_type_id (BABL_DOUBLE),
+ babl_type_from_id (BABL_U32),
+ babl_type_from_id (BABL_DOUBLE),
"plane", convert_u32_double,
NULL
);
babl_conversion_new (
- babl_type_id (BABL_DOUBLE),
- babl_type_id (BABL_U32),
+ babl_type_from_id (BABL_DOUBLE),
+ babl_type_from_id (BABL_U32),
"plane", convert_double_u32,
NULL
);
Modified: trunk/babl/base/type-u8.c
==============================================================================
--- trunk/babl/base/type-u8.c (original)
+++ trunk/babl/base/type-u8.c Sat Jan 17 19:30:40 2009
@@ -140,38 +140,38 @@
NULL
);
babl_conversion_new (
- babl_type_id (BABL_U8),
- babl_type_id (BABL_DOUBLE),
+ babl_type_from_id (BABL_U8),
+ babl_type_from_id (BABL_DOUBLE),
"plane", convert_u8_double,
NULL
);
babl_conversion_new (
- babl_type_id (BABL_DOUBLE),
- babl_type_id (BABL_U8),
+ babl_type_from_id (BABL_DOUBLE),
+ babl_type_from_id (BABL_U8),
"plane", convert_double_u8,
NULL
);
babl_conversion_new (
- babl_type_id (BABL_U8_LUMA),
- babl_type_id (BABL_DOUBLE),
+ babl_type_from_id (BABL_U8_LUMA),
+ babl_type_from_id (BABL_DOUBLE),
"plane", convert_u8_luma_double,
NULL
);
babl_conversion_new (
- babl_type_id (BABL_DOUBLE),
- babl_type_id (BABL_U8_LUMA),
+ babl_type_from_id (BABL_DOUBLE),
+ babl_type_from_id (BABL_U8_LUMA),
"plane", convert_double_u8_luma,
NULL
);
babl_conversion_new (
- babl_type_id (BABL_U8_CHROMA),
- babl_type_id (BABL_DOUBLE),
+ babl_type_from_id (BABL_U8_CHROMA),
+ babl_type_from_id (BABL_DOUBLE),
"plane", convert_u8_chroma_double,
NULL
);
babl_conversion_new (
- babl_type_id (BABL_DOUBLE),
- babl_type_id (BABL_U8_CHROMA),
+ babl_type_from_id (BABL_DOUBLE),
+ babl_type_from_id (BABL_U8_CHROMA),
"plane", convert_double_u8_chroma,
NULL
);
Modified: trunk/extensions/CIE-Lab.c
==============================================================================
--- trunk/extensions/CIE-Lab.c (original)
+++ trunk/extensions/CIE-Lab.c Sat Jan 17 19:30:40 2009
@@ -55,17 +55,17 @@
{
babl_model_new (
"name", "CIE Lab",
- babl_component ("CIE L"),
- babl_component ("CIE a"),
- babl_component ("CIE b"),
+ babl_component_from_name ("CIE L"),
+ babl_component_from_name ("CIE a"),
+ babl_component_from_name ("CIE b"),
NULL);
babl_model_new (
"name", "CIE Lab alpha",
- babl_component ("CIE L"),
- babl_component ("CIE a"),
- babl_component ("CIE b"),
- babl_component ("A"),
+ babl_component_from_name ("CIE L"),
+ babl_component_from_name ("CIE a"),
+ babl_component_from_name ("CIE b"),
+ babl_component_from_name ("A"),
NULL);
}
@@ -232,26 +232,26 @@
conversions (void)
{
babl_conversion_new (
- babl_model ("RGBA"),
- babl_model ("CIE Lab"),
+ babl_model_from_name ("RGBA"),
+ babl_model_from_name ("CIE Lab"),
"linear", rgba_to_lab,
NULL
);
babl_conversion_new (
- babl_model ("CIE Lab"),
- babl_model ("RGBA"),
+ babl_model_from_name ("CIE Lab"),
+ babl_model_from_name ("RGBA"),
"linear", lab_to_rgba,
NULL
);
babl_conversion_new (
- babl_model ("RGBA"),
- babl_model ("CIE Lab alpha"),
+ babl_model_from_name ("RGBA"),
+ babl_model_from_name ("CIE Lab alpha"),
"linear", rgba_to_laba,
NULL
);
babl_conversion_new (
- babl_model ("CIE Lab alpha"),
- babl_model ("RGBA"),
+ babl_model_from_name ("CIE Lab alpha"),
+ babl_model_from_name ("RGBA"),
"linear", laba_to_rgba,
NULL
);
@@ -264,47 +264,47 @@
{
babl_format_new (
"name", "CIE Lab float",
- babl_model ("CIE Lab"),
+ babl_model_from_name ("CIE Lab"),
- babl_type ("float"),
- babl_component ("CIE L"),
- babl_component ("CIE a"),
- babl_component ("CIE b"),
+ babl_type_from_name ("float"),
+ babl_component_from_name ("CIE L"),
+ babl_component_from_name ("CIE a"),
+ babl_component_from_name ("CIE b"),
NULL);
babl_format_new (
"name", "CIE Lab alpha float",
- babl_model ("CIE Lab alpha"),
+ babl_model_from_name ("CIE Lab alpha"),
- babl_type ("double"),
- babl_component ("CIE L"),
- babl_component ("CIE a"),
- babl_component ("CIE b"),
- babl_component ("A"),
+ 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"),
NULL);
babl_format_new (
"name", "CIE Lab u8",
- babl_model ("CIE Lab"),
+ babl_model_from_name ("CIE Lab"),
- 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"),
+ 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"),
NULL);
babl_format_new (
"name", "CIE Lab u16",
- babl_model ("CIE Lab"),
+ babl_model_from_name ("CIE Lab"),
- 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"),
+ 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"),
NULL);
}
@@ -423,27 +423,27 @@
);
babl_conversion_new (
- babl_type ("CIE u8 L"),
- babl_type ("double"),
+ babl_type_from_name ("CIE u8 L"),
+ babl_type_from_name ("double"),
"plane", convert_u8_l_double,
NULL
);
babl_conversion_new (
- babl_type ("double"),
- babl_type ("CIE u8 L"),
+ babl_type_from_name ("double"),
+ babl_type_from_name ("CIE u8 L"),
"plane", convert_double_u8_l,
NULL
);
babl_conversion_new (
- babl_type ("CIE u8 ab"),
- babl_type ("double"),
+ babl_type_from_name ("CIE u8 ab"),
+ babl_type_from_name ("double"),
"plane", convert_u8_ab_double,
NULL
);
babl_conversion_new (
- babl_type ("double"),
- babl_type ("CIE u8 ab"),
+ babl_type_from_name ("double"),
+ babl_type_from_name ("CIE u8 ab"),
"plane", convert_double_u8_ab,
NULL
);
@@ -562,27 +562,27 @@
babl_conversion_new (
- babl_type ("CIE u16 L"),
- babl_type ("double"),
+ babl_type_from_name ("CIE u16 L"),
+ babl_type_from_name ("double"),
"plane", convert_u16_l_double,
NULL
);
babl_conversion_new (
- babl_type ("double"),
- babl_type ("CIE u16 L"),
+ babl_type_from_name ("double"),
+ babl_type_from_name ("CIE u16 L"),
"plane", convert_double_u16_l,
NULL
);
babl_conversion_new (
- babl_type ("CIE u16 ab"),
- babl_type ("double"),
+ babl_type_from_name ("CIE u16 ab"),
+ babl_type_from_name ("double"),
"plane", convert_u16_ab_double,
NULL
);
babl_conversion_new (
- babl_type ("double"),
- babl_type ("CIE u16 ab"),
+ babl_type_from_name ("double"),
+ babl_type_from_name ("CIE u16 ab"),
"plane", convert_double_u16_ab,
NULL
);
Modified: trunk/extensions/frequency.c
==============================================================================
--- trunk/extensions/frequency.c (original)
+++ trunk/extensions/frequency.c Sat Jan 17 19:30:40 2009
@@ -59,57 +59,57 @@
babl_model_new (
"name", "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"),
+ 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"),
NULL
);
babl_conversion_new (
- babl_model ("RGBA"),
- babl_model ("frequency"),
+ babl_model_from_name ("RGBA"),
+ babl_model_from_name ("frequency"),
"linear", rgba_to_frequency,
NULL
);
babl_conversion_new (
- babl_model ("frequency"),
- babl_model ("RGBA"),
+ babl_model_from_name ("frequency"),
+ babl_model_from_name ("RGBA"),
"linear", frequency_to_rgba,
NULL
);
babl_format_new (
"name", "frequency float",
- 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"),
+ 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"),
NULL
);
babl_format_new (
"name", "frequency double",
- 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"),
+ 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"),
NULL
);
Modified: trunk/extensions/gegl-fixups.c
==============================================================================
--- trunk/extensions/gegl-fixups.c (original)
+++ trunk/extensions/gegl-fixups.c Sat Jan 17 19:30:40 2009
@@ -527,63 +527,63 @@
init (void)
{
Babl *rgbaF = babl_format_new (
- babl_model ("RGBA"),
- babl_type ("float"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgbAF = babl_format_new (
- babl_model ("RaGaBaA"),
- babl_type ("float"),
- babl_component ("Ra"),
- babl_component ("Ga"),
- babl_component ("Ba"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *lrgba8 = babl_format_new (
- babl_model ("RGBA"),
- babl_type ("u8"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgba8 = babl_format_new (
- babl_model ("R'G'B'A"),
- babl_type ("u8"),
- babl_component ("R'"),
- babl_component ("G'"),
- babl_component ("B'"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *bgrA8 = babl_format_new (
"name", "B'aG'aR'aA u8",
- babl_model ("R'aG'aB'aA"),
- babl_type ("u8"),
- babl_component ("B'a"),
- babl_component ("G'a"),
- babl_component ("R'a"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgb8 = babl_format_new (
- babl_model ("R'G'B'"),
- babl_type ("u8"),
- babl_component ("R'"),
- babl_component ("G'"),
- babl_component ("B'"),
+ 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'"),
NULL);
Babl *sdl32 = babl_format_new (
"name", "B'aG'aR'aPAD u8",
- babl_model ("R'G'B'"),
- babl_type ("u8"),
- babl_component ("B'"),
- babl_component ("G'"),
- babl_component ("R'"),
- babl_component ("PAD"),
+ 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"),
NULL);
table_init ();
Modified: trunk/extensions/gggl-lies.c
==============================================================================
--- trunk/extensions/gggl-lies.c (original)
+++ trunk/extensions/gggl-lies.c Sat Jan 17 19:30:40 2009
@@ -1796,158 +1796,158 @@
init (void)
{
Babl *rgbaF = babl_format_new (
- babl_model ("RGBA"),
- babl_type ("float"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgba16 = babl_format_new (
- babl_model ("RGBA"),
- babl_type ("u16"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgbaD = babl_format_new (
- babl_model ("RGBA"),
- babl_type ("double"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgba8 = babl_format_new (
- babl_model ("RGBA"),
- babl_type ("u8"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgbAF = babl_format_new (
- babl_model ("RaGaBaA"),
- babl_type ("float"),
- babl_component ("Ra"),
- babl_component ("Ga"),
- babl_component ("Ba"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgbA16 = babl_format_new (
- babl_model ("RaGaBaA"),
- babl_type ("u16"),
- babl_component ("Ra"),
- babl_component ("Ga"),
- babl_component ("Ba"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgbA8 = babl_format_new (
- babl_model ("RaGaBaA"),
- babl_type ("u8"),
- babl_component ("Ra"),
- babl_component ("Ga"),
- babl_component ("Ba"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgbF = babl_format_new (
- babl_model ("RGB"),
- babl_type ("float"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
+ 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"),
NULL);
Babl *rgb16 = babl_format_new (
- babl_model ("RGB"),
- babl_type ("u16"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
+ 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"),
NULL);
Babl *rgb8 = babl_format_new (
- babl_model ("RGB"),
- babl_type ("u8"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
+ 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"),
NULL);
Babl *gaF = babl_format_new (
- babl_model ("YA"),
- babl_type ("float"),
- babl_component ("Y"),
- babl_component ("A"),
+ babl_model_from_name ("YA"),
+ babl_type_from_name ("float"),
+ babl_component_from_name ("Y"),
+ babl_component_from_name ("A"),
NULL);
Babl *gAF = babl_format_new (
- babl_model ("YaA"),
- babl_type ("float"),
- babl_component ("Ya"),
- babl_component ("A"),
+ babl_model_from_name ("YaA"),
+ babl_type_from_name ("float"),
+ babl_component_from_name ("Ya"),
+ babl_component_from_name ("A"),
NULL);
Babl *gF = babl_format_new (
- babl_model ("Y"),
- babl_type ("float"),
- babl_component ("Y"),
+ babl_model_from_name ("Y"),
+ babl_type_from_name ("float"),
+ babl_component_from_name ("Y"),
NULL);
Babl *ga16 = babl_format_new (
- babl_model ("YA"),
- babl_type ("u16"),
- babl_component ("Y"),
- babl_component ("A"),
+ babl_model_from_name ("YA"),
+ babl_type_from_name ("u16"),
+ babl_component_from_name ("Y"),
+ babl_component_from_name ("A"),
NULL);
Babl *gA16 = babl_format_new (
- babl_model ("YaA"),
- babl_type ("u16"),
- babl_component ("Ya"),
- babl_component ("A"),
+ babl_model_from_name ("YaA"),
+ babl_type_from_name ("u16"),
+ babl_component_from_name ("Ya"),
+ babl_component_from_name ("A"),
NULL);
Babl *g16 = babl_format_new (
- babl_model ("Y"),
- babl_type ("u16"),
- babl_component ("Y"),
+ babl_model_from_name ("Y"),
+ babl_type_from_name ("u16"),
+ babl_component_from_name ("Y"),
NULL);
Babl *ga8 = babl_format_new (
- babl_model ("YA"),
- babl_type ("u8"),
- babl_component ("Y"),
- babl_component ("A"),
+ babl_model_from_name ("YA"),
+ babl_type_from_name ("u8"),
+ babl_component_from_name ("Y"),
+ babl_component_from_name ("A"),
NULL);
Babl *gA8 = babl_format_new (
- babl_model ("YaA"),
- babl_type ("u8"),
- babl_component ("Ya"),
- babl_component ("A"),
+ babl_model_from_name ("YaA"),
+ babl_type_from_name ("u8"),
+ babl_component_from_name ("Ya"),
+ babl_component_from_name ("A"),
NULL);
Babl *g8 = babl_format_new (
- babl_model ("Y"),
- babl_type ("u8"),
- babl_component ("Y"),
+ babl_model_from_name ("Y"),
+ babl_type_from_name ("u8"),
+ babl_component_from_name ("Y"),
NULL);
Babl *yuv8 = babl_format_new (
"name", "Y'CbCr u8",
- babl_model ("Y'CbCr"),
- babl_type ("u8-luma"),
- babl_component ("Y'"),
- babl_type ("u8-chroma"),
- babl_component ("Cb"),
- babl_component ("Cr"),
+ 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"),
NULL);
Babl *yuvF = babl_format_new (
- babl_model ("Y'CbCr"),
- babl_type ("float"),
- babl_component ("Y'"),
- babl_type ("float"),
- babl_component ("Cb"),
- babl_component ("Cr"),
+ 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"),
NULL);
Babl *yuvaF = babl_format_new (
- babl_model ("Y'CbCrA"),
- babl_type ("float"),
- babl_component ("Y'"),
- babl_type ("float"),
- babl_component ("Cb"),
- babl_component ("Cr"),
- babl_component ("A"),
+ 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"),
NULL);
#define o(src, dst) \
Modified: trunk/extensions/gggl.c
==============================================================================
--- trunk/extensions/gggl.c (original)
+++ trunk/extensions/gggl.c Sat Jan 17 19:30:40 2009
@@ -1887,158 +1887,158 @@
init (void)
{
Babl *rgbaD = babl_format_new (
- babl_model ("R'G'B'A"),
- babl_type ("double"),
- babl_component ("R'"),
- babl_component ("G'"),
- babl_component ("B'"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgbaF = babl_format_new (
- babl_model ("R'G'B'A"),
- babl_type ("float"),
- babl_component ("R'"),
- babl_component ("G'"),
- babl_component ("B'"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgba16 = babl_format_new (
- babl_model ("R'G'B'A"),
- babl_type ("u16"),
- babl_component ("R'"),
- babl_component ("G'"),
- babl_component ("B'"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgba8 = babl_format_new (
- babl_model ("R'G'B'A"),
- babl_type ("u8"),
- babl_component ("R'"),
- babl_component ("G'"),
- babl_component ("B'"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgbAF = babl_format_new (
- babl_model ("R'aG'aB'aA"),
- babl_type ("float"),
- babl_component ("R'a"),
- babl_component ("G'a"),
- babl_component ("B'a"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgbA16 = babl_format_new (
- babl_model ("R'aG'aB'aA"),
- babl_type ("u16"),
- babl_component ("R'a"),
- babl_component ("G'a"),
- babl_component ("B'a"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgbA8 = babl_format_new (
- babl_model ("R'aG'aB'aA"),
- babl_type ("u8"),
- babl_component ("R'a"),
- babl_component ("G'a"),
- babl_component ("B'a"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgbF = babl_format_new (
- babl_model ("R'G'B'"),
- babl_type ("float"),
- babl_component ("R'"),
- babl_component ("G'"),
- babl_component ("B'"),
+ 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'"),
NULL);
Babl *rgb16 = babl_format_new (
- babl_model ("R'G'B'"),
- babl_type ("u16"),
- babl_component ("R'"),
- babl_component ("G'"),
- babl_component ("B'"),
+ 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'"),
NULL);
Babl *rgb8 = babl_format_new (
- babl_model ("R'G'B'"),
- babl_type ("u8"),
- babl_component ("R'"),
- babl_component ("G'"),
- babl_component ("B'"),
+ 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'"),
NULL);
Babl *gaF = babl_format_new (
- babl_model ("Y'A"),
- babl_type ("float"),
- babl_component ("Y'"),
- babl_component ("A"),
+ babl_model_from_name ("Y'A"),
+ babl_type_from_name ("float"),
+ babl_component_from_name ("Y'"),
+ babl_component_from_name ("A"),
NULL);
Babl *gAF = babl_format_new (
- babl_model ("Y'aA"),
- babl_type ("float"),
- babl_component ("Y'a"),
- babl_component ("A"),
+ babl_model_from_name ("Y'aA"),
+ babl_type_from_name ("float"),
+ babl_component_from_name ("Y'a"),
+ babl_component_from_name ("A"),
NULL);
Babl *gF = babl_format_new (
- babl_model ("Y'"),
- babl_type ("float"),
- babl_component ("Y'"),
+ babl_model_from_name ("Y'"),
+ babl_type_from_name ("float"),
+ babl_component_from_name ("Y'"),
NULL);
Babl *ga16 = babl_format_new (
- babl_model ("Y'A"),
- babl_type ("u16"),
- babl_component ("Y'"),
- babl_component ("A"),
+ babl_model_from_name ("Y'A"),
+ babl_type_from_name ("u16"),
+ babl_component_from_name ("Y'"),
+ babl_component_from_name ("A"),
NULL);
Babl *gA16 = babl_format_new (
- babl_model ("Y'aA"),
- babl_type ("u16"),
- babl_component ("Y'a"),
- babl_component ("A"),
+ babl_model_from_name ("Y'aA"),
+ babl_type_from_name ("u16"),
+ babl_component_from_name ("Y'a"),
+ babl_component_from_name ("A"),
NULL);
Babl *g16 = babl_format_new (
- babl_model ("Y'"),
- babl_type ("u16"),
- babl_component ("Y'"),
+ babl_model_from_name ("Y'"),
+ babl_type_from_name ("u16"),
+ babl_component_from_name ("Y'"),
NULL);
Babl *ga8 = babl_format_new (
- babl_model ("Y'A"),
- babl_type ("u8"),
- babl_component ("Y'"),
- babl_component ("A"),
+ babl_model_from_name ("Y'A"),
+ babl_type_from_name ("u8"),
+ babl_component_from_name ("Y'"),
+ babl_component_from_name ("A"),
NULL);
Babl *gA8 = babl_format_new (
- babl_model ("Y'aA"),
- babl_type ("u8"),
- babl_component ("Y'a"),
- babl_component ("A"),
+ babl_model_from_name ("Y'aA"),
+ babl_type_from_name ("u8"),
+ babl_component_from_name ("Y'a"),
+ babl_component_from_name ("A"),
NULL);
Babl *g8 = babl_format_new (
- babl_model ("Y'"),
- babl_type ("u8"),
- babl_component ("Y'"),
+ babl_model_from_name ("Y'"),
+ babl_type_from_name ("u8"),
+ babl_component_from_name ("Y'"),
NULL);
Babl *yuv8 = babl_format_new (
"name", "Y'CbCr u8",
- babl_model ("Y'CbCr"),
- babl_type ("u8-luma"),
- babl_component ("Y'"),
- babl_type ("u8-chroma"),
- babl_component ("Cb"),
- babl_component ("Cr"),
+ 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"),
NULL);
Babl *yuvF = babl_format_new (
- babl_model ("Y'CbCr"),
- babl_type ("float"),
- babl_component ("Y'"),
- babl_type ("float"),
- babl_component ("Cb"),
- babl_component ("Cr"),
+ 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"),
NULL);
Babl *yuvaF = babl_format_new (
- babl_model ("Y'CbCrA"),
- babl_type ("float"),
- babl_component ("Y'"),
- babl_type ("float"),
- babl_component ("Cb"),
- babl_component ("Cr"),
- babl_component ("A"),
+ 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"),
NULL);
#define o(src, dst) \
Modified: trunk/extensions/gimp-8bit.c
==============================================================================
--- trunk/extensions/gimp-8bit.c (original)
+++ trunk/extensions/gimp-8bit.c Sat Jan 17 19:30:40 2009
@@ -354,82 +354,82 @@
init (void)
{
Babl *rgbaF_linear = babl_format_new (
- babl_model ("RGBA"),
- babl_type ("float"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgba8_linear = babl_format_new (
- babl_model ("RGBA"),
- babl_type ("u8"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgba8_gamma_2_2 = babl_format_new (
- babl_model ("R'G'B'A"),
- babl_type ("u8"),
- babl_component ("R'"),
- babl_component ("G'"),
- babl_component ("B'"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgbF_linear = babl_format_new (
- babl_model ("RGB"),
- babl_type ("float"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
+ 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"),
NULL);
Babl *rgb8_linear = babl_format_new (
- babl_model ("RGB"),
- babl_type ("u8"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
+ 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"),
NULL);
Babl *rgb8_gamma_2_2 = babl_format_new (
- babl_model ("R'G'B'"),
- babl_type ("u8"),
- babl_component ("R'"),
- babl_component ("G'"),
- babl_component ("B'"),
+ 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'"),
NULL);
Babl *gaF_linear = babl_format_new (
- babl_model ("YA"),
- babl_type ("float"),
- babl_component ("Y"),
- babl_component ("A"),
+ babl_model_from_name ("YA"),
+ babl_type_from_name ("float"),
+ babl_component_from_name ("Y"),
+ babl_component_from_name ("A"),
NULL);
Babl *ga8_linear = babl_format_new (
- babl_model ("YA"),
- babl_type ("u8"),
- babl_component ("Y"),
- babl_component ("A"),
+ babl_model_from_name ("YA"),
+ babl_type_from_name ("u8"),
+ babl_component_from_name ("Y"),
+ babl_component_from_name ("A"),
NULL);
Babl *ga8_gamma_2_2 = babl_format_new (
- babl_model ("Y'A"),
- babl_type ("u8"),
- babl_component ("Y'"),
- babl_component ("A"),
+ babl_model_from_name ("Y'A"),
+ babl_type_from_name ("u8"),
+ babl_component_from_name ("Y'"),
+ babl_component_from_name ("A"),
NULL);
Babl *gF_linear = babl_format_new (
- babl_model ("Y"),
- babl_type ("float"),
- babl_component ("Y"),
+ babl_model_from_name ("Y"),
+ babl_type_from_name ("float"),
+ babl_component_from_name ("Y"),
NULL);
Babl *g8_linear = babl_format_new (
- babl_model ("Y"),
- babl_type ("u8"),
- babl_component ("Y"),
+ babl_model_from_name ("Y"),
+ babl_type_from_name ("u8"),
+ babl_component_from_name ("Y"),
NULL);
Babl *g8_gamma_2_2 = babl_format_new (
- babl_model ("Y'"),
- babl_type ("u8"),
- babl_component ("Y'"),
+ babl_model_from_name ("Y'"),
+ babl_type_from_name ("u8"),
+ babl_component_from_name ("Y'"),
NULL);
tables_init ();
Modified: trunk/extensions/naive-CMYK.c
==============================================================================
--- trunk/extensions/naive-CMYK.c (original)
+++ trunk/extensions/naive-CMYK.c Sat Jan 17 19:30:40 2009
@@ -44,34 +44,34 @@
babl_model_new (
"name", "CMYK",
- babl_component ("cyan"),
- babl_component ("magenta"),
- babl_component ("yellow"),
- babl_component ("key"),
+ babl_component_from_name ("cyan"),
+ babl_component_from_name ("magenta"),
+ babl_component_from_name ("yellow"),
+ babl_component_from_name ("key"),
NULL
);
babl_conversion_new (
- babl_model ("RGBA"),
- babl_model ("CMYK"),
+ babl_model_from_name ("RGBA"),
+ babl_model_from_name ("CMYK"),
"linear", rgba_to_cmyk,
NULL
);
babl_conversion_new (
- babl_model ("CMYK"),
- babl_model ("RGBA"),
+ babl_model_from_name ("CMYK"),
+ babl_model_from_name ("RGBA"),
"linear", cmyk_to_rgba,
NULL
);
babl_format_new (
"name", "CMYK float",
- babl_model ("CMYK"),
- babl_type ("float"),
- babl_component ("cyan"),
- babl_component ("yellow"),
- babl_component ("magenta"),
- babl_component ("key"),
+ 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"),
NULL
);
Modified: trunk/extensions/sse-fixups.c
==============================================================================
--- trunk/extensions/sse-fixups.c (original)
+++ trunk/extensions/sse-fixups.c Sat Jan 17 19:30:40 2009
@@ -175,27 +175,27 @@
#if defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX)
Babl *rgbaF_linear = babl_format_new (
- babl_model ("RGBA"),
- babl_type ("float"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgba8_linear = babl_format_new (
- babl_model ("RGBA"),
- babl_type ("u8"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
- babl_component ("A"),
+ 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"),
NULL);
Babl *rgb8_linear = babl_format_new (
- babl_model ("RGB"),
- babl_type ("u8"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
+ 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"),
NULL);
if ((babl_cpu_accel_get_support () & BABL_CPU_ACCEL_X86_MMX) &&
Modified: trunk/tests/babl-html-dump.c
==============================================================================
--- trunk/tests/babl-html-dump.c (original)
+++ trunk/tests/babl-html-dump.c Sat Jan 17 19:30:40 2009
@@ -39,36 +39,36 @@
printf ("<br/><a href='javascript:");
printf ("show(\"x_types\");show(\"x_models\");show(\"x_formats\");show(\"x_conversions\");");
- babl_type_each (show_item, NULL);
- babl_model_each (show_item, NULL);
- babl_format_each (show_item, NULL);
+ babl_type_class_for_each (show_item, NULL);
+ babl_model_class_for_each (show_item, NULL);
+ babl_format_class_for_each (show_item, NULL);
/* babl_conversion_each (show_item, NULL);*/
printf ("'>+</a>");
printf ("<a href='javascript:");
printf ("hide(\"x_types\");hide(\"x_models\");hide(\"x_formats\");hide(\"x_conversions\");");
- babl_type_each (hide_item, NULL);
- babl_model_each (hide_item, NULL);
- babl_format_each (hide_item, NULL);
+ babl_type_class_for_each (hide_item, NULL);
+ babl_model_class_for_each (hide_item, NULL);
+ babl_format_class_for_each (hide_item, NULL);
/*babl_conversion_each (hide_item, NULL);*/
printf ("'>-</a>");
printf ("<div class='expander'>");
printf ("<div class='expander_title'><a style='font-size:110%%' name='Data-types' href='javascript:toggle_visible(\"x_types\")'>Data types</a></div><div class='expander_content' id='x_types'>\n");
- babl_type_each (each_item, NULL);
+ babl_type_class_for_each (each_item, NULL);
printf ("</div>\n");
printf ("</div>\n");
printf ("<div class='expander'>");
printf ("<div class='expander_title'><a style='font-size:110%%' name='Color-models' href='javascript:toggle_visible(\"x_models\")'>Color models</a></div><div class='expander_content' id='x_models'>\n");
- babl_model_each (each_item, NULL);
+ babl_model_class_for_each (each_item, NULL);
printf ("</div>\n");
printf ("</div>\n");
printf ("<div class='expander'>");
printf ("<div class='expander_title'><a style='font-size:110%%' name='Pixel-formats' href='javascript:toggle_visible(\"x_formats\")'>Pixel formats</a></div><div class='expander_content' id='x_formats'>\n");
- babl_format_each (each_item, NULL);
+ babl_format_class_for_each (each_item, NULL);
printf ("</div>\n");
printf ("</div>\n");
Modified: trunk/tests/babl_fish_path_fitness.c
==============================================================================
--- trunk/tests/babl_fish_path_fitness.c (original)
+++ trunk/tests/babl_fish_path_fitness.c Sat Jan 17 19:30:40 2009
@@ -63,7 +63,7 @@
static int source_each (Babl *babl,
void *userdata)
{
- babl_format_each (destination_each, babl);
+ babl_format_class_for_each (destination_each, babl);
printf ("ââ%2i %s\n", source_no++, babl->instance.name);
return 0;
}
@@ -74,7 +74,7 @@
test_init ();
babl_set_extender (babl_extension_quiet_log ());
- babl_format_each (source_each, NULL);
+ babl_format_class_for_each (source_each, NULL);
{
int i;
Modified: trunk/tests/conversions.c
==============================================================================
--- trunk/tests/conversions.c (original)
+++ trunk/tests/conversions.c Sat Jan 17 19:30:40 2009
@@ -28,7 +28,7 @@
babl_init ();
babl_set_extender (babl_extension_quiet_log ());
- babl_conversion_each (each_conversion, NULL);
+ babl_conversion_class_for_each (each_conversion, NULL);
babl_destroy ();
Modified: trunk/tests/formats.c
==============================================================================
--- trunk/tests/formats.c (original)
+++ trunk/tests/formats.c Sat Jan 17 19:30:40 2009
@@ -18,7 +18,7 @@
babl_init ();
babl_set_extender (babl_extension_quiet_log ());
- babl_format_each (format_check, (void *) 1);
+ babl_format_class_for_each (format_check, (void *) 1);
babl_destroy ();
Modified: trunk/tests/grayscale_to_rgb.c
==============================================================================
--- trunk/tests/grayscale_to_rgb.c (original)
+++ trunk/tests/grayscale_to_rgb.c Sat Jan 17 19:30:40 2009
@@ -37,17 +37,17 @@
fish = babl_fish (
babl_format_new (
- babl_model ("Y"),
- babl_type ("float"),
- babl_component ("Y"),
+ babl_model_from_name ("Y"),
+ babl_type_from_name ("float"),
+ babl_component_from_name ("Y"),
NULL
),
babl_format_new (
- babl_model ("RGB"),
- babl_type ("float"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
+ 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"),
NULL
)
);
Modified: trunk/tests/models.c
==============================================================================
--- trunk/tests/models.c (original)
+++ trunk/tests/models.c Sat Jan 17 19:30:40 2009
@@ -25,7 +25,7 @@
babl_init ();
babl_set_extender (babl_extension_quiet_log ());
- babl_model_each (model_check, NULL);
+ babl_model_class_for_each (model_check, NULL);
babl_destroy ();
Modified: trunk/tests/rgb_to_bgr.c
==============================================================================
--- trunk/tests/rgb_to_bgr.c (original)
+++ trunk/tests/rgb_to_bgr.c Sat Jan 17 19:30:40 2009
@@ -44,19 +44,19 @@
fish = babl_fish (
babl_format_new (
- babl_model ("RGB"),
- babl_type ("u8"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
+ 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"),
NULL
),
babl_format_new (
- babl_model ("RGB"),
- babl_type ("u8"),
- babl_component ("B"),
- babl_component ("G"),
- babl_component ("R"),
+ 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"),
NULL
)
);
Modified: trunk/tests/rgb_to_ycbcr.c
==============================================================================
--- trunk/tests/rgb_to_ycbcr.c (original)
+++ trunk/tests/rgb_to_ycbcr.c Sat Jan 17 19:30:40 2009
@@ -51,19 +51,19 @@
fish = babl_fish (
babl_format_new (
- babl_model ("RGB"),
- babl_type ("float"),
- babl_component ("R"),
- babl_component ("G"),
- babl_component ("B"),
+ 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"),
NULL
),
babl_format_new (
- babl_model ("Y'CbCr"),
- babl_type ("float"),
- babl_component ("Y'"),
- babl_component ("Cb"),
- babl_component ("Cr"),
+ 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"),
NULL
)
);
Modified: trunk/tests/types.c
==============================================================================
--- trunk/tests/types.c (original)
+++ trunk/tests/types.c Sat Jan 17 19:30:40 2009
@@ -19,7 +19,7 @@
babl_init ();
babl_set_extender (babl_extension_quiet_log ());
- babl_type_each (type_check, NULL);
+ babl_type_class_for_each (type_check, NULL);
babl_destroy ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
