[gegl/samplers] lohalo: use anchor offsets (positive) instead of leftmost/topmost shifts (negative)
- From: Nicolas Robidoux <nrobidoux src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl/samplers] lohalo: use anchor offsets (positive) instead of leftmost/topmost shifts (negative)
- Date: Sun, 26 Jun 2011 14:43:10 +0000 (UTC)
commit 32b7acb7189abd65a7f6ec51471b004ecead0e2a
Author: Nicolas Robidoux <nicolas robidoux gmail com>
Date: Sun Jun 26 10:43:05 2011 -0400
lohalo: use anchor offsets (positive) instead of leftmost/topmost shifts (negative)
gegl/buffer/gegl-sampler-lohalo.c | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/gegl/buffer/gegl-sampler-lohalo.c b/gegl/buffer/gegl-sampler-lohalo.c
index 04a9c7e..7a2e423 100644
--- a/gegl/buffer/gegl-sampler-lohalo.c
+++ b/gegl/buffer/gegl-sampler-lohalo.c
@@ -33,8 +33,8 @@
* WARNING: This version of Lohalo only gives top quality downsampling
* results only down to about 1/2.5 = 40% of the size. Beyond that,
* the quality is somewhat lower (due to the use of mipmap data),
- * especially beyond 1/LOHALO_CONTEXT_RECT_SIZE_1 because then it does
- * not average over enough pixels to perform sufficient antialiasing.
+ * especially beyond 1/LOHALO_OFFSET because then it does not average
+ * over enough pixels to perform sufficient antialiasing.
*/
/*
@@ -279,7 +279,6 @@ gegl_sampler_lohalo_class_init (GeglSamplerLohaloClass *klass)
*/
#define LOHALO_OFFSET (2)
#define LOHALO_SIZE ( 1 + 2 * LOHALO_OFFSET )
-#define LOHALO_SHIFT ( - (LOHALO_OFFSET) )
/*
* The higher mipmap context_rects must be set so that there is at
@@ -301,7 +300,6 @@ gegl_sampler_lohalo_class_init (GeglSamplerLohaloClass *klass)
*/
#define LOHALO_LEVEL_1_OFFSET (4)
#define LOHALO_LEVEL_1_SIZE ( 1 + 2 * LOHALO_LEVEL_1_OFFSET )
-#define LOHALO_LEVEL_1_SHIFT ( - (LOHALO_LEVEL_1_OFFSET) )
/*
* ADAM: THE WAY I (NICOLAS) SET UP JACOBIAN-ADAPTIVITY, LEVEL 0
@@ -310,8 +308,8 @@ gegl_sampler_lohalo_class_init (GeglSamplerLohaloClass *klass)
static void
gegl_sampler_lohalo_init (GeglSamplerLohalo *self)
{
- GEGL_SAMPLER (self)->context_rect.x = LOHALO_SHIFT;
- GEGL_SAMPLER (self)->context_rect.y = LOHALO_SHIFT;
+ GEGL_SAMPLER (self)->context_rect.x = -LOHALO_OFFSET;
+ GEGL_SAMPLER (self)->context_rect.y = -LOHALO_OFFSET;
GEGL_SAMPLER (self)->context_rect.width = LOHALO_SIZE;
GEGL_SAMPLER (self)->context_rect.height = LOHALO_SIZE;
GEGL_SAMPLER (self)->interpolate_format = babl_format ("RaGaBaA float");
@@ -2076,10 +2074,10 @@ gegl_sampler_lohalo_get ( GeglSampler* restrict self,
* higher mipmap levels.
*/
{
- gint i = LOHALO_SHIFT;
+ gint i = -LOHALO_OFFSET;
do
(
- gint j = LOHALO_SHIFT;
+ gint j = -LOHALO_OFFSET;
do
(
ewa_update ((j),
@@ -2268,12 +2266,12 @@ gegl_sampler_lohalo_get ( GeglSampler* restrict self,
)
)
,
- LOHALO_CONTEXT_RECT_SHIFT_1
+ -LOHALO_OFFSET_1
);
const gint out_rite =
LOHALO_MIN
(
- -LOHALO_CONTEXT_RECT_SHIFT_1
+ LOHALO_OFFSET_1
,
(gint)
(
@@ -2298,12 +2296,12 @@ gegl_sampler_lohalo_get ( GeglSampler* restrict self,
)
)
,
- LOHALO_CONTEXT_RECT_SHIFT_1
+ LOHALO_OFFSET_1
);
const gint out_bot =
LOHALO_MIN
(
- -LOHALO_CONTEXT_RECT_SHIFT_1
+ -LOHALO_OFFSET_1
,
(gint)
(
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]