diff options
| author | Stephan Mühlstrasser <stm@pdflib.com> | 2015-10-07 12:28:12 +0200 |
|---|---|---|
| committer | Stephan Mühlstrasser <stm@pdflib.com> | 2015-10-07 12:28:12 +0200 |
| commit | 8414870ca7362723c796e7accdd11b0adf9cdc26 (patch) | |
| tree | 806c6b6ef8736371b89770453bcfccfabfe5c015 /src/lib/openjp2/cio.h | |
| parent | f8c822266043a689055b44274c0bf4dc34d4c8ba (diff) | |
Fixed problem that C++ compilation failed because of enum variable.
Replaced usage of an enum typedef for a variable that is used
for bit flags with OPJ_UINT32 type.
Diffstat (limited to 'src/lib/openjp2/cio.h')
| -rw-r--r-- | src/lib/openjp2/cio.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/lib/openjp2/cio.h b/src/lib/openjp2/cio.h index 1b684ef8..4ea03ff3 100644 --- a/src/lib/openjp2/cio.h +++ b/src/lib/openjp2/cio.h @@ -70,16 +70,10 @@ The functions in CIO.C have for goal to realize a byte input / output process. #endif - -typedef enum -{ - opj_signed_sentinel = -1, /* do not use in code */ - opj_stream_e_output = 0x1, - opj_stream_e_input = 0x2, - opj_stream_e_end = 0x4, - opj_stream_e_error = 0x8 -} -opj_stream_flag ; +#define OPJ_STREAM_STATUS_OUTPUT 0x1U +#define OPJ_STREAM_STATUS_INPUT 0x2U +#define OPJ_STREAM_STATUS_END 0x4U +#define OPJ_STREAM_STATUS_ERROR 0x8U /** Byte input-output stream. @@ -162,8 +156,9 @@ typedef struct opj_stream_private /** * Flags to tell the status of the stream. + * Used with OPJ_STREAM_STATUS_* defines. */ - opj_stream_flag m_status; + OPJ_UINT32 m_status; } opj_stream_private_t; |