Merge to XFA: Cleanup CFX_UnicodeEncoding and remove IFX_FontEncoding.

xfa/src/fxbarcode/oned/BC_OneDimWriter.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
 // Original code is licensed as follows:
 /*
  * Copyright 2011 ZXing authors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ skipping 111 matching lines @@
     color ^= 1;
   }
   return numAdded;
 }
 void CBC_OneDimWriter::CalcTextInfo(const CFX_ByteString& text,
                                     FXTEXT_CHARPOS* charPos,
                                     CFX_Font* cFont,
                                     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;
   for (int32_t j = 0; j < text.GetLength(); j++) {
     pCharCode[j] = encoding->CharCodeFromUnicode(text[j]);
     int32_t glyp_code = encoding->GlyphFromCharCode(pCharCode[j]);
     int32_t glyp_value = cFont->GetGlyphWidth(glyp_code);
     FX_FLOAT temp = (FX_FLOAT)((glyp_value)*fontSize / 1000.0);
     charWidth += temp;
   }
@@ skipping 21 matching lines @@
     charPos[i].m_GlyphIndex = encoding->GlyphFromCharCode(pCharCode[i]);
     charPos[i].m_FontCharWidth = cFont->GetGlyphWidth(charPos[i].m_GlyphIndex);
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
     charPos[i].m_ExtGID = charPos[i].m_GlyphIndex;
 #endif
     penX +=
         (FX_FLOAT)(charPos[i].m_FontCharWidth) * (FX_FLOAT)fontSize / 1000.0f;
   }
   FX_Free(pCharCode);
   delete encoding;
   encoding = NULL;

[Tom Sepez, 2015/08/17 23:49:29]

nit: pointless assignment.

[Lei Zhang, 2015/08/18 01:36:39]

Done.

 }
 void CBC_OneDimWriter::ShowDeviceChars(CFX_RenderDevice* device,
                                        const CFX_Matrix* matrix,
                                        const CFX_ByteString str,
                                        FX_FLOAT geWidth,
                                        FXTEXT_CHARPOS* pCharPos,
                                        FX_FLOAT locX,
                                        FX_FLOAT locY,
                                        int32_t barWidth) {
   int32_t iFontSize = (int32_t)fabs(m_fFontSize);
@@ skipping 246 matching lines @@
       if (outputX + m_multiple > outputWidth && outputWidth - outputX > 0) {
         m_output->SetRegion(outputX, 0, outputWidth - outputX, outputHeight, e);
         break;
       }
       m_output->SetRegion(outputX, 0, m_multiple, outputHeight, e);
       BC_EXCEPTION_CHECK_ReturnVoid(e);
     }
     outputX += m_multiple;
   }
 }