diff options
| author | Lei Zhang <thestig@chromium.org> | 2018-05-01 14:32:54 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-05-01 14:32:54 +0000 |
| commit | ea603b9f0baf33462b61fa4ee6364e4f4161f55a (patch) | |
| tree | 0a1f18531181ac30a4a87cd5e67909f4248bfb66 /core/fxcodec/jbig2/JBig2_Image.h | |
| parent | 723543481bea9c6ea14fc39b71333b34eb8d89b4 (diff) | |
| download | pdfium-ea603b9f0baf33462b61fa4ee6364e4f4161f55a.tar.xz | |
Clean up CJBig2_Image compose methods.
- Mark them private when possible.
- Disambiguate method names.
- Make method names match the style guide.
- Pass in rects by reference.
Change-Id: I0bf848756e81a92d20e46a81cd6260b660eaf482
Reviewed-on: https://pdfium-review.googlesource.com/31772
Commit-Queue: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Diffstat (limited to 'core/fxcodec/jbig2/JBig2_Image.h')
| -rw-r--r-- | core/fxcodec/jbig2/JBig2_Image.h | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/core/fxcodec/jbig2/JBig2_Image.h b/core/fxcodec/jbig2/JBig2_Image.h index 51ccaeb8f7..0d0a7f0794 100644 --- a/core/fxcodec/jbig2/JBig2_Image.h +++ b/core/fxcodec/jbig2/JBig2_Image.h @@ -42,29 +42,12 @@ class CJBig2_Image { void copyLine(int32_t hTo, int32_t hFrom); void fill(bool v); - bool composeTo(CJBig2_Image* pDst, int32_t x, int32_t y, JBig2ComposeOp op); - bool composeTo(CJBig2_Image* pDst, - int32_t x, - int32_t y, - JBig2ComposeOp op, - const FX_RECT* pSrcRect); - - bool composeTo_opt2(CJBig2_Image* pDst, - int32_t x, - int32_t y, - JBig2ComposeOp op); - bool composeTo_opt2(CJBig2_Image* pDst, - int32_t x, - int32_t y, - JBig2ComposeOp op, - const FX_RECT* pSrcRect); - - bool composeFrom(int32_t x, int32_t y, CJBig2_Image* pSrc, JBig2ComposeOp op); - bool composeFrom(int32_t x, - int32_t y, - CJBig2_Image* pSrc, - JBig2ComposeOp op, - const FX_RECT* pSrcRect); + bool ComposeFrom(int32_t x, int32_t y, CJBig2_Image* pSrc, JBig2ComposeOp op); + bool ComposeFromWithRect(int32_t x, + int32_t y, + CJBig2_Image* pSrc, + const FX_RECT& rtSrc, + JBig2ComposeOp op); std::unique_ptr<CJBig2_Image> subImage(int32_t x, int32_t y, @@ -74,6 +57,22 @@ class CJBig2_Image { private: + bool ComposeTo(CJBig2_Image* pDst, int32_t x, int32_t y, JBig2ComposeOp op); + bool ComposeToWithRect(CJBig2_Image* pDst, + int32_t x, + int32_t y, + const FX_RECT& rtSrc, + JBig2ComposeOp op); + bool ComposeToOpt2(CJBig2_Image* pDst, + int32_t x, + int32_t y, + JBig2ComposeOp op); + bool ComposeToOpt2WithRect(CJBig2_Image* pDst, + int32_t x, + int32_t y, + JBig2ComposeOp op, + const FX_RECT& rtSrc); + MaybeOwned<uint8_t, FxFreeDeleter> m_pData; int32_t m_nWidth; // 1-bit pixels int32_t m_nHeight; // lines |