xfa/fde/xml/fde_xml_imp.cpp - Issue 1821043003: Remove FX_WORD in favor of uint16_t.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: xfa/fde/xml/fde_xml_imp.cpp

Issue 1821043003: Remove FX_WORD in favor of uint16_t. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Use stdint.h directly, bitfield minefield. Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: xfa/fde/xml/fde_xml_imp.cpp

diff --git a/xfa/fde/xml/fde_xml_imp.cpp b/xfa/fde/xml/fde_xml_imp.cpp

index 731f88db40c8e6f4512709a328a3a03fbdb40e7f..3e0c87f8219fcf42590cfa855dabb605891a74c7 100644

--- a/xfa/fde/xml/fde_xml_imp.cpp

+++ b/xfa/fde/xml/fde_xml_imp.cpp

@@ -388,7 +388,7 @@ void CFDE_XMLNode::SaveXMLNode(IFX_Stream* pXMLStream) {

CFDE_XMLInstruction* pInstruction = (CFDE_XMLInstruction*)pNode;

if (pInstruction->m_wsTarget.CompareNoCase(L"xml") == 0) {

ws = L"<?xml version=\"1.0\" encoding=\"";

- FX_WORD wCodePage = pXMLStream->GetCodePage();

+ uint16_t wCodePage = pXMLStream->GetCodePage();

if (wCodePage == FX_CODEPAGE_UTF16LE) {

ws += L"UTF-16";

} else if (wCodePage == FX_CODEPAGE_UTF16BE) {

@@ -914,7 +914,7 @@ FX_BOOL CFDE_XMLDoc::LoadXML(IFX_Stream* pXMLStream,

iTextDataSize = 128;

}

m_pStream = pXMLStream;

- FX_WORD wCodePage = m_pStream->GetCodePage();

+ uint16_t wCodePage = m_pStream->GetCodePage();

if (wCodePage != FX_CODEPAGE_UTF16LE && wCodePage != FX_CODEPAGE_UTF16BE &&

wCodePage != FX_CODEPAGE_UTF8) {

m_pStream->SetCodePage(FX_CODEPAGE_UTF8);

@@ -958,7 +958,7 @@ void CFDE_XMLDoc::SaveXMLNode(IFX_Stream* pXMLStream, IFDE_XMLNode* pINode) {

CFDE_XMLInstruction* pInstruction = (CFDE_XMLInstruction*)pNode;

if (pInstruction->m_wsTarget.CompareNoCase(L"xml") == 0) {

ws = L"<?xml version=\"1.0\" encoding=\"";

- FX_WORD wCodePage = pXMLStream->GetCodePage();

+ uint16_t wCodePage = pXMLStream->GetCodePage();

if (wCodePage == FX_CODEPAGE_UTF16LE) {

ws += L"UTF-16";

} else if (wCodePage == FX_CODEPAGE_UTF16BE) {

@@ -1067,7 +1067,7 @@ void CFDE_XMLDoc::SaveXML(IFX_Stream* pXMLStream, FX_BOOL bSaveBOM) {

}

FXSYS_assert((pXMLStream->GetAccessModes() & FX_STREAMACCESS_Text) != 0);

FXSYS_assert((pXMLStream->GetAccessModes() & FX_STREAMACCESS_Write) != 0);

- FX_WORD wCodePage = pXMLStream->GetCodePage();

+ uint16_t wCodePage = pXMLStream->GetCodePage();

if (wCodePage != FX_CODEPAGE_UTF16LE && wCodePage != FX_CODEPAGE_UTF16BE &&

wCodePage != FX_CODEPAGE_UTF8) {

wCodePage = FX_CODEPAGE_UTF8;

« no previous file with comments | « xfa/fde/css/fde_csssyntax.cpp ('k') | xfa/fee/fx_wordbreak/fx_wordbreak_impl.h » ('j') | no next file with comments »