| openjpeg.h (2.1) | | openjpeg.h (2.1.1) | |
|---|
| | | | |
| skipping to change at line 80 | | skipping to change at line 80 | |
|---|
| #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
compiler") | | #pragma message("WARNING: You need to implement DEPRECATED for this
compiler") | |
| #define OPJ_DEPRECATED(func) func | | #define OPJ_DEPRECATED(func) func | |
| #endif | | #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 __GNUC__ >= 4 | | # if __GNUC__ >= 4 | |
| #define OPJ_API __attribute__ ((visibility ("default"))) | | # if defined(OPJ_STATIC) /* static library uses "hidden" */ | |
| #define OPJ_LOCAL __attribute__ ((visibility ("hidden"))) | | # define OPJ_API __attribute__ ((visibility ("hidde | |
| #else | | n"))) | |
| #define OPJ_API | | # else | |
| #define OPJ_LOCAL | | # define OPJ_API __attribute__ ((visibility ("defau | |
| #endif | | lt"))) | |
| #define OPJ_CALLCONV | | # endif | |
| | | # define OPJ_LOCAL __attribute__ ((visibility ("hidden"))) | |
| | | # else | |
| | | # define OPJ_API | |
| | | # define OPJ_LOCAL | |
| | | # endif | |
| | | # define OPJ_CALLCONV | |
| #else | | #else | |
|
| #define OPJ_CALLCONV __stdcall | | # define OPJ_CALLCONV __stdcall | |
| /* | | /* | |
| The following ifdef block is the standard way of creating macros which make
exporting | | The following ifdef block is the standard way of creating macros which make
exporting | |
| from a DLL simpler. All files within this DLL are compiled with the OPJ_EXP
ORTS | | from a DLL simpler. All files within this DLL are compiled with the OPJ_EXP
ORTS | |
| symbol defined on the command line. this symbol should not be defined on an
y project | | symbol defined on the command line. this symbol should not be defined on an
y project | |
| that uses this DLL. This way any other project whose source files include t
his file see | | that uses this DLL. This way any other project whose source files include t
his file see | |
|
| OPJ_API functions as being imported from a DLL, wheras this DLL sees symbol
s | | OPJ_API functions as being imported from a DLL, whereas this DLL sees symbo
ls | |
| defined with this macro as being exported. | | defined with this macro as being exported. | |
| */ | | */ | |
|
| #if defined(OPJ_EXPORTS) || defined(DLL_EXPORT) | | # if defined(OPJ_EXPORTS) || defined(DLL_EXPORT) | |
| #define OPJ_API __declspec(dllexport) | | # define OPJ_API __declspec(dllexport) | |
| #else | | # else | |
| #define OPJ_API __declspec(dllimport) | | # define OPJ_API __declspec(dllimport) | |
| #endif /* OPJ_EXPORTS */ | | # endif /* OPJ_EXPORTS */ | |
| #endif /* !OPJ_STATIC || !_WIN32 */ | | #endif /* !OPJ_STATIC || !_WIN32 */ | |
| | | | |
| typedef int OPJ_BOOL; | | typedef int OPJ_BOOL; | |
| #define OPJ_TRUE 1 | | #define OPJ_TRUE 1 | |
| #define OPJ_FALSE 0 | | #define OPJ_FALSE 0 | |
| | | | |
| typedef char OPJ_CHAR; | | typedef char OPJ_CHAR; | |
| typedef float OPJ_FLOAT32; | | typedef float OPJ_FLOAT32; | |
| typedef double OPJ_FLOAT64; | | typedef double OPJ_FLOAT64; | |
| typedef unsigned char OPJ_BYTE; | | typedef unsigned char OPJ_BYTE; | |
| | | | |
| skipping to change at line 843 | | skipping to change at line 847 | |
|---|
| int main_head_start; | | int main_head_start; | |
| /** main header position */ | | /** main header position */ | |
| int main_head_end; | | int main_head_end; | |
| /** codestream's size */ | | /** codestream's size */ | |
| int codestream_size; | | int codestream_size; | |
| /** information regarding tiles inside image */ | | /** information regarding tiles inside image */ | |
| opj_tile_info_t *tile; | | opj_tile_info_t *tile; | |
| } opj_codestream_info_t; | | } opj_codestream_info_t; | |
| | | | |
| /* <----------------------------------------------------------- */ | | /* <----------------------------------------------------------- */ | |
|
| /* new output managment of the codestream information and index */ | | /* new output management of the codestream information and index */ | |
| | | | |
| /** | | /** | |
| * Tile-component coding parameters information | | * Tile-component coding parameters information | |
| */ | | */ | |
| typedef struct opj_tccp_info | | typedef struct opj_tccp_info | |
| { | | { | |
| /** component index */ | | /** component index */ | |
| OPJ_UINT32 compno; | | OPJ_UINT32 compno; | |
| /** coding style */ | | /** coding style */ | |
| OPJ_UINT32 csty; | | OPJ_UINT32 csty; | |
| | | | |
| skipping to change at line 1336 | | skipping to change at line 1340 | |
|---|
| * | | * | |
| * @return true if the data could be written. | | * @return true if the data could be written. | |
| */ | | */ | |
| OPJ_API OPJ_BOOL OPJ_CALLCONV opj_write_tile ( opj_codec_t *p_codec, | | OPJ_API OPJ_BOOL OPJ_CALLCONV opj_write_tile ( opj_codec_t *p_codec, | |
|
OPJ_UINT32 p_tile_index, | |
OPJ_UINT32 p_tile_index, | |
|
OPJ_BYTE * p_data, | |
OPJ_BYTE * p_data, | |
|
OPJ_UINT32 p_data_size, | |
OPJ_UINT32 p_data_size, | |
|
opj_stream_t *p_stream ); | |
opj_stream_t *p_stream ); | |
| | | | |
| /** | | /** | |
|
| * Reads a tile header. This function is compulsory and allows one to know
the size of the tile thta will be decoded. | | * Reads a tile header. This function is compulsory and allows one to know
the size of the tile that will be decoded. | |
| * The user may need to refer to the image got by opj_read_header to unders
tand the size being taken by the tile. | | * The user may need to refer to the image got by opj_read_header to unders
tand the size being taken by the tile. | |
| * | | * | |
| * @param p_codec the jpeg2000 codec. | | * @param p_codec the jpeg2000 codec. | |
| * @param p_tile_index pointer to a value that will hold the index
of the tile being decoded, in case of success. | | * @param p_tile_index pointer to a value that will hold the index
of the tile being decoded, in case of success. | |
| * @param p_data_size pointer to a value that will hold th
e maximum size of the decoded data, in case of success. In case | | * @param p_data_size pointer to a value that will hold th
e maximum size of the decoded data, in case of success. In case | |
| * of truncated codestr
eams, the actual number of bytes decoded may be lower. The computation of t
he size is the same | | * of truncated codestr
eams, the actual number of bytes decoded may be lower. The computation of t
he size is the same | |
| * as depicted in opj_w
rite_tile. | | * as depicted in opj_w
rite_tile. | |
| * @param p_tile_x0 pointer to a value that will hold th
e x0 pos of the tile (in the image). | | * @param p_tile_x0 pointer to a value that will hold th
e x0 pos of the tile (in the image). | |
| * @param p_tile_y0 pointer to a value that will hold th
e y0 pos of the tile (in the image). | | * @param p_tile_y0 pointer to a value that will hold th
e y0 pos of the tile (in the image). | |
| * @param p_tile_x1 pointer to a value that will hold th
e x1 pos of the tile (in the image). | | * @param p_tile_x1 pointer to a value that will hold th
e x1 pos of the tile (in the image). | |
| | | | |
| End of changes. 6 change blocks. |
|---|
| 17 lines changed or deleted | | 23 lines changed or added | |
|---|
|