diff options
| author | thestig <thestig@chromium.org> | 2016-06-22 07:29:08 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-06-22 07:29:08 -0700 |
| commit | 726b3db9b05c785923c65a260c59a9a9190c29e0 (patch) | |
| tree | 9ac0909d9992af059ed4655bc062f46b9205a3c9 /core/fxge/include | |
| parent | ca0bc7deead753698af70dced5e619176e37c65a (diff) | |
| download | pdfium-726b3db9b05c785923c65a260c59a9a9190c29e0.tar.xz | |
Remove some fx_dib functions with unused parameters.
Review-Url: https://codereview.chromium.org/2075383002
Diffstat (limited to 'core/fxge/include')
| -rw-r--r-- | core/fxge/include/fx_dib.h | 25 | ||||
| -rw-r--r-- | core/fxge/include/fx_font.h | 5 |
2 files changed, 16 insertions, 14 deletions
diff --git a/core/fxge/include/fx_dib.h b/core/fxge/include/fx_dib.h index b1108076a4..5a31722a82 100644 --- a/core/fxge/include/fx_dib.h +++ b/core/fxge/include/fx_dib.h @@ -29,6 +29,7 @@ enum FXDIB_Format { FXDIB_Cmyk = 0x420, FXDIB_Cmyka = 0x620, }; + enum FXDIB_Channel { FXDIB_Red = 1, FXDIB_Green, @@ -39,6 +40,7 @@ enum FXDIB_Channel { FXDIB_Black, FXDIB_Alpha }; + #define FXDIB_DOWNSAMPLE 0x04 #define FXDIB_INTERPOL 0x20 #define FXDIB_BICUBIC_INTERPOL 0x80 @@ -153,7 +155,16 @@ FX_ARGB ArgbEncode(int a, FX_COLORREF rgb); ((uint8_t)(argb)) << 16 | ((uint8_t)(argb >> 24) << 24)) #define FXGETFLAG_COLORTYPE(flag) (uint8_t)((flag) >> 8) #define FXGETFLAG_ALPHA_FILL(flag) (uint8_t)(flag) -#define FXGETFLAG_ALPHA_STROKE(flag) (uint8_t)((flag) >> 16) + +FX_BOOL ConvertBuffer(FXDIB_Format dest_format, + uint8_t* dest_buf, + int dest_pitch, + int width, + int height, + const CFX_DIBSource* pSrcBitmap, + int src_left, + int src_top, + uint32_t*& pal); class CFX_DIBSource { public: @@ -204,9 +215,7 @@ class CFX_DIBSource { void CopyPalette(const uint32_t* pSrcPal, uint32_t size = 256); CFX_DIBitmap* Clone(const FX_RECT* pClip = nullptr) const; - CFX_DIBitmap* CloneConvert(FXDIB_Format format, - const FX_RECT* pClip = nullptr, - void* pIccTransform = nullptr) const; + CFX_DIBitmap* CloneConvert(FXDIB_Format format) const; CFX_DIBitmap* StretchTo(int dest_width, int dest_height, @@ -283,7 +292,7 @@ class CFX_DIBitmap : public CFX_DIBSource { void TakeOver(CFX_DIBitmap* pSrcBitmap); - FX_BOOL ConvertFormat(FXDIB_Format format, void* pIccTransform = nullptr); + FX_BOOL ConvertFormat(FXDIB_Format format); void Clear(uint32_t color); @@ -307,8 +316,7 @@ class CFX_DIBitmap : public CFX_DIBSource { int height, const CFX_DIBSource* pSrcBitmap, int src_left, - int src_top, - void* pIccTransform = nullptr); + int src_top); FX_BOOL CompositeBitmap(int dest_left, int dest_top, @@ -366,8 +374,7 @@ class CFX_DIBitmap : public CFX_DIBSource { class CFX_DIBExtractor { public: - CFX_DIBExtractor(const CFX_DIBSource* pSrc); - + explicit CFX_DIBExtractor(const CFX_DIBSource* pSrc); ~CFX_DIBExtractor(); operator CFX_DIBitmap*() { return m_pBitmap; } diff --git a/core/fxge/include/fx_font.h b/core/fxge/include/fx_font.h index f99d4a8af9..8c9bdb92c4 100644 --- a/core/fxge/include/fx_font.h +++ b/core/fxge/include/fx_font.h @@ -567,11 +567,6 @@ struct FXTEXT_GLYPHPOS { FX_FLOAT m_fOriginY; }; -void Color2Argb(FX_ARGB& argb, - uint32_t color, - int alpha_flag, - void* pIccTransform); - FX_RECT FXGE_GetGlyphsBBox(const std::vector<FXTEXT_GLYPHPOS>& glyphs, int anti_alias, FX_FLOAT retinaScaleX = 1.0f, |