Merge to XFA - else after returns.

core/src/fxge/win32/fx_win32_print.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../../include/fxge/fx_ge.h"
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
 #include <windows.h>
 #include "../../../include/fxge/fx_ge_win32.h"
@@ skipping 62 matching lines @@
             FX_BOOL ret = GDI_StretchBitMask(pFlipped, dest_left, dest_top, abs(dest_width), abs(dest_height), color, flags, alpha_flag, pIccTransform);
             delete pFlipped;
             return ret;
         }
         CFX_DIBExtractor temp(pSource);
         CFX_DIBitmap* pBitmap = temp;
         if (pBitmap == NULL) {
             return FALSE;
         }
         return GDI_StretchBitMask(pBitmap, dest_left, dest_top, dest_width, dest_height, color, flags, alpha_flag, pIccTransform);
-    } else {
-        ASSERT(pSource != NULL);
-        if (pSource->HasAlpha()) {
+    }
+    if (pSource->HasAlpha()) {
+        return FALSE;
+    }
+    if (dest_width < 0 || dest_height < 0) {
+        CFX_DIBitmap* pFlipped = pSource->FlipImage(dest_width < 0, dest_height < 0);
+        if (pFlipped == NULL) {
             return FALSE;
         }
-        if (dest_width < 0 || dest_height < 0) {
-            CFX_DIBitmap* pFlipped = pSource->FlipImage(dest_width < 0, dest_height < 0);
-            if (pFlipped == NULL) {
-                return FALSE;
-            }
-            if (dest_width < 0) {
-                dest_left += dest_width;
-            }
-            if (dest_height < 0) {
-                dest_top += dest_height;
-            }
-            FX_BOOL ret = GDI_StretchDIBits(pFlipped, dest_left, dest_top, abs(dest_width), abs(dest_height), flags, pIccTransform);
-            delete pFlipped;
-            return ret;
+        if (dest_width < 0) {
+            dest_left += dest_width;
         }
-        CFX_DIBExtractor temp(pSource);
-        CFX_DIBitmap* pBitmap = temp;
-        if (pBitmap == NULL) {
-            return FALSE;
+        if (dest_height < 0) {
+            dest_top += dest_height;
         }
-        return GDI_StretchDIBits(pBitmap, dest_left, dest_top, dest_width, dest_height, flags, pIccTransform);
+        FX_BOOL ret = GDI_StretchDIBits(pFlipped, dest_left, dest_top, abs(dest_width), abs(dest_height), flags, pIccTransform);
+        delete pFlipped;
+        return ret;
     }
+    CFX_DIBExtractor temp(pSource);
+    CFX_DIBitmap* pBitmap = temp;
+    if (pBitmap == NULL) {
+        return FALSE;
+    }
+    return GDI_StretchDIBits(pBitmap, dest_left, dest_top, dest_width, dest_height, flags, pIccTransform);
 }
 static CFX_DIBitmap* Transform1bppBitmap(const CFX_DIBSource* pSrc, const CFX_AffineMatrix* pDestMatrix)
 {
     ASSERT(pSrc->GetFormat() == FXDIB_1bppRgb || pSrc->GetFormat() == FXDIB_1bppMask || pSrc->GetFormat() == FXDIB_1bppCmyk);
     CFX_FloatRect unit_rect = pDestMatrix->GetUnitRect();
     FX_RECT full_rect = unit_rect.GetOutterRect();
     int full_left = full_rect.left;
     int full_top = full_rect.top;
     CFX_DIBExtractor src_bitmap(pSrc);
     CFX_DIBitmap* pSrcBitmap = src_bitmap;
@@ skipping 292 matching lines @@
     handle = NULL;
     return m_PSRenderer.DrawDIBits(pBitmap, color, pMatrix, render_flags, alpha_flag, pIccTransform);
 }
 FX_BOOL CPSPrinterDriver::DrawDeviceText(int nChars, const FXTEXT_CHARPOS* pCharPos, CFX_Font* pFont,
         CFX_FontCache* pCache, const CFX_AffineMatrix* pObject2Device, FX_FLOAT font_size, FX_DWORD color,
         int alpha_flag, void* pIccTransform)
 {
     return m_PSRenderer.DrawText(nChars, pCharPos, pFont, pCache, pObject2Device, font_size, color, alpha_flag, pIccTransform);
 }
 #endif