diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-11-25 15:52:28 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-11-25 15:52:28 -0800 |
| commit | a2c42ce6150c4072613a6fc9fa0dc064dbf0a15d (patch) | |
| tree | b1705df8ed8c9f2f8db5095fbb6e19548493eacd /core/include/fxcodec/fx_codec_def.h | |
| parent | 214947de80a9be2ddb134b1962affc82e20563c9 (diff) | |
| download | pdfium-a2c42ce6150c4072613a6fc9fa0dc064dbf0a15d.tar.xz | |
Manual fixups to PDF_ENABLE_XFA in core/
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1477663003 .
Diffstat (limited to 'core/include/fxcodec/fx_codec_def.h')
| -rw-r--r-- | core/include/fxcodec/fx_codec_def.h | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/core/include/fxcodec/fx_codec_def.h b/core/include/fxcodec/fx_codec_def.h index 6dd4d0d309..99ccf15f0f 100644 --- a/core/include/fxcodec/fx_codec_def.h +++ b/core/include/fxcodec/fx_codec_def.h @@ -7,17 +7,6 @@ #ifndef CORE_INCLUDE_FXCODEC_FX_CODEC_DEF_H_ #define CORE_INCLUDE_FXCODEC_FX_CODEC_DEF_H_ -#ifdef PDF_ENABLE_XFA -enum FXCODEC_IMAGE_TYPE { - FXCODEC_IMAGE_UNKNOWN = 0, - FXCODEC_IMAGE_BMP, - FXCODEC_IMAGE_JPG, - FXCODEC_IMAGE_PNG, - FXCODEC_IMAGE_GIF, - FXCODEC_IMAGE_TIF, - FXCODEC_IMAGE_MAX -}; -#endif enum FXCODEC_STATUS { FXCODEC_STATUS_ERROR = -1, FXCODEC_STATUS_FRAME_READY, @@ -27,7 +16,7 @@ enum FXCODEC_STATUS { FXCODEC_STATUS_DECODE_FINISH, #ifdef PDF_ENABLE_XFA FXCODEC_STATUS_ERR_MEMORY, -#endif +#endif // PDF_ENABLE_XFA FXCODEC_STATUS_ERR_READ, FXCODEC_STATUS_ERR_FLUSH, FXCODEC_STATUS_ERR_FORMAT, @@ -73,13 +62,22 @@ enum FXCODEC_STATUS { #define Icc_PARAMTYPE_BUFFER 1 #define Icc_PARAMTYPE_PARAM 2 #ifdef PDF_ENABLE_XFA +enum FXCODEC_IMAGE_TYPE { + FXCODEC_IMAGE_UNKNOWN = 0, + FXCODEC_IMAGE_BMP, + FXCODEC_IMAGE_JPG, + FXCODEC_IMAGE_PNG, + FXCODEC_IMAGE_GIF, + FXCODEC_IMAGE_TIF, + FXCODEC_IMAGE_MAX +}; enum FXCODEC_RESUNIT { FXCODEC_RESUNIT_NONE = 0, FXCODEC_RESUNIT_INCH, FXCODEC_RESUNIT_CENTIMETER, FXCODEC_RESUNIT_METER }; -#endif +#endif // PDF_ENABLE_XFA #define EXIFTAG_USHORT_RESUNIT 296 #define EXIFTAG_FLOAT_DPIX 282 #define EXIFTAG_FLOAT_DPIY 283 |