From 1460d23294fb81287cf1d9ff122cd1925c726fed Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Tue, 31 Jan 2006 14:51:39 +0000 Subject: [PATCH] STYLE: Remove completely reference to OPJ_EXPORT --- libopenjpeg/openjpeg.h | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h index 7feb0133..ad2c4d6a 100644 --- a/libopenjpeg/openjpeg.h +++ b/libopenjpeg/openjpeg.h @@ -32,8 +32,6 @@ #define OPENJPEG_VERSION "1.0.0" -#define OPJ_EXPORT - /* ========================================================== Compiler directives @@ -463,13 +461,13 @@ Create an image @param clrspc image color space @return returns a new image structure if successful, returns NULL otherwise */ -OPJ_EXPORT opj_image_t *opj_image_create(int numcmpts, opj_image_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc); +opj_image_t *opj_image_create(int numcmpts, opj_image_cmptparm_t *cmptparms, OPJ_COLOR_SPACE clrspc); /** Deallocate any resources associated with an image @param image image to be destroyed */ -OPJ_EXPORT void opj_image_destroy(opj_image_t *image); +void opj_image_destroy(opj_image_t *image); /* ========================================================== @@ -488,20 +486,20 @@ to contain encoded data. @param length Reading: buffer length. Writing: 0 @return Returns a CIO handle if successful, returns NULL otherwise */ -OPJ_EXPORT opj_cio_t* opj_cio_open(opj_common_ptr cinfo, unsigned char *buffer, int length); +opj_cio_t* opj_cio_open(opj_common_ptr cinfo, unsigned char *buffer, int length); /** Close and free a CIO handle @param cio CIO handle to free */ -OPJ_EXPORT void opj_cio_close(opj_cio_t *cio); +void opj_cio_close(opj_cio_t *cio); /** Get position in byte stream @param cio CIO handle @return Returns the position in bytes */ -OPJ_EXPORT int cio_tell(opj_cio_t *cio); +int cio_tell(opj_cio_t *cio); /** Set position in byte stream @param cio CIO handle @@ -515,7 +513,7 @@ void cio_seek(opj_cio_t *cio, int pos); ========================================================== */ -OPJ_EXPORT opj_event_mgr_t* opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context); +opj_event_mgr_t* opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context); /* ========================================================== @@ -527,42 +525,42 @@ Creates a J2K/JPT/JP2 decompression structure @param format Decoder to select @return Returns a handle to a decompressor if successful, returns NULL otherwise */ -OPJ_EXPORT opj_dinfo_t* opj_create_decompress(OPJ_CODEC_FORMAT format); +opj_dinfo_t* opj_create_decompress(OPJ_CODEC_FORMAT format); /** Destroy a decompressor handle @param dinfo decompressor handle to destroy */ -OPJ_EXPORT void opj_destroy_decompress(opj_dinfo_t *dinfo); +void opj_destroy_decompress(opj_dinfo_t *dinfo); /** Set decoding parameters to default values @param parameters Decompression parameters */ -OPJ_EXPORT void opj_set_default_decoder_parameters(opj_dparameters_t *parameters); +void opj_set_default_decoder_parameters(opj_dparameters_t *parameters); /** Setup the decoder decoding parameters using user parameters. Decoding parameters are returned in j2k->cp. @param dinfo decompressor handle @param parameters decompression parameters */ -OPJ_EXPORT void opj_setup_decoder(opj_dinfo_t *dinfo, opj_dparameters_t *parameters); +void opj_setup_decoder(opj_dinfo_t *dinfo, opj_dparameters_t *parameters); /** Decode an image from a JPEG-2000 codestream @param dinfo decompressor handle @param cio Input buffer stream @return Returns a decoded image if successful, returns NULL otherwise */ -OPJ_EXPORT opj_image_t* opj_decode(opj_dinfo_t *dinfo, opj_cio_t *cio); +opj_image_t* opj_decode(opj_dinfo_t *dinfo, opj_cio_t *cio); /** Creates a J2K/JP2 compression structure @param format Coder to select @return Returns a handle to a compressor if successful, returns NULL otherwise */ -OPJ_EXPORT opj_cinfo_t* opj_create_compress(OPJ_CODEC_FORMAT format); +opj_cinfo_t* opj_create_compress(OPJ_CODEC_FORMAT format); /** Destroy a compressor handle @param cinfo compressor handle to destroy */ -OPJ_EXPORT void opj_destroy_compress(opj_cinfo_t *cinfo); +void opj_destroy_compress(opj_cinfo_t *cinfo); /** Set encoding parameters to default values, that means : @param parameters Compression parameters */ -OPJ_EXPORT void opj_set_default_encoder_parameters(opj_cparameters_t *parameters); +void opj_set_default_encoder_parameters(opj_cparameters_t *parameters); /** Setup the encoder parameters using the current image and using user parameters. @param cinfo compressor handle @param parameters compression parameters @param image input filled image */ -OPJ_EXPORT void opj_setup_encoder(opj_cinfo_t *cinfo, opj_cparameters_t *parameters, opj_image_t *image); +void opj_setup_encoder(opj_cinfo_t *cinfo, opj_cparameters_t *parameters, opj_image_t *image); /** Encode an image into a JPEG-2000 codestream @param cinfo compressor handle @@ -600,7 +598,7 @@ Encode an image into a JPEG-2000 codestream @param index Name of the index file if required, NULL otherwise @return Returns true if successful, returns false otherwise */ -OPJ_EXPORT bool opj_encode(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, char *index); +bool opj_encode(opj_cinfo_t *cinfo, opj_cio_t *cio, opj_image_t *image, char *index); #ifdef __cplusplus }