Replace or remove _FX control-flow defines

xfa/src/fxgraphics/src/fx_graphics.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 <memory>
 
 #include "xfa/src/fxgraphics/src/fx_path_generator.h"
 #include "xfa/src/fxgraphics/src/pre.h"
@@ skipping 21 matching lines @@
   _info._fillColor = NULL;
   _info._font = NULL;
   _info._fontSize = 40.0;
   _info._fontHScale = 1.0;
   _info._fontSpacing = 0.0;
   _renderDevice = NULL;
   _aggGraphics = NULL;
 }
 FX_ERR CFX_Graphics::Create(CFX_RenderDevice* renderDevice,
                             FX_BOOL isAntialiasing) {
-  _FX_RETURN_VALUE_IF_FAIL(renderDevice, FX_ERR_Parameter_Invalid);
+  if (!renderDevice)
+    return FX_ERR_Parameter_Invalid;
   if (_type != FX_CONTEXT_None) {
     return FX_ERR_Property_Invalid;
   }
   _type = FX_CONTEXT_Device;
   _info._isAntialiasing = isAntialiasing;
   _renderDevice = renderDevice;
   if (_renderDevice->GetDeviceCaps(FXDC_RENDER_CAPS) & FXRC_SOFT_CLIP) {
     return FX_ERR_Succeeded;
   }
   return FX_ERR_Indefinite;
@@ skipping 18 matching lines @@
     delete _aggGraphics;
     _aggGraphics = NULL;
   }
   _renderDevice = NULL;
   _info._graphState.SetDashCount(0);
   _type = FX_CONTEXT_None;
 }
 FX_ERR CFX_Graphics::GetDeviceCap(const int32_t capID, FX_DeviceCap& capVal) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       capVal = _renderDevice->GetDeviceCaps(capID);
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::IsPrinterDevice(FX_BOOL& isPrinter) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       int32_t deviceClass = _renderDevice->GetDeviceClass();
       if (deviceClass == FXDC_PRINTER) {
         isPrinter = TRUE;
       } else {
         isPrinter = FALSE;
       }
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::EnableAntialiasing(FX_BOOL isAntialiasing) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       _info._isAntialiasing = isAntialiasing;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::SaveGraphState() {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       _renderDevice->SaveState();
       TInfo* info = new TInfo;
       info->_graphState.Copy(_info._graphState);
       info->_isAntialiasing = _info._isAntialiasing;
       info->_strokeAlignment = _info._strokeAlignment;
       info->_CTM = _info._CTM;
       info->_isActOnDash = _info._isActOnDash;
       info->_strokeColor = _info._strokeColor;
       info->_fillColor = _info._fillColor;
       info->_font = _info._font;
       info->_fontSize = _info._fontSize;
       info->_fontHScale = _info._fontHScale;
       info->_fontSpacing = _info._fontSpacing;
       _infoStack.Add(info);
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::RestoreGraphState() {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       _renderDevice->RestoreState();
       int32_t size = _infoStack.GetSize();
       if (size <= 0) {
         return FX_ERR_Intermediate_Value_Invalid;
       }
       int32_t topIndex = size - 1;
       TInfo* info = (TInfo*)_infoStack.GetAt(topIndex);
-      _FX_RETURN_VALUE_IF_FAIL(info, FX_ERR_Intermediate_Value_Invalid);
+      if (!info)
+        return FX_ERR_Intermediate_Value_Invalid;
       _info._graphState.Copy(info->_graphState);
       _info._isAntialiasing = info->_isAntialiasing;
       _info._strokeAlignment = info->_strokeAlignment;
       _info._CTM = info->_CTM;
       _info._isActOnDash = info->_isActOnDash;
       _info._strokeColor = info->_strokeColor;
       _info._fillColor = info->_fillColor;
       _info._font = info->_font;
       _info._fontSize = info->_fontSize;
       _info._fontHScale = info->_fontHScale;
       _info._fontSpacing = info->_fontSpacing;
       delete info;
       info = NULL;
       _infoStack.RemoveAt(topIndex);
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::GetLineCap(CFX_GraphStateData::LineCap& lineCap) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       lineCap = _info._graphState.m_LineCap;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::SetLineCap(CFX_GraphStateData::LineCap lineCap) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       _info._graphState.m_LineCap = lineCap;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::GetDashCount(int32_t& dashCount) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       dashCount = _info._graphState.m_DashCount;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::GetLineDash(FX_FLOAT& dashPhase, FX_FLOAT* dashArray) {
-  _FX_RETURN_VALUE_IF_FAIL(dashArray, FX_ERR_Parameter_Invalid);
+  if (!dashArray)
+    return FX_ERR_Parameter_Invalid;
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       dashPhase = _info._graphState.m_DashPhase;
       FXSYS_memcpy(dashArray, _info._graphState.m_DashArray,
                    _info._graphState.m_DashCount * sizeof(FX_FLOAT));
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::SetLineDash(FX_FLOAT dashPhase,
                                  FX_FLOAT* dashArray,
                                  int32_t dashCount) {
   if (dashCount > 0 && !dashArray) {
     return FX_ERR_Parameter_Invalid;
   }
   dashCount = dashCount < 0 ? 0 : dashCount;
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       FX_FLOAT scale = 1.0;
       if (_info._isActOnDash) {
         scale = _info._graphState.m_LineWidth;
       }
       _info._graphState.m_DashPhase = dashPhase;
       _info._graphState.SetDashCount(dashCount);
       for (int32_t i = 0; i < dashCount; i++) {
         _info._graphState.m_DashArray[i] = dashArray[i] * scale;
       }
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::SetLineDash(FX_DashStyle dashStyle) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       return RenderDeviceSetLineDash(dashStyle);
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::GetLineJoin(CFX_GraphStateData::LineJoin& lineJoin) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       lineJoin = _info._graphState.m_LineJoin;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::SetLineJoin(CFX_GraphStateData::LineJoin lineJoin) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       _info._graphState.m_LineJoin = lineJoin;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::GetMiterLimit(FX_FLOAT& miterLimit) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       miterLimit = _info._graphState.m_MiterLimit;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::SetMiterLimit(FX_FLOAT miterLimit) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       _info._graphState.m_MiterLimit = miterLimit;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::GetLineWidth(FX_FLOAT& lineWidth) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       lineWidth = _info._graphState.m_LineWidth;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::SetLineWidth(FX_FLOAT lineWidth, FX_BOOL isActOnDash) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       _info._graphState.m_LineWidth = lineWidth;
       _info._isActOnDash = isActOnDash;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::GetStrokeAlignment(FX_StrokeAlignment& strokeAlignment) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       strokeAlignment = _info._strokeAlignment;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::SetStrokeAlignment(FX_StrokeAlignment strokeAlignment) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       _info._strokeAlignment = strokeAlignment;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::SetStrokeColor(CFX_Color* color) {
-  _FX_RETURN_VALUE_IF_FAIL(color, FX_ERR_Parameter_Invalid);
+  if (!color)
+    return FX_ERR_Parameter_Invalid;
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       _info._strokeColor = color;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::SetFillColor(CFX_Color* color) {
-  _FX_RETURN_VALUE_IF_FAIL(color, FX_ERR_Parameter_Invalid);
+  if (!color)
+    return FX_ERR_Parameter_Invalid;
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       _info._fillColor = color;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::StrokePath(CFX_Path* path, CFX_Matrix* matrix) {
-  _FX_RETURN_VALUE_IF_FAIL(path, FX_ERR_Parameter_Invalid);
+  if (!path)
+    return FX_ERR_Parameter_Invalid;
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       return RenderDeviceStrokePath(path, matrix);
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::FillPath(CFX_Path* path,
                               FX_FillMode fillMode,
                               CFX_Matrix* matrix) {
-  _FX_RETURN_VALUE_IF_FAIL(path, FX_ERR_Parameter_Invalid);
+  if (!path)
+    return FX_ERR_Parameter_Invalid;
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       return RenderDeviceFillPath(path, fillMode, matrix);
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::ClipPath(CFX_Path* path,
                               FX_FillMode fillMode,
                               CFX_Matrix* matrix) {
-  _FX_RETURN_VALUE_IF_FAIL(path, FX_ERR_Parameter_Invalid);
+  if (!path)
+    return FX_ERR_Parameter_Invalid;
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       FX_BOOL result = _renderDevice->SetClip_PathFill(
           path->GetPathData(), (CFX_Matrix*)matrix, fillMode);
-      _FX_RETURN_VALUE_IF_FAIL(result, FX_ERR_Indefinite);
+      if (!result)
+        return FX_ERR_Indefinite;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::DrawImage(CFX_DIBSource* source,
                                const CFX_PointF& point,
                                CFX_Matrix* matrix) {
-  _FX_RETURN_VALUE_IF_FAIL(source, FX_ERR_Parameter_Invalid);
+  if (!source)
+    return FX_ERR_Parameter_Invalid;
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       return RenderDeviceDrawImage(source, point, matrix);
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::StretchImage(CFX_DIBSource* source,
                                   const CFX_RectF& rect,
                                   CFX_Matrix* matrix) {
-  _FX_RETURN_VALUE_IF_FAIL(source, FX_ERR_Parameter_Invalid);
+  if (!source)
+    return FX_ERR_Parameter_Invalid;
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       return RenderDeviceStretchImage(source, rect, matrix);
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::ConcatMatrix(const CFX_Matrix* matrix) {
-  _FX_RETURN_VALUE_IF_FAIL(matrix, FX_ERR_Parameter_Invalid);
+  if (!matrix)
+    return FX_ERR_Parameter_Invalid;
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       _info._CTM.Concat(*matrix);
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 CFX_Matrix* CFX_Graphics::GetMatrix() {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, NULL);
+      if (!_renderDevice)
+        return NULL;
       return &_info._CTM;
     }
     default: { return NULL; }
   }
 }
 FX_ERR CFX_Graphics::GetClipRect(CFX_RectF& rect) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       FX_RECT r = _renderDevice->GetClipBox();
       rect.left = (FX_FLOAT)r.left;
       rect.top = (FX_FLOAT)r.top;
       rect.width = (FX_FLOAT)r.Width();
       rect.height = (FX_FLOAT)r.Height();
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::SetClipRect(const CFX_RectF& rect) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       FX_RECT r(FXSYS_round(rect.left), FXSYS_round(rect.top),
                 FXSYS_round(rect.right()), FXSYS_round(rect.bottom()));
       FX_BOOL result = _renderDevice->SetClip_Rect(&r);
-      _FX_RETURN_VALUE_IF_FAIL(result, FX_ERR_Method_Not_Supported);
+      if (!result)
+        return FX_ERR_Method_Not_Supported;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::ClearClip() {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       FX_BOOL result = FX_ERR_Succeeded;

[Lei Zhang, 2016/02/26 19:40:55]

uh

[Tom Sepez, 2016/02/26 19:50:09]

Uh-oh. Probably Does the opposite of what the want, since succeeded = 0.

-      _FX_RETURN_VALUE_IF_FAIL(result, FX_ERR_Method_Not_Supported);
+      if (!result)
+        return FX_ERR_Method_Not_Supported;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::SetFont(CFX_Font* font) {
-  _FX_RETURN_VALUE_IF_FAIL(font, FX_ERR_Parameter_Invalid);
+  if (!font)
+    return FX_ERR_Parameter_Invalid;
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       _info._font = font;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::SetFontSize(const FX_FLOAT size) {
   FX_FLOAT fontSize = size <= 0 ? 1.0f : size;
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       _info._fontSize = fontSize;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::SetFontHScale(const FX_FLOAT scale) {
   FX_FLOAT fontHScale = scale <= 0 ? 1.0f : scale;
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       _info._fontHScale = fontHScale;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::SetCharSpacing(const FX_FLOAT spacing) {
   FX_FLOAT fontSpacing = spacing < 0 ? 0 : spacing;
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       _info._fontSpacing = fontSpacing;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::SetTextDrawingMode(const int32_t mode) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::ShowText(const CFX_PointF& point,
                               const CFX_WideString& text,
                               CFX_Matrix* matrix) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       return RenderDeviceShowText(point, text, matrix);
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::CalcTextRect(CFX_RectF& rect,
                                   const CFX_WideString& text,
                                   FX_BOOL isMultiline,
                                   CFX_Matrix* matrix) {
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       int32_t length = text.GetLength();
       FX_DWORD* charCodes = FX_Alloc(FX_DWORD, length);
       FXTEXT_CHARPOS* charPos = FX_Alloc(FXTEXT_CHARPOS, length);
       CalcTextInfo(text, charCodes, charPos, rect);
       FX_Free(charPos);
       FX_Free(charCodes);
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::Transfer(CFX_Graphics* graphics,
                               const CFX_Matrix* matrix) {
-  _FX_RETURN_VALUE_IF_FAIL(graphics, FX_ERR_Parameter_Invalid);
+  if (!graphics)
+    return FX_ERR_Parameter_Invalid;
   CFX_Matrix m;
   m.Set(_info._CTM.a, _info._CTM.b, _info._CTM.c, _info._CTM.d, _info._CTM.e,
         _info._CTM.f);
   if (matrix) {
     m.Concat(*matrix);
   }
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       {
-        _FX_RETURN_VALUE_IF_FAIL(graphics->_renderDevice,
-                                 FX_ERR_Parameter_Invalid);
+        if (!graphics->_renderDevice)
+          return FX_ERR_Parameter_Invalid;
         CFX_DIBitmap* bitmap = graphics->_renderDevice->GetBitmap();
         FX_BOOL result = _renderDevice->SetDIBits(bitmap, 0, 0);
-        _FX_RETURN_VALUE_IF_FAIL(result, FX_ERR_Method_Not_Supported);
+        if (!result)
+          return FX_ERR_Method_Not_Supported;
       }
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::Transfer(CFX_Graphics* graphics,
                               FX_FLOAT srcLeft,
                               FX_FLOAT srcTop,
                               const CFX_RectF& dstRect,
                               const CFX_Matrix* matrix) {
-  _FX_RETURN_VALUE_IF_FAIL(graphics, FX_ERR_Parameter_Invalid);
+  if (!graphics)
+    return FX_ERR_Parameter_Invalid;
   CFX_Matrix m;
   m.Set(_info._CTM.a, _info._CTM.b, _info._CTM.c, _info._CTM.d, _info._CTM.e,
         _info._CTM.f);
   if (matrix) {
     m.Concat(*matrix);
   }
   switch (_type) {
     case FX_CONTEXT_Device: {
-      _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+      if (!_renderDevice)
+        return FX_ERR_Property_Invalid;
       {
-        _FX_RETURN_VALUE_IF_FAIL(graphics->_renderDevice,
-                                 FX_ERR_Parameter_Invalid);
+        if (!graphics->_renderDevice)
+          return FX_ERR_Parameter_Invalid;
         CFX_DIBitmap* bitmap = graphics->_renderDevice->GetBitmap();
         FX_BOOL result = FX_ERR_Indefinite;

[Lei Zhang, 2016/02/26 19:40:55]

Combine with line 649.

[Tom Sepez, 2016/02/26 19:50:09]

Done.

         CFX_DIBitmap bmp;
         result = bmp.Create((int32_t)dstRect.width, (int32_t)dstRect.height,
                             bitmap->GetFormat());
-        _FX_RETURN_VALUE_IF_FAIL(result, FX_ERR_Intermediate_Value_Invalid);
+        if (!result)
+          return FX_ERR_Intermediate_Value_Invalid;
         result = graphics->_renderDevice->GetDIBits(&bmp, (int32_t)srcLeft,
                                                     (int32_t)srcTop);
-        _FX_RETURN_VALUE_IF_FAIL(result, FX_ERR_Method_Not_Supported);
+        if (!result)
+          return FX_ERR_Method_Not_Supported;
         result = _renderDevice->SetDIBits(&bmp, (int32_t)dstRect.left,
                                           (int32_t)dstRect.top);
-        _FX_RETURN_VALUE_IF_FAIL(result, FX_ERR_Method_Not_Supported);
+        if (!result)
+          return FX_ERR_Method_Not_Supported;
         return FX_ERR_Succeeded;
       }
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 CFX_RenderDevice* CFX_Graphics::GetRenderDevice() {
   return _renderDevice;
 }
 FX_ERR CFX_Graphics::InverseRect(const CFX_RectF& rect) {
-  _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+  if (!_renderDevice)
+    return FX_ERR_Property_Invalid;
   CFX_DIBitmap* bitmap = _renderDevice->GetBitmap();
-  _FX_RETURN_VALUE_IF_FAIL(bitmap, FX_ERR_Property_Invalid);
+  if (!bitmap)
+    return FX_ERR_Property_Invalid;
   CFX_RectF temp(rect);
   _info._CTM.TransformRect(temp);
   CFX_RectF r;
   r.Set(0, 0, (FX_FLOAT)bitmap->GetWidth(), (FX_FLOAT)bitmap->GetWidth());
   r.Intersect(temp);
   if (r.IsEmpty()) {
     return FX_ERR_Parameter_Invalid;
   }
   FX_ARGB* pBuf =
       (FX_ARGB*)(bitmap->GetBuffer() + int32_t(r.top) * bitmap->GetPitch());
   int32_t bottom = (int32_t)r.bottom();
   int32_t right = (int32_t)r.right();
   for (int32_t i = (int32_t)r.top; i < bottom; i++) {
     FX_ARGB* pLine = pBuf + (int32_t)r.left;
     for (int32_t j = (int32_t)r.left; j < right; j++) {
       FX_ARGB c = *pLine;
       *pLine++ = (c & 0xFF000000) | (0xFFFFFF - (c & 0x00FFFFFF));
     }
     pBuf = (FX_ARGB*)((uint8_t*)pBuf + bitmap->GetPitch());
   }
   return FX_ERR_Succeeded;
 }
 FX_ERR CFX_Graphics::XorDIBitmap(const CFX_DIBitmap* srcBitmap,
                                  const CFX_RectF& rect) {
-  _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+  if (!_renderDevice)
+    return FX_ERR_Property_Invalid;
   CFX_DIBitmap* dst = _renderDevice->GetBitmap();
-  _FX_RETURN_VALUE_IF_FAIL(dst, FX_ERR_Property_Invalid);
+  if (!dst)
+    return FX_ERR_Property_Invalid;
   CFX_RectF temp(rect);
   _info._CTM.TransformRect(temp);
   CFX_RectF r;
   r.Set(0, 0, (FX_FLOAT)dst->GetWidth(), (FX_FLOAT)dst->GetWidth());
   r.Intersect(temp);
   if (r.IsEmpty()) {
     return FX_ERR_Parameter_Invalid;
   }
   FX_ARGB* pSrcBuf = (FX_ARGB*)(srcBitmap->GetBuffer() +
                                 int32_t(r.top) * srcBitmap->GetPitch());
@@ skipping 10 matching lines @@
           ArgbEncode(FXARGB_A(c), (c & 0xFFFFFF) ^ (*pSrcLine & 0xFFFFFF));
       pSrcLine++;
     }
     pSrcBuf = (FX_ARGB*)((uint8_t*)pSrcBuf + srcBitmap->GetPitch());
     pDstBuf = (FX_ARGB*)((uint8_t*)pDstBuf + dst->GetPitch());
   }
   return FX_ERR_Succeeded;
 }
 FX_ERR CFX_Graphics::EqvDIBitmap(const CFX_DIBitmap* srcBitmap,
                                  const CFX_RectF& rect) {
-  _FX_RETURN_VALUE_IF_FAIL(_renderDevice, FX_ERR_Property_Invalid);
+  if (!_renderDevice)
+    return FX_ERR_Property_Invalid;
   CFX_DIBitmap* dst = _renderDevice->GetBitmap();
-  _FX_RETURN_VALUE_IF_FAIL(dst, FX_ERR_Property_Invalid);
+  if (!dst)
+    return FX_ERR_Property_Invalid;
   CFX_RectF temp(rect);
   _info._CTM.TransformRect(temp);
   CFX_RectF r;
   r.Set(0, 0, (FX_FLOAT)dst->GetWidth(), (FX_FLOAT)dst->GetWidth());
   r.Intersect(temp);
   if (r.IsEmpty()) {
     return FX_ERR_Parameter_Invalid;
   }
   FX_ARGB* pSrcBuf = (FX_ARGB*)(srcBitmap->GetBuffer() +
                                 int32_t(r.top) * srcBitmap->GetPitch());
@@ skipping 39 matching lines @@
     case FX_DASHSTYLE_DashDotDot: {
       FX_FLOAT dashArray[] = {4, 1, 2, 1, 2, 1};
       SetLineDash(0, dashArray, 6);
       return FX_ERR_Succeeded;
     }
     default: { return FX_ERR_Parameter_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::RenderDeviceStrokePath(CFX_Path* path,
                                             CFX_Matrix* matrix) {
-  _FX_RETURN_VALUE_IF_FAIL(_info._strokeColor, FX_ERR_Property_Invalid);
+  if (!_info._strokeColor)
+    return FX_ERR_Property_Invalid;
   CFX_Matrix m;
   m.Set(_info._CTM.a, _info._CTM.b, _info._CTM.c, _info._CTM.d, _info._CTM.e,
         _info._CTM.f);
   if (matrix) {
     m.Concat(*matrix);
   }
   switch (_info._strokeColor->_type) {
     case FX_COLOR_Solid: {
       FX_BOOL result = _renderDevice->DrawPath(
           path->GetPathData(), (CFX_Matrix*)&m, &_info._graphState, 0x0,
           _info._strokeColor->_argb, 0);
-      _FX_RETURN_VALUE_IF_FAIL(result, FX_ERR_Indefinite);
+      if (!result)
+        return FX_ERR_Indefinite;
       return FX_ERR_Succeeded;
     }
     case FX_COLOR_Pattern: {
       return StrokePathWithPattern(path, &m);
     }
     case FX_COLOR_Shading: {
       return StrokePathWithShading(path, &m);
     }
     default: { return FX_ERR_Property_Invalid; }
   }
 }
 FX_ERR CFX_Graphics::RenderDeviceFillPath(CFX_Path* path,
                                           FX_FillMode fillMode,
                                           CFX_Matrix* matrix) {
-  _FX_RETURN_VALUE_IF_FAIL(_info._fillColor, FX_ERR_Property_Invalid);
+  if (!_info._fillColor)
+    return FX_ERR_Property_Invalid;
   CFX_Matrix m;
   m.Set(_info._CTM.a, _info._CTM.b, _info._CTM.c, _info._CTM.d, _info._CTM.e,
         _info._CTM.f);
   if (matrix) {
     m.Concat(*matrix);
   }
   switch (_info._fillColor->_type) {
     case FX_COLOR_Solid: {
       FX_BOOL result = _renderDevice->DrawPath(
           path->GetPathData(), (CFX_Matrix*)&m, &_info._graphState,
           _info._fillColor->_argb, 0x0, fillMode);
-      _FX_RETURN_VALUE_IF_FAIL(result, FX_ERR_Indefinite);
+      if (!result)
+        return FX_ERR_Indefinite;
       return FX_ERR_Succeeded;
     }
     case FX_COLOR_Pattern: {
       { return FillPathWithPattern(path, fillMode, &m); }
     }
     case FX_COLOR_Shading: {
       { return FillPathWithShading(path, fillMode, &m); }
     }
     default: { return FX_ERR_Property_Invalid; }
   }
@@ skipping 93 matching lines @@
   m.Set(_info._CTM.a, _info._CTM.b, _info._CTM.c, _info._CTM.d, _info._CTM.e,
         _info._CTM.f);
   m.Translate(0, _info._fontSize * _info._fontHScale);
   if (matrix) {
     m.Concat(*matrix);
   }
   FX_BOOL result = _renderDevice->DrawNormalText(
       length, charPos, _info._font, CFX_GEModule::Get()->GetFontCache(),
       -_info._fontSize * _info._fontHScale, (CFX_Matrix*)&m,
       _info._fillColor->_argb, FXTEXT_CLEARTYPE);
-  _FX_RETURN_VALUE_IF_FAIL(result, FX_ERR_Indefinite);
+  if (!result)
+    return FX_ERR_Indefinite;
   FX_Free(charPos);
   FX_Free(charCodes);
   return FX_ERR_Succeeded;
 }
 FX_ERR CFX_Graphics::StrokePathWithPattern(CFX_Path* path, CFX_Matrix* matrix) {
   return FX_ERR_Method_Not_Supported;
 }
 FX_ERR CFX_Graphics::StrokePathWithShading(CFX_Path* path, CFX_Matrix* matrix) {
   return FX_ERR_Method_Not_Supported;
 }
@@ skipping 279 matching lines @@
   _generator->Create();
   return FX_ERR_Succeeded;
 }
 CFX_Path::~CFX_Path() {
   if (_generator) {
     delete _generator;
     _generator = NULL;
   }
 }
 FX_ERR CFX_Path::MoveTo(FX_FLOAT x, FX_FLOAT y) {
-  _FX_RETURN_VALUE_IF_FAIL(_generator, FX_ERR_Property_Invalid);
+  if (!_generator)
+    return FX_ERR_Property_Invalid;
   _generator->MoveTo(x, y);
   return FX_ERR_Succeeded;
 }
 FX_ERR CFX_Path::LineTo(FX_FLOAT x, FX_FLOAT y) {
-  _FX_RETURN_VALUE_IF_FAIL(_generator, FX_ERR_Property_Invalid);
+  if (!_generator)
+    return FX_ERR_Property_Invalid;
   _generator->LineTo(x, y);
   return FX_ERR_Succeeded;
 }
 FX_ERR CFX_Path::BezierTo(FX_FLOAT ctrlX1,
                           FX_FLOAT ctrlY1,
                           FX_FLOAT ctrlX2,
                           FX_FLOAT ctrlY2,
                           FX_FLOAT toX,
                           FX_FLOAT toY) {
-  _FX_RETURN_VALUE_IF_FAIL(_generator, FX_ERR_Property_Invalid);
+  if (!_generator)
+    return FX_ERR_Property_Invalid;
   _generator->BezierTo(ctrlX1, ctrlY1, ctrlX2, ctrlY2, toX, toY);
   return FX_ERR_Succeeded;
 }
 FX_ERR CFX_Path::ArcTo(FX_FLOAT left,
                        FX_FLOAT top,
                        FX_FLOAT width,
                        FX_FLOAT height,
                        FX_FLOAT startAngle,
                        FX_FLOAT sweepAngle) {
-  _FX_RETURN_VALUE_IF_FAIL(_generator, FX_ERR_Property_Invalid);
+  if (!_generator)
+    return FX_ERR_Property_Invalid;
   _generator->ArcTo(left + width / 2, top + height / 2, width / 2, height / 2,
                     startAngle, sweepAngle);
   return FX_ERR_Succeeded;
 }
 FX_ERR CFX_Path::Close() {
-  _FX_RETURN_VALUE_IF_FAIL(_generator, FX_ERR_Property_Invalid);
+  if (!_generator)
+    return FX_ERR_Property_Invalid;
   _generator->Close();
   return FX_ERR_Succeeded;
 }
 FX_ERR CFX_Path::AddLine(FX_FLOAT x1, FX_FLOAT y1, FX_FLOAT x2, FX_FLOAT y2) {
-  _FX_RETURN_VALUE_IF_FAIL(_generator, FX_ERR_Property_Invalid);
+  if (!_generator)
+    return FX_ERR_Property_Invalid;
   _generator->AddLine(x1, y1, x2, y2);
   return FX_ERR_Succeeded;
 }
 FX_ERR CFX_Path::AddBezier(FX_FLOAT startX,
                            FX_FLOAT startY,
                            FX_FLOAT ctrlX1,
                            FX_FLOAT ctrlY1,
                            FX_FLOAT ctrlX2,
                            FX_FLOAT ctrlY2,
                            FX_FLOAT endX,
                            FX_FLOAT endY) {
-  _FX_RETURN_VALUE_IF_FAIL(_generator, FX_ERR_Property_Invalid);
+  if (!_generator)
+    return FX_ERR_Property_Invalid;
   _generator->AddBezier(startX, startY, ctrlX1, ctrlY1, ctrlX2, ctrlY2, endX,
                         endY);
   return FX_ERR_Succeeded;
 }
 FX_ERR CFX_Path::AddRectangle(FX_FLOAT left,
                               FX_FLOAT top,
                               FX_FLOAT width,
                               FX_FLOAT height) {
-  _FX_RETURN_VALUE_IF_FAIL(_generator, FX_ERR_Property_Invalid);
+  if (!_generator)
+    return FX_ERR_Property_Invalid;
   _generator->AddRectangle(left, top, left + width, top + height);
   return FX_ERR_Succeeded;
 }
 FX_ERR CFX_Path::AddEllipse(FX_FLOAT left,
                             FX_FLOAT top,
                             FX_FLOAT width,
                             FX_FLOAT height) {
-  _FX_RETURN_VALUE_IF_FAIL(_generator, FX_ERR_Property_Invalid);
+  if (!_generator)
+    return FX_ERR_Property_Invalid;
   _generator->AddEllipse(left + width / 2, top + height / 2, width / 2,
                          height / 2);
   return FX_ERR_Succeeded;
 }
 FX_ERR CFX_Path::AddEllipse(const CFX_RectF& rect) {
-  _FX_RETURN_VALUE_IF_FAIL(_generator, FX_ERR_Property_Invalid);
+  if (!_generator)
+    return FX_ERR_Property_Invalid;
   _generator->AddEllipse(rect.left + rect.Width() / 2,
                          rect.top + rect.Height() / 2, rect.Width() / 2,
                          rect.Height() / 2);
   return FX_ERR_Succeeded;
 }
 FX_ERR CFX_Path::AddArc(FX_FLOAT left,
                         FX_FLOAT top,
                         FX_FLOAT width,
                         FX_FLOAT height,
                         FX_FLOAT startAngle,
                         FX_FLOAT sweepAngle) {
-  _FX_RETURN_VALUE_IF_FAIL(_generator, FX_ERR_Property_Invalid);
+  if (!_generator)
+    return FX_ERR_Property_Invalid;
   _generator->AddArc(left + width / 2, top + height / 2, width / 2, height / 2,
                      startAngle, sweepAngle);
   return FX_ERR_Succeeded;
 }
 FX_ERR CFX_Path::AddPie(FX_FLOAT left,
                         FX_FLOAT top,
                         FX_FLOAT width,
                         FX_FLOAT height,
                         FX_FLOAT startAngle,
                         FX_FLOAT sweepAngle) {
-  _FX_RETURN_VALUE_IF_FAIL(_generator, FX_ERR_Property_Invalid);
+  if (!_generator)
+    return FX_ERR_Property_Invalid;
   _generator->AddPie(left + width / 2, top + height / 2, width / 2, height / 2,
                      startAngle, sweepAngle);
   return FX_ERR_Succeeded;
 }
 FX_ERR CFX_Path::AddSubpath(CFX_Path* path) {
-  _FX_RETURN_VALUE_IF_FAIL(_generator, FX_ERR_Property_Invalid);
+  if (!_generator)
+    return FX_ERR_Property_Invalid;
   _generator->AddPathData(path->GetPathData());
   return FX_ERR_Succeeded;
 }
 FX_ERR CFX_Path::Clear() {
-  _FX_RETURN_VALUE_IF_FAIL(_generator, FX_ERR_Property_Invalid);
+  if (!_generator)
+    return FX_ERR_Property_Invalid;
   _generator->GetPathData()->SetPointCount(0);
   return FX_ERR_Succeeded;
 }
 FX_BOOL CFX_Path::IsEmpty() {
-  _FX_RETURN_VALUE_IF_FAIL(_generator, FX_ERR_Property_Invalid);
+  if (!_generator)
+    return FX_ERR_Property_Invalid;
   if (_generator->GetPathData()->GetPointCount() == 0) {
     return TRUE;
   }
   return FALSE;
 }
 CFX_PathData* CFX_Path::GetPathData() {
-  _FX_RETURN_VALUE_IF_FAIL(_generator, NULL);
+  if (!_generator)
+    return NULL;
   return _generator->GetPathData();
 }
 CFX_Color::CFX_Color() {
   _type = FX_COLOR_None;
 }
 CFX_Color::CFX_Color(const FX_ARGB argb) {
   _type = FX_COLOR_None;
   Set(argb);
 }
 CFX_Color::CFX_Color(CFX_Pattern* pattern, const FX_ARGB argb) {
   _type = FX_COLOR_None;
   Set(pattern, argb);
 }
 CFX_Color::CFX_Color(CFX_Shading* shading) {
   _type = FX_COLOR_None;
   Set(shading);
 }
 CFX_Color::~CFX_Color() {
   _type = FX_COLOR_None;
 }
 FX_ERR CFX_Color::Set(const FX_ARGB argb) {
   _type = FX_COLOR_Solid;
   _argb = argb;
   _pattern = NULL;
   return FX_ERR_Succeeded;
 }
 FX_ERR CFX_Color::Set(CFX_Pattern* pattern, const FX_ARGB argb) {
-  _FX_RETURN_VALUE_IF_FAIL(pattern, FX_ERR_Parameter_Invalid);
+  if (!pattern)
+    return FX_ERR_Parameter_Invalid;
   _type = FX_COLOR_Pattern;
   _argb = argb;
   _pattern = pattern;
   return FX_ERR_Succeeded;
 }
 FX_ERR CFX_Color::Set(CFX_Shading* shading) {
-  _FX_RETURN_VALUE_IF_FAIL(shading, FX_ERR_Parameter_Invalid);
+  if (!shading)
+    return FX_ERR_Parameter_Invalid;
   _type = FX_COLOR_Shading;
   _shading = shading;
   return FX_ERR_Succeeded;
 }
 CFX_Pattern::CFX_Pattern() {
   _type = FX_PATTERN_None;
   _matrix.SetIdentity();
 }
 FX_ERR CFX_Pattern::Create(CFX_DIBitmap* bitmap,
                            const FX_FLOAT xStep,
                            const FX_FLOAT yStep,
                            CFX_Matrix* matrix) {
-  _FX_RETURN_VALUE_IF_FAIL(bitmap, FX_ERR_Parameter_Invalid);
+  if (!bitmap)
+    return FX_ERR_Parameter_Invalid;
   if (_type != FX_PATTERN_None) {
     return FX_ERR_Property_Invalid;
   }
   _type = FX_PATTERN_Bitmap;
   _bitmap = bitmap;
   _x1Step = xStep;
   _y1Step = yStep;
   if (matrix) {
     _matrix.Set(matrix->a, matrix->b, matrix->c, matrix->d, matrix->e,
                 matrix->f);
@@ skipping 88 matching lines @@
     b3 = (int32_t)(i * bScale);
     _argbArray[i] =
         FXARGB_TODIB(FXARGB_MAKE((a1 + a3), (r1 + r3), (g1 + g3), (b1 + b3)));
   }
   return FX_ERR_Succeeded;
 }
 class CFX_Pause : public IFX_Pause {
  public:
   virtual FX_BOOL NeedToPauseNow() { return TRUE; }
 };