Merge branch 'main' of github.com:vfx-rs/openexr-bind into 18-bind_im…

…f_version
vfx-rs · May 16, 2021 · a034f83 · a034f83
2 parents f4d531d + 14e6bef
commit a034f83
Show file tree

Hide file tree

Showing 15 changed files with 1,079 additions and 256 deletions.
diff --git a/bind/imf_deepimagestate.cpp b/bind/imf_deepimagestate.cpp
@@ -8,7 +8,7 @@ namespace OPENEXR_IMF_INTERNAL_NAMESPACE {
 
 namespace Imf = ::OPENEXR_IMF_INTERNAL_NAMESPACE;
 
-enum DeepImageState {};
+enum DeepImageState {} CPPMM_RUSTIFY_ENUM;
 
 } // namespace OPENEXR_IMF_INTERNAL_NAMESPACE
 

diff --git a/bind/imf_envmap.cpp b/bind/imf_envmap.cpp
@@ -8,8 +8,8 @@ namespace OPENEXR_IMF_INTERNAL_NAMESPACE {
 
 namespace Imf = ::OPENEXR_IMF_INTERNAL_NAMESPACE;
 
-enum Envmap {};
-enum CubeMapFace {};
+enum Envmap {} CPPMM_RUSTIFY_ENUM;
+enum CubeMapFace {} CPPMM_RUSTIFY_ENUM;
 
 namespace LatLongMap {
 IMF_EXPORT

diff --git a/bind/imf_flatimageio.cpp b/bind/imf_flatimageio.cpp
@@ -11,50 +11,62 @@ namespace Imf = ::OPENEXR_IMF_INTERNAL_NAMESPACE;
 IMFUTIL_EXPORT
 void saveFlatImage(const std::string& fileName, const Imf::Header& hdr,
                    const Imf::FlatImage& img, Imf::DataWindowSource dws)
-    CPPMM_RENAME(saveFlatImage_with_header);
+    CPPMM_RENAME(saveFlatImage_with_header)
+        CPPMM_THROWS(Iex::BaseExc, IEX_BASE);
 
 IMFUTIL_EXPORT
-void saveFlatImage(const std::string& fileName, const Imf::FlatImage& img);
+void saveFlatImage(const std::string& fileName, const Imf::FlatImage& img)
+    CPPMM_THROWS(Iex::BaseExc, IEX_BASE);
 
 IMFUTIL_EXPORT
 void loadFlatImage(const std::string& fileName, Imf::Header& hdr,
-                   Imf::FlatImage& img);
+                   Imf::FlatImage& img) CPPMM_THROWS(Iex::BaseExc, IEX_BASE)
+    CPPMM_RENAME(loadFlatImage_with_header);
 
 IMFUTIL_EXPORT
-void loadFlatImage(const std::string& fileName, Imf::FlatImage& img);
+void loadFlatImage(const std::string& fileName, Imf::FlatImage& img)
+    CPPMM_THROWS(Iex::BaseExc, IEX_BASE);
 
 IMFUTIL_EXPORT
 void saveFlatScanLineImage(const std::string& fileName, const Imf::Header& hdr,
                            const Imf::FlatImage& img, Imf::DataWindowSource dws)
-    CPPMM_RENAME(saveFlatScanLineImage_with_header);
+    CPPMM_RENAME(saveFlatScanLineImage_with_header)
+        CPPMM_THROWS(Iex::BaseExc, IEX_BASE);
 
 IMFUTIL_EXPORT
 void saveFlatScanLineImage(const std::string& fileName,
-                           const Imf::FlatImage& img);
+                           const Imf::FlatImage& img)
+    CPPMM_THROWS(Iex::BaseExc, IEX_BASE);
 
 IMFUTIL_EXPORT
 void loadFlatScanLineImage(const std::string& fileName, Imf::Header& hdr,
                            Imf::FlatImage& img)
-    CPPMM_RENAME(loadFlatScanLineImage_with_header);
+    CPPMM_RENAME(loadFlatScanLineImage_with_header)
+        CPPMM_THROWS(Iex::BaseExc, IEX_BASE);
 
 IMFUTIL_EXPORT
-void loadFlatScanLineImage(const std::string& fileName, Imf::FlatImage& img);
+void loadFlatScanLineImage(const std::string& fileName, Imf::FlatImage& img)
+    CPPMM_THROWS(Iex::BaseExc, IEX_BASE);
 
 IMFUTIL_EXPORT
 void saveFlatTiledImage(const std::string& fileName, const Imf::Header& hdr,
                         const Imf::FlatImage& img, Imf::DataWindowSource dws)
-    CPPMM_RENAME(saveFlatTiledImage_with_header);
+    CPPMM_RENAME(saveFlatTiledImage_with_header)
+        CPPMM_THROWS(Iex::BaseExc, IEX_BASE);
 
 IMFUTIL_EXPORT
-void saveFlatTiledImage(const std::string& fileName, const Imf::FlatImage& img);
+void saveFlatTiledImage(const std::string& fileName, const Imf::FlatImage& img)
+    CPPMM_THROWS(Iex::BaseExc, IEX_BASE);
 
 IMFUTIL_EXPORT
 void loadFlatTiledImage(const std::string& fileName, Imf::Header& hdr,
                         Imf::FlatImage& img)
-    CPPMM_RENAME(loadFlatTiledImage_with_header);
+    CPPMM_RENAME(loadFlatTiledImage_with_header)
+        CPPMM_THROWS(Iex::BaseExc, IEX_BASE);
 
 IMFUTIL_EXPORT
-void loadFlatTiledImage(const std::string& fileName, Imf::FlatImage& img);
+void loadFlatTiledImage(const std::string& fileName, Imf::FlatImage& img)
+    CPPMM_THROWS(Iex::BaseExc, IEX_BASE);
 } // namespace OPENEXR_IMF_INTERNAL_NAMESPACE
 
 } // namespace cppmm_bind
diff --git a/bind/imf_imagedatawindow.cpp b/bind/imf_imagedatawindow.cpp
@@ -8,7 +8,8 @@ namespace OPENEXR_IMF_INTERNAL_NAMESPACE {
 
 namespace Imf = ::OPENEXR_IMF_INTERNAL_NAMESPACE;
 
-enum DataWindowSource {};
+enum DataWindowSource {} CPPMM_RUSTIFY_ENUM CPPMM_ENUM_PREFIX(USE_)
+    CPPMM_ENUM_SUFFIX(_DATA_WINDOW);
 
 IMFUTIL_EXPORT
 IMATH_NAMESPACE::Box2i dataWindowForFile(const Imf::Header& hdr,

diff --git a/bind/std_string.cpp b/bind/std_string.cpp
@@ -25,7 +25,7 @@ class basic_string {
     ::std::string& assign(const char* s, ::std::string::size_type count);
     const char* c_str() const;
 
-} CPPMM_OPAQUEPTR CPPMM_IGNORE_UNBOUND;
+} CPPMM_OPAQUEBYTES CPPMM_IGNORE_UNBOUND;
 
 using string = ::std::string;
 

diff --git a/bind/std_vector.cpp b/bind/std_vector.cpp
@@ -19,9 +19,14 @@ template <class T> class vector {
     // This allows us to see through to the type in Imath
     using BoundType = std::vector<T>;
 
-    vector();
+    vector() CPPMM_RENAME(ctor);
     ~vector();
 
+    T* data();
+    const T* data() const CPPMM_RENAME(data_const);
+
+    size_t size() const;
+
 } CPPMM_OPAQUEPTR CPPMM_IGNORE_UNBOUND;
 
 // explicit instantiation