Index: core/fpdfapi/fpdf_render/fpdf_render_image.cpp |
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp |
index 6aee8e75b6bbfc98bcec8313bbccd91375565814..a5eb5408bad0f22de05e872c00ec2fc4e032c3a2 100644 |
--- a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp |
+++ b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp |
@@ -412,13 +412,13 @@ FX_BOOL CPDF_ImageRenderer::StartRenderDIBSource() { |
"Filter"); |
if (pFilters) { |
if (pFilters->IsName()) { |
- CFX_ByteStringC bsDecodeType = pFilters->GetConstString(); |
+ CFX_ByteString bsDecodeType = pFilters->GetString(); |
if (bsDecodeType == "DCTDecode" || bsDecodeType == "JPXDecode") { |
m_Flags |= FXRENDER_IMAGE_LOSSY; |
} |
} else if (CPDF_Array* pArray = pFilters->AsArray()) { |
for (size_t i = 0; i < pArray->GetCount(); i++) { |
- CFX_ByteStringC bsDecodeType = pArray->GetConstStringAt(i); |
+ CFX_ByteString bsDecodeType = pArray->GetStringAt(i); |
if (bsDecodeType == "DCTDecode" || bsDecodeType == "JPXDecode") { |
m_Flags |= FXRENDER_IMAGE_LOSSY; |
break; |
@@ -882,8 +882,7 @@ 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->GetConstStringBy("S") != "Alpha"; |
+ FX_BOOL bLuminosity = pSMaskDict->GetStringBy("S") != "Alpha"; |
Lei Zhang
2016/04/11 21:57:34
You can also move this down, closer to where it's
|
CPDF_Stream* pGroup = pSMaskDict->GetStreamBy("G"); |
if (!pGroup) { |
return NULL; |