XFA: clang-format all pdfium code.

No behavior change.

Generated by:
  find . -name '*.cpp' -o -name '*.h' | \
  grep -E -v 'third_party|thirdparties|lpng_v163|tiff_v403' | \
  xargs ../../buildtools/mac/clang-format -i
Then manually merged https://codereview.chromium.org/1269223002/

See thread "tabs vs spaces" on pdfium@googlegroups.com for discussion.

BUG=none

1 files changed, 257 insertions, 244 deletions

diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp
index 7753d1eabb..d4f90a570f 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp
@@ -28,267 +28,280 @@
 #include "BC_OneDimWriter.h"

 #include "BC_OnedEAN13Reader.h"

 #include "BC_OnedEAN13Writer.h"

-CBC_OnedEAN13Writer::CBC_OnedEAN13Writer()

-{

-    m_bLeftPadding = TRUE;

-    m_codeWidth = 3 +

-                  (7 * 6) +

-                  5 +

-                  (7 * 6) +

-                  3;

+CBC_OnedEAN13Writer::CBC_OnedEAN13Writer() {

+  m_bLeftPadding = TRUE;

+  m_codeWidth = 3 + (7 * 6) + 5 + (7 * 6) + 3;

 }

-CBC_OnedEAN13Writer::~CBC_OnedEAN13Writer()

-{

-}

-FX_BOOL	CBC_OnedEAN13Writer::CheckContentValidity(const CFX_WideStringC& contents)

-{

-    for (int32_t i = 0; i < contents.GetLength(); i++) {

-        if (contents.GetAt(i) >= '0' && contents.GetAt(i) <= '9') {

-            continue;

-        } else {

-            return FALSE;

-        }

+CBC_OnedEAN13Writer::~CBC_OnedEAN13Writer() {}

+FX_BOOL CBC_OnedEAN13Writer::CheckContentValidity(

+    const CFX_WideStringC& contents) {

+  for (int32_t i = 0; i < contents.GetLength(); i++) {

+    if (contents.GetAt(i) >= '0' && contents.GetAt(i) <= '9') {

+      continue;

+    } else {

+      return FALSE;

     }

-    return TRUE;

+  }

+  return TRUE;

 }

-CFX_WideString	CBC_OnedEAN13Writer::FilterContents(const CFX_WideStringC& contents)

-{

-    CFX_WideString filtercontents;

-    FX_WCHAR ch;

-    for (int32_t i = 0; i < contents.GetLength(); i++) {

-        ch = contents.GetAt(i);

-        if(ch > 175) {

-            i++;

-            continue;

-        }

-        if (ch >= '0' && ch <= '9') {

-            filtercontents += ch;

-        }

+CFX_WideString CBC_OnedEAN13Writer::FilterContents(

+    const CFX_WideStringC& contents) {

+  CFX_WideString filtercontents;

+  FX_WCHAR ch;

+  for (int32_t i = 0; i < contents.GetLength(); i++) {

+    ch = contents.GetAt(i);

+    if (ch > 175) {

+      i++;

+      continue;

+    }

+    if (ch >= '0' && ch <= '9') {

+      filtercontents += ch;

     }

-    return filtercontents;

+  }

+  return filtercontents;

 }

-int32_t CBC_OnedEAN13Writer::CalcChecksum(const CFX_ByteString &contents)

-{

-    int32_t odd = 0;

-    int32_t even = 0;

-    int32_t j = 1;

-    for(int32_t i = contents.GetLength() - 1; i >= 0; i--) {

-        if(j % 2) {

-            odd += FXSYS_atoi(contents.Mid(i, 1));

-        } else {

-            even += FXSYS_atoi(contents.Mid(i, 1));

-        }

-        j++;

+int32_t CBC_OnedEAN13Writer::CalcChecksum(const CFX_ByteString& contents) {

+  int32_t odd = 0;

+  int32_t even = 0;

+  int32_t j = 1;

+  for (int32_t i = contents.GetLength() - 1; i >= 0; i--) {

+    if (j % 2) {

+      odd += FXSYS_atoi(contents.Mid(i, 1));

+    } else {

+      even += FXSYS_atoi(contents.Mid(i, 1));

     }

-    int32_t checksum = (odd * 3 + even) % 10;

-    checksum = (10 - checksum) % 10;

-    return (checksum);

+    j++;

+  }

+  int32_t checksum = (odd * 3 + even) % 10;

+  checksum = (10 - checksum) % 10;

+  return (checksum);

 }

-uint8_t *CBC_OnedEAN13Writer::Encode(const CFX_ByteString &contents, BCFORMAT format, int32_t &outWidth, int32_t &outHeight, int32_t &e)

-{

-    uint8_t *ret = Encode(contents, format, outWidth, outHeight, 0, e);

-    BC_EXCEPTION_CHECK_ReturnValue(e, NULL);

-    return ret;

+uint8_t* CBC_OnedEAN13Writer::Encode(const CFX_ByteString& contents,

+                                     BCFORMAT format,

+                                     int32_t& outWidth,

+                                     int32_t& outHeight,

+                                     int32_t& e) {

+  uint8_t* ret = Encode(contents, format, outWidth, outHeight, 0, e);

+  BC_EXCEPTION_CHECK_ReturnValue(e, NULL);

+  return ret;

 }

-uint8_t *CBC_OnedEAN13Writer::Encode(const CFX_ByteString &contents, BCFORMAT format, int32_t &outWidth, int32_t &outHeight, int32_t hints, int32_t &e)

-{

-    if(format != BCFORMAT_EAN_13) {

-        e = BCExceptionOnlyEncodeEAN_13;

-    }

-    uint8_t *ret = CBC_OneDimWriter::Encode(contents, format, outWidth, outHeight, hints, e);

-    BC_EXCEPTION_CHECK_ReturnValue(e, NULL);

-    return ret;

+uint8_t* CBC_OnedEAN13Writer::Encode(const CFX_ByteString& contents,

+                                     BCFORMAT format,

+                                     int32_t& outWidth,

+                                     int32_t& outHeight,

+                                     int32_t hints,

+                                     int32_t& e) {

+  if (format != BCFORMAT_EAN_13) {

+    e = BCExceptionOnlyEncodeEAN_13;

+  }

+  uint8_t* ret =

+      CBC_OneDimWriter::Encode(contents, format, outWidth, outHeight, hints, e);

+  BC_EXCEPTION_CHECK_ReturnValue(e, NULL);

+  return ret;

 }

-uint8_t *CBC_OnedEAN13Writer::Encode(const CFX_ByteString &contents, int32_t &outLength, int32_t &e)

-{

-    if (contents.GetLength() != 13) {

-        e = BCExceptionDigitLengthShould13;

-        return NULL;

+uint8_t* CBC_OnedEAN13Writer::Encode(const CFX_ByteString& contents,

+                                     int32_t& outLength,

+                                     int32_t& e) {

+  if (contents.GetLength() != 13) {

+    e = BCExceptionDigitLengthShould13;

+    return NULL;

+  }

+  m_iDataLenth = 13;

+  int32_t firstDigit = FXSYS_atoi(contents.Mid(0, 1));

+  int32_t parities = CBC_OnedEAN13Reader::FIRST_DIGIT_ENCODINGS[firstDigit];

+  outLength = m_codeWidth;

+  uint8_t* result = FX_Alloc(uint8_t, m_codeWidth);

+  int32_t pos = 0;

+  pos +=

+      AppendPattern(result, pos, CBC_OneDimReader::START_END_PATTERN, 3, 1, e);

+  if (e != BCExceptionNO) {

+    FX_Free(result);

+    return NULL;

+  }

+  int32_t i = 0;

+  for (i = 1; i <= 6; i++) {

+    int32_t digit = FXSYS_atoi(contents.Mid(i, 1));

+    if ((parities >> (6 - i) & 1) == 1) {

+      digit += 10;

     }

-    m_iDataLenth = 13;

-    int32_t firstDigit = FXSYS_atoi(contents.Mid(0, 1));

-    int32_t parities = CBC_OnedEAN13Reader::FIRST_DIGIT_ENCODINGS[firstDigit];

-    outLength = m_codeWidth;

-    uint8_t *result = FX_Alloc(uint8_t, m_codeWidth);

-    int32_t pos = 0;

-    pos += AppendPattern(result, pos, CBC_OneDimReader::START_END_PATTERN, 3, 1, e);

+    pos += AppendPattern(result, pos, CBC_OneDimReader::L_AND_G_PATTERNS[digit],

+                         4, 0, e);

     if (e != BCExceptionNO) {

-        FX_Free (result);

-        return NULL;

-    }

-    int32_t i = 0;

-    for ( i = 1; i <= 6; i++) {

-        int32_t digit = FXSYS_atoi(contents.Mid(i, 1));

-        if ((parities >> (6 - i) & 1) == 1) {

-            digit += 10;

-        }

-        pos += AppendPattern(result, pos, CBC_OneDimReader::L_AND_G_PATTERNS[digit], 4, 0, e);

-        if (e != BCExceptionNO) {

-            FX_Free (result);

-            return NULL;

-        }

-    }

-    pos += AppendPattern(result, pos, CBC_OneDimReader::MIDDLE_PATTERN, 5, 0, e);

-    if (e != BCExceptionNO) {

-        FX_Free (result);

-        return NULL;

-    }

-    for (i = 7; i <= 12; i++) {

-        int32_t digit = FXSYS_atoi(contents.Mid(i, 1));

-        pos += AppendPattern(result, pos, CBC_OneDimReader::L_PATTERNS[digit], 4, 1, e);

-        if (e != BCExceptionNO) {

-            FX_Free (result);

-            return NULL;

-        }

+      FX_Free(result);

+      return NULL;

     }

-    pos += AppendPattern(result, pos, CBC_OneDimReader::START_END_PATTERN, 3, 1, e);

+  }

+  pos += AppendPattern(result, pos, CBC_OneDimReader::MIDDLE_PATTERN, 5, 0, e);

+  if (e != BCExceptionNO) {

+    FX_Free(result);

+    return NULL;

+  }

+  for (i = 7; i <= 12; i++) {

+    int32_t digit = FXSYS_atoi(contents.Mid(i, 1));

+    pos += AppendPattern(result, pos, CBC_OneDimReader::L_PATTERNS[digit], 4, 1,

+                         e);

     if (e != BCExceptionNO) {

-        FX_Free (result);

-        return NULL;

+      FX_Free(result);

+      return NULL;

     }

-    return result;

+  }

+  pos +=

+      AppendPattern(result, pos, CBC_OneDimReader::START_END_PATTERN, 3, 1, e);

+  if (e != BCExceptionNO) {

+    FX_Free(result);

+    return NULL;

+  }

+  return result;

 }

-void CBC_OnedEAN13Writer::ShowChars(const CFX_WideStringC& contents, CFX_DIBitmap *pOutBitmap, CFX_RenderDevice* device, const CFX_Matrix* matrix, int32_t barWidth, int32_t multiple, int32_t &e)

-{

-    if (device == NULL && pOutBitmap == NULL) {

-        e = BCExceptionIllegalArgument;

-        return;

+void CBC_OnedEAN13Writer::ShowChars(const CFX_WideStringC& contents,

+                                    CFX_DIBitmap* pOutBitmap,

+                                    CFX_RenderDevice* device,

+                                    const CFX_Matrix* matrix,

+                                    int32_t barWidth,

+                                    int32_t multiple,

+                                    int32_t& e) {

+  if (device == NULL && pOutBitmap == NULL) {

+    e = BCExceptionIllegalArgument;

+    return;

+  }

+  int32_t leftPadding = 7 * multiple;

+  int32_t leftPosition = 3 * multiple + leftPadding;

+  CFX_ByteString str = FX_UTF8Encode(contents);

+  int32_t iLen = str.GetLength();

+  FXTEXT_CHARPOS* pCharPos = FX_Alloc(FXTEXT_CHARPOS, iLen);

+  if (!pCharPos) {

+    return;

+  }

+  FXSYS_memset(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);

+  CFX_FxgeDevice geBitmap;

+  if (pOutBitmap != NULL) {

+    geBitmap.Attach(pOutBitmap);

+  }

+  int32_t iFontSize = (int32_t)fabs(m_fFontSize);

+  int32_t iTextHeight = iFontSize + 1;

+  CFX_ByteString tempStr = str.Mid(1, 6);

+  int32_t strWidth = multiple * 42;

+  if (pOutBitmap == NULL) {

+    CFX_Matrix matr(m_outputHScale, 0.0, 0.0, 1.0, 0.0, 0.0);

+    CFX_FloatRect rect(

+        (FX_FLOAT)leftPosition, (FX_FLOAT)(m_Height - iTextHeight),

+        (FX_FLOAT)(leftPosition + strWidth - 0.5), (FX_FLOAT)m_Height);

+    matr.Concat(*matrix);

+    matr.TransformRect(rect);

+    FX_RECT re = rect.GetOutterRect();

+    device->FillRect(&re, m_backgroundColor);

+    CFX_FloatRect rect1(

+        (FX_FLOAT)(leftPosition + 47 * multiple),

+        (FX_FLOAT)(m_Height - iTextHeight),

+        (FX_FLOAT)(leftPosition + 47 * multiple + strWidth - 0.5),

+        (FX_FLOAT)m_Height);

+    CFX_Matrix matr1(m_outputHScale, 0.0, 0.0, 1.0, 0.0, 0.0);

+    matr1.Concat(*matrix);

+    matr1.TransformRect(rect1);

+    re = rect1.GetOutterRect();

+    device->FillRect(&re, m_backgroundColor);

+    int32_t strWidth1 = multiple * 7;

+    CFX_Matrix matr2(m_outputHScale, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f);

+    CFX_FloatRect rect2(0.0f, (FX_FLOAT)(m_Height - iTextHeight),

+                        (FX_FLOAT)strWidth1 - 0.5f, (FX_FLOAT)m_Height);

+    matr2.Concat(*matrix);

+    matr2.TransformRect(rect2);

+    re = rect2.GetOutterRect();

+    device->FillRect(&re, m_backgroundColor);

+  }

+  FX_FLOAT blank = 0.0;

+  FX_FLOAT charsWidth = 0;

+  iLen = tempStr.GetLength();

+  if (pOutBitmap == NULL) {

+    strWidth = (int32_t)(strWidth * m_outputHScale);

+  }

+  CalcTextInfo(tempStr, pCharPos + 1, m_pFont, (FX_FLOAT)strWidth, iFontSize,

+               blank);

+  CFX_AffineMatrix affine_matrix(1.0, 0.0, 0.0, -1.0, 0.0, (FX_FLOAT)iFontSize);

+  CFX_FxgeDevice ge;

+  if (pOutBitmap != NULL) {

+    ge.Create(strWidth, iTextHeight, FXDIB_Argb);

+    FX_RECT rect(0, 0, strWidth, iTextHeight);

+    ge.FillRect(&rect, m_backgroundColor);

+    ge.DrawNormalText(iLen, pCharPos + 1, m_pFont,

+                      CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize,

+                      (CFX_AffineMatrix*)&affine_matrix, m_fontColor,

+                      FXTEXT_CLEARTYPE);

+    geBitmap.SetDIBits(ge.GetBitmap(), leftPosition, m_Height - iTextHeight);

+  } else {

+    CFX_AffineMatrix affine_matrix1(

+        1.0, 0.0, 0.0, -1.0, (FX_FLOAT)leftPosition * m_outputHScale,

+        (FX_FLOAT)(m_Height - iTextHeight) + iFontSize);

+    if (matrix != NULL) {

+      affine_matrix1.Concat(*matrix);

     }

-    int32_t leftPadding = 7 * multiple;

-    int32_t leftPosition = 3 * multiple + leftPadding;

-    CFX_ByteString str = FX_UTF8Encode(contents);

-    int32_t iLen = str.GetLength();

-    FXTEXT_CHARPOS* pCharPos = FX_Alloc(FXTEXT_CHARPOS, iLen);

-    if (!pCharPos) {

-        return;

+    device->DrawNormalText(

+        iLen, pCharPos + 1, m_pFont, CFX_GEModule::Get()->GetFontCache(),

+        (FX_FLOAT)iFontSize, (CFX_AffineMatrix*)&affine_matrix1, m_fontColor,

+        FXTEXT_CLEARTYPE);

+  }

+  tempStr = str.Mid(7, 6);

+  iLen = tempStr.GetLength();

+  charsWidth = 0.0f;

+  CalcTextInfo(tempStr, pCharPos + 7, m_pFont, (FX_FLOAT)strWidth, iFontSize,

+               blank);

+  if (pOutBitmap != NULL) {

+    FX_RECT rect1(0, 0, strWidth, iTextHeight);

+    ge.FillRect(&rect1, m_backgroundColor);

+    ge.DrawNormalText(iLen, pCharPos + 7, m_pFont,

+                      CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize,

+                      (CFX_AffineMatrix*)&affine_matrix, m_fontColor,

+                      FXTEXT_CLEARTYPE);

+    geBitmap.SetDIBits(ge.GetBitmap(), leftPosition + 47 * multiple,

+                       m_Height - iTextHeight);

+  } else {

+    CFX_AffineMatrix affine_matrix1(

+        1.0, 0.0, 0.0, -1.0,

+        (FX_FLOAT)(leftPosition + 47 * multiple) * m_outputHScale,

+        (FX_FLOAT)(m_Height - iTextHeight + iFontSize));

+    if (matrix != NULL) {

+      affine_matrix1.Concat(*matrix);

     }

-    FXSYS_memset(pCharPos, 0, sizeof(FXTEXT_CHARPOS) * iLen);

-    CFX_FxgeDevice geBitmap;

-    if (pOutBitmap != NULL) {

-        geBitmap.Attach(pOutBitmap);

-    }

-    int32_t iFontSize = (int32_t)fabs(m_fFontSize);

-    int32_t iTextHeight = iFontSize + 1;

-    CFX_ByteString tempStr = str.Mid(1, 6);

-    int32_t strWidth = multiple * 42;

-    if (pOutBitmap == NULL) {

-        CFX_Matrix matr(m_outputHScale, 0.0, 0.0, 1.0, 0.0, 0.0);

-        CFX_FloatRect rect((FX_FLOAT)leftPosition, (FX_FLOAT)(m_Height - iTextHeight), (FX_FLOAT)(leftPosition + strWidth - 0.5), (FX_FLOAT)m_Height);

-        matr.Concat(*matrix);

-        matr.TransformRect(rect);

-        FX_RECT re = rect.GetOutterRect();

-        device->FillRect(&re, m_backgroundColor);

-        CFX_FloatRect rect1((FX_FLOAT)(leftPosition + 47 * multiple), (FX_FLOAT)(m_Height - iTextHeight), (FX_FLOAT)(leftPosition + 47 * multiple + strWidth - 0.5), (FX_FLOAT)m_Height);

-        CFX_Matrix matr1(m_outputHScale, 0.0, 0.0, 1.0, 0.0, 0.0);

-        matr1.Concat(*matrix);

-        matr1.TransformRect(rect1);

-        re = rect1.GetOutterRect();

-        device->FillRect(&re, m_backgroundColor);

-        int32_t strWidth1 = multiple * 7;

-        CFX_Matrix matr2(m_outputHScale, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f);

-        CFX_FloatRect rect2(0.0f, (FX_FLOAT)(m_Height - iTextHeight), (FX_FLOAT)strWidth1 - 0.5f, (FX_FLOAT)m_Height);

-        matr2.Concat(*matrix);

-        matr2.TransformRect(rect2);

-        re = rect2.GetOutterRect();

-        device->FillRect(&re, m_backgroundColor);

-    }

-    FX_FLOAT blank = 0.0;

-    FX_FLOAT charsWidth = 0;

-    iLen = tempStr.GetLength();

-    if (pOutBitmap == NULL) {

-        strWidth = (int32_t)(strWidth * m_outputHScale);

-    }

-    CalcTextInfo(tempStr, pCharPos + 1, m_pFont, (FX_FLOAT)strWidth, iFontSize, blank);

-    CFX_AffineMatrix affine_matrix(1.0, 0.0, 0.0, -1.0, 0.0, (FX_FLOAT)iFontSize);

-    CFX_FxgeDevice ge;

-    if (pOutBitmap != NULL) {

-        ge.Create(strWidth, iTextHeight, FXDIB_Argb);

-        FX_RECT rect(0, 0, strWidth, iTextHeight);

-        ge.FillRect(&rect, m_backgroundColor);

-        ge.DrawNormalText(iLen,

-                          pCharPos + 1,

-                          m_pFont,

-                          CFX_GEModule::Get()->GetFontCache(),

-                          (FX_FLOAT)iFontSize ,

-                          (CFX_AffineMatrix *) &affine_matrix,

-                          m_fontColor, FXTEXT_CLEARTYPE);

-        geBitmap.SetDIBits(ge.GetBitmap(), leftPosition, m_Height - iTextHeight);

-    } else {

-        CFX_AffineMatrix affine_matrix1(1.0, 0.0, 0.0, -1.0, (FX_FLOAT)leftPosition * m_outputHScale, (FX_FLOAT)(m_Height - iTextHeight) + iFontSize);

-        if (matrix != NULL) {

-            affine_matrix1.Concat(*matrix);

-        }

-        device->DrawNormalText(iLen,

-                               pCharPos + 1,

-                               m_pFont,

-                               CFX_GEModule::Get()->GetFontCache(),

-                               (FX_FLOAT)iFontSize ,

-                               (CFX_AffineMatrix *) &affine_matrix1,

-                               m_fontColor, FXTEXT_CLEARTYPE);

-    }

-    tempStr = str.Mid(7, 6);

-    iLen = tempStr.GetLength();

-    charsWidth = 0.0f;

-    CalcTextInfo(tempStr, pCharPos + 7, m_pFont, (FX_FLOAT)strWidth, iFontSize, blank);

-    if(pOutBitmap != NULL) {

-        FX_RECT rect1(0, 0, strWidth, iTextHeight);

-        ge.FillRect(&rect1, m_backgroundColor);

-        ge.DrawNormalText(iLen,

-                          pCharPos + 7,

-                          m_pFont,

-                          CFX_GEModule::Get()->GetFontCache(),

-                          (FX_FLOAT)iFontSize ,

-                          (CFX_AffineMatrix *) &affine_matrix,

-                          m_fontColor, FXTEXT_CLEARTYPE);

-        geBitmap.SetDIBits(ge.GetBitmap(), leftPosition + 47 * multiple, m_Height - iTextHeight);

-    } else {

-        CFX_AffineMatrix affine_matrix1(1.0, 0.0, 0.0, -1.0, (FX_FLOAT)(leftPosition + 47 * multiple) * m_outputHScale, (FX_FLOAT)(m_Height - iTextHeight + iFontSize));

-        if (matrix != NULL) {

-            affine_matrix1.Concat(*matrix);

-        }

-        device->DrawNormalText(iLen,

-                               pCharPos + 7,

-                               m_pFont,

-                               CFX_GEModule::Get()->GetFontCache(),

-                               (FX_FLOAT)iFontSize ,

-                               (CFX_AffineMatrix *) &affine_matrix1,

-                               m_fontColor, FXTEXT_CLEARTYPE);

-    }

-    tempStr = str.Mid(0, 1);

-    iLen = tempStr.GetLength();

-    strWidth = multiple * 7;

-    if (pOutBitmap == NULL) {

-        strWidth = (int32_t)(strWidth * m_outputHScale);

-    }

-    CalcTextInfo(tempStr, pCharPos, m_pFont, (FX_FLOAT)strWidth, iFontSize, blank);

-    if(pOutBitmap != NULL) {

-        delete ge.GetBitmap();

-        ge.Create(strWidth, iTextHeight, FXDIB_Argb);

-        ge.GetBitmap()->Clear(m_backgroundColor);

-        ge.DrawNormalText(iLen,

-                          pCharPos,

-                          m_pFont,

-                          CFX_GEModule::Get()->GetFontCache(),

-                          (FX_FLOAT)iFontSize ,

-                          (CFX_AffineMatrix *) &affine_matrix,

-                          m_fontColor, FXTEXT_CLEARTYPE);

-        geBitmap.SetDIBits(ge.GetBitmap(), 0, m_Height - iTextHeight);

-    } else {

-        CFX_AffineMatrix affine_matrix1(1.0, 0.0, 0.0, -1.0, 0.0, (FX_FLOAT)(m_Height - iTextHeight + iFontSize));

-        if (matrix != NULL) {

-            affine_matrix1.Concat(*matrix);

-        }

-        device->DrawNormalText(iLen,

-                               pCharPos,

-                               m_pFont,

-                               CFX_GEModule::Get()->GetFontCache(),

-                               (FX_FLOAT)iFontSize ,

-                               (CFX_AffineMatrix *) &affine_matrix1,

-                               m_fontColor, FXTEXT_CLEARTYPE);

+    device->DrawNormalText(

+        iLen, pCharPos + 7, m_pFont, CFX_GEModule::Get()->GetFontCache(),

+        (FX_FLOAT)iFontSize, (CFX_AffineMatrix*)&affine_matrix1, m_fontColor,

+        FXTEXT_CLEARTYPE);

+  }

+  tempStr = str.Mid(0, 1);

+  iLen = tempStr.GetLength();

+  strWidth = multiple * 7;

+  if (pOutBitmap == NULL) {

+    strWidth = (int32_t)(strWidth * m_outputHScale);

+  }

+  CalcTextInfo(tempStr, pCharPos, m_pFont, (FX_FLOAT)strWidth, iFontSize,

+               blank);

+  if (pOutBitmap != NULL) {

+    delete ge.GetBitmap();

+    ge.Create(strWidth, iTextHeight, FXDIB_Argb);

+    ge.GetBitmap()->Clear(m_backgroundColor);

+    ge.DrawNormalText(iLen, pCharPos, m_pFont,

+                      CFX_GEModule::Get()->GetFontCache(), (FX_FLOAT)iFontSize,

+                      (CFX_AffineMatrix*)&affine_matrix, m_fontColor,

+                      FXTEXT_CLEARTYPE);

+    geBitmap.SetDIBits(ge.GetBitmap(), 0, m_Height - iTextHeight);

+  } else {

+    CFX_AffineMatrix affine_matrix1(

+        1.0, 0.0, 0.0, -1.0, 0.0,

+        (FX_FLOAT)(m_Height - iTextHeight + iFontSize));

+    if (matrix != NULL) {

+      affine_matrix1.Concat(*matrix);

     }

-    FX_Free(pCharPos);

+    device->DrawNormalText(

+        iLen, pCharPos, m_pFont, CFX_GEModule::Get()->GetFontCache(),

+        (FX_FLOAT)iFontSize, (CFX_AffineMatrix*)&affine_matrix1, m_fontColor,

+        FXTEXT_CLEARTYPE);

+  }

+  FX_Free(pCharPos);

 }

-void CBC_OnedEAN13Writer::RenderResult(const CFX_WideStringC& contents, uint8_t* code, int32_t codeLength, FX_BOOL isDevice, int32_t &e)

-{

-    CBC_OneDimWriter::RenderResult(contents, code, codeLength, isDevice, e);

+void CBC_OnedEAN13Writer::RenderResult(const CFX_WideStringC& contents,

+                                       uint8_t* code,

+                                       int32_t codeLength,

+                                       FX_BOOL isDevice,

+                                       int32_t& e) {

+  CBC_OneDimWriter::RenderResult(contents, code, codeLength, isDevice, e);

 }