X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.cpp;h=a9d01a72f920b2409849165df1efcb776eb1dada;hp=6e118bc3a3c1b5633bc786772ce85d377fffb9ed;hb=b10c546f579c7ccb5939161e61a71cd18a3f9bbd;hpb=caa05550e868db406e4b54e69d60b5573f59cb60 diff --git a/flat_input.cpp b/flat_input.cpp index 6e118bc..a9d01a7 100644 --- a/flat_input.cpp +++ b/flat_input.cpp @@ -52,13 +52,15 @@ void FlatInput::finalize() if (pixel_format == FORMAT_RGB) { format = GL_RGB; bytes_per_pixel = 3; - } else if (pixel_format == FORMAT_RGBA) { + } else if (pixel_format == FORMAT_RGBA_PREMULTIPLIED_ALPHA || + pixel_format == FORMAT_RGBA_POSTMULTIPLIED_ALPHA) { format = GL_RGBA; bytes_per_pixel = 4; } else if (pixel_format == FORMAT_BGR) { format = GL_BGR; bytes_per_pixel = 3; - } else if (pixel_format == FORMAT_BGRA) { + } else if (pixel_format == FORMAT_BGRA_PREMULTIPLIED_ALPHA || + pixel_format == FORMAT_BGRA_POSTMULTIPLIED_ALPHA) { format = GL_BGRA; bytes_per_pixel = 4; } else if (pixel_format == FORMAT_GRAYSCALE) {