| openjpeg.h (2.5.1) | | openjpeg.h (2.5.3) | |
| | | | |
| skipping to change at line 140 ¶ | | skipping to change at line 140 ¶ | |
| typedef int32_t OPJ_INT32; | | typedef int32_t OPJ_INT32; | |
| typedef uint32_t OPJ_UINT32; | | typedef uint32_t OPJ_UINT32; | |
| typedef int64_t OPJ_INT64; | | typedef int64_t OPJ_INT64; | |
| typedef uint64_t OPJ_UINT64; | | typedef uint64_t OPJ_UINT64; | |
| | | | |
| typedef int64_t OPJ_OFF_T; /* 64-bit file offset type */ | | typedef int64_t OPJ_OFF_T; /* 64-bit file offset type */ | |
| | | | |
| #include <stdio.h> | | #include <stdio.h> | |
| typedef size_t OPJ_SIZE_T; | | typedef size_t OPJ_SIZE_T; | |
| | | | |
|
| | | #include "opj_config.h" | |
| | | | |
| /* Avoid compile-time warning because parameter is not used */ | | /* Avoid compile-time warning because parameter is not used */ | |
| #define OPJ_ARG_NOT_USED(x) (void)(x) | | #define OPJ_ARG_NOT_USED(x) (void)(x) | |
| | | | |
| /* | | /* | |
| ========================================================== | | ========================================================== | |
| Useful constant definitions | | Useful constant definitions | |
| ========================================================== | | ========================================================== | |
| */ | | */ | |
| | | | |
| #define OPJ_PATH_LEN 4096 /**< Maximum allowed size for filenames */ | | #define OPJ_PATH_LEN 4096 /**< Maximum allowed size for filenames */ | |
| | | | |
| skipping to change at line 545 ¶ | | skipping to change at line 547 ¶ | |
| * If it does not comply with tcp_rates, max_cs_size prevails | | * If it does not comply with tcp_rates, max_cs_size prevails | |
| * and a warning is issued. | | * and a warning is issued. | |
| * */ | | * */ | |
| int max_cs_size; | | int max_cs_size; | |
| /** RSIZ value | | /** RSIZ value | |
| To be used to combine OPJ_PROFILE_*, OPJ_EXTENSION_* and (sub)level
s values. */ | | To be used to combine OPJ_PROFILE_*, OPJ_EXTENSION_* and (sub)level
s values. */ | |
| OPJ_UINT16 rsiz; | | OPJ_UINT16 rsiz; | |
| } opj_cparameters_t; | | } opj_cparameters_t; | |
| | | | |
| #define OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG 0x0001 | | #define OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG 0x0001 | |
|
| #define OPJ_DPARAMETERS_DUMP_FLAG 0x0002 | | #define OPJ_DPARAMETERS_DUMP_FLAG 0x0002 | |
| | | | |
| /** | | /** | |
| * Decompression parameters | | * Decompression parameters | |
| * */ | | * */ | |
| typedef struct opj_dparameters { | | typedef struct opj_dparameters { | |
| /** | | /** | |
| Set the number of highest resolution levels to be discarded. | | Set the number of highest resolution levels to be discarded. | |
| The image resolution is effectively divided by 2 to the power of the nu
mber of discarded levels. | | The image resolution is effectively divided by 2 to the power of the nu
mber of discarded levels. | |
| The reduce factor is limited by the smallest total number of decomposit
ion levels among tiles. | | The reduce factor is limited by the smallest total number of decomposit
ion levels among tiles. | |
| if != 0, then original dimension divided by 2^(reduce); | | if != 0, then original dimension divided by 2^(reduce); | |
| | | | |
| skipping to change at line 768 ¶ | | skipping to change at line 770 ¶ | |
| /** | | /** | |
| * Index structure : Information concerning a packet inside tile | | * Index structure : Information concerning a packet inside tile | |
| * */ | | * */ | |
| typedef struct opj_packet_info { | | typedef struct opj_packet_info { | |
| /** packet start position (including SOP marker if it exists) */ | | /** packet start position (including SOP marker if it exists) */ | |
| OPJ_OFF_T start_pos; | | OPJ_OFF_T start_pos; | |
| /** end of packet header position (including EPH marker if it exists)*/ | | /** end of packet header position (including EPH marker if it exists)*/ | |
| OPJ_OFF_T end_ph_pos; | | OPJ_OFF_T end_ph_pos; | |
| /** packet end position */ | | /** packet end position */ | |
| OPJ_OFF_T end_pos; | | OPJ_OFF_T end_pos; | |
|
| /** packet distorsion */ | | /** packet distortion */ | |
| double disto; | | double disto; | |
| } opj_packet_info_t; | | } opj_packet_info_t; | |
| | | | |
| /* UniPG>> */ | | /* UniPG>> */ | |
| /** | | /** | |
| * Marker structure | | * Marker structure | |
| * */ | | * */ | |
| typedef struct opj_marker_info { | | typedef struct opj_marker_info { | |
| /** marker type */ | | /** marker type */ | |
| unsigned short int type; | | unsigned short int type; | |
| | | | |
| skipping to change at line 1339 ¶ | | skipping to change at line 1341 ¶ | |
| * | | * | |
| * @param p_codec decompressor handler | | * @param p_codec decompressor handler | |
| * @param parameters decompression parameters | | * @param parameters decompression parameters | |
| * | | * | |
| * @return true if the decoder is correctly set | | * @return true if the decoder is correctly set | |
| */ | | */ | |
| OPJ_API OPJ_BOOL OPJ_CALLCONV opj_setup_decoder(opj_codec_t *p_codec, | | OPJ_API OPJ_BOOL OPJ_CALLCONV opj_setup_decoder(opj_codec_t *p_codec, | |
| opj_dparameters_t *parameters); | | opj_dparameters_t *parameters); | |
| | | | |
| /** | | /** | |
|
| * Set strict decoding parameter for this decoder. If strict decoding is e | | * Set strict decoding parameter for this decoder. | |
| nabled, partial bit | | * If strict decoding is enabled, partial bit streams will fail to decode, | |
| * streams will fail to decode. If strict decoding is disabled, the decode | | and | |
| r will decode partial | | * the check for invalid TPSOT values added in https://github.com/uclouvain | |
| * bitstreams as much as possible without erroring | | /openjpeg/pull/514 | |
| | | * will be disabled. | |
| | | * If strict decoding is disabled, the decoder will decode partial | |
| | | * bitstreams as much as possible without erroring, and the TPSOT fixing lo | |
| | | gic | |
| | | * will be enabled. | |
| * | | * | |
| * @param p_codec decompressor handler | | * @param p_codec decompressor handler | |
| * @param strict OPJ_TRUE to enable strict decoding, OPJ_FALSE to di
sable | | * @param strict OPJ_TRUE to enable strict decoding, OPJ_FALSE to di
sable | |
| * | | * | |
| * @return true if the decoder is correctly set | | * @return true if the decoder is correctly set | |
| */ | | */ | |
| | | | |
| OPJ_API OPJ_BOOL OPJ_CALLCONV opj_decoder_set_strict_mode(opj_codec_t *p_co
dec, | | OPJ_API OPJ_BOOL OPJ_CALLCONV opj_decoder_set_strict_mode(opj_codec_t *p_co
dec, | |
| OPJ_BOOL strict); | | OPJ_BOOL strict); | |
| | | | |
| | | | |
End of changes. 4 change blocks. |
| 7 lines changed or deleted | | 14 lines changed or added | |
|