summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/fpdfapi/page/cpdf_streamcontentparser.cpp4
-rw-r--r--core/fpdfapi/page/cpdf_streamparser.cpp2
-rw-r--r--core/fpdfapi/parser/cpdf_document.h2
-rw-r--r--core/fpdfapi/render/cpdf_renderstatus.cpp2
-rw-r--r--core/fxcodec/codec/ccodec_gifmodule.h2
-rw-r--r--core/fxcodec/codec/fx_codec_progress.cpp2
-rw-r--r--core/fxge/apple/apple_int.h3
-rw-r--r--core/fxge/apple/fx_apple_platform.cpp6
-rw-r--r--core/fxge/apple/fx_quartz_device.cpp12
9 files changed, 14 insertions, 21 deletions
diff --git a/core/fpdfapi/page/cpdf_streamcontentparser.cpp b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
index 860f6d6b3b..d0be6b3193 100644
--- a/core/fpdfapi/page/cpdf_streamcontentparser.cpp
+++ b/core/fpdfapi/page/cpdf_streamcontentparser.cpp
@@ -1201,14 +1201,14 @@ CPDF_ColorSpace* CPDF_StreamContentParser::FindColorSpace(
}
return CPDF_ColorSpace::GetStockCS(PDFCS_DEVICECMYK);
}
- return m_pDocument->LoadColorSpace(pDefObj);
+ return m_pDocument->LoadColorSpace(pDefObj, nullptr);
}
const CPDF_Object* pCSObj = FindResourceObj("ColorSpace", name);
if (!pCSObj) {
m_bResourceMissing = true;
return nullptr;
}
- return m_pDocument->LoadColorSpace(pCSObj);
+ return m_pDocument->LoadColorSpace(pCSObj, nullptr);
}
CPDF_Pattern* CPDF_StreamContentParser::FindPattern(const ByteString& name,
diff --git a/core/fpdfapi/page/cpdf_streamparser.cpp b/core/fpdfapi/page/cpdf_streamparser.cpp
index 8652490a22..4b27cb32f3 100644
--- a/core/fpdfapi/page/cpdf_streamparser.cpp
+++ b/core/fpdfapi/page/cpdf_streamparser.cpp
@@ -141,7 +141,7 @@ std::unique_ptr<CPDF_Stream> CPDF_StreamParser::ReadInlineStream(
if (pCSObj) {
uint32_t bpc = pDict->GetIntegerFor("BitsPerComponent");
uint32_t nComponents = 1;
- CPDF_ColorSpace* pCS = pDoc->LoadColorSpace(pCSObj);
+ CPDF_ColorSpace* pCS = pDoc->LoadColorSpace(pCSObj, nullptr);
if (pCS) {
nComponents = pCS->CountComponents();
pDoc->GetPageData()->ReleaseColorSpace(pCSObj);
diff --git a/core/fpdfapi/parser/cpdf_document.h b/core/fpdfapi/parser/cpdf_document.h
index 81860a926d..8261441f64 100644
--- a/core/fpdfapi/parser/cpdf_document.h
+++ b/core/fpdfapi/parser/cpdf_document.h
@@ -90,7 +90,7 @@ class CPDF_Document : public Observable<CPDF_Document>,
// |pFontDict| must not be null.
CPDF_Font* LoadFont(CPDF_Dictionary* pFontDict);
CPDF_ColorSpace* LoadColorSpace(const CPDF_Object* pCSObj,
- const CPDF_Dictionary* pResources = nullptr);
+ const CPDF_Dictionary* pResources);
CPDF_Pattern* LoadPattern(CPDF_Object* pObj,
bool bShading,
diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index 568e350302..85e446f1a5 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -2633,7 +2633,7 @@ FX_ARGB CPDF_RenderStatus::GetBackColor(const CPDF_Dictionary* pSMaskDict,
if (pGroup)
pCSObj = pGroup->GetDirectObjectFor(pdfium::transparency::kCS);
const CPDF_ColorSpace* pCS =
- m_pContext->GetDocument()->LoadColorSpace(pCSObj);
+ m_pContext->GetDocument()->LoadColorSpace(pCSObj, nullptr);
if (!pCS)
return kDefaultColor;
diff --git a/core/fxcodec/codec/ccodec_gifmodule.h b/core/fxcodec/codec/ccodec_gifmodule.h
index e7b250fe27..cbc8fc6815 100644
--- a/core/fxcodec/codec/ccodec_gifmodule.h
+++ b/core/fxcodec/codec/ccodec_gifmodule.h
@@ -42,7 +42,7 @@ class CCodec_GifModule {
~CCodec_GifModule();
std::unique_ptr<Context> Start(Delegate* pDelegate);
- uint32_t GetAvailInput(Context* context, uint8_t** avail_buf_ptr = nullptr);
+ uint32_t GetAvailInput(Context* context, uint8_t** avail_buf_ptr);
void Input(Context* context, const uint8_t* src_buf, uint32_t src_size);
CFX_GifDecodeStatus ReadHeader(Context* context,
int* width,
diff --git a/core/fxcodec/codec/fx_codec_progress.cpp b/core/fxcodec/codec/fx_codec_progress.cpp
index d1c04b9790..8ebb119dff 100644
--- a/core/fxcodec/codec/fx_codec_progress.cpp
+++ b/core/fxcodec/codec/fx_codec_progress.cpp
@@ -457,7 +457,7 @@ void CCodec_ProgressiveDecoder::PngFillScanlineBufCompleted(int pass,
#ifdef PDF_ENABLE_XFA_GIF
void CCodec_ProgressiveDecoder::GifRecordCurrentPosition(uint32_t& cur_pos) {
uint32_t remain_size =
- m_pCodecMgr->GetGifModule()->GetAvailInput(m_pGifContext.get());
+ m_pCodecMgr->GetGifModule()->GetAvailInput(m_pGifContext.get(), nullptr);
cur_pos = m_offSet - remain_size;
}
diff --git a/core/fxge/apple/apple_int.h b/core/fxge/apple/apple_int.h
index d57989180d..e84387a3c8 100644
--- a/core/fxge/apple/apple_int.h
+++ b/core/fxge/apple/apple_int.h
@@ -31,8 +31,7 @@ class CQuartz2D {
uint16_t* glyphIndices,
CGPoint* glyphPositions,
int32_t chars,
- FX_ARGB argb,
- CFX_Matrix* matrix = nullptr);
+ FX_ARGB argb);
void saveGraphicsState(void* graphics);
void restoreGraphicsState(void* graphics);
};
diff --git a/core/fxge/apple/fx_apple_platform.cpp b/core/fxge/apple/fx_apple_platform.cpp
index 3c1e4d7766..cafe44730c 100644
--- a/core/fxge/apple/fx_apple_platform.cpp
+++ b/core/fxge/apple/fx_apple_platform.cpp
@@ -76,9 +76,9 @@ bool CGDrawGlyphRun(CGContextRef pContext,
new_matrix.d = -new_matrix.d;
}
quartz2d.setGraphicsTextMatrix(pContext, &new_matrix);
- return quartz2d.drawGraphicsString(
- pContext, pFont->GetPlatformFont(), font_size, glyph_indices.data(),
- glyph_positions.data(), nChars, argb, nullptr);
+ return quartz2d.drawGraphicsString(pContext, pFont->GetPlatformFont(),
+ font_size, glyph_indices.data(),
+ glyph_positions.data(), nChars, argb);
}
} // namespace
diff --git a/core/fxge/apple/fx_quartz_device.cpp b/core/fxge/apple/fx_quartz_device.cpp
index 709f201f8a..62b9b9e618 100644
--- a/core/fxge/apple/fx_quartz_device.cpp
+++ b/core/fxge/apple/fx_quartz_device.cpp
@@ -79,20 +79,14 @@ bool CQuartz2D::drawGraphicsString(void* graphics,
uint16_t* glyphIndices,
CGPoint* glyphPositions,
int32_t charsCount,
- FX_ARGB argb,
- CFX_Matrix* matrix) {
+ FX_ARGB argb) {
if (!graphics)
return false;
+
CGContextRef context = (CGContextRef)graphics;
CGContextSetFont(context, (CGFontRef)font);
CGContextSetFontSize(context, fontSize);
- if (matrix) {
- CGAffineTransform m = CGContextGetTextMatrix(context);
- m = CGAffineTransformConcat(
- m, CGAffineTransformMake(matrix->a, matrix->b, matrix->c, matrix->d,
- matrix->e, matrix->f));
- CGContextSetTextMatrix(context, m);
- }
+
int32_t a;
int32_t r;
int32_t g;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 18:51:57 +0000