[niepce] Update to Geglmm 0.2.0

[Hubert FiguiÃre <hub src gnome org>]

commit 7ee4bc911c7e954420cf0971bd9a2b184097d48a
Author: Hubert FiguiÃre <hub figuiere net>
Date:   Tue Apr 17 08:50:51 2012 -0700

    Update to Geglmm 0.2.0

 camerawire/configure.ac |   10 ++++------
 configure.ac            |    6 +++---
 src/ncr/Makefile.am     |    2 +-
 src/ncr/ncr.cpp         |    2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/camerawire/configure.ac b/camerawire/configure.ac
index 4037985..8da451d 100644
--- a/camerawire/configure.ac
+++ b/camerawire/configure.ac
@@ -25,8 +25,8 @@ LIBGLIBMM_VERSION=2.4
 LIBGTKMM_VERSION=3.0
 LIBGNOMEUI_VERSION=2.0.0
 EXEMPI_VERSION=2.0.0
-GEGL_VERSION=0.0.22
-GEGLMM_VERSION=0.0.22
+GEGL_VERSION=0.2.0
+GEGLMM_VERSION=0.2.0
 LIBOPENRAW_VERSION=0.0.5
 LIBGPHOTO_VERSION=2.4
 dnl need at least 2.5.0 because of xmlTextReader
@@ -75,11 +75,9 @@ PKG_CHECK_MODULES(OPENRAW, libopenraw-gnome-1.0 >= $LIBOPENRAW_VERSION)
 AC_SUBST(OPENRAW_CFLAGS)
 AC_SUBST(OPENRAW_LIBS)
 
-dnl need 0.0.20 specifically.
-PKG_CHECK_MODULES(GEGL, gegl >= $GEGL_VERSION)
+PKG_CHECK_MODULES(GEGL, gegl-0.2 >= $GEGL_VERSION)
 dnl we want to use geglmm.
-dnl 0.0.17.1 because of bugs in 0.0.17
-PKG_CHECK_MODULES(GEGLMM, geglmm >= $GEGLMM_VERSION)
+PKG_CHECK_MODULES(GEGLMM, geglmm-0.2 >= $GEGLMM_VERSION)
 AC_SUBST(GEGLMM_CFLAGS)
 AC_SUBST(GEGLMM_LIBS)
 
diff --git a/configure.ac b/configure.ac
index 92d0efc..6afa02b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ LIBGNOMEUI_VERSION=2.0.0
 EXEMPI_VERSION=2.2.0
 SQLITE_VERSION=3.0
 GEGL_VERSION=0.1.0
-GEGLMM_VERSION=0.1.0
+GEGLMM_VERSION=0.2.0
 LIBOPENRAW_VERSION=0.0.5
 LIBGPHOTO_VERSION=2.4
 dnl need at least 2.5.0 because of xmlTextReader
@@ -76,9 +76,9 @@ PKG_CHECK_MODULES(OPENRAW, libopenraw-gnome-1.0 >= $LIBOPENRAW_VERSION)
 AC_SUBST(OPENRAW_CFLAGS)
 AC_SUBST(OPENRAW_LIBS)
 
-PKG_CHECK_MODULES(GEGL, gegl >= $GEGL_VERSION)
+PKG_CHECK_MODULES(GEGL, gegl-0.2 >= $GEGL_VERSION)
 dnl we want to use geglmm.
-PKG_CHECK_MODULES(GEGLMM, geglmm >= $GEGLMM_VERSION)
+PKG_CHECK_MODULES(GEGLMM, geglmm-0.2 >= $GEGLMM_VERSION)
 AC_SUBST(GEGLMM_CFLAGS)
 AC_SUBST(GEGLMM_LIBS)
 
diff --git a/src/ncr/Makefile.am b/src/ncr/Makefile.am
index 69ea102..1f89bcf 100644
--- a/src/ncr/Makefile.am
+++ b/src/ncr/Makefile.am
@@ -3,7 +3,7 @@
 
 INCLUDES = -I$(top_srcdir)/src  \
 	@LIBGTKMM_CFLAGS@ \
-	@GEGLMM_CFLAGS@ @OPENRAW_CFLAGS@
+	@BABL_CFLAGS@ @GEGLMM_CFLAGS@ @OPENRAW_CFLAGS@
 
 niepcelibdir = @libdir@/niepce/
 #niepcelib_LTLIBRARIES = libncr.la
diff --git a/src/ncr/ncr.cpp b/src/ncr/ncr.cpp
index 9b708bf..535a764 100644
--- a/src/ncr/ncr.cpp
+++ b/src/ncr/ncr.cpp
@@ -41,7 +41,7 @@ Glib::RefPtr<Gegl::Buffer> load_rawdata(ORRawDataRef rawdata)
             = Gegl::Buffer::create(Gegl::Rectangle(rect), babl_format ("Y u16"));
         
         data = or_rawdata_data(rawdata);
-        buffer->set(Gegl::Rectangle(rect), babl_format ("Y u16"),
+        buffer->set(Gegl::Rectangle(rect), 1, babl_format ("Y u16"),
                     data, GEGL_AUTO_ROWSTRIDE);
         
         return buffer;