Use IMATH_NAMESPACE in place of Imath (#1613)

src/opentimelineio/clip.cpp

@@ -184,7 +184,7 @@ Clip::available_range(ErrorStatus* error_status) const
     return active_media->available_range().value();
 }
 
-optional<Imath::Box2d>
+optional<IMATH_NAMESPACE::Box2d>
 Clip::available_image_bounds(ErrorStatus* error_status) const
 {
     auto active_media = media_reference();
@@ -194,7 +194,7 @@ Clip::available_image_bounds(ErrorStatus* error_status) const
             ErrorStatus::CANNOT_COMPUTE_BOUNDS,
             "No image bounds set on clip",
             this);
-        return optional<Imath::Box2d>();
+        return optional<IMATH_NAMESPACE::Box2d>();
     }
 
     if (!active_media->available_image_bounds())
@@ -203,7 +203,7 @@ Clip::available_image_bounds(ErrorStatus* error_status) const
             ErrorStatus::CANNOT_COMPUTE_BOUNDS,
             "No image bounds set on media reference on clip",
             this);
-        return optional<Imath::Box2d>();
+        return optional<IMATH_NAMESPACE::Box2d>();
     }
 
     return active_media->available_image_bounds();

src/opentimelineio/clip.h

@@ -48,7 +48,7 @@ class Clip : public Item
     TimeRange
     available_range(ErrorStatus* error_status = nullptr) const override;
 
-    optional<Imath::Box2d>
+    optional<IMATH_NAMESPACE::Box2d>
     available_image_bounds(ErrorStatus* error_status) const override;
 
 protected:

src/opentimelineio/composable.cpp

@@ -74,11 +74,11 @@ Composable::duration(ErrorStatus* error_status) const
     return RationalTime();
 }
 
-optional<Imath::Box2d>
+optional<IMATH_NAMESPACE::Box2d>
 Composable::available_image_bounds(ErrorStatus* error_status) const
 {
     *error_status = ErrorStatus::NOT_IMPLEMENTED;
-    return optional<Imath::Box2d>();
+    return optional<IMATH_NAMESPACE::Box2d>();
 }
 
 }} // namespace opentimelineio::OPENTIMELINEIO_VERSION

src/opentimelineio/composable.h

@@ -34,7 +34,7 @@ class Composable : public SerializableObjectWithMetadata
 
     virtual RationalTime duration(ErrorStatus* error_status = nullptr) const;
 
-    virtual optional<Imath::Box2d>
+    virtual optional<IMATH_NAMESPACE::Box2d>
     available_image_bounds(ErrorStatus* error_status) const;
 
 protected:

src/opentimelineio/deserialization.cpp

@@ -609,14 +609,14 @@ SerializableObject::Reader::_decode(_Resolver& resolver)
     else if (schema_name_and_version == "V2d.1")
     {
         double x, y;
-        return _fetch("x", &x) && _fetch("y", &y) ? any(Imath::V2d(x, y))
+        return _fetch("x", &x) && _fetch("y", &y) ? any(IMATH_NAMESPACE::V2d(x, y))
                                                   : any();
     }
     else if (schema_name_and_version == "Box2d.1")
     {
-        Imath::V2d min, max;
+        IMATH_NAMESPACE::V2d min, max;
         return _fetch("min", &min) && _fetch("max", &max)
-                   ? any(Imath::Box2d(std::move(min), std::move(max)))
+                   ? any(IMATH_NAMESPACE::Box2d(std::move(min), std::move(max)))
                    : any();
     }
     else
@@ -743,13 +743,13 @@ SerializableObject::Reader::read(std::string const& key, AnyVector* value)
 }
 
 bool
-SerializableObject::Reader::read(std::string const& key, Imath::V2d* value)
+SerializableObject::Reader::read(std::string const& key, IMATH_NAMESPACE::V2d* value)
 {
     return _fetch(key, value);
 }
 
 bool
-SerializableObject::Reader::read(std::string const& key, Imath::Box2d* value)
+SerializableObject::Reader::read(std::string const& key, IMATH_NAMESPACE::Box2d* value)
 {
     return _fetch(key, value);
 }
@@ -817,7 +817,7 @@ SerializableObject::Reader::read(
 bool
 SerializableObject::Reader::read(
     std::string const&      key,
-    optional<Imath::Box2d>* value)
+    optional<IMATH_NAMESPACE::Box2d>* value)
 {
     return _read_optional(key, value);
 }

src/opentimelineio/externalReference.cpp

@@ -9,7 +9,7 @@ ExternalReference::ExternalReference(
     std::string const&            target_url,
     optional<TimeRange> const&    available_range,
     AnyDictionary const&          metadata,
-    optional<Imath::Box2d> const& available_image_bounds)
+    optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds)
     : Parent(std::string(), available_range, metadata, available_image_bounds)
     , _target_url(target_url)
 {}

src/opentimelineio/externalReference.h

