[gegl] gegl-sampler: revert 13d0986



commit f55653a3fccfb27e53f935c07d339210cf56d879
Author: Simon Budig <simon budig de>
Date:   Wed Sep 28 12:59:10 2016 +0200

    gegl-sampler: revert 13d0986
    
    That was a misguided change, I misinterpreted the range check.
    Fixes bug #772105

 gegl/buffer/gegl-sampler.c |    4 ++--
 gegl/buffer/gegl-sampler.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/gegl/buffer/gegl-sampler.c b/gegl/buffer/gegl-sampler.c
index 4a06dfd..9f556fd 100644
--- a/gegl/buffer/gegl-sampler.c
+++ b/gegl/buffer/gegl-sampler.c
@@ -384,9 +384,9 @@ gegl_sampler_get_from_mipmap (GeglSampler    *sampler,
   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 >=
+      (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 >=
+      (y + level->context_rect.y + level->context_rect.height >
        level->sampler_rectangle.y + level->sampler_rectangle.height))
     {
       /*
diff --git a/gegl/buffer/gegl-sampler.h b/gegl/buffer/gegl-sampler.h
index 470c78d..f3464ff 100644
--- a/gegl/buffer/gegl-sampler.h
+++ b/gegl/buffer/gegl-sampler.h
@@ -132,9 +132,9 @@ gegl_sampler_get_ptr (GeglSampler    *sampler,
   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 >=
+      (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 >=
+      (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);


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