diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/fpdfapi/page/cpdf_image.cpp | 14 | ||||
| -rw-r--r-- | core/fxge/cfx_font.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/core/fpdfapi/page/cpdf_image.cpp b/core/fpdfapi/page/cpdf_image.cpp index 68432bf1fe..ec826dc5ed 100644 --- a/core/fpdfapi/page/cpdf_image.cpp +++ b/core/fpdfapi/page/cpdf_image.cpp @@ -49,13 +49,13 @@ CPDF_Image::CPDF_Image(CPDF_Document* pDoc, uint32_t dwStreamObjNum) CPDF_Image::~CPDF_Image() {} -void CPDF_Image::FinishInitialization(CPDF_Dictionary* pDict) { - m_pOC = pDict->GetDictFor("OC"); - m_bIsMask = - !pDict->KeyExist("ColorSpace") || pDict->GetIntegerFor("ImageMask"); - m_bInterpolate = !!pDict->GetIntegerFor("Interpolate"); - m_Height = pDict->GetIntegerFor("Height"); - m_Width = pDict->GetIntegerFor("Width"); +void CPDF_Image::FinishInitialization(CPDF_Dictionary* pStreamDict) { + m_pOC = pStreamDict->GetDictFor("OC"); + m_bIsMask = !pStreamDict->KeyExist("ColorSpace") || + pStreamDict->GetIntegerFor("ImageMask"); + m_bInterpolate = !!pStreamDict->GetIntegerFor("Interpolate"); + m_Height = pStreamDict->GetIntegerFor("Height"); + m_Width = pStreamDict->GetIntegerFor("Width"); } void CPDF_Image::ConvertStreamToIndirectObject() { diff --git a/core/fxge/cfx_font.h b/core/fxge/cfx_font.h index 3739cad9f3..c753e7e29d 100644 --- a/core/fxge/cfx_font.h +++ b/core/fxge/cfx_font.h @@ -84,7 +84,7 @@ class CFX_Font { #endif uint8_t* GetFontData() const { return m_pFontData; } uint32_t GetSize() const { return m_dwSize; } - void AdjustMMParams(int glyph_index, uint32_t width, int weight) const; + void AdjustMMParams(int glyph_index, uint32_t dest_width, int weight) const; CFX_PathData* LoadGlyphPathImpl(uint32_t glyph_index, uint32_t dest_width) const; |