Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pre-release repo cleanup - 0.16.0 #1666

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ If you know of anyone missing from this list, please contact us: https://lists.a
* Darby Johnston ([darbyjohnston](https://github.com/darbyjohnston))
* Darwyn Peachey ([peachey](https://github.com/peachey))
* David Baraff ([davidbaraff](https://github.com/davidbaraff))
* dgw ([dgw](https://github.com/dgw))
* Doug Halley ([douglascomet](https://github.com/douglascomet))
* Ed Caspersen ([repsac](https://github.com/repsac))
* Emile Labrosse ([elabrosseRodeofx](https://github.com/elabrosseRodeofx))
* Eric ([eric-with-a-c](https://github.com/eric-with-a-c))
Expand All @@ -26,6 +28,7 @@ If you know of anyone missing from this list, please contact us: https://lists.a
* Félix David ([Tilix4](https://github.com/Tilix4))
* Henry Wilkes ([hwilkes-igalia](https://github.com/hwilkes-igalia))
* Jean-Christophe Morin ([JeanChristopheMorinPerso](https://github.com/JeanChristopheMorinPerso))
* Jeff Horrocks ([jhorrocks-tl](https://github.com/jhorrocks-tl))
* Jeffrey Barendse ([IOjeffrey](https://github.com/IOjeffrey))
* jlskuz ([jlskuz](https://github.com/jlskuz))
* John Mertic ([jmertic](https://github.com/jmertic))
Expand All @@ -36,14 +39,17 @@ If you know of anyone missing from this list, please contact us: https://lists.a
* Julian Yu-Chung Chen ([jchen9](https://github.com/jchen9))
* Karthik Ramesh Iyer ([KarthikRIyer](https://github.com/KarthikRIyer))
* Laura Savidge ([lsavidge](https://github.com/lsavidge))
* Mark Final ([foundry-markf](https://github.com/foundry-markf))
* Mark Reid ([markreidvfx](https://github.com/markreidvfx))
* Matt Johnson ([mattyjams](https://github.com/mattyjams))
* MattKC ([itsmattkc](https://github.com/itsmattkc))
* Michael Dolan ([michdolan](https://github.com/michdolan))
* Michael Jefferies ([michaeljefferies](https://github.com/michaeljefferies))
* Mike Koetter ([mikekoetter](https://github.com/mikekoetter))
* Mike Mahony ([mikemahony](https://github.com/mikemahony))
* Nick Porcino ([meshula](https://github.com/meshula))
* Pedro Labonia ([pedrolabonia](https://github.com/pedrolabonia))
* Peter Targett ([peter-targett](https://github.com/peter-targett))
* Robyn Rindge ([avrata](https://github.com/avrata))
* Roger Nelson ([rogernelson](https://github.com/rogernelson))
* Sasha Aleshchenko ([TheBigSasha](https://github.com/TheBigSasha))
Expand Down
1 change: 1 addition & 0 deletions maintainers/verify_license.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
os.path.join("src", "deps"),
"build",
".git",
".venv",
]


Expand Down
2 changes: 1 addition & 1 deletion src/opentime/rationalTime.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include "opentime/errorStatus.h"
#include "opentime/version.h"
#include <cmath>
#include <limits>
#include <cstdint>
#include <limits>
#include <string>

namespace opentime { namespace OPENTIME_VERSION {
Expand Down
15 changes: 10 additions & 5 deletions src/opentimelineio/deserialization.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -609,8 +609,9 @@ 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_NAMESPACE::V2d(x, y))
: any();
return _fetch("x", &x) && _fetch("y", &y)
? any(IMATH_NAMESPACE::V2d(x, y))
: any();
}
else if (schema_name_and_version == "Box2d.1")
{
Expand Down Expand Up @@ -743,13 +744,17 @@ SerializableObject::Reader::read(std::string const& key, AnyVector* value)
}

bool
SerializableObject::Reader::read(std::string const& key, IMATH_NAMESPACE::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_NAMESPACE::Box2d* value)
SerializableObject::Reader::read(
std::string const& key,
IMATH_NAMESPACE::Box2d* value)
{
return _fetch(key, value);
}
Expand Down Expand Up @@ -816,7 +821,7 @@ SerializableObject::Reader::read(

bool
SerializableObject::Reader::read(
std::string const& key,
std::string const& key,
optional<IMATH_NAMESPACE::Box2d>* value)
{
return _read_optional(key, value);
Expand Down
6 changes: 3 additions & 3 deletions src/opentimelineio/externalReference.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {

ExternalReference::ExternalReference(
std::string const& target_url,
optional<TimeRange> const& available_range,
AnyDictionary const& metadata,
std::string const& target_url,
optional<TimeRange> const& available_range,
AnyDictionary const& metadata,
optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds)
: Parent(std::string(), available_range, metadata, available_image_bounds)
, _target_url(target_url)
Expand Down
9 changes: 5 additions & 4 deletions src/opentimelineio/externalReference.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@ class ExternalReference final : public MediaReference
using Parent = MediaReference;

ExternalReference(
std::string const& target_url = std::string(),
optional<TimeRange> const& available_range = nullopt,
AnyDictionary const& metadata = AnyDictionary(),
optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds = nullopt);
std::string const& target_url = std::string(),
optional<TimeRange> const& available_range = nullopt,
AnyDictionary const& metadata = AnyDictionary(),
optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds =
nullopt);

std::string target_url() const noexcept { return _target_url; }

Expand Down
10 changes: 5 additions & 5 deletions src/opentimelineio/generatorReference.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {

GeneratorReference::GeneratorReference(
std::string const& name,
std::string const& generator_kind,
optional<TimeRange> const& available_range,
AnyDictionary const& parameters,
AnyDictionary const& metadata,
std::string const& name,
std::string const& generator_kind,
optional<TimeRange> const& available_range,
AnyDictionary const& parameters,
AnyDictionary const& metadata,
optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds)
: Parent(name, available_range, metadata, available_image_bounds)
, _generator_kind(generator_kind)
Expand Down
13 changes: 7 additions & 6 deletions src/opentimelineio/generatorReference.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ class GeneratorReference final : public MediaReference
using Parent = MediaReference;

GeneratorReference(
std::string const& name = std::string(),
std::string const& generator_kind = std::string(),
optional<TimeRange> const& available_range = nullopt,
AnyDictionary const& parameters = AnyDictionary(),
AnyDictionary const& metadata = AnyDictionary(),
optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds = nullopt);
std::string const& name = std::string(),
std::string const& generator_kind = std::string(),
optional<TimeRange> const& available_range = nullopt,
AnyDictionary const& parameters = AnyDictionary(),
AnyDictionary const& metadata = AnyDictionary(),
optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds =
nullopt);

std::string generator_kind() const noexcept { return _generator_kind; }

Expand Down
20 changes: 10 additions & 10 deletions src/opentimelineio/imageSequenceReference.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {

ImageSequenceReference::ImageSequenceReference(
std::string const& target_url_base,
std::string const& name_prefix,
std::string const& name_suffix,
int start_frame,
int frame_step,
double rate,
int frame_zero_padding,
MissingFramePolicy const missing_frame_policy,
optional<TimeRange> const& available_range,
AnyDictionary const& metadata,
std::string const& target_url_base,
std::string const& name_prefix,
std::string const& name_suffix,
int start_frame,
int frame_step,
double rate,
int frame_zero_padding,
MissingFramePolicy const missing_frame_policy,
optional<TimeRange> const& available_range,
AnyDictionary const& metadata,
optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds)
: Parent(std::string(), available_range, metadata, available_image_bounds)
, _target_url_base(target_url_base)
Expand Down
7 changes: 4 additions & 3 deletions src/opentimelineio/imageSequenceReference.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ class ImageSequenceReference final : public MediaReference
int frame_zero_padding = 0,
MissingFramePolicy const missing_frame_policy =
MissingFramePolicy::error,
optional<TimeRange> const& available_range = nullopt,
AnyDictionary const& metadata = AnyDictionary(),
optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds = nullopt);
optional<TimeRange> const& available_range = nullopt,
AnyDictionary const& metadata = AnyDictionary(),
optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds =
nullopt);

std::string target_url_base() const noexcept { return _target_url_base; }

Expand Down
6 changes: 3 additions & 3 deletions src/opentimelineio/mediaReference.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {

MediaReference::MediaReference(
std::string const& name,
optional<TimeRange> const& available_range,
AnyDictionary const& metadata,
std::string const& name,
optional<TimeRange> const& available_range,
AnyDictionary const& metadata,
optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds)
: Parent(name, metadata)
, _available_range(available_range)
Expand Down
11 changes: 6 additions & 5 deletions src/opentimelineio/mediaReference.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ class MediaReference : public SerializableObjectWithMetadata
using Parent = SerializableObjectWithMetadata;

MediaReference(
std::string const& name = std::string(),
optional<TimeRange> const& available_range = nullopt,
AnyDictionary const& metadata = AnyDictionary(),
optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds = nullopt);
std::string const& name = std::string(),
optional<TimeRange> const& available_range = nullopt,
AnyDictionary const& metadata = AnyDictionary(),
optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds =
nullopt);

optional<TimeRange> available_range() const noexcept
{
Expand Down Expand Up @@ -59,7 +60,7 @@ class MediaReference : public SerializableObjectWithMetadata
void write_to(Writer&) const override;

private:
optional<TimeRange> _available_range;
optional<TimeRange> _available_range;
optional<IMATH_NAMESPACE::Box2d> _available_image_bounds;
};

Expand Down
6 changes: 3 additions & 3 deletions src/opentimelineio/missingReference.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {

MissingReference::MissingReference(
std::string const& name,
optional<TimeRange> const& available_range,
AnyDictionary const& metadata,
std::string const& name,
optional<TimeRange> const& available_range,
AnyDictionary const& metadata,
optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds)
: Parent(name, available_range, metadata, available_image_bounds)
{}
Expand Down
9 changes: 5 additions & 4 deletions src/opentimelineio/missingReference.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,11 @@ class MissingReference final : public MediaReference
using Parent = MediaReference;

MissingReference(
std::string const& name = std::string(),
optional<TimeRange> const& available_range = nullopt,
AnyDictionary const& metadata = AnyDictionary(),
optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds = nullopt);
std::string const& name = std::string(),
optional<TimeRange> const& available_range = nullopt,
AnyDictionary const& metadata = AnyDictionary(),
optional<IMATH_NAMESPACE::Box2d> const& available_image_bounds =
nullopt);

bool is_missing_reference() const override;

Expand Down
22 changes: 11 additions & 11 deletions src/opentimelineio/safely_typed_any.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@ any create_safely_typed_any(AnyVector&&);
any create_safely_typed_any(AnyDictionary&&);
any create_safely_typed_any(SerializableObject*);

bool safely_cast_bool_any(any const& a);
int safely_cast_int_any(any const& a);
int64_t safely_cast_int64_any(any const& a);
uint64_t safely_cast_uint64_any(any const& a);
double safely_cast_double_any(any const& a);
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_NAMESPACE::V2d safely_cast_point_any(any const& a);
IMATH_NAMESPACE::Box2d safely_cast_box_any(any const& a);
bool safely_cast_bool_any(any const& a);
int safely_cast_int_any(any const& a);
int64_t safely_cast_int64_any(any const& a);
uint64_t safely_cast_uint64_any(any const& a);
double safely_cast_double_any(any const& a);
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_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);

Expand Down
6 changes: 4 additions & 2 deletions src/opentimelineio/serializableObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,8 @@ 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_NAMESPACE::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
Expand Down Expand Up @@ -419,7 +420,8 @@ class SerializableObject
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_NAMESPACE::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)
Expand Down
2 changes: 1 addition & 1 deletion src/opentimelineio/serializableObjectWithMetadata.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class SerializableObjectWithMetadata : public SerializableObject

protected:
virtual ~SerializableObjectWithMetadata();

bool read_from(Reader&) override;
void write_to(Writer&) const override;

Expand Down
16 changes: 11 additions & 5 deletions src/opentimelineio/serialization.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -733,8 +733,10 @@ SerializableObject::Writer::_build_dispatch_tables()
et[&typeid(TimeTransform)] = &_simple_any_comparison<TimeTransform>;
et[&typeid(SerializableObject::ReferenceId)] =
&_simple_any_comparison<SerializableObject::ReferenceId>;
et[&typeid(IMATH_NAMESPACE::V2d)] = &_simple_any_comparison<IMATH_NAMESPACE::V2d>;
et[&typeid(IMATH_NAMESPACE::Box2d)] = &_simple_any_comparison<IMATH_NAMESPACE::Box2d>;
et[&typeid(IMATH_NAMESPACE::V2d)] =
&_simple_any_comparison<IMATH_NAMESPACE::V2d>;
et[&typeid(IMATH_NAMESPACE::Box2d)] =
&_simple_any_comparison<IMATH_NAMESPACE::Box2d>;

/*
* These next recurse back through the Writer itself:
Expand Down Expand Up @@ -897,7 +899,7 @@ SerializableObject::Writer::write(

void
SerializableObject::Writer::write(
std::string const& key,
std::string const& key,
optional<IMATH_NAMESPACE::Box2d> value)
{
_encoder_write_key(key);
Expand Down Expand Up @@ -1058,14 +1060,18 @@ SerializableObject::Writer::write(
}

void
SerializableObject::Writer::write(std::string const& key, IMATH_NAMESPACE::V2d value)
SerializableObject::Writer::write(
std::string const& key,
IMATH_NAMESPACE::V2d value)
{
_encoder_write_key(key);
_encoder.write_value(value);
}

void
SerializableObject::Writer::write(std::string const& key, IMATH_NAMESPACE::Box2d value)
SerializableObject::Writer::write(
std::string const& key,
IMATH_NAMESPACE::Box2d value)
{
_encoder_write_key(key);
_encoder.write_value(value);
Expand Down
2 changes: 1 addition & 1 deletion src/opentimelineio/stack.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ optional<IMATH_NAMESPACE::Box2d>
Stack::available_image_bounds(ErrorStatus* error_status) const
{
optional<IMATH_NAMESPACE::Box2d> box;
bool found_first_child = false;
bool found_first_child = false;
for (auto clip: find_children<Clip>(error_status))
{
optional<IMATH_NAMESPACE::Box2d> child_box;
Expand Down
5 changes: 4 additions & 1 deletion src/opentimelineio/timeline.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,10 @@ Timeline::find_clips(
optional<TimeRange> const& search_range,
bool shallow_search) const
{
return _tracks.value->find_clips(error_status, search_range, shallow_search);
return _tracks.value->find_clips(
error_status,
search_range,
shallow_search);
}

}} // namespace opentimelineio::OPENTIMELINEIO_VERSION
2 changes: 1 addition & 1 deletion src/opentimelineio/track.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ optional<IMATH_NAMESPACE::Box2d>
Track::available_image_bounds(ErrorStatus* error_status) const
{
optional<IMATH_NAMESPACE::Box2d> box;
bool found_first_clip = false;
bool found_first_clip = false;
for (const auto& child: children())
{
if (auto clip = dynamic_cast<Clip*>(child.value))
Expand Down
Loading