@@ -23,7 +23,7 @@ class ExternalReference final : public MediaReference
         std::string const&            target_url             = std::string(),
         optional<TimeRange> const&    available_range        = nullopt,
         AnyDictionary const&          metadata               = AnyDictionary(),
-        optional<Imath::Box2d> const& available_image_bounds = nullopt);
+        optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds = nullopt);
 
     std::string target_url() const noexcept { return _target_url; }
 

src/opentimelineio/generatorReference.cpp

@@ -11,7 +11,7 @@ GeneratorReference::GeneratorReference(
     optional<TimeRange> const&    available_range,
     AnyDictionary const&          parameters,
     AnyDictionary const&          metadata,
-    optional<Imath::Box2d> const& available_image_bounds)
+    optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds)
     : Parent(name, available_range, metadata, available_image_bounds)
     , _generator_kind(generator_kind)
     , _parameters(parameters)

src/opentimelineio/generatorReference.h

@@ -25,7 +25,7 @@ class GeneratorReference final : public MediaReference
         optional<TimeRange> const&    available_range        = nullopt,
         AnyDictionary const&          parameters             = AnyDictionary(),
         AnyDictionary const&          metadata               = AnyDictionary(),
-        optional<Imath::Box2d> const& available_image_bounds = nullopt);
+        optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds = nullopt);
 
     std::string generator_kind() const noexcept { return _generator_kind; }
 

src/opentimelineio/imageSequenceReference.cpp

@@ -16,7 +16,7 @@ ImageSequenceReference::ImageSequenceReference(
     MissingFramePolicy const      missing_frame_policy,
     optional<TimeRange> const&    available_range,
     AnyDictionary const&          metadata,
-    optional<Imath::Box2d> const& available_image_bounds)
+    optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds)
     : Parent(std::string(), available_range, metadata, available_image_bounds)
     , _target_url_base(target_url_base)
     , _name_prefix(name_prefix)

src/opentimelineio/imageSequenceReference.h

@@ -38,7 +38,7 @@ class ImageSequenceReference final : public MediaReference
             MissingFramePolicy::error,
         optional<TimeRange> const&    available_range        = nullopt,
         AnyDictionary const&          metadata               = AnyDictionary(),
-        optional<Imath::Box2d> const& available_image_bounds = nullopt);
+        optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds = nullopt);
 
     std::string target_url_base() const noexcept { return _target_url_base; }
 

src/opentimelineio/mediaReference.cpp

@@ -9,7 +9,7 @@ MediaReference::MediaReference(
     std::string const&            name,
     optional<TimeRange> const&    available_range,
     AnyDictionary const&          metadata,
-    optional<Imath::Box2d> const& available_image_bounds)
+    optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds)
     : Parent(name, metadata)
     , _available_range(available_range)
     , _available_image_bounds(available_image_bounds)

src/opentimelineio/mediaReference.h

@@ -27,7 +27,7 @@ class MediaReference : public SerializableObjectWithMetadata
         std::string const&            name                   = std::string(),
         optional<TimeRange> const&    available_range        = nullopt,
         AnyDictionary const&          metadata               = AnyDictionary(),
-        optional<Imath::Box2d> const& available_image_bounds = nullopt);
+        optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds = nullopt);
 
     optional<TimeRange> available_range() const noexcept
     {
@@ -41,13 +41,13 @@ class MediaReference : public SerializableObjectWithMetadata
 
     virtual bool is_missing_reference() const;
 
-    optional<Imath::Box2d> available_image_bounds() const
+    optional<IMATH_NAMESPACE::Box2d> available_image_bounds() const
     {
         return _available_image_bounds;
     }
 
     void set_available_image_bounds(
-        optional<Imath::Box2d> const& available_image_bounds)
+        optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds)
     {
         _available_image_bounds = available_image_bounds;
     }
@@ -60,7 +60,7 @@ class MediaReference : public SerializableObjectWithMetadata
 
 private:
     optional<TimeRange>    _available_range;
-    optional<Imath::Box2d> _available_image_bounds;
+    optional<IMATH_NAMESPACE::Box2d> _available_image_bounds;
 };
 
 }} // namespace opentimelineio::OPENTIMELINEIO_VERSION

src/opentimelineio/missingReference.cpp

@@ -9,7 +9,7 @@ MissingReference::MissingReference(
     std::string const&            name,
     optional<TimeRange> const&    available_range,
     AnyDictionary const&          metadata,
-    optional<Imath::Box2d> const& available_image_bounds)
+    optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds)
     : Parent(name, available_range, metadata, available_image_bounds)
 {}
 

src/opentimelineio/missingReference.h

@@ -23,7 +23,7 @@ class MissingReference final : public MediaReference
         std::string const&            name                   = std::string(),
         optional<TimeRange> const&    available_range        = nullopt,
         AnyDictionary const&          metadata               = AnyDictionary(),
