Use SafeStringStream instead of std::stringstream to try to fix random crashes on...

[dcpomatic.git] / src / lib / colour_conversion.h

diff --git a/src/lib/colour_conversion.h b/src/lib/colour_conversion.h
index 85d951ce169dadb48f602f93d9c9d5990d1e145c..fa1a955e1e414806fe84453657e3b09c6c49a03b 100644 (file)
--- a/src/lib/colour_conversion.h
+++ b/src/lib/colour_conversion.h
@@ -20,13 +20,15 @@
 #ifndef DCPOMATIC_COLOUR_CONVERSION_H
 #define DCPOMATIC_COLOUR_CONVERSION_H
 
+/* Hack for OS X compile failure; see https://bugs.launchpad.net/hugin/+bug/910160 */
+#ifdef check
+#undef check
+#endif
+
 #include <boost/utility.hpp>
 #include <boost/optional.hpp>
 #include <boost/numeric/ublas/matrix.hpp>
-
-namespace cxml {
-       class Node;
-}
+#include <libcxml/cxml.h>
 
 namespace xmlpp {
        class Node;
@@ -37,9 +39,10 @@ class ColourConversion
 public:
        ColourConversion ();
        ColourConversion (double, bool, double const matrix[3][3], double);
-       ColourConversion (boost::shared_ptr<cxml::Node>);
+       ColourConversion (cxml::NodePtr);
 
        virtual void as_xml (xmlpp::Node *) const;
+       std::string identifier () const;
 
        boost::optional<size_t> preset () const;
 
@@ -54,7 +57,7 @@ class PresetColourConversion
 public:
        PresetColourConversion ();
        PresetColourConversion (std::string, double, bool, double const matrix[3][3], double);
-       PresetColourConversion (boost::shared_ptr<cxml::Node>);
+       PresetColourConversion (cxml::NodePtr);
 
        void as_xml (xmlpp::Node *) const;