diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-06-09 13:24:12 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-06-09 13:24:12 -0700 |
| commit | bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 (patch) | |
| tree | 4cfbe682869d89900f33751c37f6a84865beeb0a /public | |
| parent | b116136da234afcad018bb44a3ccb64b9ad2a554 (diff) | |
| download | pdfium-bfa9a824a20f37c2dd7111012b46c929cf2ed8a0.tar.xz | |
Merge to XFA: Use stdint.h types throughout PDFium.
Near-automatic merge, plus re-running scripts to update
additional usage.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1172793002
Diffstat (limited to 'public')
| -rw-r--r-- | public/fpdf_edit.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/public/fpdf_edit.h b/public/fpdf_edit.h index 33c51c5336..7032d6078c 100644 --- a/public/fpdf_edit.h +++ b/public/fpdf_edit.h @@ -7,16 +7,18 @@ #ifndef PUBLIC_FPDF_EDIT_H_ #define PUBLIC_FPDF_EDIT_H_ +#include <stdint.h> + #include "fpdfview.h" // Define all types used in the SDK. Note they can be simply regarded as opaque pointers // or long integer numbers. -#define FPDF_ARGB(a,r,g,b) ((((FX_DWORD)(((FX_BYTE)(b)|((FX_WORD)((FX_BYTE)(g))<<8))|(((FX_DWORD)(FX_BYTE)(r))<<16)))) | (((FX_DWORD)(FX_BYTE)(a))<<24)) -#define FPDF_GetBValue(argb) ((FX_BYTE)(argb)) -#define FPDF_GetGValue(argb) ((FX_BYTE)(((FX_WORD)(argb)) >> 8)) -#define FPDF_GetRValue(argb) ((FX_BYTE)((argb)>>16)) -#define FPDF_GetAValue(argb) ((FX_BYTE)((argb)>>24)) +#define FPDF_ARGB(a,r,g,b) ((((uint32_t)(((uint8_t)(b)|((FX_WORD)((uint8_t)(g))<<8))|(((FX_DWORD)(uint8_t)(r))<<16)))) | (((FX_DWORD)(uint8_t)(a))<<24)) +#define FPDF_GetBValue(argb) ((uint8_t)(argb)) +#define FPDF_GetGValue(argb) ((uint8_t)(((uint16_t)(argb)) >> 8)) +#define FPDF_GetRValue(argb) ((uint8_t)((argb)>>16)) +#define FPDF_GetAValue(argb) ((uint8_t)((argb)>>24)) #ifdef __cplusplus extern "C" { |