Merge branch 'master' into colorpicker

2020-04-02 15:30:55 +11:00
parent f3290003be bfbb2e3fef
commit a2ed1035da
2 changed files with 6 additions and 6 deletions
@@ -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);