Make CFX_ByteString(const CFX_ByteStringC&) explicit.

fpdfsdk/pdfwindow/PWL_Utils.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 "fpdfsdk/pdfwindow/PWL_Utils.h"
 
 #include <algorithm>
 
@@ skipping 26 matching lines @@
              << " " << pPathData[i + 2].point.x << " "
              << pPathData[i + 2].point.y << " c\n";
 
         i += 2;
         break;
       default:
         break;
     }
   }
 
-  return csAP.AsStringC();
+  return csAP.MakeString();
 }
 
 void CPWL_Utils::GetPathDataFromArray(CFX_PathData& path,
                                       const CPWL_PathData* pPathData,
                                       int32_t nCount) {
   path.SetPointCount(nCount);
 
   for (int32_t i = 0; i < nCount; i++) {
     switch (pPathData[i].type) {
       case PWLPT_MOVETO:
@@ skipping 120 matching lines @@
     FX_FLOAT px2 = pts[i][2].x - pts[nNext][0].x;
     FX_FLOAT py2 = pts[i][2].y - pts[nNext][0].y;
 
     csAP << pts[i][0].x + px1 * FX_BEZIER << " "
          << pts[i][0].y + py1 * FX_BEZIER << " "
          << pts[nNext][0].x + px2 * FX_BEZIER << " "
          << pts[nNext][0].y + py2 * FX_BEZIER << " " << pts[nNext][0].x << " "
          << pts[nNext][0].y << " c\n";
   }
 
-  return csAP.AsStringC();
+  return csAP.MakeString();
 }
 
 CFX_ByteString CPWL_Utils::GetAP_Circle(const CFX_FloatRect& crBBox) {
   CFX_ByteTextBuf csAP;
 
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
   CFX_FloatPoint pt1(crBBox.left, crBBox.bottom + fHeight / 2);
   CFX_FloatPoint pt2(crBBox.left + fWidth / 2, crBBox.top);
@@ skipping 21 matching lines @@
   csAP << pt3.x << " " << pt3.y - py * FX_BEZIER << " "
        << pt4.x + px * FX_BEZIER << " " << pt4.y << " " << pt4.x << " " << pt4.y
        << " c\n";
 
   px = pt4.x - pt1.x;
   py = pt1.y - pt4.y;
 
   csAP << pt4.x - px * FX_BEZIER << " " << pt4.y << " " << pt1.x << " "
        << pt1.y - py * FX_BEZIER << " " << pt1.x << " " << pt1.y << " c\n";
 
-  return csAP.AsStringC();
+  return csAP.MakeString();
 }
 
 CFX_ByteString CPWL_Utils::GetAP_Cross(const CFX_FloatRect& crBBox) {
   CFX_ByteTextBuf csAP;
 
   csAP << crBBox.left << " " << crBBox.top << " m\n";
   csAP << crBBox.right << " " << crBBox.bottom << " l\n";
   csAP << crBBox.left << " " << crBBox.bottom << " m\n";
   csAP << crBBox.right << " " << crBBox.top << " l\n";
 
-  return csAP.AsStringC();
+  return csAP.MakeString();
 }
 
 CFX_ByteString CPWL_Utils::GetAP_Diamond(const CFX_FloatRect& crBBox) {
   CFX_ByteTextBuf csAP;
 
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
   CFX_FloatPoint pt1(crBBox.left, crBBox.bottom + fHeight / 2);
   CFX_FloatPoint pt2(crBBox.left + fWidth / 2, crBBox.top);
   CFX_FloatPoint pt3(crBBox.right, crBBox.bottom + fHeight / 2);
   CFX_FloatPoint pt4(crBBox.left + fWidth / 2, crBBox.bottom);
 
   csAP << pt1.x << " " << pt1.y << " m\n";
   csAP << pt2.x << " " << pt2.y << " l\n";
   csAP << pt3.x << " " << pt3.y << " l\n";
   csAP << pt4.x << " " << pt4.y << " l\n";
   csAP << pt1.x << " " << pt1.y << " l\n";
 
-  return csAP.AsStringC();
+  return csAP.MakeString();
 }
 
 CFX_ByteString CPWL_Utils::GetAP_Square(const CFX_FloatRect& crBBox) {
   CFX_ByteTextBuf csAP;
 
   csAP << crBBox.left << " " << crBBox.top << " m\n";
   csAP << crBBox.right << " " << crBBox.top << " l\n";
   csAP << crBBox.right << " " << crBBox.bottom << " l\n";
   csAP << crBBox.left << " " << crBBox.bottom << " l\n";
   csAP << crBBox.left << " " << crBBox.top << " l\n";
 
-  return csAP.AsStringC();
+  return csAP.MakeString();
 }
 
 CFX_ByteString CPWL_Utils::GetAP_Star(const CFX_FloatRect& crBBox) {
   CFX_ByteTextBuf csAP;
 
   FX_FLOAT fRadius =
       (crBBox.top - crBBox.bottom) / (1 + (FX_FLOAT)cos(FX_PI / 5.0f));
   CFX_FloatPoint ptCenter = CFX_FloatPoint((crBBox.left + crBBox.right) / 2.0f,
                                            (crBBox.top + crBBox.bottom) / 2.0f);
 
@@ skipping 11 matching lines @@
   csAP << px[0] << " " << py[0] << " m\n";
 
   int32_t nNext = 0;
   for (int32_t j = 0; j < 5; j++) {
     nNext += 2;
     if (nNext >= 5)
       nNext -= 5;
     csAP << px[nNext] << " " << py[nNext] << " l\n";
   }
 
-  return csAP.AsStringC();
+  return csAP.MakeString();
 }
 
 CFX_ByteString CPWL_Utils::GetAP_HalfCircle(const CFX_FloatRect& crBBox,
                                             FX_FLOAT fRotate) {
   CFX_ByteTextBuf csAP;
 
   FX_FLOAT fWidth = crBBox.right - crBBox.left;
   FX_FLOAT fHeight = crBBox.top - crBBox.bottom;
 
   CFX_FloatPoint pt1(-fWidth / 2, 0);
@@ skipping 14 matching lines @@
   csAP << pt1.x << " " << pt1.y + py * FX_BEZIER << " "
        << pt2.x - px * FX_BEZIER << " " << pt2.y << " " << pt2.x << " " << pt2.y
        << " c\n";
 
   px = pt3.x - pt2.x;
   py = pt2.y - pt3.y;
 
   csAP << pt2.x + px * FX_BEZIER << " " << pt2.y << " " << pt3.x << " "
        << pt3.y + py * FX_BEZIER << " " << pt3.x << " " << pt3.y << " c\n";
 
-  return csAP.AsStringC();
+  return csAP.MakeString();
 }
 
 CFX_FloatRect CPWL_Utils::InflateRect(const CFX_FloatRect& rcRect,
                                       FX_FLOAT fSize) {
   if (rcRect.IsEmpty())
     return rcRect;
 
   CFX_FloatRect rcNew(rcRect.left - fSize, rcRect.bottom - fSize,
                       rcRect.right + fSize, rcRect.top + fSize);
   rcNew.Normalize();
@@ skipping 20 matching lines @@
                                            (rcRect.top + rcRect.bottom) / 2);
 
   return CFX_FloatRect(
       ptCenter.x - fHalfWidth * fScale, ptCenter.y - fHalfHeight * fScale,
       ptCenter.x + fHalfWidth * fScale, ptCenter.y + fHalfHeight * fScale);
 }
 
 CFX_ByteString CPWL_Utils::GetRectFillAppStream(const CFX_FloatRect& rect,
                                                 const CPWL_Color& color) {
   CFX_ByteTextBuf sAppStream;
-
   CFX_ByteString sColor = GetColorAppStream(color, TRUE);
   if (sColor.GetLength() > 0) {
     sAppStream << "q\n" << sColor;
     sAppStream << rect.left << " " << rect.bottom << " "
                << rect.right - rect.left << " " << rect.top - rect.bottom
                << " re f\nQ\n";
   }
 
-  return sAppStream.AsStringC();
+  return sAppStream.MakeString();
 }
 
 CFX_ByteString CPWL_Utils::GetCircleFillAppStream(const CFX_FloatRect& rect,
                                                   const CPWL_Color& color) {
   CFX_ByteTextBuf sAppStream;
-
   CFX_ByteString sColor = GetColorAppStream(color, TRUE);
   if (sColor.GetLength() > 0) {
     sAppStream << "q\n" << sColor << CPWL_Utils::GetAP_Circle(rect) << "f\nQ\n";
   }
-
-  return sAppStream.AsStringC();
+  return sAppStream.MakeString();
 }
 
 CFX_FloatRect CPWL_Utils::GetCenterSquare(const CFX_FloatRect& rect) {
   FX_FLOAT fWidth = rect.right - rect.left;
   FX_FLOAT fHeight = rect.top - rect.bottom;
 
   FX_FLOAT fCenterX = (rect.left + rect.right) / 2.0f;
   FX_FLOAT fCenterY = (rect.top + rect.bottom) / 2.0f;
 
   FX_FLOAT fRadius = (fWidth > fHeight) ? fHeight / 2 : fWidth / 2;
@@ skipping 42 matching lines @@
 
   pEdit->Initialize();
   pEdit->SetText(sText.c_str());
 
   CFX_ByteString sEdit =
       CPWL_Utils::GetEditAppStream(pEdit, CFX_FloatPoint(0.0f, 0.0f));
   if (sEdit.GetLength() > 0)
     sRet << "BT\n" << CPWL_Utils::GetColorAppStream(crText) << sEdit << "ET\n";
   IFX_Edit::DelEdit(pEdit);
 
-  return sRet.AsStringC();
+  return sRet.MakeString();
 }
 
 CFX_ByteString CPWL_Utils::GetPushButtonAppStream(const CFX_FloatRect& rcBBox,
                                                   IPVT_FontMap* pFontMap,
                                                   CPDF_Stream* pIconStream,
                                                   CPDF_IconFit& IconFit,
                                                   const CFX_WideString& sLabel,
                                                   const CPWL_Color& crText,
                                                   FX_FLOAT fFontSize,
                                                   int32_t nLayOut) {
@@ skipping 195 matching lines @@
     pEdit->SetPlateRect(rcLabel);
     CFX_ByteString sEdit =
         CPWL_Utils::GetEditAppStream(pEdit, CFX_FloatPoint(0.0f, 0.0f));
     if (sEdit.GetLength() > 0) {
       sTemp << "BT\n"
             << CPWL_Utils::GetColorAppStream(crText) << sEdit << "ET\n";
     }
   }
 
   IFX_Edit::DelEdit(pEdit);
