| Index: core/src/fxge/skia/fx_skia_blitter_new.cpp
|
| diff --git a/core/src/fxge/skia/fx_skia_blitter_new.cpp b/core/src/fxge/skia/fx_skia_blitter_new.cpp
|
| index da9e6f28f17bdfa9c36e2f0557f10182f19eb88e..f55db1d1d7a217629985a01ce219a5131de44529 100644
|
| --- a/core/src/fxge/skia/fx_skia_blitter_new.cpp
|
| +++ b/core/src/fxge/skia/fx_skia_blitter_new.cpp
|
| @@ -1386,45 +1386,44 @@
|
| m_Blue = ((uint8_t*)&m_Color)[2];
|
| m_Gray = ((uint8_t*)&m_Color)[3];
|
| return TRUE;
|
| - } else {
|
| - if (pIccTransform) {
|
| - color = bObjectCMYK ? FXCMYK_TODIB(color) : FXARGB_TODIB(color);
|
| - pIccModule->TranslateScanline(pIccTransform, (uint8_t*)&m_Color, (const uint8_t*)&color, 1);
|
| - ((uint8_t*)&m_Color)[3] = m_Alpha;
|
| - m_Red = ((uint8_t*)&m_Color)[2];
|
| - m_Green = ((uint8_t*)&m_Color)[1];
|
| - m_Blue = ((uint8_t*)&m_Color)[0];
|
| - // Need Johnson to improvement it.
|
| - if (m_bRgbByteOrder) {
|
| - // swap
|
| - m_Red = ((uint8_t*)&m_Color)[0];
|
| - m_Blue = ((uint8_t*)&m_Color)[2];
|
| - m_Color = FXARGB_TODIB(m_Color);
|
| - m_Color = FXARGB_TOBGRORDERDIB(m_Color);
|
| - }
|
| - } else {
|
| - if (bObjectCMYK) {
|
| - uint8_t r, g, b;
|
| - AdobeCMYK_to_sRGB1(FXSYS_GetCValue(color), FXSYS_GetMValue(color), FXSYS_GetYValue(color), FXSYS_GetKValue(color),
|
| - r, g, b);
|
| - m_Color = FXARGB_MAKE(m_Alpha, r, g, b);
|
| - if (m_bRgbByteOrder){
|
| - m_Color = FXARGB_TOBGRORDERDIB(m_Color);
|
| - m_Red = b; m_Green = g; m_Blue = r;//
|
| - }else {
|
| - m_Color = FXARGB_TODIB(m_Color);
|
| - m_Red = r; m_Green = g; m_Blue = b;//
|
| - }
|
| - } else {
|
| - if (m_bRgbByteOrder){
|
| - m_Color = FXARGB_TOBGRORDERDIB(color);
|
| - ArgbDecode(color, m_Alpha, m_Blue, m_Green, m_Red); //
|
| - }else {
|
| - m_Color = FXARGB_TODIB(color);
|
| - ArgbDecode(color, m_Alpha, m_Red, m_Green, m_Blue);
|
| - }
|
| - }
|
| - }
|
| + }
|
| + if (pIccTransform) {
|
| + color = bObjectCMYK ? FXCMYK_TODIB(color) : FXARGB_TODIB(color);
|
| + pIccModule->TranslateScanline(pIccTransform, (uint8_t*)&m_Color, (const uint8_t*)&color, 1);
|
| + ((uint8_t*)&m_Color)[3] = m_Alpha;
|
| + m_Red = ((uint8_t*)&m_Color)[2];
|
| + m_Green = ((uint8_t*)&m_Color)[1];
|
| + m_Blue = ((uint8_t*)&m_Color)[0];
|
| + // Need Johnson to improvement it.
|
| + if (m_bRgbByteOrder) {
|
| + // swap
|
| + m_Red = ((uint8_t*)&m_Color)[0];
|
| + m_Blue = ((uint8_t*)&m_Color)[2];
|
| + m_Color = FXARGB_TODIB(m_Color);
|
| + m_Color = FXARGB_TOBGRORDERDIB(m_Color);
|
| + }
|
| + } else {
|
| + if (bObjectCMYK) {
|
| + uint8_t r, g, b;
|
| + AdobeCMYK_to_sRGB1(FXSYS_GetCValue(color), FXSYS_GetMValue(color), FXSYS_GetYValue(color), FXSYS_GetKValue(color),
|
| + r, g, b);
|
| + m_Color = FXARGB_MAKE(m_Alpha, r, g, b);
|
| + if (m_bRgbByteOrder){
|
| + m_Color = FXARGB_TOBGRORDERDIB(m_Color);
|
| + m_Red = b; m_Green = g; m_Blue = r;//
|
| + }else {
|
| + m_Color = FXARGB_TODIB(m_Color);
|
| + m_Red = r; m_Green = g; m_Blue = b;//
|
| + }
|
| + } else {
|
| + if (m_bRgbByteOrder){
|
| + m_Color = FXARGB_TOBGRORDERDIB(color);
|
| + ArgbDecode(color, m_Alpha, m_Blue, m_Green, m_Red); //
|
| + }else {
|
| + m_Color = FXARGB_TODIB(color);
|
| + ArgbDecode(color, m_Alpha, m_Red, m_Green, m_Blue);
|
| + }
|
| + }
|
| }
|
| }
|
| // Get palette transparency selector
|
|
|