-        optional<Imath::Box2d> const& available_image_bounds = nullopt);
+        optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds = nullopt);
 
     bool is_missing_reference() const override;
 

src/opentimelineio/safely_typed_any.cpp

@@ -60,13 +60,13 @@ create_safely_typed_any(TimeTransform&& value)
 }
 
 any
-create_safely_typed_any(Imath::V2d&& value)
+create_safely_typed_any(IMATH_NAMESPACE::V2d&& value)
 {
     return any(value);
 }
 
 any
-create_safely_typed_any(Imath::Box2d&& value)
+create_safely_typed_any(IMATH_NAMESPACE::Box2d&& value)
 {
     return any(value);
 }
@@ -143,16 +143,16 @@ safely_cast_time_transform_any(any const& a)
     return any_cast<TimeTransform>(a);
 }
 
-Imath::V2d
+IMATH_NAMESPACE::V2d
 safely_cast_point_any(any const& a)
 {
-    return any_cast<Imath::V2d>(a);
+    return any_cast<IMATH_NAMESPACE::V2d>(a);
 }
 
-Imath::Box2d
+IMATH_NAMESPACE::Box2d
 safely_cast_box_any(any const& a)
 {
-    return any_cast<Imath::Box2d>(a);
+    return any_cast<IMATH_NAMESPACE::Box2d>(a);
 }
 
 AnyDictionary

src/opentimelineio/safely_typed_any.h

@@ -36,8 +36,8 @@ any create_safely_typed_any(std::string&&);
 any create_safely_typed_any(RationalTime&&);
 any create_safely_typed_any(TimeRange&&);
 any create_safely_typed_any(TimeTransform&&);
-any create_safely_typed_any(Imath::V2d&&);
-any create_safely_typed_any(Imath::Box2d&&);
+any create_safely_typed_any(IMATH_NAMESPACE::V2d&&);
+any create_safely_typed_any(IMATH_NAMESPACE::Box2d&&);
 any create_safely_typed_any(AnyVector&&);
 any create_safely_typed_any(AnyDictionary&&);
 any create_safely_typed_any(SerializableObject*);
@@ -51,8 +51,8 @@ std::string   safely_cast_string_any(any const& a);
 RationalTime  safely_cast_rational_time_any(any const& a);
 TimeRange     safely_cast_time_range_any(any const& a);
 TimeTransform safely_cast_time_transform_any(any const& a);
-Imath::V2d    safely_cast_point_any(any const& a);
-Imath::Box2d  safely_cast_box_any(any const& a);
+IMATH_NAMESPACE::V2d    safely_cast_point_any(any const& a);
+IMATH_NAMESPACE::Box2d  safely_cast_box_any(any const& a);
 
 SerializableObject* safely_cast_retainer_any(any const& a);
 

src/opentimelineio/serializableObject.h

@@ -97,8 +97,8 @@ class SerializableObject
         bool read(std::string const& key, RationalTime* dest);
         bool read(std::string const& key, TimeRange* dest);
         bool read(std::string const& key, class TimeTransform* dest);
-        bool read(std::string const& key, Imath::V2d* value);
-        bool read(std::string const& key, Imath::Box2d* value);
+        bool read(std::string const& key, IMATH_NAMESPACE::V2d* value);
+        bool read(std::string const& key, IMATH_NAMESPACE::Box2d* value);
         bool read(std::string const& key, AnyVector* dest);
         bool read(std::string const& key, AnyDictionary* dest);
         bool read(std::string const& key, any* dest);
@@ -109,7 +109,7 @@ class SerializableObject
         bool read(std::string const& key, optional<RationalTime>* dest);
         bool read(std::string const& key, optional<TimeRange>* dest);
         bool read(std::string const& key, optional<TimeTransform>* dest);
-        bool read(std::string const& key, optional<Imath::Box2d>* value);
+        bool read(std::string const& key, optional<IMATH_NAMESPACE::Box2d>* value);
 
         // skipping std::string because we translate null into the empty
         // string, so the conversion is somewhat ambiguous
@@ -415,11 +415,11 @@ class SerializableObject
         void write(std::string const& key, std::string const& value);
         void write(std::string const& key, RationalTime value);
         void write(std::string const& key, TimeRange value);
-        void write(std::string const& key, Imath::V2d value);
-        void write(std::string const& key, Imath::Box2d value);
+        void write(std::string const& key, IMATH_NAMESPACE::V2d value);
+        void write(std::string const& key, IMATH_NAMESPACE::Box2d value);
         void write(std::string const& key, optional<RationalTime> value);
         void write(std::string const& key, optional<TimeRange> value);
-        void write(std::string const& key, optional<Imath::Box2d> value);
+        void write(std::string const& key, optional<IMATH_NAMESPACE::Box2d> value);
         void write(std::string const& key, class TimeTransform value);
         void write(std::string const& key, SerializableObject const* value);
         void write(std::string const& key, SerializableObject* value)