gegl r2881 - in trunk: . bin bindings/rgegl/src examples examples/util gegl gegl/buffer gegl/graph gegl/operation gegl/property-types operations/affine operations/common operations/core operations/external operations/generated operations/workshop operations/workshop/external operations/workshop/generated tests/buffer tests/buffer/tests
- From: martinn svn gnome org
- To: svn-commits-list gnome org
- Subject: gegl r2881 - in trunk: . bin bindings/rgegl/src examples examples/util gegl gegl/buffer gegl/graph gegl/operation gegl/property-types operations/affine operations/common operations/core operations/external operations/generated operations/workshop operations/workshop/external operations/workshop/generated tests/buffer tests/buffer/tests
- Date: Tue, 20 Jan 2009 19:37:42 +0000 (UTC)
Author: martinn
Date: Tue Jan 20 19:37:42 2009
New Revision: 2881
URL: http://svn.gnome.org/viewvc/gegl?rev=2881&view=rev
Log:
Adjust to babl API adjustment by doing
s/babl_foo_from_name/babl_foo/
* lots of files
Modified:
trunk/ChangeLog
trunk/bin/gegl-path-spiro.c (props changed)
trunk/bin/gegl-path-spiro.h (props changed)
trunk/bindings/rgegl/src/rgegl-node.c
trunk/examples/gegl-paint.c
trunk/examples/util/gegl-view.c
trunk/gegl/buffer/gegl-buffer-access.c
trunk/gegl/buffer/gegl-buffer-iterator.h
trunk/gegl/buffer/gegl-buffer-linear.c
trunk/gegl/buffer/gegl-buffer-load.c
trunk/gegl/buffer/gegl-buffer.c
trunk/gegl/buffer/gegl-cache.c
trunk/gegl/buffer/gegl-sampler-cubic.c
trunk/gegl/buffer/gegl-sampler-lanczos.c
trunk/gegl/buffer/gegl-sampler-linear.c
trunk/gegl/buffer/gegl-sampler-nearest.c
trunk/gegl/buffer/gegl-sampler-sharp.c
trunk/gegl/buffer/gegl-sampler-yafr.c
trunk/gegl/buffer/gegl-tile-backend-file.c
trunk/gegl/buffer/gegl-tile-handler-zoom.c
trunk/gegl/gegl-matrix.c (props changed)
trunk/gegl/gegl-matrix.h (props changed)
trunk/gegl/graph/gegl-node.c
trunk/gegl/operation/gegl-operation-area-filter.c
trunk/gegl/operation/gegl-operation-context.c
trunk/gegl/operation/gegl-operation-point-composer.c
trunk/gegl/operation/gegl-operation-point-composer3.c
trunk/gegl/operation/gegl-operation-point-filter.c
trunk/gegl/operation/gegl-operation-point-render.c
trunk/gegl/operation/gegl-operation-temporal.c
trunk/gegl/property-types/gegl-path.c (contents, props changed)
trunk/gegl/property-types/gegl-path.h (props changed)
trunk/operations/affine/affine.c
trunk/operations/common/bilateral-filter.c
trunk/operations/common/box-blur.c
trunk/operations/common/brightness-contrast.c
trunk/operations/common/c2g.c
trunk/operations/common/checkerboard.c
trunk/operations/common/color-temperature.c
trunk/operations/common/color.c
trunk/operations/common/contrast-curve.c
trunk/operations/common/fractal-explorer.c
trunk/operations/common/gaussian-blur.c
trunk/operations/common/grey.c
trunk/operations/common/introspect.c
trunk/operations/common/mblur.c
trunk/operations/common/mono-mixer.c
trunk/operations/common/noise.c
trunk/operations/common/opacity.c
trunk/operations/common/raw-load.c
trunk/operations/common/remap.c
trunk/operations/common/snn-mean.c
trunk/operations/common/stress.c
trunk/operations/common/stretch-contrast.c
trunk/operations/common/svg-huerotate.c
trunk/operations/common/svg-luminancetoalpha.c
trunk/operations/common/svg-matrix.c
trunk/operations/common/svg-saturate.c
trunk/operations/common/threshold.c
trunk/operations/common/whitebalance.c
trunk/operations/core/convert-format.c
trunk/operations/external/display.c
trunk/operations/external/exr-load.cpp
trunk/operations/external/ff-load.c
trunk/operations/external/jpg-load.c
trunk/operations/external/openraw.c
trunk/operations/external/path.c
trunk/operations/external/pixbuf.c
trunk/operations/external/png-load.c
trunk/operations/external/png-save.c
trunk/operations/external/save-pixbuf.c
trunk/operations/external/svg-load.c
trunk/operations/external/text.c
trunk/operations/external/v4l.c
trunk/operations/generated/math.rb
trunk/operations/generated/other-blend.rb
trunk/operations/generated/svg-12-blend.rb
trunk/operations/generated/svg-12-porter-duff.rb
trunk/operations/workshop/box-max.c
trunk/operations/workshop/box-min.c
trunk/operations/workshop/box-percentile.c
trunk/operations/workshop/color-reduction.c
trunk/operations/workshop/demosaic-bimedian.c
trunk/operations/workshop/demosaic-simple.c
trunk/operations/workshop/disc-percentile.c
trunk/operations/workshop/external/ff-save.c
trunk/operations/workshop/external/gluas.c
trunk/operations/workshop/external/gtk-display.c
trunk/operations/workshop/external/line-profile.c
trunk/operations/workshop/generated/blend.rb
trunk/operations/workshop/hstack.c
trunk/operations/workshop/kuwahara-max.c
trunk/operations/workshop/kuwahara-min.c
trunk/operations/workshop/kuwahara.c
trunk/operations/workshop/lens-correct.c
trunk/operations/workshop/linear-gradient.c
trunk/operations/workshop/mandelbrot.c
trunk/operations/workshop/radial-gradient.c
trunk/operations/workshop/rawbayer-load.c
trunk/operations/workshop/snn-percentile.c
trunk/tests/buffer/buffer-test.c
trunk/tests/buffer/tests/buffer_inherit_parent_extent.c
trunk/tests/buffer/tests/buffer_shift_diagonal.c
trunk/tests/buffer/tests/buffer_shift_horizontal.c
trunk/tests/buffer/tests/buffer_shift_vertical.c
trunk/tests/buffer/tests/disabled_abyss.c
trunk/tests/buffer/tests/get_shifted.c
trunk/tests/buffer/tests/linear_from_data.c
trunk/tests/buffer/tests/linear_from_data_rows.c
trunk/tests/buffer/tests/linear_modify.c
trunk/tests/buffer/tests/linear_new.c
trunk/tests/buffer/tests/linear_proxy_modify.c
trunk/tests/buffer/tests/sub_rect_fills_and_gets.c
trunk/tests/buffer/tests/sub_sub_fill.c
trunk/tests/buffer/tests/sub_sub_fill2.c
trunk/tests/buffer/tests/test_blank.c
trunk/tests/buffer/tests/test_checkerboard.c
trunk/tests/buffer/tests/test_gegl_buffer_copy.c
trunk/tests/buffer/tests/test_gegl_buffer_copy_lower_left.c
trunk/tests/buffer/tests/test_gegl_buffer_copy_lower_right.c
trunk/tests/buffer/tests/test_gegl_buffer_copy_self.c
trunk/tests/buffer/tests/test_gegl_buffer_copy_upper_left.c
trunk/tests/buffer/tests/test_gegl_buffer_copy_upper_right.c
trunk/tests/buffer/tests/test_gegl_buffer_duplicate.c
trunk/tests/buffer/tests/test_gegl_buffer_iterator1.c
trunk/tests/buffer/tests/test_gegl_buffer_iterator1sub.c
trunk/tests/buffer/tests/test_gegl_buffer_iterator2.c
trunk/tests/buffer/tests/test_gegl_buffer_iterator2sub.c
trunk/tests/buffer/tests/test_gegl_buffer_iterator3.c
trunk/tests/buffer/tests/test_gegl_buffer_iterator3sub.c
trunk/tests/buffer/tests/test_gegl_buffer_iterator4.c
trunk/tests/buffer/tests/test_gegl_buffer_iterator4sub.c
trunk/tests/buffer/tests/test_get_buffer_scaled.c
trunk/tests/buffer/tests/test_get_buffer_scaled2.c
trunk/tests/buffer/tests/test_gray.c
trunk/tests/buffer/tests/test_rectangle.c
trunk/tests/buffer/tests/test_sample.c
trunk/tests/buffer/tests/vertical_gradient.c
Modified: trunk/bindings/rgegl/src/rgegl-node.c
==============================================================================
--- trunk/bindings/rgegl/src/rgegl-node.c (original)
+++ trunk/bindings/rgegl/src/rgegl-node.c Tue Jan 20 19:37:42 2009
@@ -166,7 +166,7 @@
Babl *format;
GeglBlitFlags flags;
- format = babl_format_from_name (RVAL2CSTR (r_format));
+ format = babl_format (RVAL2CSTR (r_format));
if (!format)
{
return Qnil;
Modified: trunk/examples/gegl-paint.c
==============================================================================
--- trunk/examples/gegl-paint.c (original)
+++ trunk/examples/gegl-paint.c Tue Jan 20 19:37:42 2009
@@ -141,8 +141,8 @@
gpointer buf;
buffer = gegl_buffer_new (&(GeglRectangle){0, 0, 512, 512},
- babl_format_from_name("RaGaBaA float"));
- buf = gegl_buffer_linear_open (buffer, NULL, NULL, babl_format_from_name ("Y' u8"));
+ babl_format("RaGaBaA float"));
+ buf = gegl_buffer_linear_open (buffer, NULL, NULL, babl_format ("Y' u8"));
memset (buf, 255, 512 * 512); /* FIXME: we need a babl_buffer_paint () */
gegl_buffer_linear_close (buffer, buf);
}
Modified: trunk/examples/util/gegl-view.c
==============================================================================
--- trunk/examples/util/gegl-view.c (original)
+++ trunk/examples/util/gegl-view.c Tue Jan 20 19:37:42 2009
@@ -461,7 +461,7 @@
gegl_node_blit (priv->node,
priv->scale,
&roi,
- babl_format_from_name ("R'G'B' u8"),
+ babl_format ("R'G'B' u8"),
(gpointer)buf,
GEGL_AUTO_ROWSTRIDE,
GEGL_BLIT_CACHE|(priv->block?0:GEGL_BLIT_DIRTY));
Modified: trunk/gegl/buffer/gegl-buffer-access.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-access.c (original)
+++ trunk/gegl/buffer/gegl-buffer-access.c Tue Jan 20 19:37:42 2009
@@ -1030,7 +1030,7 @@
* no time to make a fast implementation
*/
- if (BABL (format)->format.type[0] == (BablType *) babl_type_from_name ("u8")
+ if (BABL (format)->format.type[0] == (BablType *) babl_type ("u8")
&& !(level == 0 && scale > 1.99))
{ /* do box-filter resampling if we're 8bit (which projections are) */
Modified: trunk/gegl/buffer/gegl-buffer-iterator.h
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-iterator.h (original)
+++ trunk/gegl/buffer/gegl-buffer-iterator.h Tue Jan 20 19:37:42 2009
@@ -98,7 +98,7 @@
GeglBufferIterator *gi;
gi = gegl_buffer_iterator_new (buffer, roi,
- babl_format_from_name("Y' float"), GEGL_BUFFER_WRITE);
+ babl_format("Y' float"), GEGL_BUFFER_WRITE);
while (gegl_buffer_iterator_next (gi))
{
gfloat *buf = gi->data[0];
Modified: trunk/gegl/buffer/gegl-buffer-linear.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-linear.c (original)
+++ trunk/gegl/buffer/gegl-buffer-linear.c Tue Jan 20 19:37:42 2009
@@ -23,7 +23,7 @@
}
if (format==NULL)
- format = babl_format_from_name ("RGBA float");
+ format = babl_format ("RGBA float");
if (rowstride <= 0)
rowstride = extent->width;
Modified: trunk/gegl/buffer/gegl-buffer-load.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer-load.c (original)
+++ trunk/gegl/buffer/gegl-buffer-load.c Tue Jan 20 19:37:42 2009
@@ -359,7 +359,7 @@
info->tile_size = info->header.tile_width *
info->header.tile_height *
info->header.bytes_per_pixel;
- info->format = babl_format_from_name (info->header.description);
+ info->format = babl_format (info->header.description);
ret = g_object_new (GEGL_TYPE_BUFFER,
"format", info->format,
Modified: trunk/gegl/buffer/gegl-buffer.c
==============================================================================
--- trunk/gegl/buffer/gegl-buffer.c (original)
+++ trunk/gegl/buffer/gegl-buffer.c Tue Jan 20 19:37:42 2009
@@ -103,7 +103,7 @@
guint gegl_buffer_signals[LAST_SIGNAL] = { 0 };
-static GeglBuffer * gegl_buffer_new_from_format (const void *babl_format_from_name,
+static GeglBuffer * gegl_buffer_new_from_format (const void *babl_format,
gint x,
gint y,
gint width,
@@ -485,7 +485,7 @@
{
storage = GEGL_TILE_SOURCE (g_object_new (GEGL_TYPE_TILE_STORAGE,
"path", buffer->path,
- "format", babl_format_from_name ("RGBA float"),
+ "format", babl_format ("RGBA float"),
NULL));
}
@@ -873,7 +873,7 @@
extent = ∅
if (format==NULL)
- format = babl_format_from_name ("RGBA float");
+ format = babl_format ("RGBA float");
return g_object_new (GEGL_TYPE_BUFFER,
"x", extent->x,
@@ -895,7 +895,7 @@
extent = ∅
if (format==NULL)
- format = babl_format_from_name ("RGBA float");
+ format = babl_format ("RGBA float");
return g_object_new (GEGL_TYPE_BUFFER,
"x", extent->x,
@@ -963,7 +963,7 @@
static GeglBuffer *
-gegl_buffer_new_from_format (const void *babl_format_from_name,
+gegl_buffer_new_from_format (const void *babl_format,
gint x,
gint y,
gint width,
@@ -981,7 +981,7 @@
g_str_equal (gegl_config()->swap, "ram"))
{
tile_storage = g_object_new (GEGL_TYPE_TILE_STORAGE,
- "format", babl_format_from_name,
+ "format", babl_format,
"tile-width", tile_width,
"tile-height", tile_height,
NULL);
@@ -996,7 +996,7 @@
#if 0
filename = g_strdup_printf ("GEGL-%i-%s-%i.swap",
getpid (),
- babl_name ((Babl *) babl_format_from_name),
+ babl_name ((Babl *) babl_format),
no++);
#endif
@@ -1005,7 +1005,7 @@
g_free (filename);
tile_storage = g_object_new (GEGL_TYPE_TILE_STORAGE,
- "format", babl_format_from_name,
+ "format", babl_format,
"tile-width", tile_width,
"tile-height", tile_height,
"path", path,
Modified: trunk/gegl/buffer/gegl-cache.c
==============================================================================
--- trunk/gegl/buffer/gegl-cache.c (original)
+++ trunk/gegl/buffer/gegl-cache.c Tue Jan 20 19:37:42 2009
@@ -191,7 +191,7 @@
/* thus providing a default value for GeglCache, that overrides the NULL
* from GeglBuffer */
- GEGL_BUFFER (self)->format = (gpointer) babl_format_from_name ("R'G'B'A u8");
+ GEGL_BUFFER (self)->format = (gpointer) babl_format ("R'G'B'A u8");
}
static void
@@ -351,7 +351,7 @@
buf[i*4+2]=25;
buf[i*4+3]=40;
}
- gegl_buffer_set (buffer, rectangle, babl_format_from_name ("RGBA u8"), buf);
+ gegl_buffer_set (buffer, rectangle, babl_format ("RGBA u8"), buf);
g_free (buf);
}
#endif
Modified: trunk/gegl/buffer/gegl-sampler-cubic.c
==============================================================================
--- trunk/gegl/buffer/gegl-sampler-cubic.c (original)
+++ trunk/gegl/buffer/gegl-sampler-cubic.c Tue Jan 20 19:37:42 2009
@@ -93,7 +93,7 @@
gegl_sampler_cubic_init (GeglSamplerCubic *self)
{
GEGL_SAMPLER (self)->context_rect= (GeglRectangle){-1,-1,4,4};
- GEGL_SAMPLER (self)->interpolate_format = babl_format_from_name ("RaGaBaA float");
+ GEGL_SAMPLER (self)->interpolate_format = babl_format ("RaGaBaA float");
self->b=1.0;
self->c=0.0;
self->type = g_strdup("cubic");
Modified: trunk/gegl/buffer/gegl-sampler-lanczos.c
==============================================================================
--- trunk/gegl/buffer/gegl-sampler-lanczos.c (original)
+++ trunk/gegl/buffer/gegl-sampler-lanczos.c Tue Jan 20 19:37:42 2009
@@ -161,7 +161,7 @@
gfloat x_kernel[width2], /* 1-D kernels of Lanczos window coeffs */
y_kernel[width2];
- self->interpolate_format = babl_format_from_name ("RaGaBaA float");
+ self->interpolate_format = babl_format ("RaGaBaA float");
dx = (gint) ((x - ((gint) x)) * spp + 0.5);
dy = (gint) ((y - ((gint) y)) * spp + 0.5);
Modified: trunk/gegl/buffer/gegl-sampler-linear.c
==============================================================================
--- trunk/gegl/buffer/gegl-sampler-linear.c (original)
+++ trunk/gegl/buffer/gegl-sampler-linear.c Tue Jan 20 19:37:42 2009
@@ -104,7 +104,7 @@
gegl_sampler_linear_init (GeglSamplerLinear *self)
{
GEGL_SAMPLER (self)->context_rect = (GeglRectangle){ 0, 0, 2, 2 };
- GEGL_SAMPLER (self)->interpolate_format = babl_format_from_name ("RaGaBaA float");
+ GEGL_SAMPLER (self)->interpolate_format = babl_format ("RaGaBaA float");
}
static void
Modified: trunk/gegl/buffer/gegl-sampler-nearest.c
==============================================================================
--- trunk/gegl/buffer/gegl-sampler-nearest.c (original)
+++ trunk/gegl/buffer/gegl-sampler-nearest.c Tue Jan 20 19:37:42 2009
@@ -59,7 +59,7 @@
gegl_sampler_nearest_init (GeglSamplerNearest *self)
{
GEGL_SAMPLER (self)->context_rect = (GeglRectangle){0,0,1,1};
- GEGL_SAMPLER (self)->interpolate_format = babl_format_from_name ("RGBA float");
+ GEGL_SAMPLER (self)->interpolate_format = babl_format ("RGBA float");
}
void
Modified: trunk/gegl/buffer/gegl-sampler-sharp.c
==============================================================================
--- trunk/gegl/buffer/gegl-sampler-sharp.c (original)
+++ trunk/gegl/buffer/gegl-sampler-sharp.c Tue Jan 20 19:37:42 2009
@@ -258,7 +258,7 @@
* "non-centered" stencil (one based at the corner) instead.
*/
GEGL_SAMPLER (self)->context_rect = (GeglRectangle){-2,-2,5,5};
- GEGL_SAMPLER (self)->interpolate_format = babl_format_from_name ("RaGaBaA float");
+ GEGL_SAMPLER (self)->interpolate_format = babl_format ("RaGaBaA float");
}
static inline gfloat
Modified: trunk/gegl/buffer/gegl-sampler-yafr.c
==============================================================================
--- trunk/gegl/buffer/gegl-sampler-yafr.c (original)
+++ trunk/gegl/buffer/gegl-sampler-yafr.c Tue Jan 20 19:37:42 2009
@@ -132,7 +132,7 @@
*/
GEGL_SAMPLER (self)->context_rect = (GeglRectangle){-1,-1,4,4};
- GEGL_SAMPLER (self)->interpolate_format = babl_format_from_name ("RaGaBaA float");
+ GEGL_SAMPLER (self)->interpolate_format = babl_format ("RaGaBaA float");
}
static inline gfloat
Modified: trunk/gegl/buffer/gegl-tile-backend-file.c
==============================================================================
--- trunk/gegl/buffer/gegl-tile-backend-file.c (original)
+++ trunk/gegl/buffer/gegl-tile-backend-file.c Tue Jan 20 19:37:42 2009
@@ -916,7 +916,7 @@
/* we are overriding all of the work of the actual constructor here */
backend->tile_width = self->header.tile_width;
backend->tile_height = self->header.tile_height;
- backend->format = babl_format_from_name (self->header.description);
+ backend->format = babl_format (self->header.description);
backend->px_size = backend->format->format.bytes_per_pixel;
backend->tile_size = backend->tile_width * backend->tile_height * backend->px_size;
Modified: trunk/gegl/buffer/gegl-tile-handler-zoom.c
==============================================================================
--- trunk/gegl/buffer/gegl-tile-handler-zoom.c (original)
+++ trunk/gegl/buffer/gegl-tile-handler-zoom.c Tue Jan 20 19:37:42 2009
@@ -183,11 +183,11 @@
if (i) dst_data += bpp * width / 2;
if (j) dst_data += bpp * width * height / 2;
- if (format->format.type[0] == (BablType *) babl_type_from_name ("float"))
+ if (format->format.type[0] == (BablType *) babl_type ("float"))
{
downscale_float (components, width, height, width * bpp, src_data, dst_data);
}
- else if (format->format.type[0] == (BablType *) babl_type_from_name ("u8"))
+ else if (format->format.type[0] == (BablType *) babl_type ("u8"))
{
downscale_u8 (components, width, height, width * bpp, src_data, dst_data);
}
Modified: trunk/gegl/graph/gegl-node.c
==============================================================================
--- trunk/gegl/graph/gegl-node.c (original)
+++ trunk/gegl/graph/gegl-node.c Tue Jan 20 19:37:42 2009
@@ -1832,7 +1832,7 @@
format = gegl_pad_get_format (pad);
if (!format)
{
- format = babl_format_from_name ("RGBA float");
+ format = babl_format ("RGBA float");
}
node->cache = g_object_new (GEGL_TYPE_CACHE,
Modified: trunk/gegl/operation/gegl-operation-area-filter.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-area-filter.c (original)
+++ trunk/gegl/operation/gegl-operation-area-filter.c Tue Jan 20 19:37:42 2009
@@ -67,8 +67,8 @@
static void prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "input", babl_format_from_name ("RGBA float"));
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "input", babl_format ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static GeglRectangle
Modified: trunk/gegl/operation/gegl-operation-context.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-context.c (original)
+++ trunk/gegl/operation/gegl-operation-context.c Tue Jan 20 19:37:42 2009
@@ -325,7 +325,7 @@
if (!empty)
{
GeglRectangle rect={0,0,0,0};
- empty = gegl_buffer_new (&rect, babl_format_from_name ("RGBA float"));
+ empty = gegl_buffer_new (&rect, babl_format ("RGBA float"));
}
return empty;
}
@@ -352,7 +352,7 @@
{
g_warning ("no format for %s presuming RGBA float\n",
gegl_node_get_debug_name (node));
- format = babl_format_from_name ("RGBA float");
+ format = babl_format ("RGBA float");
}
g_assert (format != NULL);
g_assert (!strcmp (padname, "output"));
Modified: trunk/gegl/operation/gegl-operation-point-composer.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-point-composer.c (original)
+++ trunk/gegl/operation/gegl-operation-point-composer.c Tue Jan 20 19:37:42 2009
@@ -45,7 +45,7 @@
static void prepare (GeglOperation *operation)
{
- Babl *format = babl_format_from_name ("RGBA float");
+ Babl *format = babl_format ("RGBA float");
gegl_operation_set_format (operation, "input", format);
gegl_operation_set_format (operation, "aux", format);
gegl_operation_set_format (operation, "output", format);
Modified: trunk/gegl/operation/gegl-operation-point-composer3.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-point-composer3.c (original)
+++ trunk/gegl/operation/gegl-operation-point-composer3.c Tue Jan 20 19:37:42 2009
@@ -46,7 +46,7 @@
static void prepare (GeglOperation *operation)
{
- Babl *format = babl_format_from_name ("RGBA float");
+ Babl *format = babl_format ("RGBA float");
gegl_operation_set_format (operation, "input", format);
gegl_operation_set_format (operation, "aux", format);
gegl_operation_set_format (operation, "aux2", format);
Modified: trunk/gegl/operation/gegl-operation-point-filter.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-point-filter.c (original)
+++ trunk/gegl/operation/gegl-operation-point-filter.c Tue Jan 20 19:37:42 2009
@@ -41,8 +41,8 @@
static void prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "input", babl_format_from_name ("RGBA float"));
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "input", babl_format ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static void
Modified: trunk/gegl/operation/gegl-operation-point-render.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-point-render.c (original)
+++ trunk/gegl/operation/gegl-operation-point-render.c Tue Jan 20 19:37:42 2009
@@ -40,7 +40,7 @@
static void prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static GeglNode *
Modified: trunk/gegl/operation/gegl-operation-temporal.c
==============================================================================
--- trunk/gegl/operation/gegl-operation-temporal.c (original)
+++ trunk/gegl/operation/gegl-operation-temporal.c Tue Jan 20 19:37:42 2009
@@ -118,8 +118,8 @@
static void gegl_operation_temporal_prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGB u8"));
- gegl_operation_set_format (operation, "input", babl_format_from_name ("RGB u8"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGB u8"));
+ gegl_operation_set_format (operation, "input", babl_format ("RGB u8"));
}
static void
@@ -150,7 +150,7 @@
* input
*/
priv->frame_store =
- gegl_buffer_new (&((GeglRectangle){0,0,4096,4096*600}), babl_format_from_name ("RGB u8"));
+ gegl_buffer_new (&((GeglRectangle){0,0,4096,4096*600}), babl_format ("RGB u8"));
;
}
Modified: trunk/gegl/property-types/gegl-path.c
==============================================================================
--- trunk/gegl/property-types/gegl-path.c (original)
+++ trunk/gegl/property-types/gegl-path.c Tue Jan 20 19:37:42 2009
@@ -1745,7 +1745,7 @@
gint i;
if (!format)
- format = babl_format_from_name ("RaGaBaA float");
+ format = babl_format ("RaGaBaA float");
if (!buf || len < roi->width)
{
@@ -1973,7 +1973,7 @@
}
if (s.format == NULL)
- s.format = babl_format_from_name ("RaGaBaA float");
+ s.format = babl_format ("RaGaBaA float");
if (s.buf == NULL ||
s.radius != radius)
Modified: trunk/operations/affine/affine.c
==============================================================================
--- trunk/operations/affine/affine.c (original)
+++ trunk/operations/affine/affine.c Tue Jan 20 19:37:42 2009
@@ -145,7 +145,7 @@
GType desired_type;
GeglInterpolation interpolation;
- format = babl_format_from_name ("RaGaBaA float");
+ format = babl_format ("RaGaBaA float");
interpolation = gegl_buffer_interpolation_from_string (self->filter);
desired_type = gegl_sampler_type_from_interpolation (interpolation);
@@ -181,7 +181,7 @@
prepare (GeglOperation *operation)
{
OpAffine *affine = (OpAffine *) operation;
- Babl *format = babl_format_from_name ("RaGaBaA float");
+ Babl *format = babl_format ("RaGaBaA float");
op_affine_sampler_init (affine);
/*gegl_operation_set_format (operation, "input", format);
gegl_operation_set_format (operation, "aux", format); XXX(not used yet) */
@@ -672,7 +672,7 @@
gint dest_pixels;
- format = babl_format_from_name ("RaGaBaA float");
+ format = babl_format ("RaGaBaA float");
/* XXX: fast paths as existing in files in the same dir as affine.c
* should probably be hooked in here, and bailing out before using
Modified: trunk/operations/common/bilateral-filter.c
==============================================================================
--- trunk/operations/common/bilateral-filter.c (original)
+++ trunk/operations/common/bilateral-filter.c Tue Jan 20 19:37:42 2009
@@ -51,8 +51,8 @@
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
area->left = area->right = area->top = area->bottom = ceil (o->blur_radius);
- gegl_operation_set_format (operation, "input", babl_format_from_name ("RGBA float"));
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "input", babl_format ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static gboolean
@@ -101,7 +101,7 @@
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count(src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count(dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
@@ -156,7 +156,7 @@
dst_buf[offset*4+u] = accumulated[u]/count;
offset++;
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RGBA float"), dst_buf,
+ gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf,
GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
Modified: trunk/operations/common/box-blur.c
==============================================================================
--- trunk/operations/common/box-blur.c (original)
+++ trunk/operations/common/box-blur.c Tue Jan 20 19:37:42 2009
@@ -140,7 +140,7 @@
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RaGaBaA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RaGaBaA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
for (v=0; v<gegl_buffer_get_height (dst); v++)
@@ -162,7 +162,7 @@
dst_buf [offset++] = components[i];
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RaGaBaA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (dst, NULL, babl_format ("RaGaBaA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
@@ -182,7 +182,7 @@
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RaGaBaA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RaGaBaA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset=0;
for (v=0; v<gegl_buffer_get_height (dst); v++)
@@ -204,7 +204,7 @@
dst_buf [offset++] = components[c];
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RaGaBaA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (dst, NULL, babl_format ("RaGaBaA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
@@ -223,7 +223,7 @@
op_area->bottom = ceil (o->radius);
gegl_operation_set_format (operation, "output",
- babl_format_from_name ("RaGaBaA float"));
+ babl_format ("RaGaBaA float"));
}
static gboolean
@@ -236,7 +236,7 @@
GeglBuffer *temp;
temp = gegl_buffer_new (gegl_buffer_get_extent (input),
- babl_format_from_name ("RaGaBaA float"));
+ babl_format ("RaGaBaA float"));
hor_blur (input, temp, o->radius);
ver_blur (temp, output, o->radius);
Modified: trunk/operations/common/brightness-contrast.c
==============================================================================
--- trunk/operations/common/brightness-contrast.c (original)
+++ trunk/operations/common/brightness-contrast.c Tue Jan 20 19:37:42 2009
@@ -64,8 +64,8 @@
*/
static void prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "input", babl_format_from_name ("RGBA float"));
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "input", babl_format ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
/* For GeglOperationPointFilter subclasses, we operate on linear
Modified: trunk/operations/common/c2g.c
==============================================================================
--- trunk/operations/common/c2g.c (original)
+++ trunk/operations/common/c2g.c Tue Jan 20 19:37:42 2009
@@ -67,7 +67,7 @@
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
for (y=radius; y<gegl_buffer_get_height (dst)+radius; y++)
{
@@ -127,7 +127,7 @@
dst_offset+=4;
}
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
Modified: trunk/operations/common/checkerboard.c
==============================================================================
--- trunk/operations/common/checkerboard.c (original)
+++ trunk/operations/common/checkerboard.c Tue Jan 20 19:37:42 2009
@@ -44,7 +44,7 @@
static void
prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static GeglRectangle
Modified: trunk/operations/common/color-temperature.c
==============================================================================
--- trunk/operations/common/color-temperature.c (original)
+++ trunk/operations/common/color-temperature.c Tue Jan 20 19:37:42 2009
@@ -73,7 +73,7 @@
static void prepare (GeglOperation *operation)
{
- Babl *format = babl_format_from_name ("RGBA float");
+ Babl *format = babl_format ("RGBA float");
gegl_operation_set_format (operation, "input", format);
gegl_operation_set_format (operation, "output", format);
}
Modified: trunk/operations/common/color.c
==============================================================================
--- trunk/operations/common/color.c (original)
+++ trunk/operations/common/color.c Tue Jan 20 19:37:42 2009
@@ -33,7 +33,7 @@
static void
prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static GeglRectangle
Modified: trunk/operations/common/contrast-curve.c
==============================================================================
--- trunk/operations/common/contrast-curve.c (original)
+++ trunk/operations/common/contrast-curve.c Tue Jan 20 19:37:42 2009
@@ -35,7 +35,7 @@
static void prepare (GeglOperation *operation)
{
- Babl *format = babl_format_from_name ("YA float");
+ Babl *format = babl_format ("YA float");
gegl_operation_set_format (operation, "input", format);
gegl_operation_set_format (operation, "output", format);
Modified: trunk/operations/common/fractal-explorer.c
==============================================================================
--- trunk/operations/common/fractal-explorer.c (original)
+++ trunk/operations/common/fractal-explorer.c Tue Jan 20 19:37:42 2009
@@ -400,7 +400,7 @@
static void
prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "output", babl_format_from_name ("R'G'B' u8"));
+ gegl_operation_set_format (operation, "output", babl_format ("R'G'B' u8"));
}
static GeglRectangle
@@ -444,7 +444,7 @@
}
}
- gegl_buffer_set (output, NULL, babl_format_from_name ("R'G'B' u8"), buf,
+ gegl_buffer_set (output, NULL, babl_format ("R'G'B' u8"), buf,
GEGL_AUTO_ROWSTRIDE);
g_free (buf);
Modified: trunk/operations/common/gaussian-blur.c
==============================================================================
--- trunk/operations/common/gaussian-blur.c (original)
+++ trunk/operations/common/gaussian-blur.c Tue Jan 20 19:37:42 2009
@@ -185,7 +185,7 @@
buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
w = g_new0 (gfloat, gegl_buffer_get_width (src));
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RaGaBaA float"),
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RaGaBaA float"),
buf, GEGL_AUTO_ROWSTRIDE);
w_len = gegl_buffer_get_width (src);
@@ -203,7 +203,7 @@
}
}
- gegl_buffer_set (dst, gegl_buffer_get_extent(src), babl_format_from_name ("RaGaBaA float"),
+ gegl_buffer_set (dst, gegl_buffer_get_extent(src), babl_format ("RaGaBaA float"),
buf, GEGL_AUTO_ROWSTRIDE);
g_free (buf);
g_free (w);
@@ -225,7 +225,7 @@
buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
w = g_new0 (gfloat, gegl_buffer_get_height (src));
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RaGaBaA float"), buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RaGaBaA float"), buf, GEGL_AUTO_ROWSTRIDE);
w_len = gegl_buffer_get_height (src);
for (u=0; u<gegl_buffer_get_width (dst); u++)
@@ -243,7 +243,7 @@
}
gegl_buffer_set (dst, gegl_buffer_get_extent (src),
- babl_format_from_name ("RaGaBaA float"), buf, GEGL_AUTO_ROWSTRIDE);
+ babl_format ("RaGaBaA float"), buf, GEGL_AUTO_ROWSTRIDE);
g_free (buf);
g_free (w);
}
@@ -342,7 +342,7 @@
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RaGaBaA float"),
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RaGaBaA float"),
src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
@@ -359,7 +359,7 @@
matrix_length);
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RaGaBaA float"),
+ gegl_buffer_set (dst, NULL, babl_format ("RaGaBaA float"),
dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
@@ -385,7 +385,7 @@
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RaGaBaA float"),
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RaGaBaA float"),
src_buf, GEGL_AUTO_ROWSTRIDE);
offset=0;
@@ -402,7 +402,7 @@
matrix_length);
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RaGaBaA float"),
+ gegl_buffer_set (dst, NULL, babl_format ("RaGaBaA float"),
dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
@@ -425,7 +425,7 @@
area->top = area->bottom = ceil ( max (fir_radius_y, iir_radius_y));
gegl_operation_set_format (operation, "output",
- babl_format_from_name ("RaGaBaA float"));
+ babl_format ("RaGaBaA float"));
#undef max
}
@@ -451,7 +451,7 @@
temp_extend.width = gegl_buffer_get_width (output);
temp_extend.y = gegl_buffer_get_y (input);
temp_extend.height = gegl_buffer_get_height (input);
- temp = gegl_buffer_new (&temp_extend, babl_format_from_name ("RaGaBaA float"));
+ temp = gegl_buffer_new (&temp_extend, babl_format ("RaGaBaA float"));
force_iir = o->filter && !strcmp (o->filter, "iir");
force_fir = o->filter && !strcmp (o->filter, "fir");
Modified: trunk/operations/common/grey.c
==============================================================================
--- trunk/operations/common/grey.c (original)
+++ trunk/operations/common/grey.c Tue Jan 20 19:37:42 2009
@@ -33,7 +33,7 @@
static void prepare (GeglOperation *operation)
{
- Babl *format = babl_format_from_name ("YA float");
+ Babl *format = babl_format ("YA float");
gegl_operation_set_format (operation, "input", format);
gegl_operation_set_format (operation, "output", format);
Modified: trunk/operations/common/introspect.c
==============================================================================
--- trunk/operations/common/introspect.c (original)
+++ trunk/operations/common/introspect.c Tue Jan 20 19:37:42 2009
@@ -142,7 +142,7 @@
defined = gegl_node_get_bounding_box (png_load);
- o->buf = gegl_buffer_new (&defined, babl_format_from_name ("R'G'B' u8"));
+ o->buf = gegl_buffer_new (&defined, babl_format ("R'G'B' u8"));
/* FIXME
GeglNode *buffer_save;
Modified: trunk/operations/common/mblur.c
==============================================================================
--- trunk/operations/common/mblur.c (original)
+++ trunk/operations/common/mblur.c Tue Jan 20 19:37:42 2009
@@ -49,12 +49,12 @@
priv = g_new0 (Priv, 1);
o->chant_data = (void*) priv;
- priv->acc = gegl_buffer_new (&extent, babl_format_from_name ("RGBA float"));
+ priv->acc = gegl_buffer_new (&extent, babl_format ("RGBA float"));
}
static void prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static gboolean
@@ -85,8 +85,8 @@
gfloat *acc = g_new (gfloat, pixels * 4);
gfloat dampness;
gint i;
- gegl_buffer_get (p->acc, 1.0, result, babl_format_from_name ("RGBA float"), acc, GEGL_AUTO_ROWSTRIDE);
- gegl_buffer_get (temp_in, 1.0, result, babl_format_from_name ("RGBA float"), buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (p->acc, 1.0, result, babl_format ("RGBA float"), acc, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (temp_in, 1.0, result, babl_format ("RGBA float"), buf, GEGL_AUTO_ROWSTRIDE);
dampness = o->dampness;
for (i=0;i<pixels;i++)
{
@@ -94,8 +94,8 @@
for (c=0;c<4;c++)
acc[i*4+c]=acc[i*4+c]*dampness + buf[i*4+c]*(1.0-dampness);
}
- gegl_buffer_set (p->acc, result, babl_format_from_name ("RGBA float"), acc, GEGL_AUTO_ROWSTRIDE);
- gegl_buffer_set (output, result, babl_format_from_name ("RGBA float"), acc, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (p->acc, result, babl_format ("RGBA float"), acc, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (output, result, babl_format ("RGBA float"), acc, GEGL_AUTO_ROWSTRIDE);
g_free (buf);
g_free (acc);
}
Modified: trunk/operations/common/mono-mixer.c
==============================================================================
--- trunk/operations/common/mono-mixer.c (original)
+++ trunk/operations/common/mono-mixer.c Tue Jan 20 19:37:42 2009
@@ -37,8 +37,8 @@
static void prepare (GeglOperation *operation)
{
/* set the babl format this operation prefers to work on */
- gegl_operation_set_format (operation, "input", babl_format_from_name ("RGBA float"));
- gegl_operation_set_format (operation, "output", babl_format_from_name ("YA float"));
+ gegl_operation_set_format (operation, "input", babl_format ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("YA float"));
}
static gboolean
@@ -63,7 +63,7 @@
in_buf = g_new (gfloat, 4 * num_pixels);
out_buf = g_new (gfloat, 2 * num_pixels);
- gegl_buffer_get (input, 1.0, result, babl_format_from_name ("RGBA float"), in_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (input, 1.0, result, babl_format ("RGBA float"), in_buf, GEGL_AUTO_ROWSTRIDE);
in_pixel = in_buf;
out_pixel = out_buf;
@@ -76,7 +76,7 @@
out_pixel += 2;
}
- gegl_buffer_set (output, result, babl_format_from_name ("YA float"), out_buf,
+ gegl_buffer_set (output, result, babl_format ("YA float"), out_buf,
GEGL_AUTO_ROWSTRIDE);
g_free (in_buf);
Modified: trunk/operations/common/noise.c
==============================================================================
--- trunk/operations/common/noise.c (original)
+++ trunk/operations/common/noise.c Tue Jan 20 19:37:42 2009
@@ -40,7 +40,7 @@
static void
prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "output", babl_format_from_name ("Y float"));
+ gegl_operation_set_format (operation, "output", babl_format ("Y float"));
}
static GeglRectangle
Modified: trunk/operations/common/opacity.c
==============================================================================
--- trunk/operations/common/opacity.c (original)
+++ trunk/operations/common/opacity.c Tue Jan 20 19:37:42 2009
@@ -35,9 +35,9 @@
static void prepare (GeglOperation *self)
{
- gegl_operation_set_format (self, "input", babl_format_from_name ("RaGaBaA float"));
- gegl_operation_set_format (self, "output", babl_format_from_name ("RaGaBaA float"));
- gegl_operation_set_format (self, "aux", babl_format_from_name ("Y float"));
+ gegl_operation_set_format (self, "input", babl_format ("RaGaBaA float"));
+ gegl_operation_set_format (self, "output", babl_format ("RaGaBaA float"));
+ gegl_operation_set_format (self, "aux", babl_format ("Y float"));
}
static gboolean
Modified: trunk/operations/common/raw-load.c
==============================================================================
--- trunk/operations/common/raw-load.c (original)
+++ trunk/operations/common/raw-load.c Tue Jan 20 19:37:42 2009
@@ -75,11 +75,11 @@
GeglRectangle extent = { 0, 0, width, height };
op_raw_load->chant_data = (gpointer) gegl_buffer_new (&extent,
babl_format_new (
- babl_model_from_name ("RGB"),
- babl_type_from_name ("u16"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
- babl_component_from_name ("R"),
+ babl_model ("RGB"),
+ babl_type ("u16"),
+ babl_component ("G"),
+ babl_component ("B"),
+ babl_component ("R"),
NULL));
}
{
@@ -89,11 +89,11 @@
gegl_buffer_set (GEGL_BUFFER (op_raw_load->chant_data),
NULL,
babl_format_new (
- babl_model_from_name ("RGB"),
- babl_type_from_name ("u16"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
- babl_component_from_name ("R"),
+ babl_model ("RGB"),
+ babl_type ("u16"),
+ babl_component ("G"),
+ babl_component ("B"),
+ babl_component ("R"),
NULL),
buf,
GEGL_AUTO_ROWSTRIDE
Modified: trunk/operations/common/remap.c
==============================================================================
--- trunk/operations/common/remap.c (original)
+++ trunk/operations/common/remap.c Tue Jan 20 19:37:42 2009
@@ -60,7 +60,7 @@
static void
prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static GeglNode *
@@ -137,9 +137,9 @@
min = g_new (gfloat, pixels * 3);
max = g_new (gfloat, pixels * 3);
- gegl_buffer_get (input, 1.0, result, babl_format_from_name ("RGBA float"), buf, GEGL_AUTO_ROWSTRIDE);
- gegl_buffer_get (low, 1.0, result, babl_format_from_name ("RGB float"), min, GEGL_AUTO_ROWSTRIDE);
- gegl_buffer_get (high, 1.0, result, babl_format_from_name ("RGB float"), max, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (input, 1.0, result, babl_format ("RGBA float"), buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (low, 1.0, result, babl_format ("RGB float"), min, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (high, 1.0, result, babl_format ("RGB float"), max, GEGL_AUTO_ROWSTRIDE);
output = gegl_operation_context_get_target (context, "output");
@@ -160,7 +160,7 @@
}
}
- gegl_buffer_set (output, result, babl_format_from_name ("RGBA float"), buf,
+ gegl_buffer_set (output, result, babl_format ("RGBA float"), buf,
GEGL_AUTO_ROWSTRIDE);
g_free (buf);
Modified: trunk/operations/common/snn-mean.c
==============================================================================
--- trunk/operations/common/snn-mean.c (original)
+++ trunk/operations/common/snn-mean.c Tue Jan 20 19:37:42 2009
@@ -49,8 +49,8 @@
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
area->left = area->right = area->top = area->bottom = ceil (o->radius);
- gegl_operation_set_format (operation, "input", babl_format_from_name ("RGBA float"));
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "input", babl_format ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static gboolean
@@ -120,7 +120,7 @@
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
@@ -191,7 +191,7 @@
center_pix += 4;
}
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RGBA float"), dst_buf,
+ gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf,
GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
Modified: trunk/operations/common/stress.c
==============================================================================
--- trunk/operations/common/stress.c (original)
+++ trunk/operations/common/stress.c Tue Jan 20 19:37:42 2009
@@ -67,7 +67,7 @@
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
for (y=radius; y<gegl_buffer_get_height (dst)+radius; y++)
{
@@ -116,7 +116,7 @@
dst_offset+=4;
}
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
@@ -128,7 +128,7 @@
ceil (GEGL_CHANT_PROPERTIES (operation)->radius);
gegl_operation_set_format (operation, "output",
- babl_format_from_name ("RaGaBaA float"));
+ babl_format ("RaGaBaA float"));
}
static GeglRectangle
Modified: trunk/operations/common/stretch-contrast.c
==============================================================================
--- trunk/operations/common/stretch-contrast.c (original)
+++ trunk/operations/common/stretch-contrast.c Tue Jan 20 19:37:42 2009
@@ -60,7 +60,7 @@
gfloat *buf = g_new0 (gfloat, 4 * gegl_buffer_get_pixel_count (buffer));
gint i;
- gegl_buffer_get (buffer, 1.0, NULL, babl_format_from_name ("RGBA float"), buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (buffer, 1.0, NULL, babl_format ("RGBA float"), buf, GEGL_AUTO_ROWSTRIDE);
for (i=0;i< gegl_buffer_get_pixel_count (buffer);i++)
{
gint component;
@@ -83,8 +83,8 @@
static void prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "input", babl_format_from_name ("RGBA float"));
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "input", babl_format ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static GeglRectangle
@@ -121,9 +121,9 @@
result->width,
chunk};
- gegl_buffer_get (input, 1.0, &line, babl_format_from_name ("RGBA float"), buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (input, 1.0, &line, babl_format ("RGBA float"), buf, GEGL_AUTO_ROWSTRIDE);
inner_process (min, max, buf, result->width * chunk);
- gegl_buffer_set (output, &line, babl_format_from_name ("RGBA float"), buf,
+ gegl_buffer_set (output, &line, babl_format ("RGBA float"), buf,
GEGL_AUTO_ROWSTRIDE);
consumed+=chunk;
}
Modified: trunk/operations/common/svg-huerotate.c
==============================================================================
--- trunk/operations/common/svg-huerotate.c (original)
+++ trunk/operations/common/svg-huerotate.c Tue Jan 20 19:37:42 2009
@@ -37,7 +37,7 @@
static void prepare (GeglOperation *operation)
{
- Babl *format = babl_format_from_name ("RaGaBaA float");
+ Babl *format = babl_format ("RaGaBaA float");
gegl_operation_set_format (operation, "input", format);
gegl_operation_set_format (operation, "output", format);
Modified: trunk/operations/common/svg-luminancetoalpha.c
==============================================================================
--- trunk/operations/common/svg-luminancetoalpha.c (original)
+++ trunk/operations/common/svg-luminancetoalpha.c Tue Jan 20 19:37:42 2009
@@ -37,7 +37,7 @@
static void prepare (GeglOperation *operation)
{
- Babl *format = babl_format_from_name ("RaGaBaA float");
+ Babl *format = babl_format ("RaGaBaA float");
gegl_operation_set_format (operation, "input", format);
gegl_operation_set_format (operation, "output", format);
Modified: trunk/operations/common/svg-matrix.c
==============================================================================
--- trunk/operations/common/svg-matrix.c (original)
+++ trunk/operations/common/svg-matrix.c Tue Jan 20 19:37:42 2009
@@ -37,7 +37,7 @@
static void prepare (GeglOperation *operation)
{
- Babl *format = babl_format_from_name ("RaGaBaA float");
+ Babl *format = babl_format ("RaGaBaA float");
gegl_operation_set_format (operation, "input", format);
gegl_operation_set_format (operation, "output", format);
Modified: trunk/operations/common/svg-saturate.c
==============================================================================
--- trunk/operations/common/svg-saturate.c (original)
+++ trunk/operations/common/svg-saturate.c Tue Jan 20 19:37:42 2009
@@ -37,7 +37,7 @@
static void prepare (GeglOperation *operation)
{
- Babl *format = babl_format_from_name ("RaGaBaA float");
+ Babl *format = babl_format ("RaGaBaA float");
gegl_operation_set_format (operation, "input", format);
gegl_operation_set_format (operation, "output", format);
Modified: trunk/operations/common/threshold.c
==============================================================================
--- trunk/operations/common/threshold.c (original)
+++ trunk/operations/common/threshold.c Tue Jan 20 19:37:42 2009
@@ -34,9 +34,9 @@
static void prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "input", babl_format_from_name ("YA float"));
- gegl_operation_set_format (operation, "aux", babl_format_from_name ("Y float"));
- gegl_operation_set_format (operation, "output", babl_format_from_name ("YA float"));
+ gegl_operation_set_format (operation, "input", babl_format ("YA float"));
+ gegl_operation_set_format (operation, "aux", babl_format ("Y float"));
+ gegl_operation_set_format (operation, "output", babl_format ("YA float"));
}
static gboolean
Modified: trunk/operations/common/whitebalance.c
==============================================================================
--- trunk/operations/common/whitebalance.c (original)
+++ trunk/operations/common/whitebalance.c Tue Jan 20 19:37:42 2009
@@ -37,7 +37,7 @@
static void prepare (GeglOperation *operation)
{
- Babl *format = babl_format_from_name ("Y'CbCrA float");
+ Babl *format = babl_format ("Y'CbCrA float");
gegl_operation_set_format (operation, "input", format);
gegl_operation_set_format (operation, "output", format);
}
Modified: trunk/operations/core/convert-format.c
==============================================================================
--- trunk/operations/core/convert-format.c (original)
+++ trunk/operations/core/convert-format.c Tue Jan 20 19:37:42 2009
@@ -42,7 +42,7 @@
g_assert (o->format);
- format = babl_format_from_name (o->format);
+ format = babl_format (o->format);
/* check format ? */
gegl_operation_set_format (operation, "input", format);
Modified: trunk/operations/external/display.c
==============================================================================
--- trunk/operations/external/display.c (original)
+++ trunk/operations/external/display.c Tue Jan 20 19:37:42 2009
@@ -155,12 +155,12 @@
gegl_buffer_get (source,
1.0,
NULL,
- babl_format_new (babl_model_from_name ("R'G'B'A"),
- babl_type_from_name ("u8"),
- babl_component_from_name ("B'"),
- babl_component_from_name ("G'"),
- babl_component_from_name ("R'"),
- babl_component_from_name ("A"),
+ babl_format_new (babl_model ("R'G'B'A"),
+ babl_type ("u8"),
+ babl_component ("B'"),
+ babl_component ("G'"),
+ babl_component ("R'"),
+ babl_component ("A"),
NULL),
((SDL_Surface*)o->screen)->pixels, GEGL_AUTO_ROWSTRIDE);
g_object_unref (source);
Modified: trunk/operations/external/exr-load.cpp
==============================================================================
--- trunk/operations/external/exr-load.cpp (original)
+++ trunk/operations/external/exr-load.cpp Tue Jan 20 19:37:42 2009
@@ -593,7 +593,7 @@
}
*ff_ptr = format_flags;
- *format = babl_format_from_name (format_string);
+ *format = babl_format (format_string);
return TRUE;
}
Modified: trunk/operations/external/ff-load.c
==============================================================================
--- trunk/operations/external/ff-load.c (original)
+++ trunk/operations/external/ff-load.c Tue Jan 20 19:37:42 2009
@@ -253,7 +253,7 @@
g_assert (o->chant_data != NULL);
- gegl_operation_set_format (operation, "output", babl_format_from_name ("R'G'B'A u8"));
+ gegl_operation_set_format (operation, "output", babl_format ("R'G'B'A u8"));
if (!p->loadedfilename ||
Modified: trunk/operations/external/jpg-load.c
==============================================================================
--- trunk/operations/external/jpg-load.c (original)
+++ trunk/operations/external/jpg-load.c Tue Jan 20 19:37:42 2009
@@ -120,7 +120,7 @@
GeglRectangle rect = {dest_x, dest_y + row++, cinfo.output_width, 1};
jpeg_read_scanlines (&cinfo, buffer, 1);
- gegl_buffer_set (gegl_buffer, &rect, babl_format_from_name ("R'G'B' u8"), buffer[0],
+ gegl_buffer_set (gegl_buffer, &rect, babl_format ("R'G'B' u8"), buffer[0],
GEGL_AUTO_ROWSTRIDE);
}
jpeg_destroy_decompress (&cinfo);
@@ -135,7 +135,7 @@
GeglRectangle result = {0,0,0,0};
gint width, height;
gint status;
- gegl_operation_set_format (operation, "output", babl_format_from_name ("R'G'B' u8"));
+ gegl_operation_set_format (operation, "output", babl_format ("R'G'B' u8"));
status = query_jpg (o->path, &width, &height);
if (status)
Modified: trunk/operations/external/openraw.c
==============================================================================
--- trunk/operations/external/openraw.c (original)
+++ trunk/operations/external/openraw.c Tue Jan 20 19:37:42 2009
@@ -94,7 +94,7 @@
rect.height = y;
data = or_rawdata_data(rawdata);
- gegl_buffer_set(gegl_buffer, &rect, babl_format_from_name ("Y u16"),
+ gegl_buffer_set(gegl_buffer, &rect, babl_format ("Y u16"),
data, GEGL_AUTO_ROWSTRIDE);
}
}
@@ -111,7 +111,7 @@
GeglRectangle result = {0,0,0,0};
gint width, height;
gint status;
- gegl_operation_set_format (operation, "output", babl_format_from_name ("Y u16"));
+ gegl_operation_set_format (operation, "output", babl_format ("Y u16"));
status = query_raw (o->path, &width, &height);
if (status)
Modified: trunk/operations/external/path.c
==============================================================================
--- trunk/operations/external/path.c (original)
+++ trunk/operations/external/path.c Tue Jan 20 19:37:42 2009
@@ -97,7 +97,7 @@
prepare (GeglOperation *operation)
{
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RaGaBaA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RaGaBaA float"));
if (o->transform && o->transform[0] != '\0')
{
GeglMatrix3 matrix;
@@ -189,7 +189,7 @@
{
cairo_t *cr;
cairo_surface_t *surface;
- guchar *data = (void*)gegl_buffer_linear_open (output, result, NULL, babl_format_from_name ("B'aG'aR'aA u8"));
+ guchar *data = (void*)gegl_buffer_linear_open (output, result, NULL, babl_format ("B'aG'aR'aA u8"));
surface = cairo_image_surface_create_for_data (data,
CAIRO_FORMAT_ARGB32,
Modified: trunk/operations/external/pixbuf.c
==============================================================================
--- trunk/operations/external/pixbuf.c (original)
+++ trunk/operations/external/pixbuf.c Tue Jan 20 19:37:42 2009
@@ -55,7 +55,7 @@
{
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
gegl_operation_set_format (operation, "output",
- babl_format_from_name(gdk_pixbuf_get_has_alpha(o->pixbuf)?"R'G'B'A u8":"R'G'B' u8"));
+ babl_format(gdk_pixbuf_get_has_alpha(o->pixbuf)?"R'G'B'A u8":"R'G'B' u8"));
}
static gboolean
Modified: trunk/operations/external/png-load.c
==============================================================================
--- trunk/operations/external/png-load.c (original)
+++ trunk/operations/external/png-load.c Tue Jan 20 19:37:42 2009
@@ -346,7 +346,7 @@
return -1;
}
- *format = babl_format_from_name (format_string);
+ *format = babl_format (format_string);
}
png_destroy_read_struct (&load_png_ptr, &load_info_ptr, NULL);
fclose (infile);
Modified: trunk/operations/external/png-save.c
==============================================================================
--- trunk/operations/external/png-save.c (original)
+++ trunk/operations/external/png-save.c Tue Jan 20 19:37:42 2009
@@ -157,7 +157,7 @@
for (i=0; i< height; i++)
{
GeglRectangle rect = {src_x, src_y+i, width, 1};
- gegl_buffer_get (gegl_buffer, 1.0, &rect, babl_format_from_name (format_string), pixels, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (gegl_buffer, 1.0, &rect, babl_format (format_string), pixels, GEGL_AUTO_ROWSTRIDE);
png_write_rows (png, &pixels, 1);
}
Modified: trunk/operations/external/save-pixbuf.c
==============================================================================
--- trunk/operations/external/save-pixbuf.c (original)
+++ trunk/operations/external/save-pixbuf.c Tue Jan 20 19:37:42 2009
@@ -65,7 +65,7 @@
name = g_strdup_printf ("R'G'B'%s u%i",
has_alpha ? "A" : "",
bps);
- babl = babl_format_from_name (name);
+ babl = babl_format (name);
temp = g_malloc (rect->width * rect->height * bps);
gegl_buffer_get (input, 1.0, rect, babl, temp, GEGL_AUTO_ROWSTRIDE);
Modified: trunk/operations/external/svg-load.c
==============================================================================
--- trunk/operations/external/svg-load.c (original)
+++ trunk/operations/external/svg-load.c Tue Jan 20 19:37:42 2009
@@ -53,7 +53,7 @@
static void prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "output", babl_format_from_name ("R'G'B'A u8"));
+ gegl_operation_set_format (operation, "output", babl_format ("R'G'B'A u8"));
}
static gint
@@ -91,7 +91,7 @@
GeglRectangle rect = {dest_x, dest_y, width, height};
pixeldata = gdk_pixbuf_get_pixels (pixbuf);
- gegl_buffer_set (gegl_buffer, &rect, babl_format_from_name ("R'G'B'A u8"), pixeldata, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (gegl_buffer, &rect, babl_format ("R'G'B'A u8"), pixeldata, GEGL_AUTO_ROWSTRIDE);
}
rsvg_term();
Modified: trunk/operations/external/text.c
==============================================================================
--- trunk/operations/external/text.c (original)
+++ trunk/operations/external/text.c Tue Jan 20 19:37:42 2009
@@ -188,7 +188,7 @@
cairo_translate (cr, -result->x, -result->y);
text_layout_text (self, cr, 0, NULL, NULL);
- gegl_buffer_set (output, NULL, babl_format_from_name ("B'aG'aR'aA u8"), data,
+ gegl_buffer_set (output, NULL, babl_format ("B'aG'aR'aA u8"), data,
GEGL_AUTO_ROWSTRIDE);
cairo_destroy (cr);
@@ -272,7 +272,7 @@
static void
prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RaGaBaA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RaGaBaA float"));
}
Modified: trunk/operations/external/v4l.c
==============================================================================
--- trunk/operations/external/v4l.c (original)
+++ trunk/operations/external/v4l.c Tue Jan 20 19:37:42 2009
@@ -92,11 +92,11 @@
gegl_operation_set_format (operation, "output",
babl_format_new (
- 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_model ("R'G'B'"),
+ babl_type ("u8"),
+ babl_component ("B'"),
+ babl_component ("G'"),
+ babl_component ("R'"),
NULL));
p->w = o->width;
Modified: trunk/operations/generated/math.rb
==============================================================================
--- trunk/operations/generated/math.rb (original)
+++ trunk/operations/generated/math.rb Tue Jan 20 19:37:42 2009
@@ -72,10 +72,10 @@
static void prepare (GeglOperation *operation)
{
- Babl *format = babl_format_from_name (\"RGBA float\");
+ Babl *format = babl_format (\"RGBA float\");
gegl_operation_set_format (operation, \"input\", format);
- gegl_operation_set_format (operation, \"aux\", babl_format_from_name (\"RGB float\"));
+ gegl_operation_set_format (operation, \"aux\", babl_format (\"RGB float\"));
gegl_operation_set_format (operation, \"output\", format);
}
Modified: trunk/operations/generated/other-blend.rb
==============================================================================
--- trunk/operations/generated/other-blend.rb (original)
+++ trunk/operations/generated/other-blend.rb Tue Jan 20 19:37:42 2009
@@ -57,7 +57,7 @@
file_head2 = '
static void prepare (GeglOperation *operation)
{
- Babl *format = babl_format_from_name ("RaGaBaA float");
+ Babl *format = babl_format ("RaGaBaA float");
gegl_operation_set_format (operation, "input", format);
gegl_operation_set_format (operation, "aux", format);
Modified: trunk/operations/generated/svg-12-blend.rb
==============================================================================
--- trunk/operations/generated/svg-12-blend.rb (original)
+++ trunk/operations/generated/svg-12-blend.rb Tue Jan 20 19:37:42 2009
@@ -84,7 +84,7 @@
file_head2 = '
static void prepare (GeglOperation *operation)
{
- Babl *format = babl_format_from_name ("RaGaBaA float");
+ Babl *format = babl_format ("RaGaBaA float");
gegl_operation_set_format (operation, "input", format);
gegl_operation_set_format (operation, "aux", format);
Modified: trunk/operations/generated/svg-12-porter-duff.rb
==============================================================================
--- trunk/operations/generated/svg-12-porter-duff.rb (original)
+++ trunk/operations/generated/svg-12-porter-duff.rb Tue Jan 20 19:37:42 2009
@@ -87,7 +87,7 @@
file_head2 = '
static void prepare (GeglOperation *operation)
{
- Babl *format = babl_format_from_name ("RaGaBaA float");
+ Babl *format = babl_format ("RaGaBaA float");
gegl_operation_set_format (operation, "input", format);
gegl_operation_set_format (operation, "aux", format);
Modified: trunk/operations/workshop/box-max.c
==============================================================================
--- trunk/operations/workshop/box-max.c (original)
+++ trunk/operations/workshop/box-max.c Tue Jan 20 19:37:42 2009
@@ -81,7 +81,7 @@
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
for (v=0; v<gegl_buffer_get_height (dst); v++)
@@ -100,7 +100,7 @@
i);
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RGBA float"), dst_buf,
+ gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf,
GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
@@ -120,7 +120,7 @@
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset=0;
for (v=0; v<gegl_buffer_get_height (dst); v++)
@@ -140,7 +140,7 @@
c);
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RGBA float"), dst_buf,
+ gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf,
GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
@@ -152,7 +152,7 @@
area->left = area->right = area->top = area->bottom =
ceil (GEGL_CHANT_PROPERTIES (operation)->radius);
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static gboolean
@@ -165,7 +165,7 @@
GeglBuffer *temp;
temp = gegl_buffer_new (gegl_buffer_get_extent (input),
- babl_format_from_name ("RGBA float"));
+ babl_format ("RGBA float"));
hor_max (input, temp, o->radius);
ver_max (temp, output, o->radius);
Modified: trunk/operations/workshop/box-min.c
==============================================================================
--- trunk/operations/workshop/box-min.c (original)
+++ trunk/operations/workshop/box-min.c Tue Jan 20 19:37:42 2009
@@ -81,7 +81,7 @@
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
for (v=0; v<gegl_buffer_get_height (dst); v++)
@@ -100,7 +100,7 @@
i);
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RGBA float"), dst_buf,
+ gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf,
GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
@@ -120,7 +120,7 @@
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset=0;
for (v=0; v<gegl_buffer_get_height (dst); v++)
@@ -140,7 +140,7 @@
c);
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RGBA float"), dst_buf,
+ gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf,
GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
@@ -153,7 +153,7 @@
area->right =
area->top =
area->bottom = GEGL_CHANT_PROPERTIES (operation)->radius;
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static gboolean
@@ -166,7 +166,7 @@
GeglBuffer *temp;
temp = gegl_buffer_new (gegl_buffer_get_extent (input),
- babl_format_from_name ("RGBA float"));
+ babl_format ("RGBA float"));
hor_min (input, temp, o->radius);
ver_min (temp, output, o->radius);
Modified: trunk/operations/workshop/box-percentile.c
==============================================================================
--- trunk/operations/workshop/box-percentile.c (original)
+++ trunk/operations/workshop/box-percentile.c Tue Jan 20 19:37:42 2009
@@ -52,7 +52,7 @@
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
area->left = area->right = area->top = area->bottom = ceil (o->radius);
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static gboolean
@@ -172,7 +172,7 @@
src_buf = g_malloc0 (gegl_buffer_get_pixel_count (src) * 4 * 4);
dst_buf = g_malloc0 (gegl_buffer_get_pixel_count (dst) * 4 * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
for (y=0; y<gegl_buffer_get_height (dst); y++)
@@ -202,7 +202,7 @@
dst_buf[offset*4+u] = median_pix[u];
offset++;
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RGBA float"), dst_buf,
+ gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf,
GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
Modified: trunk/operations/workshop/color-reduction.c
==============================================================================
--- trunk/operations/workshop/color-reduction.c (original)
+++ trunk/operations/workshop/color-reduction.c Tue Jan 20 19:37:42 2009
@@ -39,8 +39,8 @@
static void
prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "input", babl_format_from_name ("RGBA u16"));
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA u16"));
+ gegl_operation_set_format (operation, "input", babl_format ("RGBA u16"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA u16"));
}
static void
@@ -115,7 +115,7 @@
/* Pull input row */
- gegl_buffer_get (input, 1.0, &line_rect, babl_format_from_name ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (input, 1.0, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
/* Process the row */
@@ -167,7 +167,7 @@
/* Push output row */
- gegl_buffer_set (output, &line_rect, babl_format_from_name ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (output, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
line_rect.y++;
}
@@ -214,7 +214,7 @@
{
guint x;
- gegl_buffer_get (input, 1.0, &line_rect, babl_format_from_name ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (input, 1.0, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
for (x = 0; x < input_rect->width; x++)
{
@@ -235,7 +235,7 @@
}
}
- gegl_buffer_set (output, &line_rect, babl_format_from_name ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (output, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
line_rect.y++;
}
@@ -268,7 +268,7 @@
{
guint x;
- gegl_buffer_get (input, 1.0, &line_rect, babl_format_from_name ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (input, 1.0, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
for (x = 0; x < input_rect->width; x++)
{
@@ -290,7 +290,7 @@
}
}
- gegl_buffer_set (output, &line_rect, babl_format_from_name ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (output, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
line_rect.y++;
}
@@ -323,7 +323,7 @@
{
guint x;
- gegl_buffer_get (input, 1.0, &line_rect, babl_format_from_name ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (input, 1.0, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
for (x = 0; x < input_rect->width; x++)
{
@@ -344,7 +344,7 @@
}
}
- gegl_buffer_set (output, &line_rect, babl_format_from_name ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (output, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
line_rect.y++;
}
@@ -377,7 +377,7 @@
{
guint x;
- gegl_buffer_get (input, 1.0, &line_rect, babl_format_from_name ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (input, 1.0, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
for (x = 0; x < input_rect->width; x++)
{
@@ -390,7 +390,7 @@
}
}
- gegl_buffer_set (output, &line_rect, babl_format_from_name ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (output, &line_rect, babl_format ("RGBA u16"), line_buf, GEGL_AUTO_ROWSTRIDE);
line_rect.y++;
}
Modified: trunk/operations/workshop/demosaic-bimedian.c
==============================================================================
--- trunk/operations/workshop/demosaic-bimedian.c (original)
+++ trunk/operations/workshop/demosaic-bimedian.c Tue Jan 20 19:37:42 2009
@@ -93,7 +93,7 @@
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src));
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 3);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("Y float"), src_buf,
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("Y float"), src_buf,
GEGL_AUTO_ROWSTRIDE);
offset = ROW + COL;
@@ -167,7 +167,7 @@
offset+=2;
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RGB float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (dst, NULL, babl_format ("RGB float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
Modified: trunk/operations/workshop/demosaic-simple.c
==============================================================================
--- trunk/operations/workshop/demosaic-simple.c (original)
+++ trunk/operations/workshop/demosaic-simple.c Tue Jan 20 19:37:42 2009
@@ -47,7 +47,7 @@
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src));
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 3);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("Y float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("Y float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset=0;
for (y=src_extent->y; y < dst_extent->height + src_extent->y; y++)
@@ -103,7 +103,7 @@
}
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RGB float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (dst, NULL, babl_format ("RGB float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
@@ -112,7 +112,7 @@
{
GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
area->right = area->bottom = 1;
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static gboolean
Modified: trunk/operations/workshop/disc-percentile.c
==============================================================================
--- trunk/operations/workshop/disc-percentile.c (original)
+++ trunk/operations/workshop/disc-percentile.c Tue Jan 20 19:37:42 2009
@@ -136,7 +136,7 @@
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
for (y=0; y<gegl_buffer_get_height (dst); y++)
@@ -173,7 +173,7 @@
dst_buf[offset*4+u] = median_pix[u];
offset++;
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
@@ -183,7 +183,7 @@
GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
area->left = area->right = area->top = area->bottom = ceil (o->radius);
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static gboolean
Modified: trunk/operations/workshop/external/ff-save.c
==============================================================================
--- trunk/operations/workshop/external/ff-save.c (original)
+++ trunk/operations/workshop/external/ff-save.c Tue Jan 20 19:37:42 2009
@@ -629,7 +629,7 @@
op->input_pad[0]->width * op->input_pad[0]->height * 3);*/
GeglRectangle rect={0,0,width,height};
- gegl_buffer_get (p->input, 1.0, &rect, babl_format_from_name ("R'G'B' u8"), pict->data[0], GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (p->input, 1.0, &rect, babl_format ("R'G'B' u8"), pict->data[0], GEGL_AUTO_ROWSTRIDE);
}
static void
Modified: trunk/operations/workshop/external/gluas.c
==============================================================================
--- trunk/operations/workshop/external/gluas.c (original)
+++ trunk/operations/workshop/external/gluas.c Tue Jan 20 19:37:42 2009
@@ -154,7 +154,7 @@
register_functions (L, gluas_functions);
- p.rgba_float = babl_format_from_name ("RGBA float");
+ p.rgba_float = babl_format ("RGBA float");
p.L = L;
p.width = in_rect->width;/*gimp_drawable_width (drawable->drawable_id);*/
p.height = in_rect->height;/*gimp_drawable_height (drawable->drawable_id);*/
@@ -980,9 +980,9 @@
static void
prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "input", babl_format_from_name ("RGBA float"));
- gegl_operation_set_format (operation, "aux", babl_format_from_name ("RGBA float"));
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "input", babl_format ("RGBA float"));
+ gegl_operation_set_format (operation, "aux", babl_format ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static GeglRectangle
Modified: trunk/operations/workshop/external/gtk-display.c
==============================================================================
--- trunk/operations/workshop/external/gtk-display.c (original)
+++ trunk/operations/workshop/external/gtk-display.c Tue Jan 20 19:37:42 2009
@@ -122,7 +122,7 @@
source = gegl_buffer_create_sub_buffer (input, result);
- gegl_buffer_get (source, 1.0, NULL, babl_format_from_name ("R'G'B'A u8"), priv->buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (source, 1.0, NULL, babl_format ("R'G'B'A u8"), priv->buf, GEGL_AUTO_ROWSTRIDE);
gtk_widget_queue_draw (priv->drawing_area);
if (priv->window)
Modified: trunk/operations/workshop/external/line-profile.c
==============================================================================
--- trunk/operations/workshop/external/line-profile.c (original)
+++ trunk/operations/workshop/external/line-profile.c Tue Jan 20 19:37:42 2009
@@ -48,7 +48,7 @@
gfloat rgba[4];
GeglRectangle roi = {x,y,1,1};
- gegl_buffer_get (buffer, 1.0, &roi, babl_format_from_name ("RGBA float"), &rgba[0], GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (buffer, 1.0, &roi, babl_format ("RGBA float"), &rgba[0], GEGL_AUTO_ROWSTRIDE);
return rgba[component];
}
@@ -64,7 +64,7 @@
{
GeglRectangle extent = {0,0,width,height};
- output = gegl_buffer_new (&extent, babl_format_from_name ("B'aG'aR'aA u8"));
+ output = gegl_buffer_new (&extent, babl_format ("B'aG'aR'aA u8"));
}
{
@@ -131,7 +131,7 @@
cairo_line_to (cr, o->x1, o->y1);
cairo_stroke (cr);
- gegl_buffer_set (output, NULL, babl_format_from_name ("B'aG'aR'aA u8"), buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (output, NULL, babl_format ("B'aG'aR'aA u8"), buf, GEGL_AUTO_ROWSTRIDE);
}
return TRUE;
Modified: trunk/operations/workshop/generated/blend.rb
==============================================================================
--- trunk/operations/workshop/generated/blend.rb (original)
+++ trunk/operations/workshop/generated/blend.rb Tue Jan 20 19:37:42 2009
@@ -79,7 +79,7 @@
static void prepare (GeglOperation *self)
{
- Babl *format = babl_format_from_name (\"RaGaBaA float\");
+ Babl *format = babl_format (\"RaGaBaA float\");
gegl_operation_set_format (self, \"input\", format);
gegl_operation_set_format (self, \"aux\", format);
Modified: trunk/operations/workshop/hstack.c
==============================================================================
--- trunk/operations/workshop/hstack.c (original)
+++ trunk/operations/workshop/hstack.c Tue Jan 20 19:37:42 2009
@@ -34,7 +34,7 @@
static void prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static GeglRectangle
@@ -125,8 +125,8 @@
gfloat *buf = g_new0 (gfloat, result->width * result->height * 4);
gfloat *bufB = g_new0 (gfloat, result->width * result->height * 4);
- gegl_buffer_get (temp_in, 1.0, NULL, babl_format_from_name ("RGBA float"), buf, GEGL_AUTO_ROWSTRIDE);
- gegl_buffer_get (temp_aux, 1.0, NULL, babl_format_from_name ("RGBA float"), bufB, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (temp_in, 1.0, NULL, babl_format ("RGBA float"), buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (temp_aux, 1.0, NULL, babl_format ("RGBA float"), bufB, GEGL_AUTO_ROWSTRIDE);
{
gint offset=0;
gint x,y;
@@ -143,7 +143,7 @@
offset+=4;
}
}
- gegl_buffer_set (output, NULL, babl_format_from_name ("RGBA float"), buf,
+ gegl_buffer_set (output, NULL, babl_format ("RGBA float"), buf,
GEGL_AUTO_ROWSTRIDE);
g_free (buf);
Modified: trunk/operations/workshop/kuwahara-max.c
==============================================================================
--- trunk/operations/workshop/kuwahara-max.c (original)
+++ trunk/operations/workshop/kuwahara-max.c Tue Jan 20 19:37:42 2009
@@ -96,7 +96,7 @@
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
for (v=0; v<gegl_buffer_get_height (dst); v++)
@@ -190,7 +190,7 @@
offset++;
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
@@ -201,7 +201,7 @@
area->left = area->right = area->top = area->bottom =
ceil (GEGL_CHANT_PROPERTIES (operation)->radius);
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static gboolean
Modified: trunk/operations/workshop/kuwahara-min.c
==============================================================================
--- trunk/operations/workshop/kuwahara-min.c (original)
+++ trunk/operations/workshop/kuwahara-min.c Tue Jan 20 19:37:42 2009
@@ -96,7 +96,7 @@
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
for (v=0; v<gegl_buffer_get_height (dst); v++)
@@ -190,7 +190,7 @@
offset++;
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
@@ -201,7 +201,7 @@
area->left = area->right = area->top = area->bottom =
ceil (GEGL_CHANT_PROPERTIES (operation)->radius);
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static gboolean
Modified: trunk/operations/workshop/kuwahara.c
==============================================================================
--- trunk/operations/workshop/kuwahara.c (original)
+++ trunk/operations/workshop/kuwahara.c Tue Jan 20 19:37:42 2009
@@ -96,7 +96,7 @@
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
for (v=0; v<gegl_buffer_get_height (dst); v++)
@@ -190,7 +190,7 @@
offset++;
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
@@ -201,7 +201,7 @@
area->left = area->right = area->top = area->bottom =
ceil (GEGL_CHANT_PROPERTIES (operation)->radius);
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static gboolean
Modified: trunk/operations/workshop/lens-correct.c
==============================================================================
--- trunk/operations/workshop/lens-correct.c (original)
+++ trunk/operations/workshop/lens-correct.c Tue Jan 20 19:37:42 2009
@@ -234,7 +234,7 @@
/* Get src pixels. */
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 3);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RGB float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RGB float"), src_buf, GEGL_AUTO_ROWSTRIDE);
/* Get buffer in which to place dst pixels. */
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 3);
@@ -294,7 +294,7 @@
}
/* Store dst pixels. */
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RGB float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (dst, NULL, babl_format ("RGB float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
/* Free acquired storage. */
g_free (src_buf);
@@ -361,8 +361,8 @@
#ifdef TRACE
g_warning ("> prepare");
#endif
- gegl_operation_set_format (operation, "input", babl_format_from_name ("RGB float"));
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGB float"));
+ gegl_operation_set_format (operation, "input", babl_format ("RGB float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGB float"));
#ifdef TRACE
g_warning ("< prepare");
#endif
Modified: trunk/operations/workshop/linear-gradient.c
==============================================================================
--- trunk/operations/workshop/linear-gradient.c (original)
+++ trunk/operations/workshop/linear-gradient.c Tue Jan 20 19:37:42 2009
@@ -40,7 +40,7 @@
static void
prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static GeglRectangle
Modified: trunk/operations/workshop/mandelbrot.c
==============================================================================
--- trunk/operations/workshop/mandelbrot.c (original)
+++ trunk/operations/workshop/mandelbrot.c Tue Jan 20 19:37:42 2009
@@ -69,7 +69,7 @@
static void prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "output", babl_format_from_name ("Y float"));
+ gegl_operation_set_format (operation, "output", babl_format ("Y float"));
}
static GeglRectangle
@@ -116,7 +116,7 @@
}
}
- gegl_buffer_set (output, NULL, babl_format_from_name ("Y float"), buf,
+ gegl_buffer_set (output, NULL, babl_format ("Y float"), buf,
GEGL_AUTO_ROWSTRIDE);
g_free (buf);
Modified: trunk/operations/workshop/radial-gradient.c
==============================================================================
--- trunk/operations/workshop/radial-gradient.c (original)
+++ trunk/operations/workshop/radial-gradient.c Tue Jan 20 19:37:42 2009
@@ -40,7 +40,7 @@
static void
prepare (GeglOperation *operation)
{
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static GeglRectangle
Modified: trunk/operations/workshop/rawbayer-load.c
==============================================================================
--- trunk/operations/workshop/rawbayer-load.c (original)
+++ trunk/operations/workshop/rawbayer-load.c Tue Jan 20 19:37:42 2009
@@ -64,7 +64,7 @@
{
GeglRectangle extent = { 0, 0, width, height };
- op_raw_load->chant_data = (void*)gegl_buffer_new (&extent, babl_format_from_name ("Y u16"));
+ op_raw_load->chant_data = (void*)gegl_buffer_new (&extent, babl_format ("Y u16"));
}
{
guchar *buf = g_new (guchar, width * height * 3 * 2);
@@ -81,11 +81,11 @@
gegl_buffer_set (GEGL_BUFFER (op_raw_load->chant_data),
NULL,
babl_format_new (
- babl_model_from_name ("RGB"),
- babl_type_from_name ("u16"),
- babl_component_from_name ("R"),
- babl_component_from_name ("G"),
- babl_component_from_name ("B"),
+ babl_model ("RGB"),
+ babl_type ("u16"),
+ babl_component ("R"),
+ babl_component ("G"),
+ babl_component ("B"),
NULL),
buf,
GEGL_AUTO_ROWSTRIDE);
Modified: trunk/operations/workshop/snn-percentile.c
==============================================================================
--- trunk/operations/workshop/snn-percentile.c (original)
+++ trunk/operations/workshop/snn-percentile.c Tue Jan 20 19:37:42 2009
@@ -152,7 +152,7 @@
src_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (src) * 4);
dst_buf = g_new0 (gfloat, gegl_buffer_get_pixel_count (dst) * 4);
- gegl_buffer_get (src, 1.0, NULL, babl_format_from_name ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_get (src, 1.0, NULL, babl_format ("RGBA float"), src_buf, GEGL_AUTO_ROWSTRIDE);
offset = 0;
percentile/= 100.0;
@@ -212,7 +212,7 @@
}
offset++;
}
- gegl_buffer_set (dst, NULL, babl_format_from_name ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (dst, NULL, babl_format ("RGBA float"), dst_buf, GEGL_AUTO_ROWSTRIDE);
g_free (src_buf);
g_free (dst_buf);
}
@@ -222,7 +222,7 @@
GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
area->left = area->right = area->top = area->bottom =
GEGL_CHANT_PROPERTIES (operation)->radius;
- gegl_operation_set_format (operation, "output", babl_format_from_name ("RGBA float"));
+ gegl_operation_set_format (operation, "output", babl_format ("RGBA float"));
}
static gboolean
Modified: trunk/tests/buffer/buffer-test.c
==============================================================================
--- trunk/tests/buffer/buffer-test.c (original)
+++ trunk/tests/buffer/buffer-test.c Tue Jan 20 19:37:42 2009
@@ -141,7 +141,7 @@
"height", &height,
NULL);
buf = g_malloc (width*height*sizeof(gfloat));
- gegl_buffer_get (buffer, 1.0, NULL, babl_format_from_name ("Y float"), buf, 0);
+ gegl_buffer_get (buffer, 1.0, NULL, babl_format ("Y float"), buf, 0);
print_linear_buffer_internal_float (gstring, width, height, buf);
g_free (buf);
}
@@ -160,7 +160,7 @@
"height", &height,
NULL);
buf = g_malloc (width*height*sizeof(gfloat));
- gegl_buffer_get (buffer, 1.0, NULL, babl_format_from_name ("Y float"), buf, 0);
+ gegl_buffer_get (buffer, 1.0, NULL, babl_format ("Y float"), buf, 0);
i=0;
for (y=0;y<height;y++)
@@ -170,7 +170,7 @@
buf[i++]=value;
}
}
- gegl_buffer_set (buffer, NULL, babl_format_from_name ("Y float"), buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (buffer, NULL, babl_format ("Y float"), buf, GEGL_AUTO_ROWSTRIDE);
g_free (buf);
}
@@ -189,7 +189,7 @@
"height", &height,
NULL);
buf = g_malloc (width*height*sizeof(gfloat));
- gegl_buffer_get (buffer, 1.0, NULL, babl_format_from_name ("Y float"), buf, 0);
+ gegl_buffer_get (buffer, 1.0, NULL, babl_format ("Y float"), buf, 0);
i=0;
for (y=0;y<height;y++)
@@ -215,7 +215,7 @@
}
}
- gegl_buffer_set (buffer, NULL, babl_format_from_name ("Y float"), buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (buffer, NULL, babl_format ("Y float"), buf, GEGL_AUTO_ROWSTRIDE);
g_free (buf);
}
@@ -232,7 +232,7 @@
"height", &height,
NULL);
buf = g_malloc (width*height*sizeof(gfloat));
- gegl_buffer_get (buffer, 1.0, NULL, babl_format_from_name ("Y float"), buf, 0);
+ gegl_buffer_get (buffer, 1.0, NULL, babl_format ("Y float"), buf, 0);
i=0;
for (y=0;y<height;y++)
@@ -242,7 +242,7 @@
buf[i++]= (1.0*y)/height;
}
}
- gegl_buffer_set (buffer, NULL, babl_format_from_name ("Y float"), buf, GEGL_AUTO_ROWSTRIDE);
+ gegl_buffer_set (buffer, NULL, babl_format ("Y float"), buf, GEGL_AUTO_ROWSTRIDE);
g_free (buf);
}
Modified: trunk/tests/buffer/tests/buffer_inherit_parent_extent.c
==============================================================================
--- trunk/tests/buffer/tests/buffer_inherit_parent_extent.c (original)
+++ trunk/tests/buffer/tests/buffer_inherit_parent_extent.c Tue Jan 20 19:37:42 2009
@@ -5,7 +5,7 @@
GeglRectangle subsubrect = {0, 0, -1, -1};
GeglRectangle rect = {0, 0, 20, 20};
test_start ();
- buffer = gegl_buffer_new (&rect, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&rect, babl_format ("Y float"));
sub = gegl_buffer_create_sub_buffer (buffer, &subrect);
fill (sub, 0.5);
Modified: trunk/tests/buffer/tests/buffer_shift_diagonal.c
==============================================================================
--- trunk/tests/buffer/tests/buffer_shift_diagonal.c (original)
+++ trunk/tests/buffer/tests/buffer_shift_diagonal.c Tue Jan 20 19:37:42 2009
@@ -4,7 +4,7 @@
GeglRectangle subrect = {5, 5, 10, 10};
GeglRectangle rect = {0, 0, 20, 20};
test_start ();
- buffer = gegl_buffer_new (&rect, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&rect, babl_format ("Y float"));
sub = gegl_buffer_create_sub_buffer (buffer, &subrect);
fill (sub, 0.5);
Modified: trunk/tests/buffer/tests/buffer_shift_horizontal.c
==============================================================================
--- trunk/tests/buffer/tests/buffer_shift_horizontal.c (original)
+++ trunk/tests/buffer/tests/buffer_shift_horizontal.c Tue Jan 20 19:37:42 2009
@@ -4,7 +4,7 @@
GeglRectangle subrect = {5, 5, 10, 10};
GeglRectangle rect = {0, 0, 20, 20};
test_start ();
- buffer = gegl_buffer_new (&rect, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&rect, babl_format ("Y float"));
sub = gegl_buffer_create_sub_buffer (buffer, &subrect);
fill (sub, 0.5);
Modified: trunk/tests/buffer/tests/buffer_shift_vertical.c
==============================================================================
--- trunk/tests/buffer/tests/buffer_shift_vertical.c (original)
+++ trunk/tests/buffer/tests/buffer_shift_vertical.c Tue Jan 20 19:37:42 2009
@@ -4,7 +4,7 @@
GeglRectangle subrect = {5, 5, 10, 10};
GeglRectangle rect = {0, 0, 20, 20};
test_start ();
- buffer = gegl_buffer_new (&rect, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&rect, babl_format ("Y float"));
sub = gegl_buffer_create_sub_buffer (buffer, &subrect);
fill (sub, 0.5);
Modified: trunk/tests/buffer/tests/disabled_abyss.c
==============================================================================
--- trunk/tests/buffer/tests/disabled_abyss.c (original)
+++ trunk/tests/buffer/tests/disabled_abyss.c Tue Jan 20 19:37:42 2009
@@ -9,7 +9,7 @@
GeglRectangle subsubrect = {3, 3, 4, 4};
GeglRectangle rect = {0, 0, 20, 20};
test_start ();
- buffer = gegl_buffer_new (&rect, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&rect, babl_format ("Y float"));
sub = g_object_new (GEGL_TYPE_BUFFER,
"source", buffer,
Modified: trunk/tests/buffer/tests/get_shifted.c
==============================================================================
--- trunk/tests/buffer/tests/get_shifted.c (original)
+++ trunk/tests/buffer/tests/get_shifted.c Tue Jan 20 19:37:42 2009
@@ -5,7 +5,7 @@
GeglRectangle foor = {0, 0, 10, 10};
GeglRectangle rect = {0, 0, 20, 20};
test_start ();
- buffer = gegl_buffer_new (&rect, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&rect, babl_format ("Y float"));
sub = gegl_buffer_create_sub_buffer (buffer, &subrect);
vgrad (buffer);
Modified: trunk/tests/buffer/tests/linear_from_data.c
==============================================================================
--- trunk/tests/buffer/tests/linear_from_data.c (original)
+++ trunk/tests/buffer/tests/linear_from_data.c Tue Jan 20 19:37:42 2009
@@ -10,7 +10,7 @@
for (i=0;i<100;i++)
buf[i]=i/100.0;
- buffer = gegl_buffer_linear_new_from_data (buf, babl_format_from_name ("Y float"),
+ buffer = gegl_buffer_linear_new_from_data (buf, babl_format ("Y float"),
&extent,
10 * 4,
G_CALLBACK(g_free), /* destroy_notify */
Modified: trunk/tests/buffer/tests/linear_from_data_rows.c
==============================================================================
--- trunk/tests/buffer/tests/linear_from_data_rows.c (original)
+++ trunk/tests/buffer/tests/linear_from_data_rows.c Tue Jan 20 19:37:42 2009
@@ -10,7 +10,7 @@
for (i=0;i<120;i++)
buf[i]=i%12==5?0.5:0.0;
- buffer = gegl_buffer_linear_new_from_data (buf, babl_format_from_name ("Y float"),
+ buffer = gegl_buffer_linear_new_from_data (buf, babl_format ("Y float"),
&extent,
12 * 4,
G_CALLBACK(g_free), /* destroy_notify */
Modified: trunk/tests/buffer/tests/linear_modify.c
==============================================================================
--- trunk/tests/buffer/tests/linear_modify.c (original)
+++ trunk/tests/buffer/tests/linear_modify.c Tue Jan 20 19:37:42 2009
@@ -4,7 +4,7 @@
GeglRectangle extent = {0,0,40,20};
GeglRectangle roi = {1,1,30,10};
test_start();
- buffer = gegl_buffer_linear_new (&extent, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_linear_new (&extent, babl_format ("Y float"));
fill_rect (buffer, &roi, 0.5);
roi.y+=3;
roi.x+=20;
Modified: trunk/tests/buffer/tests/linear_new.c
==============================================================================
--- trunk/tests/buffer/tests/linear_new.c (original)
+++ trunk/tests/buffer/tests/linear_new.c Tue Jan 20 19:37:42 2009
@@ -5,7 +5,7 @@
GeglRectangle roi = {1,1,30,10};
test_start();
g_print ("foo!\n");
- buffer = gegl_buffer_linear_new (&extent, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_linear_new (&extent, babl_format ("Y float"));
fill_rect (buffer, &roi, 0.5);
roi.y+=3;
roi.x+=20;
Modified: trunk/tests/buffer/tests/linear_proxy_modify.c
==============================================================================
--- trunk/tests/buffer/tests/linear_proxy_modify.c (original)
+++ trunk/tests/buffer/tests/linear_proxy_modify.c Tue Jan 20 19:37:42 2009
@@ -4,7 +4,7 @@
GeglRectangle extent = {0,0,40,20};
GeglRectangle roi = {1,1,30,10};
test_start();
- buffer = gegl_buffer_new (&extent, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&extent, babl_format ("Y float"));
fill_rect (buffer, &roi, 0.5);
roi.y+=3;
roi.x+=20;
Modified: trunk/tests/buffer/tests/sub_rect_fills_and_gets.c
==============================================================================
--- trunk/tests/buffer/tests/sub_rect_fills_and_gets.c (original)
+++ trunk/tests/buffer/tests/sub_rect_fills_and_gets.c Tue Jan 20 19:37:42 2009
@@ -6,7 +6,7 @@
GeglRectangle subrect3 = {-2, -2, 24, 24};
GeglRectangle rect = {0, 0, 20, 20};
test_start ();
- buffer = gegl_buffer_new (&rect, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&rect, babl_format ("Y float"));
sub1 = gegl_buffer_create_sub_buffer (buffer, &subrect1);
sub2 = gegl_buffer_create_sub_buffer (buffer, &subrect2);
sub3 = gegl_buffer_create_sub_buffer (buffer, &subrect3);
Modified: trunk/tests/buffer/tests/sub_sub_fill.c
==============================================================================
--- trunk/tests/buffer/tests/sub_sub_fill.c (original)
+++ trunk/tests/buffer/tests/sub_sub_fill.c Tue Jan 20 19:37:42 2009
@@ -5,7 +5,7 @@
GeglRectangle subsubrect = {3, 3, 4, 4};
GeglRectangle rect = {0, 0, 20, 20};
test_start ();
- buffer = gegl_buffer_new (&rect, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&rect, babl_format ("Y float"));
sub = gegl_buffer_create_sub_buffer (buffer, &subrect);
fill (sub, 0.5);
Modified: trunk/tests/buffer/tests/sub_sub_fill2.c
==============================================================================
--- trunk/tests/buffer/tests/sub_sub_fill2.c (original)
+++ trunk/tests/buffer/tests/sub_sub_fill2.c Tue Jan 20 19:37:42 2009
@@ -5,7 +5,7 @@
GeglRectangle subsubrect = {3, 3, 4, 4};
GeglRectangle rect = {0, 0, 20, 20};
test_start ();
- buffer = gegl_buffer_new (&rect, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&rect, babl_format ("Y float"));
fill (buffer, 0.8);
sub = gegl_buffer_create_sub_buffer (buffer, &subrect);
Modified: trunk/tests/buffer/tests/test_blank.c
==============================================================================
--- trunk/tests/buffer/tests/test_blank.c (original)
+++ trunk/tests/buffer/tests/test_blank.c Tue Jan 20 19:37:42 2009
@@ -5,7 +5,7 @@
test_start ();
- buffer = gegl_buffer_new (&rect, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&rect, babl_format ("Y float"));
print_buffer (buffer);
gegl_buffer_destroy (buffer);
Modified: trunk/tests/buffer/tests/test_checkerboard.c
==============================================================================
--- trunk/tests/buffer/tests/test_checkerboard.c (original)
+++ trunk/tests/buffer/tests/test_checkerboard.c Tue Jan 20 19:37:42 2009
@@ -5,7 +5,7 @@
test_start ();
- buffer = gegl_buffer_new (&rect, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&rect, babl_format ("Y float"));
checkerboard (buffer, 3, 0.0, 1.0);
print_buffer (buffer);
gegl_buffer_destroy (buffer);
Modified: trunk/tests/buffer/tests/test_gegl_buffer_copy.c
==============================================================================
--- trunk/tests/buffer/tests/test_gegl_buffer_copy.c (original)
+++ trunk/tests/buffer/tests/test_gegl_buffer_copy.c Tue Jan 20 19:37:42 2009
@@ -5,8 +5,8 @@
GeglRectangle source = {2, 2, 5, 5};
GeglRectangle dest = {10, 10, 5, 5};
test_start ();
- buffer = gegl_buffer_new (&bound, babl_format_from_name ("Y float"));
- buffer2 = gegl_buffer_new (&bound, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&bound, babl_format ("Y float"));
+ buffer2 = gegl_buffer_new (&bound, babl_format ("Y float"));
vgrad (buffer);
gegl_buffer_copy (buffer, &source, buffer2, &dest);
Modified: trunk/tests/buffer/tests/test_gegl_buffer_copy_lower_left.c
==============================================================================
--- trunk/tests/buffer/tests/test_gegl_buffer_copy_lower_left.c (original)
+++ trunk/tests/buffer/tests/test_gegl_buffer_copy_lower_left.c Tue Jan 20 19:37:42 2009
@@ -3,7 +3,7 @@
GeglBuffer *buffer, *buffer2;
GeglRectangle bound = {0, 0, 20, 20};
test_start ();
- buffer = gegl_buffer_new (&bound, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&bound, babl_format ("Y float"));
vgrad (buffer);
{
GeglRectangle rect = *gegl_buffer_get_extent(buffer);
Modified: trunk/tests/buffer/tests/test_gegl_buffer_copy_lower_right.c
==============================================================================
--- trunk/tests/buffer/tests/test_gegl_buffer_copy_lower_right.c (original)
+++ trunk/tests/buffer/tests/test_gegl_buffer_copy_lower_right.c Tue Jan 20 19:37:42 2009
@@ -3,7 +3,7 @@
GeglBuffer *buffer, *buffer2;
GeglRectangle bound = {0, 0, 20, 20};
test_start ();
- buffer = gegl_buffer_new (&bound, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&bound, babl_format ("Y float"));
vgrad (buffer);
{
GeglRectangle rect = *gegl_buffer_get_extent(buffer);
Modified: trunk/tests/buffer/tests/test_gegl_buffer_copy_self.c
==============================================================================
--- trunk/tests/buffer/tests/test_gegl_buffer_copy_self.c (original)
+++ trunk/tests/buffer/tests/test_gegl_buffer_copy_self.c Tue Jan 20 19:37:42 2009
@@ -5,7 +5,7 @@
GeglRectangle dest = {15, 15, 1, 1};
GeglRectangle rect = {0, 0, 20, 20};
test_start ();
- buffer = gegl_buffer_new (&rect, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&rect, babl_format ("Y float"));
vgrad (buffer);
gegl_buffer_copy (buffer, &source, buffer, &dest); /* copying to self */
Modified: trunk/tests/buffer/tests/test_gegl_buffer_copy_upper_left.c
==============================================================================
--- trunk/tests/buffer/tests/test_gegl_buffer_copy_upper_left.c (original)
+++ trunk/tests/buffer/tests/test_gegl_buffer_copy_upper_left.c Tue Jan 20 19:37:42 2009
@@ -3,7 +3,7 @@
GeglBuffer *buffer, *buffer2;
GeglRectangle bound = {0, 0, 20, 20};
test_start ();
- buffer = gegl_buffer_new (&bound, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&bound, babl_format ("Y float"));
vgrad (buffer);
{
GeglRectangle rect = *gegl_buffer_get_extent(buffer);
Modified: trunk/tests/buffer/tests/test_gegl_buffer_copy_upper_right.c
==============================================================================
--- trunk/tests/buffer/tests/test_gegl_buffer_copy_upper_right.c (original)
+++ trunk/tests/buffer/tests/test_gegl_buffer_copy_upper_right.c Tue Jan 20 19:37:42 2009
@@ -3,7 +3,7 @@
GeglBuffer *buffer, *buffer2;
GeglRectangle bound = {0, 0, 20, 20};
test_start ();
- buffer = gegl_buffer_new (&bound, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&bound, babl_format ("Y float"));
vgrad (buffer);
{
GeglRectangle rect = *gegl_buffer_get_extent(buffer);
Modified: trunk/tests/buffer/tests/test_gegl_buffer_duplicate.c
==============================================================================
--- trunk/tests/buffer/tests/test_gegl_buffer_duplicate.c (original)
+++ trunk/tests/buffer/tests/test_gegl_buffer_duplicate.c Tue Jan 20 19:37:42 2009
@@ -3,7 +3,7 @@
GeglBuffer *buffer, *buffer2;
GeglRectangle bound = {0, 0, 20, 20};
test_start ();
- buffer = gegl_buffer_new (&bound, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&bound, babl_format ("Y float"));
vgrad (buffer);
buffer2 = gegl_buffer_dup (buffer);
print_buffer (buffer2);
Modified: trunk/tests/buffer/tests/test_gegl_buffer_iterator1.c
==============================================================================
--- trunk/tests/buffer/tests/test_gegl_buffer_iterator1.c (original)
+++ trunk/tests/buffer/tests/test_gegl_buffer_iterator1.c Tue Jan 20 19:37:42 2009
@@ -4,7 +4,7 @@
GeglRectangle extent = {0,0,20,20};
GeglRectangle roi = {0,0,20,20};
test_start();
- buffer = gegl_buffer_new (&extent, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&extent, babl_format ("Y float"));
fill_rect (buffer, &roi, 0.5);
print_buffer (buffer);
gegl_buffer_destroy (buffer);
Modified: trunk/tests/buffer/tests/test_gegl_buffer_iterator1sub.c
==============================================================================
--- trunk/tests/buffer/tests/test_gegl_buffer_iterator1sub.c (original)
+++ trunk/tests/buffer/tests/test_gegl_buffer_iterator1sub.c Tue Jan 20 19:37:42 2009
@@ -6,7 +6,7 @@
GeglRectangle sextent = {2,2,20,20};
GeglRectangle roi = {0,0,20,20};
test_start();
- buffer = gegl_buffer_new (&extent, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&extent, babl_format ("Y float"));
sub = gegl_buffer_create_sub_buffer (buffer, &sextent);
fill_rect (sub, &roi, 0.5);
Modified: trunk/tests/buffer/tests/test_gegl_buffer_iterator2.c
==============================================================================
--- trunk/tests/buffer/tests/test_gegl_buffer_iterator2.c (original)
+++ trunk/tests/buffer/tests/test_gegl_buffer_iterator2.c Tue Jan 20 19:37:42 2009
@@ -4,7 +4,7 @@
GeglRectangle extent = {0,0,20,20};
GeglRectangle roi = {0,0,10,10};
test_start();
- buffer = gegl_buffer_new (&extent, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&extent, babl_format ("Y float"));
fill_rect (buffer, &roi, 0.5);
print_buffer (buffer);
test_end ();
Modified: trunk/tests/buffer/tests/test_gegl_buffer_iterator2sub.c
==============================================================================
--- trunk/tests/buffer/tests/test_gegl_buffer_iterator2sub.c (original)
+++ trunk/tests/buffer/tests/test_gegl_buffer_iterator2sub.c Tue Jan 20 19:37:42 2009
@@ -6,7 +6,7 @@
GeglRectangle sextent = {2,2,20,20};
GeglRectangle roi = {0,0,10,10};
test_start();
- buffer = gegl_buffer_new (&extent, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&extent, babl_format ("Y float"));
sub = gegl_buffer_create_sub_buffer (buffer, &sextent);
fill_rect (sub, &roi, 0.5);
print_buffer (buffer);
Modified: trunk/tests/buffer/tests/test_gegl_buffer_iterator3.c
==============================================================================
--- trunk/tests/buffer/tests/test_gegl_buffer_iterator3.c (original)
+++ trunk/tests/buffer/tests/test_gegl_buffer_iterator3.c Tue Jan 20 19:37:42 2009
@@ -4,7 +4,7 @@
GeglRectangle extent = {0,0,20,20};
GeglRectangle roi = {5,5,10,10};
test_start();
- buffer = gegl_buffer_new (&extent, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&extent, babl_format ("Y float"));
fill_rect (buffer, &roi, 0.5);
print_buffer (buffer);
test_end ();
Modified: trunk/tests/buffer/tests/test_gegl_buffer_iterator3sub.c
==============================================================================
--- trunk/tests/buffer/tests/test_gegl_buffer_iterator3sub.c (original)
+++ trunk/tests/buffer/tests/test_gegl_buffer_iterator3sub.c Tue Jan 20 19:37:42 2009
@@ -6,7 +6,7 @@
GeglRectangle sextent = {2,2,20,20};
GeglRectangle roi = {5,5,10,10};
test_start();
- buffer = gegl_buffer_new (&extent, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&extent, babl_format ("Y float"));
sub = gegl_buffer_create_sub_buffer (buffer, &sextent);
fill_rect (sub, &roi, 0.5);
print_buffer (buffer);
Modified: trunk/tests/buffer/tests/test_gegl_buffer_iterator4.c
==============================================================================
--- trunk/tests/buffer/tests/test_gegl_buffer_iterator4.c (original)
+++ trunk/tests/buffer/tests/test_gegl_buffer_iterator4.c Tue Jan 20 19:37:42 2009
@@ -4,7 +4,7 @@
GeglRectangle extent = {0,0,20,20};
GeglRectangle roi = {1,1,10,10};
test_start();
- buffer = gegl_buffer_new (&extent, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&extent, babl_format ("Y float"));
fill_rect (buffer, &roi, 0.5);
print_buffer (buffer);
test_end ();
Modified: trunk/tests/buffer/tests/test_gegl_buffer_iterator4sub.c
==============================================================================
--- trunk/tests/buffer/tests/test_gegl_buffer_iterator4sub.c (original)
+++ trunk/tests/buffer/tests/test_gegl_buffer_iterator4sub.c Tue Jan 20 19:37:42 2009
@@ -6,7 +6,7 @@
GeglRectangle sextent = {2,2,20,20};
GeglRectangle roi = {1,1,10,10};
test_start();
- buffer = gegl_buffer_new (&extent, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&extent, babl_format ("Y float"));
sub = gegl_buffer_create_sub_buffer (buffer, &sextent);
fill_rect (sub, &roi, 0.5);
print_buffer (buffer);
Modified: trunk/tests/buffer/tests/test_get_buffer_scaled.c
==============================================================================
--- trunk/tests/buffer/tests/test_get_buffer_scaled.c (original)
+++ trunk/tests/buffer/tests/test_get_buffer_scaled.c Tue Jan 20 19:37:42 2009
@@ -7,7 +7,7 @@
test_start ();
- buffer = gegl_buffer_new (&rect, babl_format_from_name ("Y u8"));
+ buffer = gegl_buffer_new (&rect, babl_format ("Y u8"));
checkerboard (buffer, 2, 0.0, 1.0);
buf = g_malloc (getrect.width*getrect.height*sizeof(gfloat));
@@ -18,7 +18,7 @@
{
getrect.x=i;
/*getrect.y=i;*/
- gegl_buffer_get (buffer, 1.2, &getrect, babl_format_from_name ("Y u8"), buf, 0);
+ gegl_buffer_get (buffer, 1.2, &getrect, babl_format ("Y u8"), buf, 0);
print_linear_buffer_u8 (getrect.width, getrect.height, buf);
}
}
Modified: trunk/tests/buffer/tests/test_get_buffer_scaled2.c
==============================================================================
--- trunk/tests/buffer/tests/test_get_buffer_scaled2.c (original)
+++ trunk/tests/buffer/tests/test_get_buffer_scaled2.c Tue Jan 20 19:37:42 2009
@@ -7,11 +7,11 @@
test_start ();
- buffer = gegl_buffer_new (&rect, babl_format_from_name ("Y u8"));
+ buffer = gegl_buffer_new (&rect, babl_format ("Y u8"));
checkerboard (buffer, 2, 0.0, 1.0);
buf = g_malloc (getrect.width*getrect.height*sizeof(gfloat));
- gegl_buffer_get (buffer, 0.66, &getrect, babl_format_from_name ("Y u8"), buf, 0);
+ gegl_buffer_get (buffer, 0.66, &getrect, babl_format ("Y u8"), buf, 0);
print_linear_buffer_u8 (getrect.width, getrect.height, buf);
Modified: trunk/tests/buffer/tests/test_gray.c
==============================================================================
--- trunk/tests/buffer/tests/test_gray.c (original)
+++ trunk/tests/buffer/tests/test_gray.c Tue Jan 20 19:37:42 2009
@@ -5,7 +5,7 @@
test_start ();
- buffer = gegl_buffer_new (&rect, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&rect, babl_format ("Y float"));
fill (buffer, 0.5);
print_buffer (buffer);
gegl_buffer_destroy (buffer);
Modified: trunk/tests/buffer/tests/test_rectangle.c
==============================================================================
--- trunk/tests/buffer/tests/test_rectangle.c (original)
+++ trunk/tests/buffer/tests/test_rectangle.c Tue Jan 20 19:37:42 2009
@@ -5,7 +5,7 @@
test_start ();
- buffer = gegl_buffer_new (&rect, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&rect, babl_format ("Y float"));
fill (buffer, 0.5);
rectangle (buffer, 5,5, 10, 10, 0.0);
print_buffer (buffer);
Modified: trunk/tests/buffer/tests/test_sample.c
==============================================================================
--- trunk/tests/buffer/tests/test_sample.c (original)
+++ trunk/tests/buffer/tests/test_sample.c Tue Jan 20 19:37:42 2009
@@ -6,7 +6,7 @@
GeglRectangle subsubsubrect = {5, 3, 2, 2};
GeglRectangle rect = {0, 0, 20, 20};
test_start ();
- buffer = gegl_buffer_new (&rect, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&rect, babl_format ("Y float"));
vgrad (buffer);
Modified: trunk/tests/buffer/tests/vertical_gradient.c
==============================================================================
--- trunk/tests/buffer/tests/vertical_gradient.c (original)
+++ trunk/tests/buffer/tests/vertical_gradient.c Tue Jan 20 19:37:42 2009
@@ -4,7 +4,7 @@
GeglRectangle rect = {0, 0, 20, 20};
test_start();
- buffer = gegl_buffer_new (&rect, babl_format_from_name ("Y float"));
+ buffer = gegl_buffer_new (&rect, babl_format ("Y float"));
vgrad (buffer);
print_buffer (buffer);
gegl_buffer_destroy (buffer);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