-
   if (sTemp.GetSize() > 0) {
     sAppStream << "q\n"
                << rcBBox.left << " " << rcBBox.bottom << " "
                << rcBBox.right - rcBBox.left << " "
                << rcBBox.top - rcBBox.bottom << " re W n\n";
     sAppStream << sTemp << "Q\n";
   }
-
-  return sAppStream.AsStringC();
+  return sAppStream.MakeString();
 }
 
 CFX_ByteString CPWL_Utils::GetColorAppStream(const CPWL_Color& color,
                                              const FX_BOOL& bFillOrStroke) {
   CFX_ByteTextBuf sColorStream;
 
   switch (color.nColorType) {
     case COLORTYPE_RGB:
       sColorStream << color.fColor1 << " " << color.fColor2 << " "
                    << color.fColor3 << " " << (bFillOrStroke ? "rg" : "RG")
                    << "\n";
       break;
     case COLORTYPE_GRAY:
       sColorStream << color.fColor1 << " " << (bFillOrStroke ? "g" : "G")
                    << "\n";
       break;
     case COLORTYPE_CMYK:
       sColorStream << color.fColor1 << " " << color.fColor2 << " "
                    << color.fColor3 << " " << color.fColor4 << " "
                    << (bFillOrStroke ? "k" : "K") << "\n";
       break;
   }
 
-  return sColorStream.AsStringC();
+  return sColorStream.MakeString();
 }
 
 CFX_ByteString CPWL_Utils::GetBorderAppStream(const CFX_FloatRect& rect,
                                               FX_FLOAT fWidth,
                                               const CPWL_Color& color,
                                               const CPWL_Color& crLeftTop,
                                               const CPWL_Color& crRightBottom,
                                               int32_t nStyle,
                                               const CPWL_Dash& dash) {
   CFX_ByteTextBuf sAppStream;
@@ skipping 95 matching lines @@
           sAppStream << fWidth << " w\n";
           sAppStream << fLeft << " " << fBottom + fWidth / 2 << " m\n";
           sAppStream << fRight << " " << fBottom + fWidth / 2 << " l S\n";
         }
         break;
     }
 
     sAppStream << "Q\n";
   }
 
