| Index: core/fpdfapi/fpdf_render/fpdf_render_text.cpp
|
| diff --git a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
|
| index e5e28b429c9ed38ccafb3cb61d3ea0e55ec80eeb..ed254c17be9c697137b5a9474cd8eeb9839622c7 100644
|
| --- a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
|
| +++ b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
|
| @@ -20,6 +20,7 @@
|
| #include "core/fpdfapi/fpdf_page/pageint.h"
|
| #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
|
| #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
|
| +#include "core/fpdfapi/fpdf_render/cpdf_type3cache.h"
|
| #include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h"
|
| #include "core/fpdfapi/fpdf_render/include/cpdf_textrenderer.h"
|
| #include "core/fxge/include/cfx_autofontcache.h"
|
| @@ -31,200 +32,6 @@
|
| #include "core/fxge/include/cfx_pathdata.h"
|
| #include "core/fxge/include/cfx_renderdevice.h"
|
|
|
| -namespace {
|
| -
|
| -struct CPDF_UniqueKeyGen {
|
| - void Generate(int count, ...);
|
| - FX_CHAR m_Key[128];
|
| - int m_KeyLen;
|
| -};
|
| -
|
| -void CPDF_UniqueKeyGen::Generate(int count, ...) {
|
| - va_list argList;
|
| - va_start(argList, count);
|
| - for (int i = 0; i < count; i++) {
|
| - int p = va_arg(argList, int);
|
| - ((uint32_t*)m_Key)[i] = p;
|
| - }
|
| - va_end(argList);
|
| - m_KeyLen = count * sizeof(uint32_t);
|
| -}
|
| -
|
| -} // namespace
|
| -
|
| -CPDF_Type3Cache::CPDF_Type3Cache(CPDF_Type3Font* pFont) : m_pFont(pFont) {}
|
| -
|
| -CPDF_Type3Cache::~CPDF_Type3Cache() {
|
| - for (const auto& pair : m_SizeMap) {
|
| - delete pair.second;
|
| - }
|
| - m_SizeMap.clear();
|
| -}
|
| -
|
| -CFX_GlyphBitmap* CPDF_Type3Cache::LoadGlyph(uint32_t charcode,
|
| - const CFX_Matrix* pMatrix,
|
| - FX_FLOAT retinaScaleX,
|
| - FX_FLOAT retinaScaleY) {
|
| - CPDF_UniqueKeyGen keygen;
|
| - keygen.Generate(
|
| - 4, FXSYS_round(pMatrix->a * 10000), FXSYS_round(pMatrix->b * 10000),
|
| - FXSYS_round(pMatrix->c * 10000), FXSYS_round(pMatrix->d * 10000));
|
| - CFX_ByteString FaceGlyphsKey(keygen.m_Key, keygen.m_KeyLen);
|
| - CPDF_Type3Glyphs* pSizeCache;
|
| - auto it = m_SizeMap.find(FaceGlyphsKey);
|
| - if (it == m_SizeMap.end()) {
|
| - pSizeCache = new CPDF_Type3Glyphs;
|
| - m_SizeMap[FaceGlyphsKey] = pSizeCache;
|
| - } else {
|
| - pSizeCache = it->second;
|
| - }
|
| - auto it2 = pSizeCache->m_GlyphMap.find(charcode);
|
| - if (it2 != pSizeCache->m_GlyphMap.end())
|
| - return it2->second;
|
| -
|
| - CFX_GlyphBitmap* pGlyphBitmap =
|
| - RenderGlyph(pSizeCache, charcode, pMatrix, retinaScaleX, retinaScaleY);
|
| - pSizeCache->m_GlyphMap[charcode] = pGlyphBitmap;
|
| - return pGlyphBitmap;
|
| -}
|
| -
|
| -CPDF_Type3Glyphs::CPDF_Type3Glyphs()
|
| - : m_TopBlueCount(0), m_BottomBlueCount(0) {}
|
| -
|
| -CPDF_Type3Glyphs::~CPDF_Type3Glyphs() {
|
| - for (const auto& pair : m_GlyphMap)
|
| - delete pair.second;
|
| -}
|
| -
|
| -static int _AdjustBlue(FX_FLOAT pos, int& count, int blues[]) {
|
| - FX_FLOAT min_distance = 1000000.0f * 1.0f;
|
| - int closest_pos = -1;
|
| - for (int i = 0; i < count; i++) {
|
| - FX_FLOAT distance = (FX_FLOAT)FXSYS_fabs(pos - (FX_FLOAT)blues[i]);
|
| - if (distance < 1.0f * 80.0f / 100.0f && distance < min_distance) {
|
| - min_distance = distance;
|
| - closest_pos = i;
|
| - }
|
| - }
|
| - if (closest_pos >= 0) {
|
| - return blues[closest_pos];
|
| - }
|
| - int new_pos = FXSYS_round(pos);
|
| - if (count == TYPE3_MAX_BLUES) {
|
| - return new_pos;
|
| - }
|
| - blues[count++] = new_pos;
|
| - return new_pos;
|
| -}
|
| -void CPDF_Type3Glyphs::AdjustBlue(FX_FLOAT top,
|
| - FX_FLOAT bottom,
|
| - int& top_line,
|
| - int& bottom_line) {
|
| - top_line = _AdjustBlue(top, m_TopBlueCount, m_TopBlue);
|
| - bottom_line = _AdjustBlue(bottom, m_BottomBlueCount, m_BottomBlue);
|
| -}
|
| -
|
| -static FX_BOOL _IsScanLine1bpp(uint8_t* pBuf, int width) {
|
| - int size = width / 8;
|
| - for (int i = 0; i < size; i++) {
|
| - if (pBuf[i])
|
| - return TRUE;
|
| - }
|
| - return (width % 8) && (pBuf[width / 8] & (0xff << (8 - width % 8)));
|
| -}
|
| -
|
| -static FX_BOOL _IsScanLine8bpp(uint8_t* pBuf, int width) {
|
| - for (int i = 0; i < width; i++) {
|
| - if (pBuf[i] > 0x40)
|
| - return TRUE;
|
| - }
|
| - return FALSE;
|
| -}
|
| -
|
| -static int _DetectFirstLastScan(const CFX_DIBitmap* pBitmap, FX_BOOL bFirst) {
|
| - int height = pBitmap->GetHeight(), pitch = pBitmap->GetPitch(),
|
| - width = pBitmap->GetWidth();
|
| - int bpp = pBitmap->GetBPP();
|
| - if (bpp > 8) {
|
| - width *= bpp / 8;
|
| - }
|
| - uint8_t* pBuf = pBitmap->GetBuffer();
|
| - int line = bFirst ? 0 : height - 1;
|
| - int line_step = bFirst ? 1 : -1;
|
| - int line_end = bFirst ? height : -1;
|
| - while (line != line_end) {
|
| - if (bpp == 1) {
|
| - if (_IsScanLine1bpp(pBuf + line * pitch, width)) {
|
| - return line;
|
| - }
|
| - } else {
|
| - if (_IsScanLine8bpp(pBuf + line * pitch, width)) {
|
| - return line;
|
| - }
|
| - }
|
| - line += line_step;
|
| - }
|
| - return -1;
|
| -}
|
| -
|
| -CFX_GlyphBitmap* CPDF_Type3Cache::RenderGlyph(CPDF_Type3Glyphs* pSize,
|
| - uint32_t charcode,
|
| - const CFX_Matrix* pMatrix,
|
| - FX_FLOAT retinaScaleX,
|
| - FX_FLOAT retinaScaleY) {
|
| - const CPDF_Type3Char* pChar = m_pFont->LoadChar(charcode);
|
| - if (!pChar || !pChar->m_pBitmap)
|
| - return nullptr;
|
| -
|
| - CFX_DIBitmap* pBitmap = pChar->m_pBitmap.get();
|
| - CFX_Matrix image_matrix, text_matrix;
|
| - image_matrix = pChar->m_ImageMatrix;
|
| - text_matrix.Set(pMatrix->a, pMatrix->b, pMatrix->c, pMatrix->d, 0, 0);
|
| - image_matrix.Concat(text_matrix);
|
| - std::unique_ptr<CFX_DIBitmap> pResBitmap;
|
| - int left = 0;
|
| - int top = 0;
|
| - if (FXSYS_fabs(image_matrix.b) < FXSYS_fabs(image_matrix.a) / 100 &&
|
| - FXSYS_fabs(image_matrix.c) < FXSYS_fabs(image_matrix.d) / 100) {
|
| - int top_line = _DetectFirstLastScan(pBitmap, TRUE);
|
| - int bottom_line = _DetectFirstLastScan(pBitmap, FALSE);
|
| - if (top_line == 0 && bottom_line == pBitmap->GetHeight() - 1) {
|
| - FX_FLOAT top_y = image_matrix.d + image_matrix.f;
|
| - FX_FLOAT bottom_y = image_matrix.f;
|
| - FX_BOOL bFlipped = top_y > bottom_y;
|
| - if (bFlipped) {
|
| - FX_FLOAT temp = top_y;
|
| - top_y = bottom_y;
|
| - bottom_y = temp;
|
| - }
|
| - pSize->AdjustBlue(top_y, bottom_y, top_line, bottom_line);
|
| - pResBitmap.reset(pBitmap->StretchTo(
|
| - (int)(FXSYS_round(image_matrix.a) * retinaScaleX),
|
| - (int)((bFlipped ? top_line - bottom_line : bottom_line - top_line) *
|
| - retinaScaleY)));
|
| - top = top_line;
|
| - if (image_matrix.a < 0) {
|
| - image_matrix.Scale(retinaScaleX, retinaScaleY);
|
| - left = FXSYS_round(image_matrix.e + image_matrix.a);
|
| - } else {
|
| - left = FXSYS_round(image_matrix.e);
|
| - }
|
| - }
|
| - }
|
| - if (!pResBitmap) {
|
| - image_matrix.Scale(retinaScaleX, retinaScaleY);
|
| - pResBitmap.reset(pBitmap->TransformTo(&image_matrix, left, top));
|
| - }
|
| - if (!pResBitmap)
|
| - return nullptr;
|
| -
|
| - CFX_GlyphBitmap* pGlyph = new CFX_GlyphBitmap;
|
| - pGlyph->m_Left = left;
|
| - pGlyph->m_Top = -top;
|
| - pGlyph->m_Bitmap.TakeOver(pResBitmap.get());
|
| - return pGlyph;
|
| -}
|
| -
|
| FX_BOOL CPDF_RenderStatus::ProcessText(const CPDF_TextObject* textobj,
|
| const CFX_Matrix* pObj2Device,
|
| CFX_PathData* pClippingPath) {
|
|
|