From 345d489b70a8e057587512524e69bd5692e2e14b Mon Sep 17 00:00:00 2001 From: tsepez Date: Wed, 30 Nov 2016 15:10:55 -0800 Subject: Convert loose FX_Create* functions into static methods Also remove a bool that is always false. Review-Url: https://codereview.chromium.org/2539203002 --- xfa/fxfa/app/xfa_ffdoc.cpp | 4 ++-- xfa/fxfa/app/xfa_ffwidget.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'xfa/fxfa/app') diff --git a/xfa/fxfa/app/xfa_ffdoc.cpp b/xfa/fxfa/app/xfa_ffdoc.cpp index 1b5665bb08..cf5b289613 100644 --- a/xfa/fxfa/app/xfa_ffdoc.cpp +++ b/xfa/fxfa/app/xfa_ffdoc.cpp @@ -417,8 +417,8 @@ CFX_DIBitmap* CXFA_FFDoc::GetPDFNamedImage(const CFX_WideStringC& wsName, CPDF_StreamAcc streamAcc; streamAcc.LoadAllData(pStream); - IFX_SeekableReadStream* pImageFileRead = - FX_CreateMemoryStream((uint8_t*)streamAcc.GetData(), streamAcc.GetSize()); + IFX_SeekableReadStream* pImageFileRead = IFX_MemoryStream::Create( + (uint8_t*)streamAcc.GetData(), streamAcc.GetSize()); CFX_DIBitmap* pDibSource = XFA_LoadImageFromBuffer( pImageFileRead, FXCODEC_IMAGE_UNKNOWN, iImageXDpi, iImageYDpi); diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp index e6c0c595b2..bc1854eb42 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp @@ -1066,11 +1066,11 @@ CFX_DIBitmap* XFA_LoadImageData(CXFA_FFDoc* pDoc, pImageBuffer = FX_Alloc(uint8_t, iLength); int32_t iRead = XFA_Base64Decode(bsData.c_str(), pImageBuffer); if (iRead > 0) { - pImageFileRead = FX_CreateMemoryStream(pImageBuffer, iRead); + pImageFileRead = IFX_MemoryStream::Create(pImageBuffer, iRead); } } else { bsContent = CFX_ByteString::FromUnicode(wsImage); - pImageFileRead = FX_CreateMemoryStream( + pImageFileRead = IFX_MemoryStream::Create( const_cast(bsContent.raw_str()), bsContent.GetLength()); } } else { -- cgit v1.2.3