| Index: core/fxcodec/jbig2/JBig2_Image.h
|
| diff --git a/core/fxcodec/jbig2/JBig2_Image.h b/core/fxcodec/jbig2/JBig2_Image.h
|
| index 695420d76ca5478c5dc778cc8f52f8155fc7371f..54529ef868d3a75a387cf10c085f4466d5066f74 100644
|
| --- a/core/fxcodec/jbig2/JBig2_Image.h
|
| +++ b/core/fxcodec/jbig2/JBig2_Image.h
|
| @@ -34,40 +34,34 @@ class CJBig2_Image {
|
| int32_t setPixel(int32_t x, int32_t y, int bVal);
|
|
|
| void copyLine(int32_t hTo, int32_t hFrom);
|
| - void fill(FX_BOOL v);
|
| -
|
| - FX_BOOL composeTo(CJBig2_Image* pDst,
|
| - int32_t x,
|
| - int32_t y,
|
| - JBig2ComposeOp op);
|
| - FX_BOOL composeTo(CJBig2_Image* pDst,
|
| - int32_t x,
|
| - int32_t y,
|
| - JBig2ComposeOp op,
|
| - const FX_RECT* pSrcRect);
|
| -
|
| - FX_BOOL composeTo_opt2(CJBig2_Image* pDst,
|
| - int32_t x,
|
| - int32_t y,
|
| - JBig2ComposeOp op);
|
| - FX_BOOL composeTo_opt2(CJBig2_Image* pDst,
|
| - int32_t x,
|
| - int32_t y,
|
| - JBig2ComposeOp op,
|
| - const FX_RECT* pSrcRect);
|
| -
|
| - FX_BOOL composeFrom(int32_t x,
|
| + 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,
|
| - CJBig2_Image* pSrc,
|
| JBig2ComposeOp op);
|
| - FX_BOOL composeFrom(int32_t x,
|
| + bool composeTo_opt2(CJBig2_Image* pDst,
|
| + 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 composeFrom(int32_t x,
|
| + int32_t y,
|
| + CJBig2_Image* pSrc,
|
| + JBig2ComposeOp op,
|
| + const FX_RECT* pSrcRect);
|
| +
|
| CJBig2_Image* subImage(int32_t x, int32_t y, int32_t w, int32_t h);
|
| - void expand(int32_t h, FX_BOOL v);
|
| + void expand(int32_t h, bool v);
|
|
|
| uint8_t* m_pData;
|
|
|
|
|