[gegl: 51/51] Merge branch 'samplers'

[Ãyvind KolÃs <ok src gnome org>]

commit b24670426d8ee31202295afa230a9fb0f3aeb5aa
Merge: 22b0f77 a8984f7
Author: Ãyvind KolÃs <pippin gimp org>
Date:   Sat Jun 18 23:34:20 2011 +0100

    Merge branch 'samplers'

 gegl/buffer/Makefile.am                            |   14 +-
 gegl/buffer/gegl-buffer-access.c                   |    7 +-
 gegl/buffer/gegl-buffer.c                          |    7 +-
 gegl/buffer/gegl-buffer.h                          |    7 +-
 gegl/buffer/gegl-sampler-downsharp.c               |   26 -
 gegl/buffer/gegl-sampler-downsharp.h               |   48 -
 gegl/buffer/gegl-sampler-downsharpfast.c           |   26 -
 gegl/buffer/gegl-sampler-downsharpfast.h           |   48 -
 gegl/buffer/gegl-sampler-downsize.c                |  927 ---------
 gegl/buffer/gegl-sampler-downsize.h                |   48 -
 gegl/buffer/gegl-sampler-downsizefast.c            |  616 ------
 gegl/buffer/gegl-sampler-downsizefast.h            |   48 -
 gegl/buffer/gegl-sampler-downsmooth.c              |   26 -
 gegl/buffer/gegl-sampler-downsmooth.h              |   48 -
 gegl/buffer/gegl-sampler-downsmoothfast.c          |   26 -
 gegl/buffer/gegl-sampler-downsmoothfast.h          |   48 -
 gegl/buffer/gegl-sampler-lohalo.c                  | 2067 ++++++++++++++++++++
 gegl/buffer/gegl-sampler-lohalo.h                  |   49 +
 gegl/buffer/gegl-sampler-upsharp.c                 | 1150 -----------
 gegl/buffer/gegl-sampler-upsharp.h                 |   48 -
 gegl/buffer/gegl-sampler-upsize.c                  |  664 -------
 gegl/buffer/gegl-sampler-upsize.h                  |   50 -
 gegl/buffer/gegl-sampler-upsmooth.c                | 1243 ------------
 gegl/buffer/gegl-sampler-upsmooth.h                |   48 -
 gegl/buffer/gegl-sampler.c                         |   40 +-
 gegl/gegl-matrix.h                                 |    2 +-
 operations/affine/affine.c                         |    2 +-
 tests/compositions/Makefile.am                     |    8 +-
 tests/compositions/downsharptest-broken.xml        |   35 -
 tests/compositions/downsizetest-broken.xml         |   35 -
 tests/compositions/downsmoothtest-broken.xml       |   35 -
 .../reference/downsharptest-broken.png             |  Bin 27749 -> 0 bytes
 .../compositions/reference/downsizetest-broken.png |  Bin 27653 -> 0 bytes
 .../reference/downsmoothtest-broken.png            |  Bin 27307 -> 0 bytes
 tests/compositions/upsharptest.xml                 |   35 -
 tests/compositions/upsizetest.xml                  |   35 -
 tests/compositions/upsmoothtest.xml                |   35 -
 37 files changed, 2129 insertions(+), 5422 deletions(-)
---