[gegl] gegl-sampler: fix some range checks



commit 13d0986ca9c018337da32b96fd9d385a35d4383f
Author: Simon Budig <simon budig de>
Date:   Sun Sep 25 00:21:03 2016 +0200

    gegl-sampler: fix some range checks

 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 1d79e2f..14861df 100644
--- a/gegl/buffer/gegl-sampler.c
+++ b/gegl/buffer/gegl-sampler.c
@@ -386,9 +386,9 @@ gegl_sampler_get_from_mipmap (GeglSampler    *sampler,
    || (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)
+     >= 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.y + level->sampler_rectangle.height))
     {
       /*
        * fetch_rectangle will become the value of
diff --git a/gegl/buffer/gegl-sampler.h b/gegl/buffer/gegl-sampler.h
index afb1844..c9d99f7 100644
--- a/gegl/buffer/gegl-sampler.h
+++ b/gegl/buffer/gegl-sampler.h
@@ -130,9 +130,9 @@ gegl_sampler_get_ptr (GeglSampler    *sampler,
   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)
+     >= 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.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]