Add missing includes. Don't use forward defines of the STL.

3 files changed, 49 insertions, 0 deletions

diff --git a/graphics/openimageio/patches/patch-include_pugixml.hpp b/graphics/openimageio/patches/patch-include_pugixml.hpp
new file mode 100644
index 00000000000..61b529e541e
--- /dev/null
+++ b/graphics/openimageio/patches/patch-include_pugixml.hpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-include_pugixml.hpp,v 1.1 2013/05/09 13:58:54 joerg Exp $
+
+--- include/pugixml.hpp.orig	2013-02-21 17:10:46.000000000 +0000
++++ include/pugixml.hpp
+@@ -18,6 +18,11 @@
+ #include "version.h"
+ 
+ #ifndef PUGIXML_NO_STL
++#include <iterator>
++#include <string>
++#include <istream>
++#include <ostream>
++#if 0
+ namespace std
+ {
+ 	struct bidirectional_iterator_tag;
+@@ -45,6 +50,7 @@ namespace std
+ #endif
+ }
+ #endif
++#endif
+ 
+ // Macro for deprecated features
+ #ifndef PUGIXML_DEPRECATED
diff --git a/graphics/openimageio/patches/patch-include_tbb_tbb__exception.h b/graphics/openimageio/patches/patch-include_tbb_tbb__exception.h
new file mode 100644
index 00000000000..9e7daaf9d68
--- /dev/null
+++ b/graphics/openimageio/patches/patch-include_tbb_tbb__exception.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-include_tbb_tbb__exception.h,v 1.1 2013/05/09 13:58:54 joerg Exp $
+
+--- include/tbb/tbb_exception.h.orig	2013-02-21 17:10:46.000000000 +0000
++++ include/tbb/tbb_exception.h
+@@ -30,6 +30,7 @@
+ #define __TBB_exception_H
+ 
+ #include "tbb_stddef.h"
++#include <new>
+ #include <stdexcept>
+ 
+ #if __TBB_EXCEPTIONS && !defined(__EXCEPTIONS) && !defined(_CPPUNWIND) && !defined(__SUNPRO_CC)
diff --git a/graphics/openimageio/patches/patch-psd.imageio_psdinput.cpp b/graphics/openimageio/patches/patch-psd.imageio_psdinput.cpp
new file mode 100644
index 00000000000..4846e53a0e1
--- /dev/null
+++ b/graphics/openimageio/patches/patch-psd.imageio_psdinput.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-psd.imageio_psdinput.cpp,v 1.1 2013/05/09 13:58:54 joerg Exp $
+
+--- psd.imageio/psdinput.cpp.orig	2013-02-21 17:10:46.000000000 +0000
++++ psd.imageio/psdinput.cpp
+@@ -328,7 +328,7 @@ private:
+         // For debugging, numeric_cast will throw if precision is lost:
+         // value = boost::numeric_cast<TVariable>(buffer);
+         value = buffer;
+-        return m_file;
++        return m_file.good();
+     }
+ 
+     int read_pascal_string (std::string &s, uint16_t mod_padding);