diff --git a/app/render/color.cpp b/app/render/color.cpp index 4ddb87005..225f30c5f 100644 --- a/app/render/color.cpp +++ b/app/render/color.cpp @@ -43,11 +43,11 @@ Color Color::fromHsv(const float &h, const float &s, const float &v) 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); 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: