[gegl] samplers: do not run prepare() on buffer set

[Øyvind Kolås <ok src gnome org>]

commit 09033e05ed4347522c949f679bd54d8662904bb7
Author: Øyvind Kolås <pippin gimp org>
Date:   Sun Jun 15 06:14:17 2014 +0200

    samplers: do not run prepare() on buffer set

 gegl/buffer/gegl-sampler-nearest.c |    4 ++--
 gegl/buffer/gegl-sampler.c         |    4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/gegl/buffer/gegl-sampler-nearest.c b/gegl/buffer/gegl-sampler-nearest.c
index c0982de..865cb88 100644
--- a/gegl/buffer/gegl-sampler-nearest.c
+++ b/gegl/buffer/gegl-sampler-nearest.c
@@ -201,10 +201,10 @@ gegl_sampler_nearest_get (      GeglSampler*    restrict  sampler,
    */
 
   const gfloat* restrict in_bptr =
-    gegl_sampler_get_ptr (self,
+    gegl_sampler_get_ptr (sampler,
                           (gint) floor ((double) absolute_x),
                           (gint) floor ((double) absolute_y),
                           repeat_mode);
-  babl_process (self->fish, in_bptr, output, 1);
+  babl_process (sampler->fish, in_bptr, output, 1);
 #endif
 }
diff --git a/gegl/buffer/gegl-sampler.c b/gegl/buffer/gegl-sampler.c
index f8370de..755160e 100644
--- a/gegl/buffer/gegl-sampler.c
+++ b/gegl/buffer/gegl-sampler.c
@@ -143,7 +143,7 @@ gegl_sampler_prepare (GeglSampler *self)
 
   klass = GEGL_SAMPLER_GET_CLASS (self);
 
-  if (!self->buffer)
+  if (!self->buffer) /* happens when extent of sampler is queried */
     return;
   if (!self->format)
     self->format = self->buffer->soft_format;
@@ -183,8 +183,6 @@ gegl_sampler_set_buffer (GeglSampler *self, GeglBuffer *buffer)
 
   if (klass->set_buffer)
     klass->set_buffer (self, buffer);
-
-  gegl_sampler_prepare (self);
 }
 
 static void