Merge branch 'master' of https://github.com/olive-editor/olive

2020-04-02 13:02:53 +11:00
parent 920a0a27a7 5e609882d8
commit 03c9c708f0
1 changed files with 5 additions and 5 deletions
@@ -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);