[niepce] Fix use of libopenraw API to what's in master



commit 601ab9450d388b62520cbab42fcce7ea243e603e
Author: Hubert Figuière <hub figuiere net>
Date:   Sat May 14 00:09:16 2016 -0400

    Fix use of libopenraw API to what's in master

 configure.ac      |    2 +-
 src/ncr/image.cpp |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 34feafe..0677b13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,7 +105,7 @@ PKG_CHECK_MODULES(GPHOTO, [libgphoto2 >= $LIBGPHOTO_VERSION libgphoto2_port])
 
 dnl niepce
 PKG_CHECK_MODULES(BABL, babl)
-PKG_CHECK_MODULES(OPENRAW, libopenraw-gnome-1.0 >= $LIBOPENRAW_VERSION)
+PKG_CHECK_MODULES(OPENRAW, libopenraw-gnome-0.1 >= $LIBOPENRAW_VERSION)
 PKG_CHECK_MODULES(GEGL, gegl-0.3 >= $GEGL_VERSION)
 
 BOOST_REQUIRE([$BOOST_VERSION])
diff --git a/src/ncr/image.cpp b/src/ncr/image.cpp
index 576e8be..b8c7f45 100644
--- a/src/ncr/image.cpp
+++ b/src/ncr/image.cpp
@@ -169,7 +169,8 @@ GeglNode* Image::Private::_load_raw(const std::string &p)
     GeglNode* load_file = gegl_node_new_child(m_graph,
                                               "operation", "gegl:buffer-source",
                                               "buffer", buffer, nullptr);
-    or_cfa_pattern pattern = or_rawdata_get_cfa_pattern(rawdata);
+    ORCfaPatternRef pattern = or_rawdata_get_cfa_pattern(rawdata);
+    or_cfa_pattern pattern_type = or_cfapattern_get_type(pattern);
     or_rawdata_release(rawdata);
 
     GeglNode* stretch =
@@ -182,7 +183,7 @@ GeglNode* Image::Private::_load_raw(const std::string &p)
                             nullptr);
     // @todo refactor somewhere.
     int npattern = 0;
-    switch(pattern) {
+    switch(pattern_type) {
     case OR_CFA_PATTERN_GRBG:
         npattern = 0;
         break;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]