[gegl] gegl-sampler.[ch] coding style fixes



commit fffd41e4f3342247af1d296ebc184ded303b4b22
Author: Simon Budig <simon budig de>
Date:   Sun Sep 25 02:28:04 2016 +0200

    gegl-sampler.[ch] coding style fixes

 gegl/buffer/gegl-sampler.c |   28 +++++++++++++---------------
 gegl/buffer/gegl-sampler.h |   27 ++++++++++++++-------------
 2 files changed, 27 insertions(+), 28 deletions(-)
---
diff --git a/gegl/buffer/gegl-sampler.c b/gegl/buffer/gegl-sampler.c
index 14861df..4a06dfd 100644
--- a/gegl/buffer/gegl-sampler.c
+++ b/gegl/buffer/gegl-sampler.c
@@ -366,14 +366,14 @@ gegl_sampler_get_from_mipmap (GeglSampler    *sampler,
   gint    dy;
   gint    sof;
 
-  const gdouble scale = 1. / ( (gdouble) (1<<level_no) );
+  const gdouble scale = 1. / ((gdouble) (1 << level_no));
 
   const gint maximum_width  = GEGL_SAMPLER_MAXIMUM_WIDTH;
   const gint maximum_height = GEGL_SAMPLER_MAXIMUM_HEIGHT;
 
   if (gegl_cl_is_accelerated ())
     {
-      GeglRectangle rect={x,y,1,1};
+      GeglRectangle rect = {x, y, 1, 1};
       gegl_buffer_cl_cache_flush (sampler->buffer, &rect);
     }
 
@@ -381,26 +381,24 @@ gegl_sampler_get_from_mipmap (GeglSampler    *sampler,
   g_assert (level->context_rect.width  <= maximum_width);
   g_assert (level->context_rect.height <= maximum_height);
 
-
-  if ((level->sampler_buffer == NULL)
-   || (x + level->context_rect.x < level->sampler_rectangle.x)
-   || (y + level->context_rect.y < level->sampler_rectangle.y)
-   || (x + level->context_rect.x + level->context_rect.width
-     >= level->sampler_rectangle.x + level->sampler_rectangle.width)
-   || (y + level->context_rect.y + level->context_rect.height
-     >= level->sampler_rectangle.y + level->sampler_rectangle.height))
+  if ((level->sampler_buffer == NULL)                               ||
+      (x + level->context_rect.x < level->sampler_rectangle.x)      ||
+      (y + level->context_rect.y < level->sampler_rectangle.y)      ||
+      (x + level->context_rect.x + level->context_rect.width >=
+       level->sampler_rectangle.x + level->sampler_rectangle.width) ||
+      (y + level->context_rect.y + level->context_rect.height >=
+       level->sampler_rectangle.y + level->sampler_rectangle.height))
     {
       /*
        * fetch_rectangle will become the value of
        * sampler->sampler_rectangle[level]:
        */
-      level->sampler_rectangle = _gegl_sampler_compute_rectangle (sampler, x, y, 
+      level->sampler_rectangle = _gegl_sampler_compute_rectangle (sampler, x, y,
                                                                   level_no);
       if (!level->sampler_buffer)
         level->sampler_buffer =
           g_malloc0 (GEGL_SAMPLER_ROWSTRIDE * GEGL_SAMPLER_MAXIMUM_HEIGHT);
 
-
       gegl_buffer_get (sampler->buffer,
                        &level->sampler_rectangle,
                        scale,
@@ -412,10 +410,10 @@ gegl_sampler_get_from_mipmap (GeglSampler    *sampler,
 
   dx         = x - level->sampler_rectangle.x;
   dy         = y - level->sampler_rectangle.y;
-  buffer_ptr = (guchar *)level->sampler_buffer;
-  sof        = ( dx + dy * GEGL_SAMPLER_MAXIMUM_WIDTH) * GEGL_SAMPLER_BPP;
+  buffer_ptr = (guchar *) level->sampler_buffer;
+  sof        = (dx + dy * GEGL_SAMPLER_MAXIMUM_WIDTH) * GEGL_SAMPLER_BPP;
 
-  return (gfloat*)(buffer_ptr+sof);
+  return (gfloat*) (buffer_ptr + sof);
 }
 
 static void
diff --git a/gegl/buffer/gegl-sampler.h b/gegl/buffer/gegl-sampler.h
index c9d99f7..470c78d 100644
--- a/gegl/buffer/gegl-sampler.h
+++ b/gegl/buffer/gegl-sampler.h
@@ -126,13 +126,16 @@ gegl_sampler_get_ptr (GeglSampler    *sampler,
                       gint            y,
                       GeglAbyssPolicy repeat_mode)
 {
+  gint dx, dy, sof;
+  guchar *buffer_ptr;
+
   GeglSamplerLevel *level = &sampler->level[0];
-  if ((x + level->context_rect.x < level->sampler_rectangle.x)
-   || (y + level->context_rect.y < level->sampler_rectangle.y)
-   || (x + level->context_rect.x + level->context_rect.width
-     >= level->sampler_rectangle.x + level->sampler_rectangle.width)
-   || (y + level->context_rect.y + level->context_rect.height
-     >= level->sampler_rectangle.y + level->sampler_rectangle.height))
+  if ((x + level->context_rect.x < level->sampler_rectangle.x)      ||
+      (y + level->context_rect.y < level->sampler_rectangle.y)      ||
+      (x + level->context_rect.x + level->context_rect.width >=
+       level->sampler_rectangle.x + level->sampler_rectangle.width) ||
+      (y + level->context_rect.y + level->context_rect.height >=
+       level->sampler_rectangle.y + level->sampler_rectangle.height))
     {
       level->sampler_rectangle = _gegl_sampler_compute_rectangle (sampler, x, y, 0);
 
@@ -145,14 +148,12 @@ gegl_sampler_get_ptr (GeglSampler    *sampler,
                        repeat_mode);
     }
 
-  {
-    gint    dx         = x - level->sampler_rectangle.x;
-    gint    dy         = y - level->sampler_rectangle.y;
-    gint    sof        = (dx + dy * GEGL_SAMPLER_MAXIMUM_WIDTH) * GEGL_SAMPLER_BPP;
-    guchar *buffer_ptr = (guchar *)level->sampler_buffer;
+  dx         = x - level->sampler_rectangle.x;
+  dy         = y - level->sampler_rectangle.y;
+  sof        = (dx + dy * GEGL_SAMPLER_MAXIMUM_WIDTH) * GEGL_SAMPLER_BPP;
+  buffer_ptr = (guchar *) level->sampler_buffer;
 
-    return (gfloat*)(buffer_ptr+sof);
-  }
+  return (gfloat *) (buffer_ptr + sof);
 }
 
 G_END_DECLS


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]