diff options
| author | dan sinclair <dsinclair@chromium.org> | 2017-02-02 14:05:30 -0800 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-02-02 22:43:09 +0000 |
| commit | 65c7c234d026101f69754f97f40e73eb29a3ef16 (patch) | |
| tree | 166644acf64477c792b01f46de965ba07f64eea3 /xfa/fxfa/app/xfa_ffwidget.cpp | |
| parent | 44b297bb2c948ee4fb1e67301f31e4e7f70e48d7 (diff) | |
| download | pdfium-65c7c234d026101f69754f97f40e73eb29a3ef16.tar.xz | |
Remove FX_WSTRC usagechromium/3003chromium/3002
Not needed with modern compilers, removed.
Change-Id: Ia8977262b5791bd4445f02be8456641d1a7e18f3
Reviewed-on: https://pdfium-review.googlesource.com/2431
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Diffstat (limited to 'xfa/fxfa/app/xfa_ffwidget.cpp')
| -rw-r--r-- | xfa/fxfa/app/xfa_ffwidget.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp index 4cd6b44a66..c87fa4ef9f 100644 --- a/xfa/fxfa/app/xfa_ffwidget.cpp +++ b/xfa/fxfa/app/xfa_ffwidget.cpp @@ -1020,21 +1020,16 @@ FX_CHAR* XFA_Base64Encode(const uint8_t* buf, int32_t buf_len) { FXCODEC_IMAGE_TYPE XFA_GetImageType(const CFX_WideString& wsType) { CFX_WideString wsContentType(wsType); wsContentType.MakeLower(); - if (wsContentType == FX_WSTRC(L"image/jpg")) { + if (wsContentType == L"image/jpg") return FXCODEC_IMAGE_JPG; - } - if (wsContentType == FX_WSTRC(L"image/png")) { + if (wsContentType == L"image/png") return FXCODEC_IMAGE_PNG; - } - if (wsContentType == FX_WSTRC(L"image/gif")) { + if (wsContentType == L"image/gif") return FXCODEC_IMAGE_GIF; - } - if (wsContentType == FX_WSTRC(L"image/bmp")) { + if (wsContentType == L"image/bmp") return FXCODEC_IMAGE_BMP; - } - if (wsContentType == FX_WSTRC(L"image/tif")) { + if (wsContentType == L"image/tif") return FXCODEC_IMAGE_TIF; - } return FXCODEC_IMAGE_UNKNOWN; } CFX_DIBitmap* XFA_LoadImageData(CXFA_FFDoc* pDoc, @@ -1073,8 +1068,7 @@ CFX_DIBitmap* XFA_LoadImageData(CXFA_FFDoc* pDoc, } } else { CFX_WideString wsURL = wsHref; - if (wsURL.Left(7) != FX_WSTRC(L"http://") && - wsURL.Left(6) != FX_WSTRC(L"ftp://")) { + if (wsURL.Left(7) != L"http://" && wsURL.Left(6) != L"ftp://") { CFX_DIBitmap* pBitmap = pDoc->GetPDFNamedImage(wsURL.AsStringC(), iImageXDpi, iImageYDpi); if (pBitmap) { |