| Index: xfa/include/fxbarcode/BC_BarCode.h
|
| diff --git a/xfa/include/fxbarcode/BC_BarCode.h b/xfa/include/fxbarcode/BC_BarCode.h
|
| index 1893bc3e98282f9ead1837c50ccd0475a2261d93..29820c7ce70a9c534edf599c8b5d06a30f1a0715 100644
|
| --- a/xfa/include/fxbarcode/BC_BarCode.h
|
| +++ b/xfa/include/fxbarcode/BC_BarCode.h
|
| @@ -42,18 +42,18 @@ public:
|
| CBC_CodeBase();
|
| virtual ~CBC_CodeBase();
|
| virtual BC_TYPE GetType() = 0;
|
| - virtual FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e) = 0;
|
| - virtual FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e) = 0;
|
| - virtual FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e) = 0;
|
| - virtual CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e) = 0;
|
| - virtual CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e) = 0;
|
| + virtual FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e) = 0;
|
| + virtual FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e) = 0;
|
| + virtual FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e) = 0;
|
| + virtual CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e) = 0;
|
| + virtual CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e) = 0;
|
|
|
| - virtual FX_BOOL SetCharEncoding(FX_INT32 encoding);
|
| - virtual FX_BOOL SetModuleHeight(FX_INT32 moduleHeight);
|
| - virtual FX_BOOL SetModuleWidth(FX_INT32 moduleWidth);
|
| + virtual FX_BOOL SetCharEncoding(int32_t encoding);
|
| + virtual FX_BOOL SetModuleHeight(int32_t moduleHeight);
|
| + virtual FX_BOOL SetModuleWidth(int32_t moduleWidth);
|
|
|
| - virtual FX_BOOL SetHeight(FX_INT32 height);
|
| - virtual FX_BOOL SetWidth(FX_INT32 width);
|
| + virtual FX_BOOL SetHeight(int32_t height);
|
| + virtual FX_BOOL SetWidth(int32_t width);
|
| virtual void SetBackgroundColor(FX_ARGB backgroundColor);
|
| virtual void SetBarcodeColor(FX_ARGB foregroundColor);
|
| protected:
|
| @@ -66,19 +66,19 @@ public:
|
| CBC_OneCode();
|
| virtual ~CBC_OneCode();
|
| virtual BC_TYPE GetType() = 0;
|
| - virtual FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e) = 0;
|
| - virtual FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e) = 0;
|
| - virtual FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e) = 0;
|
| - virtual CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e) = 0;
|
| - virtual CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e) = 0;
|
| + virtual FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e) = 0;
|
| + virtual FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e) = 0;
|
| + virtual FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e) = 0;
|
| + virtual CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e) = 0;
|
| + virtual CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e) = 0;
|
| virtual FX_BOOL CheckContentValidity(FX_WSTR contents);
|
| virtual CFX_WideString FilterContents(FX_WSTR contents);
|
| virtual void SetPrintChecksum(FX_BOOL checksum);
|
| - virtual void SetDataLength(FX_INT32 length);
|
| + virtual void SetDataLength(int32_t length);
|
| virtual void SetCalChecksum(FX_BOOL calc);
|
| virtual FX_BOOL SetFont(CFX_Font * cFont);
|
| virtual void SetFontSize(FX_FLOAT size);
|
| - virtual void SetFontStyle(FX_INT32 style);
|
| + virtual void SetFontStyle(int32_t style);
|
| virtual void SetFontColor(FX_ARGB color);
|
| };
|
| class CBC_Code39 : public CBC_OneCode
|
| @@ -88,17 +88,17 @@ public:
|
| CBC_Code39(FX_BOOL usingCheckDigit);
|
| CBC_Code39(FX_BOOL usingCheckDigit, FX_BOOL extendedMode);
|
| virtual ~CBC_Code39();
|
| - FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e);
|
| - FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e);
|
| - FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e);
|
| - CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e);
|
| - CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e);
|
| + FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);
|
| + FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);
|
| + FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);
|
| + CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);
|
| + CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e);
|
| BC_TYPE GetType()
|
| {
|
| return BC_CODE39;
|
| }
|
| FX_BOOL SetTextLocation(BC_TEXT_LOC location);
|
| - FX_BOOL SetWideNarrowRatio(FX_INT32 ratio);
|
| + FX_BOOL SetWideNarrowRatio(int32_t ratio);
|
| private:
|
| CFX_WideString m_renderContents;
|
| };
|
| @@ -107,11 +107,11 @@ class CBC_Codabar : public CBC_OneCode
|
| public:
|
| CBC_Codabar();
|
| virtual ~CBC_Codabar();
|
| - FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e);
|
| - FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e);
|
| - FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e);
|
| - CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e);
|
| - CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e);
|
| + FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);
|
| + FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);
|
| + FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);
|
| + CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);
|
| + CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e);
|
| BC_TYPE GetType()
|
| {
|
| return BC_CODABAR;
|
| @@ -119,7 +119,7 @@ public:
|
| FX_BOOL SetStartChar(FX_CHAR start);
|
| FX_BOOL SetEndChar(FX_CHAR end);
|
| FX_BOOL SetTextLocation(BC_TEXT_LOC location);
|
| - FX_BOOL SetWideNarrowRatio(FX_INT32 ratio);
|
| + FX_BOOL SetWideNarrowRatio(int32_t ratio);
|
| private:
|
| CFX_WideString m_renderContents;
|
| };
|
| @@ -130,11 +130,11 @@ private:
|
| public:
|
| CBC_Code128(BC_TYPE type);
|
| virtual ~CBC_Code128();
|
| - FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e);
|
| - FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e);
|
| - FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e);
|
| - CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e);
|
| - CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e);
|
| + FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);
|
| + FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);
|
| + FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);
|
| + CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);
|
| + CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e);
|
| BC_TYPE GetType()
|
| {
|
| return BC_CODE128;
|
| @@ -148,11 +148,11 @@ class CBC_EAN8 : public CBC_OneCode
|
| public:
|
| CBC_EAN8();
|
| virtual ~CBC_EAN8();
|
| - FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e);
|
| - FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e);
|
| - FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e);
|
| - CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e);
|
| - CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e);
|
| + FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);
|
| + FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);
|
| + FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);
|
| + CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);
|
| + CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e);
|
| BC_TYPE GetType()
|
| {
|
| return BC_EAN8;
|
| @@ -166,11 +166,11 @@ class CBC_EAN13 : public CBC_OneCode
|
| public:
|
| CBC_EAN13();
|
| virtual ~CBC_EAN13();
|
| - FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e);
|
| - FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e);
|
| - FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e);
|
| - CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e);
|
| - CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e);
|
| + FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);
|
| + FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);
|
| + FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);
|
| + CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);
|
| + CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e);
|
| BC_TYPE GetType()
|
| {
|
| return BC_EAN13;
|
| @@ -184,11 +184,11 @@ class CBC_UPCA : public CBC_OneCode
|
| public:
|
| CBC_UPCA();
|
| virtual ~CBC_UPCA();
|
| - FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e);
|
| - FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e);
|
| - FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e);
|
| - CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e);
|
| - CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e);
|
| + FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);
|
| + FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);
|
| + FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);
|
| + CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);
|
| + CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e);
|
| BC_TYPE GetType()
|
| {
|
| return BC_UPCA;
|
| @@ -202,33 +202,33 @@ class CBC_QRCode : public CBC_CodeBase
|
| public:
|
| CBC_QRCode();
|
| virtual ~CBC_QRCode();
|
| - FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e);
|
| - FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e);
|
| - FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e);
|
| - CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e);
|
| - CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e);
|
| + FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);
|
| + FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);
|
| + FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);
|
| + CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);
|
| + CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e);
|
| BC_TYPE GetType()
|
| {
|
| return BC_QR_CODE;
|
| }
|
| - FX_BOOL SetVersion(FX_INT32 version);
|
| - FX_BOOL SetErrorCorrectionLevel (FX_INT32 level);
|
| + FX_BOOL SetVersion(int32_t version);
|
| + FX_BOOL SetErrorCorrectionLevel (int32_t level);
|
| };
|
| class CBC_PDF417I : public CBC_CodeBase
|
| {
|
| public:
|
| CBC_PDF417I();
|
| virtual ~CBC_PDF417I();
|
| - FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e);
|
| - FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e);
|
| - FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e);
|
| - CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e);
|
| - CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e);
|
| + FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);
|
| + FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);
|
| + FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);
|
| + CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);
|
| + CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e);
|
| BC_TYPE GetType()
|
| {
|
| return BC_PDF417;
|
| }
|
| - FX_BOOL SetErrorCorrectionLevel (FX_INT32 level);
|
| + FX_BOOL SetErrorCorrectionLevel (int32_t level);
|
| void SetTruncated(FX_BOOL truncated);
|
| };
|
| class CBC_DataMatrix : public CBC_CodeBase
|
| @@ -236,11 +236,11 @@ class CBC_DataMatrix : public CBC_CodeBase
|
| public:
|
| CBC_DataMatrix();
|
| virtual ~CBC_DataMatrix();
|
| - FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, FX_INT32 &e);
|
| - FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, FX_INT32 &e);
|
| - FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, FX_INT32 &e);
|
| - CFX_WideString Decode(FX_BYTE* buf, FX_INT32 width, FX_INT32 hight, FX_INT32 &e);
|
| - CFX_WideString Decode(CFX_DIBitmap *pBitmap, FX_INT32 &e);
|
| + FX_BOOL Encode(FX_WSTR contents, FX_BOOL isDevice, int32_t &e);
|
| + FX_BOOL RenderDevice(CFX_RenderDevice* device, const CFX_Matrix* matirx, int32_t &e);
|
| + FX_BOOL RenderBitmap(CFX_DIBitmap *&pOutBitmap, int32_t &e);
|
| + CFX_WideString Decode(uint8_t* buf, int32_t width, int32_t hight, int32_t &e);
|
| + CFX_WideString Decode(CFX_DIBitmap *pBitmap, int32_t &e);
|
| BC_TYPE GetType()
|
| {
|
| return BC_DATAMATRIX;
|
|
|