generic-library/openjpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed minor problems that prevented the solution file from building in Windows (issue 40) - thanks to Sheet Spotter

Browse Source
This commit is contained in:
Antonin Descampe 2010-10-05 20:22:17 +00:00
parent 6ab100903e
commit 68e1771ae5
3 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
DllOpenJPEG.vcproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8,00"
Version="8.00"
Name="DllOpenJPEG"
ProjectGUID="{89AC992C-5E2C-4E6B-A453-61C1DF446216}"
>
@ -294,6 +294,10 @@
/>
</FileConfiguration>
</File>
<File
RelativePath=".\libopenjpeg\function_list.c"
>
</File>
<File
RelativePath="libopenjpeg\image.c"
>
@ -314,6 +318,10 @@
/>
</FileConfiguration>
</File>
<File
RelativePath=".\libopenjpeg\invert.c"
>
</File>
<File
RelativePath="libopenjpeg\j2k.c"
>
@ -474,6 +482,10 @@
/>
</FileConfiguration>
</File>
<File
RelativePath=".\libopenjpeg\profile.c"
>
</File>
<File
RelativePath="libopenjpeg\raw.c"
>
@ -599,6 +611,10 @@
RelativePath="libopenjpeg\fix.h"
>
</File>
<File
RelativePath=".\libopenjpeg\function_list.h"
>
</File>
<File
RelativePath="libopenjpeg\image.h"
>
@ -607,6 +623,10 @@
RelativePath="libopenjpeg\int.h"
>
</File>
<File
RelativePath=".\libopenjpeg\invert.h"
>
</File>
<File
RelativePath="libopenjpeg\j2k.h"
>
@ -643,6 +663,10 @@
RelativePath="libopenjpeg\pi.h"
>
</File>
<File
RelativePath=".\libopenjpeg\profile.h"
>
</File>
<File
RelativePath="libopenjpeg\raw.h"
>

4
libopenjpeg/cio.c
View File

@ -224,7 +224,7 @@ void opj_read_float_LE(const OPJ_BYTE * p_buffer, OPJ_FLOAT32 * p_value)
* Creates an abstract stream. This function does nothing except allocating memory and initializing the abstract stream.
* @return a stream object.
*/
opj_stream_t* opj_stream_create(OPJ_UINT32 p_size,bool l_is_input)
opj_stream_t* OPJ_CALLCONV opj_stream_create(OPJ_UINT32 p_size,bool l_is_input)
{
opj_stream_private_t * l_stream = 00;
l_stream = (opj_stream_private_t*) opj_malloc(sizeof(opj_stream_private_t));
@ -268,7 +268,7 @@ opj_stream_t* opj_stream_create(OPJ_UINT32 p_size,bool l_is_input)
* Creates an abstract stream. This function does nothing except allocating memory and initializing the abstract stream.
* @return a stream object.
*/
opj_stream_t* opj_stream_default_create(bool l_is_input)
opj_stream_t* OPJ_CALLCONV opj_stream_default_create(bool l_is_input)
{
return opj_stream_create(J2K_STREAM_CHUNK_SIZE,l_is_input);
}

10
libopenjpeg/openjpeg.c
View File

@ -367,7 +367,7 @@ opj_image_t* OPJ_CALLCONV opj_decode(opj_codec_t *p_info, opj_stream_t *cio)
* depending on the precision of the given component.
* @param p_stream the stream to write data to.
*/
bool opj_write_tile (
bool OPJ_CALLCONV opj_write_tile (
opj_codec_t *p_codec,
OPJ_UINT32 p_tile_index,
OPJ_BYTE * p_data,
@ -411,7 +411,7 @@ bool opj_write_tile (
* @return true if the tile header could be decoded. In case the decoding should end, the returned value is still true.
* returning false may be the result of a shortage of memory or an internal error.
*/
bool opj_read_tile_header(
bool OPJ_CALLCONV opj_read_tile_header(
opj_codec_t *p_codec,
OPJ_UINT32 * p_tile_index,
OPJ_UINT32 * p_data_size,
@ -460,7 +460,7 @@ bool opj_read_tile_header(
*
* @return true if the data could be decoded.
*/
bool opj_decode_tile_data(
bool OPJ_CALLCONV opj_decode_tile_data(
opj_codec_t *p_codec,
OPJ_UINT32 p_tile_index,
OPJ_BYTE * p_data,
@ -530,7 +530,7 @@ bool OPJ_CALLCONV opj_read_header (
*
* @return true if the area could be set.
*/
bool opj_set_decode_area(
bool OPJ_CALLCONV opj_set_decode_area(
opj_codec_t *p_codec,
OPJ_INT32 p_start_x,
OPJ_INT32 p_start_y,
@ -866,7 +866,7 @@ void OPJ_CALLCONV opj_destroy_cstr_info(opj_codestream_info_t *cstr_info) {
}
}
bool opj_set_MCT(opj_cparameters_t *parameters,OPJ_FLOAT32 * pEncodingMatrix,OPJ_INT32 * p_dc_shift,OPJ_UINT32 pNbComp)
bool OPJ_CALLCONV opj_set_MCT(opj_cparameters_t *parameters,OPJ_FLOAT32 * pEncodingMatrix,OPJ_INT32 * p_dc_shift,OPJ_UINT32 pNbComp)
{
OPJ_UINT32 l_matrix_size = pNbComp * pNbComp * sizeof(OPJ_FLOAT32);
OPJ_UINT32 l_dc_shift_size = pNbComp * sizeof(OPJ_INT32);