[gegl/gsoc2011-opencl: 78/78] Merge branch 'master' into gsoc2011-opencl

[Victor Matheus de Araujo Oliveira <vmaolive src gnome org>]

commit 88261b68eebddeeef7e3cb3ef5147630e7575c78
Merge: 7c2eeb8 bc53ca6
Author: Victor Oliveira <victormatheus gmail com>
Date:   Tue Jun 21 17:48:35 2011 -0300

    Merge branch 'master' into gsoc2011-opencl

 configure.ac                                       |    5 +
 gegl.pc.in                                         |    1 +
 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                  | 2065 ++++++++++++++++++++
 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/buffer/gegl-tile-backend-file.c               |    8 +
 gegl/gegl-matrix.h                                 |    2 +-
 gegl/operation/gegl-operation-area-filter.h        |    6 +
 gegl/operation/gegl-operation-composer.h           |    5 +
 gegl/operation/gegl-operation-filter.h             |    4 +
 gegl/operation/gegl-operation-meta.h               |    6 +
 gegl/operation/gegl-operation-point-composer.h     |    5 +
 gegl/operation/gegl-operation-point-filter.h       |    7 +
 gegl/operation/gegl-operation-sink.h               |    5 +
 gegl/operation/gegl-operation-source.h             |    5 +
 gegl/operation/gegl-operation-temporal.h           |    6 +
 operations/affine/affine.c                         |    2 +-
 operations/common/noise-reduction.c                |  231 +++
 tests/compositions/Makefile.am                     |    9 +-
 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 -
 50 files changed, 2422 insertions(+), 5422 deletions(-)
---