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

3 files changed, 32 insertions, 8 deletions

diff --git a/DllOpenJPEG.vcproj b/DllOpenJPEG.vcproj
index a035b985..f7aad9ea 100644
--- a/DllOpenJPEG.vcproj
+++ b/DllOpenJPEG.vcproj
@@ -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}"

 	>

@@ -295,6 +295,10 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath=".\libopenjpeg\function_list.c"

+				>

+			</File>

+			<File

 				RelativePath="libopenjpeg\image.c"

 				>

 				<FileConfiguration

@@ -315,6 +319,10 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath=".\libopenjpeg\invert.c"

+				>

+			</File>

+			<File

 				RelativePath="libopenjpeg\j2k.c"

 				>

 				<FileConfiguration

@@ -475,6 +483,10 @@
 				</FileConfiguration>

 			</File>

 			<File

+				RelativePath=".\libopenjpeg\profile.c"

+				>

+			</File>

+			<File

 				RelativePath="libopenjpeg\raw.c"

 				>

 				<FileConfiguration

@@ -600,6 +612,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\libopenjpeg\function_list.h"

+				>

+			</File>

+			<File

 				RelativePath="libopenjpeg\image.h"

 				>

 			</File>

@@ -608,6 +624,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\libopenjpeg\invert.h"

+				>

+			</File>

+			<File

 				RelativePath="libopenjpeg\j2k.h"

 				>

 			</File>

@@ -644,6 +664,10 @@
 				>

 			</File>

 			<File

+				RelativePath=".\libopenjpeg\profile.h"

+				>

+			</File>

+			<File

 				RelativePath="libopenjpeg\raw.h"

 				>

 			</File>

diff --git a/libopenjpeg/cio.c b/libopenjpeg/cio.c
index fd914ad0..9f3612dc 100644
--- a/libopenjpeg/cio.c
+++ b/libopenjpeg/cio.c
@@ -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);
 }
diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c
index ac8a760c..a50ee705 100644
--- a/libopenjpeg/openjpeg.c
+++ b/libopenjpeg/openjpeg.c
@@ -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);