-  return sAppStream.AsStringC();
+  return sAppStream.MakeString();
 }
 
 CFX_ByteString CPWL_Utils::GetCircleBorderAppStream(
     const CFX_FloatRect& rect,
     FX_FLOAT fWidth,
     const CPWL_Color& color,
     const CPWL_Color& crLeftTop,
     const CPWL_Color& crRightBottom,
     int32_t nStyle,
     const CPWL_Dash& dash) {
@@ skipping 78 matching lines @@
                             CPWL_Utils::DeflateRect(rect, fHalfWidth * 0.75f),
                             FX_PI * 5 / 4.0f)
                      << " S\nQ\n";
         }
       } break;
     }
 
     sAppStream << "Q\n";
   }
 
-  return sAppStream.AsStringC();
+  return sAppStream.MakeString();
 }
 
 CPWL_Color CPWL_Utils::SubstractColor(const CPWL_Color& sColor,
                                       FX_FLOAT fColorSub) {
   CPWL_Color sRet;
   sRet.nColorType = sColor.nColorType;
 
   switch (sColor.nColorType) {
     case COLORTYPE_TRANSPARENT:
       sRet.nColorType = COLORTYPE_RGB;
@@ skipping 38 matching lines @@
   }
 
   return sRet;
 }
 
 CFX_ByteString CPWL_Utils::GetAppStream_Check(const CFX_FloatRect& rcBBox,
                                               const CPWL_Color& crText) {
   CFX_ByteTextBuf sAP;
   sAP << "q\n" << CPWL_Utils::GetColorAppStream(crText, TRUE)
       << CPWL_Utils::GetAP_Check(rcBBox) << "f\nQ\n";
-  return sAP.AsStringC();
+  return sAP.MakeString();
 }
 
 CFX_ByteString CPWL_Utils::GetAppStream_Circle(const CFX_FloatRect& rcBBox,
                                                const CPWL_Color& crText) {
   CFX_ByteTextBuf sAP;
   sAP << "q\n" << CPWL_Utils::GetColorAppStream(crText, TRUE)
       << CPWL_Utils::GetAP_Circle(rcBBox) << "f\nQ\n";
-  return sAP.AsStringC();
+  return sAP.MakeString();
 }
 
 CFX_ByteString CPWL_Utils::GetAppStream_Cross(const CFX_FloatRect& rcBBox,
                                               const CPWL_Color& crText) {
   CFX_ByteTextBuf sAP;
   sAP << "q\n" << CPWL_Utils::GetColorAppStream(crText, FALSE)
       << CPWL_Utils::GetAP_Cross(rcBBox) << "S\nQ\n";
-  return sAP.AsStringC();
+  return sAP.MakeString();
 }
 
 CFX_ByteString CPWL_Utils::GetAppStream_Diamond(const CFX_FloatRect& rcBBox,
                                                 const CPWL_Color& crText) {
   CFX_ByteTextBuf sAP;
   sAP << "q\n1 w\n" << CPWL_Utils::GetColorAppStream(crText, TRUE)
       << CPWL_Utils::GetAP_Diamond(rcBBox) << "f\nQ\n";
-  return sAP.AsStringC();
+  return sAP.MakeString();
 }
 
 CFX_ByteString CPWL_Utils::GetAppStream_Square(const CFX_FloatRect& rcBBox,
                                                const CPWL_Color& crText) {
   CFX_ByteTextBuf sAP;
   sAP << "q\n" << CPWL_Utils::GetColorAppStream(crText, TRUE)
       << CPWL_Utils::GetAP_Square(rcBBox) << "f\nQ\n";
-  return sAP.AsStringC();
+  return sAP.MakeString();
 }
 
 CFX_ByteString CPWL_Utils::GetAppStream_Star(const CFX_FloatRect& rcBBox,
                                              const CPWL_Color& crText) {
   CFX_ByteTextBuf sAP;
   sAP << "q\n" << CPWL_Utils::GetColorAppStream(crText, TRUE)
       << CPWL_Utils::GetAP_Star(rcBBox) << "f\nQ\n";
-  return sAP.AsStringC();
+  return sAP.MakeString();
 }
 
 CFX_ByteString CPWL_Utils::GetCheckBoxAppStream(const CFX_FloatRect& rcBBox,
                                                 int32_t nStyle,
                                                 const CPWL_Color& crText) {
   CFX_FloatRect rcCenter = GetCenterSquare(rcBBox);
   switch (nStyle) {
     default:
     case PCS_CHECK:
       return GetAppStream_Check(rcCenter, crText);
@@ skipping 58 matching lines @@
       sAppStream << "q\n"
                  << " 0 g\n";
       sAppStream << ptCenter.x - 3 << " " << ptCenter.y + 1.5f << " m\n";
       sAppStream << ptCenter.x + 3 << " " << ptCenter.y + 1.5f << " l\n";
       sAppStream << ptCenter.x << " " << ptCenter.y - 1.5f << " l\n";
       sAppStream << ptCenter.x - 3 << " " << ptCenter.y + 1.5f << " l f\n";
       sAppStream << "Q\n";
     }
   }
 
-  return sAppStream.AsStringC();
+  return sAppStream.MakeString();
 }
 
 void CPWL_Utils::ConvertCMYK2GRAY(FX_FLOAT dC,
                                   FX_FLOAT dM,
                                   FX_FLOAT dY,
                                   FX_FLOAT dK,
                                   FX_FLOAT& dGray) {
   if (dC < 0 || dC > 1 || dM < 0 || dM > 1 || dY < 0 || dY > 1 || dK < 0 ||
       dK > 1)
     return;
@@ skipping 2238 matching lines @@
           break;
         case COLORTYPE_RGB:
           CPWL_Utils::ConvertCMYK2RGB(fColor1, fColor2, fColor3, fColor4,
                                       fColor1, fColor2, fColor3);
           break;
       }
       break;
   }
   nColorType = other_nColorType;
 }