diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2019-09-24 02:18:38 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2019-11-27 09:55:06 +0100 |
| commit | 55c0d61125f7da9b4c666d7008d4c81bceb9d439 (patch) | |
| tree | cfafa17b6d4e0e315c2721472999e7c75f24910a /vcl/opengl/salbmp.cxx | |
| parent | 1a94be64dfe4c1877c24b5d22152a0cad7db40b6 (diff) | |
Skia alpha handling improvements
CppunitTest_vcl_bitmap_render_test now passes.
Change-Id: I88863c63de84f28b5dfeeaf73d3879bc7cbba1b2
Diffstat (limited to 'vcl/opengl/salbmp.cxx')
| -rw-r--r-- | vcl/opengl/salbmp.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/opengl/salbmp.cxx b/vcl/opengl/salbmp.cxx index f3147cdcc101..3a033c4afef0 100644 --- a/vcl/opengl/salbmp.cxx +++ b/vcl/opengl/salbmp.cxx @@ -403,8 +403,9 @@ GLuint OpenGLSalBitmap::CreateTexture() VCL_GL_INFO( "::CreateTexture - convert from " << mnBits << " to 24 bits" ); // convert to 24 bits RGB using palette determineTextureFormat(24, nFormat, nType); - pData = convertDataTo24Bpp( mpUserBuffer.get(), mnWidth, mnHeight, - mnBits, mnBytesPerRow, maPalette, nFormat == GL_BGR ).release(); + pData = convertDataBitCount( mpUserBuffer.get(), mnWidth, mnHeight, + mnBits, mnBytesPerRow, maPalette, + nFormat == GL_BGR ? BitConvert::BGR : BitConvert::RGB ).release(); bAllocated = true; } } |