Fix a bunch of -Wunused-but-set-variable warnings.

core/src/fxge/dib/fx_dib_composite.cpp

Index: core/src/fxge/dib/fx_dib_composite.cpp
diff --git a/core/src/fxge/dib/fx_dib_composite.cpp b/core/src/fxge/dib/fx_dib_composite.cpp
index 375b7c110e82b23428b51d7aaac985ccd8822f02..97faa4a1df323fb47700ea6cd20495eec11bd6ee 100644
--- a/core/src/fxge/dib/fx_dib_composite.cpp
+++ b/core/src/fxge/dib/fx_dib_composite.cpp
@@ -4149,11 +4149,8 @@ FX_BOOL CFX_DIBitmap::CompositeBitmap(int dest_left, int dest_top, int width, in
     int dest_Bpp = m_bpp / 8;
     int src_Bpp = pSrcBitmap->GetBPP() / 8;
     FX_BOOL bRgb = FALSE;
-    FX_BOOL bCmyk = FALSE;
     if (src_Bpp > 1) {
-        if (pSrcBitmap->IsCmykImage()) {
-            bCmyk = TRUE;
-        } else {
+        if (!pSrcBitmap->IsCmykImage()) {
             bRgb = TRUE;

[Tom Sepez, 2015/04/17 16:20:16]

nit: or maybe just ???
    FX_BOOL bRgb = src_Bpp > 1 && !pSrcBitmap->IsCmykImage();

[Lei Zhang, 2015/05/08 05:40:38]

Done.

         }
     }