From 5e609882d84b100a8b6c9f8285bf1af12a11c0aa Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Thu, 2 Apr 2020 12:47:05 +1100 Subject: [PATCH 1/2] color: fixed oiio incompatibility While developing, we used a function that only exists in OpenImageIO 2.1.x+. Fortunately however, it seems to have simply existed with a different name in earlier versions so we can maintain compatibility with 1.6+. --- app/render/color.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/render/color.cpp b/app/render/color.cpp index 3ad4f25c2..0c548bf32 100644 --- a/app/render/color.cpp +++ b/app/render/color.cpp @@ -2,11 +2,11 @@ Color::Color(const char *data, const PixelFormat::Format &format) { - OIIO::convert_type(PixelFormat::GetOIIOTypeDesc(format), - data, - PixelFormat::GetOIIOTypeDesc(PixelFormat::PIX_FMT_RGB32F), - data_, - PixelFormat::FormatHasAlphaChannel(format) ? kRGBAChannels : kRGBChannels); + OIIO::convert_types(PixelFormat::GetOIIOTypeDesc(format), + data, + PixelFormat::GetOIIOTypeDesc(PixelFormat::PIX_FMT_RGB32F), + data_, + PixelFormat::FormatHasAlphaChannel(format) ? kRGBAChannels : kRGBChannels); if (!PixelFormat::FormatHasAlphaChannel(format)) { set_alpha(1.0f); From bfbb2e3fef262bc6727c5ac828cc3763a6f9b46b Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Thu, 2 Apr 2020 13:09:21 +1100 Subject: [PATCH 2/2] msvc: fixed compile/syntax error that only seems to occur in msvc --- app/widget/timelinewidget/view/timelineviewblockitem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/widget/timelinewidget/view/timelineviewblockitem.cpp b/app/widget/timelinewidget/view/timelineviewblockitem.cpp index b45264da6..3d7e56ecc 100644 --- a/app/widget/timelinewidget/view/timelineviewblockitem.cpp +++ b/app/widget/timelinewidget/view/timelineviewblockitem.cpp @@ -70,7 +70,7 @@ void TimelineViewBlockItem::UpdateRect() Timecode::time_to_timecode(block_->out() - block_->in(), timebase(), Core::instance()->GetTimecodeDisplay()))); } -void TimelineViewBlockItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget */*widget*/) +void TimelineViewBlockItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *) { switch (block_->type()) { case Block::kClip: