Revert to 15d2b35574d7eac8d465029854cc3c4bd64ae2cc

diff --git a/client/Android/FreeRDPCore/jni/android_freerdp.c b/client/Android/FreeRDPCore/jni/android_freerdp.c
index 87b4d7f..5f75ce4 100644 (file)
--- a/client/Android/FreeRDPCore/jni/android_freerdp.c
+++ b/client/Android/FreeRDPCore/jni/android_freerdp.c
@@ -836,15 +836,44 @@ JNIEXPORT void JNICALL jni_freerdp_set_performance_flags(
        }
 
        /* store performance settings */
-       settings->DisableWallpaper = (disableWallpaper == JNI_TRUE) ? TRUE : FALSE;
-       settings->DisableFullWindowDrag = (disableFullWindowDrag == JNI_TRUE) ? TRUE : FALSE;
-       settings->DisableMenuAnims = (disableMenuAnimations == JNI_TRUE) ? TRUE : FALSE;
-       settings->DisableThemes = (disableTheming == JNI_TRUE) ? TRUE : FALSE;
-       settings->AllowFontSmoothing = (enableFontSmoothing == JNI_TRUE) ? TRUE : FALSE;
-       settings->AllowDesktopComposition = (enableDesktopComposition == JNI_TRUE) ? TRUE : FALSE;
+       if (disableWallpaper == JNI_TRUE)
+               settings->DisableWallpaper = TRUE;
+
+       if (disableFullWindowDrag == JNI_TRUE)
+               settings->DisableFullWindowDrag = TRUE;
+
+       if (disableMenuAnimations == JNI_TRUE)
+               settings->DisableMenuAnims = TRUE;
+
+       if (disableTheming == JNI_TRUE)
+               settings->DisableThemes = TRUE;
+
+       if (enableFontSmoothing == JNI_TRUE)
+               settings->AllowFontSmoothing = TRUE;
+
+       if(enableDesktopComposition == JNI_TRUE)
+               settings->AllowDesktopComposition = TRUE;
+
 
        /* Create performance flags from settings */
-       freerdp_performance_flags_make(settings);
+       settings->PerformanceFlags = PERF_FLAG_NONE;
+       if (settings->AllowFontSmoothing)
+               settings->PerformanceFlags |= PERF_ENABLE_FONT_SMOOTHING;
+
+       if (settings->AllowDesktopComposition)
+               settings->PerformanceFlags |= PERF_ENABLE_DESKTOP_COMPOSITION;
+
+       if (settings->DisableWallpaper)
+               settings->PerformanceFlags |= PERF_DISABLE_WALLPAPER;
+
+       if (settings->DisableFullWindowDrag)
+               settings->PerformanceFlags |= PERF_DISABLE_FULLWINDOWDRAG;
+
+       if (settings->DisableMenuAnims)
+               settings->PerformanceFlags |= PERF_DISABLE_MENUANIMATIONS;
+
+       if (settings->DisableThemes)
+               settings->PerformanceFlags |= PERF_DISABLE_THEMING;
 
        DEBUG_ANDROID("performance_flags: %04X", settings->PerformanceFlags);
 }

diff --git a/libfreerdp/codec/color.c b/libfreerdp/codec/color.c
index e788303..8b2578a 100644 (file)
--- a/libfreerdp/codec/color.c
+++ b/libfreerdp/codec/color.c
@@ -1092,25 +1092,11 @@ BYTE* freerdp_mono_image_convert(BYTE* srcData, int width, int height, int srcBp
                        {
                                if ((bitMask >> bitIndex) & 0x01)
                                {
-                                       if (clrconv->alpha)
-                                       {
-                                               *dst32 = (clrconv->invert) ? ABGR32(0xFF, redBg, greenBg, blueBg) : ARGB32(0xFF, redBg, greenBg, blueBg);
-                                       }
-                                       else
-                                       {
-                                               *dst32 = (clrconv->invert) ? BGR32(redBg, greenBg, blueBg) : RGB32(redBg, greenBg, blueBg);
-                                       }
+                                       *dst32 = (clrconv->invert) ? BGR32(redBg, greenBg, blueBg) : RGB32(redBg, greenBg, blueBg);
                                }
                                else
                                {
-                                       if (clrconv->alpha)
-                                       {
-                                               *dst32 = (clrconv->invert) ? ABGR32(0xFF, redFg, greenFg, blueFg) : ARGB32(0xFF, redFg, greenFg, blueFg);
-                                       }
-                                       else
-                                       {
-                                               *dst32 = (clrconv->invert) ? BGR32(redFg, greenFg, blueFg) : RGB32(redFg, greenFg, blueFg);
-                                       }
+                                       *dst32 = (clrconv->invert) ? BGR32(redFg, greenFg, blueFg) : RGB32(redFg, greenFg, blueFg);
                                }
                                dst32++;
                        }