xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp - Issue 1297083002: Merge to XFA: Cleanup CFX_UnicodeEncoding and remove IFX_FontEncoding.

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/src/fxbarcode/oned/BC_OneDimWriter.cpp

Issue 1297083002: Merge to XFA: Cleanup CFX_UnicodeEncoding and remove IFX_FontEncoding. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa

Patch Set: Created 5 years, 4 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/src/fxbarcode/oned/BC_OneDimWriter.cpp

diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp

index aaab954380c4e5452d35733f2796fa6a2e786da1..2097b294a8e22c38af674c6594f69da1c5c924fe 100644

--- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp

+++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp

@@ -129,11 +129,7 @@ void CBC_OneDimWriter::CalcTextInfo(const CFX_ByteString& text,

FX_FLOAT geWidth,

int32_t fontSize,

FX_FLOAT& charsLen) {

-#ifdef FXFM_ENCODING_NONE

- IFX_FontEncodingEx* encoding = FX_CreateFontEncodingEx(cFont);

-#else

- IFX_FontEncoding* encoding = FXGE_CreateUnicodeEncoding(cFont);

-#endif

+ CFX_UnicodeEncodingEx* encoding = FX_CreateFontEncodingEx(cFont);

Tom Sepez 2015/08/17 23:49:29 nit: unique_ptr?

Lei Zhang 2015/08/18 01:36:39 Done.

int32_t length = text.GetLength();

FX_DWORD* pCharCode = FX_Alloc(FX_DWORD, text.GetLength());

FX_FLOAT charWidth = 0;

« core/src/fxge/ge/fx_ge_font.cpp ('K') | « xfa/src/fgas/src/font/fx_gefont.cpp ('k') | xfa/src/fxgraphics/src/fx_graphics.cpp » ('j') | xfa/src/fxgraphics/src/fx_graphics.cpp » ('J')