This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/boost/python/object/class_metadata.hpp b/boost/python/object/class_metadata.hpp | |
index c71cf67..5009c17 100644 | |
--- a/boost/python/object/class_metadata.hpp | |
+++ b/boost/python/object/class_metadata.hpp | |
@@ -164,7 +164,7 @@ struct class_metadata | |
>::type held_type; | |
// Determine if the object will be held by value | |
- typedef is_convertible<held_type*,T*> use_value_holder; | |
+ typedef mpl::bool_<is_convertible<held_type*,T*>::value> use_value_holder; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/src/osra_lib.cpp b/src/osra_lib.cpp | |
index 4262e83..48979ae 100644 | |
--- a/src/osra_lib.cpp | |
+++ b/src/osra_lib.cpp | |
@@ -635,7 +635,7 @@ int osra_process_image( | |
if (type.empty() || type == "PDF" || type == "PS") | |
{ | |
#ifdef OSRA_LIB | |
- poppler_doc = load_from_raw_data(image_data, image_length); | |
+ poppler_doc = poppler::document::load_from_raw_data(image_data, image_length); |
OlderNewer