| openjpeg.h (2.4.0) | | openjpeg.h (2.5.0) | |
|---|
| | | | |
| skipping to change at line 78 ¶ | | skipping to change at line 78 ¶ | |
|---|
| /* deprecated attribute */ | | /* deprecated attribute */ | |
| #ifdef __GNUC__ | | #ifdef __GNUC__ | |
| #define OPJ_DEPRECATED(func) func __attribute__ ((deprecated)) | | #define OPJ_DEPRECATED(func) func __attribute__ ((deprecated)) | |
| #elif defined(_MSC_VER) | | #elif defined(_MSC_VER) | |
| #define OPJ_DEPRECATED(func) __declspec(deprecated) func | | #define OPJ_DEPRECATED(func) __declspec(deprecated) func | |
| #else | | #else | |
| #pragma message("WARNING: You need to implement DEPRECATED for this compile
r") | | #pragma message("WARNING: You need to implement DEPRECATED for this compile
r") | |
| #define OPJ_DEPRECATED(func) func | | #define OPJ_DEPRECATED(func) func | |
| #endif | | #endif | |
| | | | |
|
| | | #if defined(__GNUC__) && __GNUC__ >= 6 | |
| | | #define OPJ_DEPRECATED_STRUCT_MEMBER(memb, msg) __attribute__ ((deprecated( | |
| | | msg))) memb | |
| | | #else | |
| | | #define OPJ_DEPRECATED_STRUCT_MEMBER(memb, msg) memb | |
| | | #endif | |
| | | | |
| #if defined(OPJ_STATIC) || !defined(_WIN32) | | #if defined(OPJ_STATIC) || !defined(_WIN32) | |
| /* http://gcc.gnu.org/wiki/Visibility */ | | /* http://gcc.gnu.org/wiki/Visibility */ | |
| # if !defined(_WIN32) && __GNUC__ >= 4 | | # if !defined(_WIN32) && __GNUC__ >= 4 | |
| # if defined(OPJ_STATIC) /* static library uses "hidden" */ | | # if defined(OPJ_STATIC) /* static library uses "hidden" */ | |
| # define OPJ_API __attribute__ ((visibility ("hidden"))) | | # define OPJ_API __attribute__ ((visibility ("hidden"))) | |
| # else | | # else | |
| # define OPJ_API __attribute__ ((visibility ("default"))) | | # define OPJ_API __attribute__ ((visibility ("default"))) | |
| # endif | | # endif | |
| # define OPJ_LOCAL __attribute__ ((visibility ("hidden"))) | | # define OPJ_LOCAL __attribute__ ((visibility ("hidden"))) | |
| # else | | # else | |
| | | | |
| skipping to change at line 450 ¶ | | skipping to change at line 456 ¶ | |
|---|
| int prcw_init[OPJ_J2K_MAXRLVLS]; | | int prcw_init[OPJ_J2K_MAXRLVLS]; | |
| /** initial precinct height */ | | /** initial precinct height */ | |
| int prch_init[OPJ_J2K_MAXRLVLS]; | | int prch_init[OPJ_J2K_MAXRLVLS]; | |
| | | | |
| /**@name command line encoder parameters (not used inside the library)
*/ | | /**@name command line encoder parameters (not used inside the library)
*/ | |
| /*@{*/ | | /*@{*/ | |
| /** input file name */ | | /** input file name */ | |
| char infile[OPJ_PATH_LEN]; | | char infile[OPJ_PATH_LEN]; | |
| /** output file name */ | | /** output file name */ | |
| char outfile[OPJ_PATH_LEN]; | | char outfile[OPJ_PATH_LEN]; | |
|
| /** DEPRECATED. Index generation is now handeld with the opj_encode_wit
h_info() function. Set to NULL */ | | /** DEPRECATED. Index generation is now handled with the opj_encode_wit
h_info() function. Set to NULL */ | |
| int index_on; | | int index_on; | |
|
| /** DEPRECATED. Index generation is now handeld with the opj_encode_wit
h_info() function. Set to NULL */ | | /** DEPRECATED. Index generation is now handled with the opj_encode_wit
h_info() function. Set to NULL */ | |
| char index[OPJ_PATH_LEN]; | | char index[OPJ_PATH_LEN]; | |
| /** subimage encoding: origin image offset in x direction */ | | /** subimage encoding: origin image offset in x direction */ | |
| int image_offset_x0; | | int image_offset_x0; | |
| /** subimage encoding: origin image offset in y direction */ | | /** subimage encoding: origin image offset in y direction */ | |
| int image_offset_y0; | | int image_offset_y0; | |
| /** subsampling value for dx */ | | /** subsampling value for dx */ | |
| int subsampling_dx; | | int subsampling_dx; | |
| /** subsampling value for dy */ | | /** subsampling value for dy */ | |
| int subsampling_dy; | | int subsampling_dy; | |
| /** input file format 0: PGX, 1: PxM, 2: BMP 3:TIF*/ | | /** input file format 0: PGX, 1: PxM, 2: BMP 3:TIF*/ | |
| | | | |
| skipping to change at line 681 ¶ | | skipping to change at line 687 ¶ | |
|---|
| /** YRsiz: vertical separation of a sample of ith component with respec
t to the reference grid */ | | /** YRsiz: vertical separation of a sample of ith component with respec
t to the reference grid */ | |
| OPJ_UINT32 dy; | | OPJ_UINT32 dy; | |
| /** data width */ | | /** data width */ | |
| OPJ_UINT32 w; | | OPJ_UINT32 w; | |
| /** data height */ | | /** data height */ | |
| OPJ_UINT32 h; | | OPJ_UINT32 h; | |
| /** x component offset compared to the whole image */ | | /** x component offset compared to the whole image */ | |
| OPJ_UINT32 x0; | | OPJ_UINT32 x0; | |
| /** y component offset compared to the whole image */ | | /** y component offset compared to the whole image */ | |
| OPJ_UINT32 y0; | | OPJ_UINT32 y0; | |
|
| /** precision */ | | /** precision: number of bits per component per pixel */ | |
| OPJ_UINT32 prec; | | OPJ_UINT32 prec; | |
|
| /** image depth in bits */ | | /** obsolete: use prec instead */ | |
| OPJ_UINT32 bpp; | | OPJ_DEPRECATED_STRUCT_MEMBER(OPJ_UINT32 bpp, "Use prec instead"); | |
| /** signed (1) / unsigned (0) */ | | /** signed (1) / unsigned (0) */ | |
| OPJ_UINT32 sgnd; | | OPJ_UINT32 sgnd; | |
| /** number of decoded resolution */ | | /** number of decoded resolution */ | |
| OPJ_UINT32 resno_decoded; | | OPJ_UINT32 resno_decoded; | |
| /** number of division by 2 of the out image compared to the original s
ize of image */ | | /** number of division by 2 of the out image compared to the original s
ize of image */ | |
| OPJ_UINT32 factor; | | OPJ_UINT32 factor; | |
| /** image component data */ | | /** image component data */ | |
| OPJ_INT32 *data; | | OPJ_INT32 *data; | |
| /** alpha channel */ | | /** alpha channel */ | |
| OPJ_UINT16 alpha; | | OPJ_UINT16 alpha; | |
| | | | |
| skipping to change at line 737 ¶ | | skipping to change at line 743 ¶ | |
|---|
| /** YRsiz: vertical separation of a sample of ith component with respec
t to the reference grid */ | | /** YRsiz: vertical separation of a sample of ith component with respec
t to the reference grid */ | |
| OPJ_UINT32 dy; | | OPJ_UINT32 dy; | |
| /** data width */ | | /** data width */ | |
| OPJ_UINT32 w; | | OPJ_UINT32 w; | |
| /** data height */ | | /** data height */ | |
| OPJ_UINT32 h; | | OPJ_UINT32 h; | |
| /** x component offset compared to the whole image */ | | /** x component offset compared to the whole image */ | |
| OPJ_UINT32 x0; | | OPJ_UINT32 x0; | |
| /** y component offset compared to the whole image */ | | /** y component offset compared to the whole image */ | |
| OPJ_UINT32 y0; | | OPJ_UINT32 y0; | |
|
| /** precision */ | | /** precision: number of bits per component per pixel */ | |
| OPJ_UINT32 prec; | | OPJ_UINT32 prec; | |
|
| /** image depth in bits */ | | /** obsolete: use prec instead */ | |
| OPJ_UINT32 bpp; | | OPJ_DEPRECATED_STRUCT_MEMBER(OPJ_UINT32 bpp, "Use prec instead"); | |
| /** signed (1) / unsigned (0) */ | | /** signed (1) / unsigned (0) */ | |
| OPJ_UINT32 sgnd; | | OPJ_UINT32 sgnd; | |
| } opj_image_cmptparm_t; | | } opj_image_cmptparm_t; | |
| | | | |
| /* | | /* | |
| ========================================================== | | ========================================================== | |
| Information on the JPEG 2000 codestream | | Information on the JPEG 2000 codestream | |
| ========================================================== | | ========================================================== | |
| */ | | */ | |
| /* QUITE EXPERIMENTAL FOR THE MOMENT */ | | /* QUITE EXPERIMENTAL FOR THE MOMENT */ | |
| | | | |
| skipping to change at line 1333 ¶ | | skipping to change at line 1339 ¶ | |
|---|
| * | | * | |
| * @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 | |
| | | nabled, partial bit | |
| | | * streams will fail to decode. If strict decoding is disabled, the decode | |
| | | r will decode partial | |
| | | * bitstreams as much as possible without erroring | |
| | | * | |
| | | * @param p_codec decompressor handler | |
| | | * @param strict OPJ_TRUE to enable strict decoding, OPJ_FALSE to di | |
| | | sable | |
| | | * | |
| | | * @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_BOOL strict); | |
| | | | |
| | | /** | |
| * Allocates worker threads for the compressor/decompressor. | | * Allocates worker threads for the compressor/decompressor. | |
| * | | * | |
| * By default, only the main thread is used. If this function is not used, | | * By default, only the main thread is used. If this function is not used, | |
| * but the OPJ_NUM_THREADS environment variable is set, its value will be | | * but the OPJ_NUM_THREADS environment variable is set, its value will be | |
| * used to initialize the number of threads. The value can be either an int
eger | | * used to initialize the number of threads. The value can be either an int
eger | |
| * number, or "ALL_CPUS". If OPJ_NUM_THREADS is set and this function is ca
lled, | | * number, or "ALL_CPUS". If OPJ_NUM_THREADS is set and this function is ca
lled, | |
| * this function will override the behaviour of the environment variable. | | * this function will override the behaviour of the environment variable. | |
| * | | * | |
| * This function must be called after opj_setup_decoder() and | | * This function must be called after opj_setup_decoder() and | |
| * before opj_read_header() for the decoding side, or after opj_setup_encod
er() | | * before opj_read_header() for the decoding side, or after opj_setup_encod
er() | |
| | | | |
| skipping to change at line 1439 ¶ | | skipping to change at line 1459 ¶ | |
|---|
| * @return true if success, otherwise false | | * @return true if success, otherwise false | |
| * */ | | * */ | |
| OPJ_API OPJ_BOOL OPJ_CALLCONV opj_decode(opj_codec_t *p_decompressor, | | OPJ_API OPJ_BOOL OPJ_CALLCONV opj_decode(opj_codec_t *p_decompressor, | |
| opj_stream_t *p_stream, | | opj_stream_t *p_stream, | |
| opj_image_t *p_image); | | opj_image_t *p_image); | |
| | | | |
| /** | | /** | |
| * Get the decoded tile from the codec | | * Get the decoded tile from the codec | |
| * | | * | |
| * @param p_codec the jpeg2000 codec. | | * @param p_codec the jpeg2000 codec. | |
|
| * @param p_stream input streamm | | * @param p_stream input stream | |
| * @param p_image output image | | * @param p_image output image | |
| * @param tile_index index of the tile which will be decode | | * @param tile_index index of the tile which will be decode | |
| * | | * | |
| * @return true if success, otherwise false | | * @return true if success, otherwise false | |
| */ | | */ | |
| OPJ_API OPJ_BOOL OPJ_CALLCONV opj_get_decoded_tile(opj_codec_t *p_codec, | | OPJ_API OPJ_BOOL OPJ_CALLCONV opj_get_decoded_tile(opj_codec_t *p_codec, | |
| opj_stream_t *p_stream, | | opj_stream_t *p_stream, | |
| opj_image_t *p_image, | | opj_image_t *p_image, | |
| OPJ_UINT32 tile_index); | | OPJ_UINT32 tile_index); | |
| | | | |
| | | | |
| skipping to change at line 1583 ¶ | | skipping to change at line 1603 ¶ | |
|---|
| * | | * | |
| * This may be called after opj_setup_encoder() and before opj_start_compre
ss() | | * This may be called after opj_setup_encoder() and before opj_start_compre
ss() | |
| * | | * | |
| * This is the way to add new options in a fully ABI compatible way, withou
t | | * This is the way to add new options in a fully ABI compatible way, withou
t | |
| * extending the opj_cparameters_t structure. | | * extending the opj_cparameters_t structure. | |
| * | | * | |
| * Currently supported options are: | | * Currently supported options are: | |
| * <ul> | | * <ul> | |
| * <li>PLT=YES/NO. Defaults to NO. If set to YES, PLT marker segments, | | * <li>PLT=YES/NO. Defaults to NO. If set to YES, PLT marker segments, | |
| * indicating the length of each packet in the tile-part header, will b
e | | * indicating the length of each packet in the tile-part header, will b
e | |
|
| * written. Since 2.3.2</li> | | * written. Since 2.4.0</li> | |
| | | * <li>TLM=YES/NO. Defaults to NO (except for Cinema and IMF profiles). | |
| | | * If set to YES, TLM marker segments, indicating the length of each | |
| | | * tile-part part will be written. Since 2.4.0</li> | |
| | | * <li>GUARD_BITS=value. Number of guard bits in [0,7] range. Default value | |
| | | is 2. | |
| | | * 1 may be used sometimes (like in SMPTE DCP Bv2.1 Application Profile | |
| | | for 2K images). | |
| | | * Since 2.5.0</li> | |
| * </ul> | | * </ul> | |
| * | | * | |
| * @param p_codec Compressor handle | | * @param p_codec Compressor handle | |
| * @param p_options Compression options. This should be a NULL terminat
ed | | * @param p_options Compression options. This should be a NULL terminat
ed | |
| * array of strings. Each string is of the form KEY=VA
LUE. | | * array of strings. Each string is of the form KEY=VA
LUE. | |
| * | | * | |
| * @return OPJ_TRUE in case of success. | | * @return OPJ_TRUE in case of success. | |
|
| * @since 2.3.2 | | * @since 2.4.0 | |
| */ | | */ | |
| OPJ_API OPJ_BOOL OPJ_CALLCONV opj_encoder_set_extra_options( | | OPJ_API OPJ_BOOL OPJ_CALLCONV opj_encoder_set_extra_options( | |
| opj_codec_t *p_codec, | | opj_codec_t *p_codec, | |
| const char* const* p_options); | | const char* const* p_options); | |
| | | | |
| /** | | /** | |
| * Start to compress the current image. | | * Start to compress the current image. | |
| * @param p_codec Compressor handle | | * @param p_codec Compressor handle | |
| * @param p_image Input filled image | | * @param p_image Input filled image | |
| * @param p_stream Input stgream | | * @param p_stream Input stgream | |
| | | | |
| End of changes. 11 change blocks. |
|---|
| 11 lines changed or deleted | | 44 lines changed or added | |
|---|
|