| Index: core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp
|
| diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp
|
| index a0b3059e5b19c34bbebfba4f1c3d6fa778917368..d31e214ffd1a7e783635121c1028f3f76446acf3 100644
|
| --- a/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp
|
| +++ b/core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp
|
| @@ -406,7 +406,7 @@ FX_BOOL CPDF_ImageRenderer::StartRenderDIBSource() {
|
| }
|
| } else if (CPDF_Array* pArray = pFilters->AsArray()) {
|
| for (FX_DWORD i = 0; i < pArray->GetCount(); i++) {
|
| - CFX_ByteStringC bsDecodeType = pArray->GetConstString(i);
|
| + CFX_ByteStringC bsDecodeType = pArray->GetConstStringAt(i);
|
| if (bsDecodeType == "DCTDecode" || bsDecodeType == "JPXDecode") {
|
| m_Flags |= FXRENDER_IMAGE_LOSSY;
|
| break;
|
| @@ -871,8 +871,8 @@ CFX_DIBitmap* CPDF_RenderStatus::LoadSMask(CPDF_Dictionary* pSMaskDict,
|
| int width = pClipRect->right - pClipRect->left;
|
| int height = pClipRect->bottom - pClipRect->top;
|
| FX_BOOL bLuminosity = FALSE;
|
| - bLuminosity = pSMaskDict->GetConstString("S") != "Alpha";
|
| - CPDF_Stream* pGroup = pSMaskDict->GetStream("G");
|
| + bLuminosity = pSMaskDict->GetConstStringBy("S") != "Alpha";
|
| + CPDF_Stream* pGroup = pSMaskDict->GetStreamBy("G");
|
| if (!pGroup) {
|
| return NULL;
|
| }
|
| @@ -902,12 +902,12 @@ CFX_DIBitmap* CPDF_RenderStatus::LoadSMask(CPDF_Dictionary* pSMaskDict,
|
| CPDF_Object* pCSObj = NULL;
|
| CPDF_ColorSpace* pCS = NULL;
|
| if (bLuminosity) {
|
| - CPDF_Array* pBC = pSMaskDict->GetArray("BC");
|
| + CPDF_Array* pBC = pSMaskDict->GetArrayBy("BC");
|
| FX_ARGB back_color = 0xff000000;
|
| if (pBC) {
|
| CPDF_Dictionary* pDict = pGroup->GetDict();
|
| - if (pDict && pDict->GetDict("Group"))
|
| - pCSObj = pDict->GetDict("Group")->GetElementValue("CS");
|
| + if (pDict && pDict->GetDictBy("Group"))
|
| + pCSObj = pDict->GetDictBy("Group")->GetElementValue("CS");
|
| else
|
| pCSObj = NULL;
|
| pCS = m_pContext->GetDocument()->LoadColorSpace(pCSObj);
|
| @@ -927,7 +927,7 @@ CFX_DIBitmap* CPDF_RenderStatus::LoadSMask(CPDF_Dictionary* pSMaskDict,
|
| FXSYS_memset(pFloats, 0, num_floats.ValueOrDie());
|
| int count = pBC->GetCount() > 8 ? 8 : pBC->GetCount();
|
| for (int i = 0; i < count; i++) {
|
| - pFloats[i] = pBC->GetNumber(i);
|
| + pFloats[i] = pBC->GetNumberAt(i);
|
| }
|
| pCS->GetRGB(pFloats, R, G, B);
|
| back_color = 0xff000000 | ((int32_t)(R * 255) << 16) |
|
| @@ -941,7 +941,7 @@ CFX_DIBitmap* CPDF_RenderStatus::LoadSMask(CPDF_Dictionary* pSMaskDict,
|
| }
|
| CPDF_Dictionary* pFormResource = NULL;
|
| if (form.m_pFormDict) {
|
| - pFormResource = form.m_pFormDict->GetDict("Resources");
|
| + pFormResource = form.m_pFormDict->GetDictBy("Resources");
|
| }
|
| CPDF_RenderOptions options;
|
| options.m_ColorMode = bLuminosity ? RENDER_COLOR_NORMAL : RENDER_COLOR_ALPHA;
|
|
|