fixed various minor warnings occuring under icc9 and bcc32, added MSVC project and compiler directives to build a 'standard' WIN32 DLL

5 files changed, 5 insertions, 17 deletions

diff --git a/codec/convert.c b/codec/convert.c
index ae46390f..5e4d9bf1 100644
--- a/codec/convert.c
+++ b/codec/convert.c
@@ -417,7 +417,6 @@ opj_image_t* bmptoimage(char *filename, opj_cparameters_t *parameters) {
 							opj_image_destroy(image);
 							fclose(IN);
 							return NULL;
-							break;
 						default:
 							for (i = 0; i < v; i++) {
 								v2 = getc(IN);
diff --git a/codec/image_to_j2k.c b/codec/image_to_j2k.c
index 80de1006..cbf0a461 100644
--- a/codec/image_to_j2k.c
+++ b/codec/image_to_j2k.c
@@ -239,7 +239,6 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
 							"!! Unrecognized format for infile : %s [accept only *.pnm, *.pgm, *.ppm, *.pgx or *.bmp] !!\n\n", 
 							infile);
 						return 1;
-						break;
 				}
 				strncpy(parameters->infile, infile, MAX_PATH);
 			}
@@ -258,7 +257,6 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
 					default:
 						fprintf(stderr, "Unknown output format image %s [only *.j2k, *.jp2]!! \n", outfile);
 						return 1;
-						break;
 				}
 				strncpy(parameters->outfile, outfile, MAX_PATH);
 			}
@@ -451,11 +449,8 @@ int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *parameters)
 				/* ----------------------------------------------------- */
 			
 			case 'h':			/* display an help description */
-			{
 				encode_help_display();
 				return 1;
-			}
-			break;
 				
 				/* ----------------------------------------------------- */
 
diff --git a/codec/image_to_j2k.dsp b/codec/image_to_j2k.dsp
index 8bca167a..4600a988 100644
--- a/codec/image_to_j2k.dsp
+++ b/codec/image_to_j2k.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../libopenjpeg" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../libopenjpeg" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "OPJ_STATIC" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x40c /d "NDEBUG"
 # ADD RSC /l 0x40c /d "NDEBUG"
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "OPJ_STATIC" /FD /GZ /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x40c /d "_DEBUG"
 # ADD RSC /l 0x40c /d "_DEBUG"
diff --git a/codec/j2k_to_image.c b/codec/j2k_to_image.c
index 13338f2c..4541badd 100644
--- a/codec/j2k_to_image.c
+++ b/codec/j2k_to_image.c
@@ -126,7 +126,6 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters)
 							"!! Unrecognized format for infile : %s [accept only *.j2k, *.jp2, *.jpc or *.jpt] !!\n\n", 
 							infile);
 						return 1;
-						break;
 				}
 				strncpy(parameters->infile, infile, MAX_PATH);
 			}
@@ -146,7 +145,6 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters)
 					default:
 						fprintf(stderr, "Unknown output format image %s [only *.pnm, *.pgm, *.ppm, *.pgx or *.bmp]!! \n", outfile);
 						return 1;
-						break;
 				}
 				strncpy(parameters->outfile, outfile, MAX_PATH);
 			}
@@ -173,11 +171,8 @@ int parse_cmdline_decoder(int argc, char **argv, opj_dparameters_t *parameters)
 				/* ----------------------------------------------------- */
 			
 			case 'h': 			/* display an help description */
-			{
 				decode_help_display();
-				return 1;
-			}
-			break;
+				return 1;				
             
 				/* ----------------------------------------------------- */
 			
@@ -360,7 +355,6 @@ int main(int argc, char **argv) {
 		default:
 			fprintf(stderr, "ERROR -> j2k_to_image : Unknown input image format\n");
 			return 1;
-			break;
 	}
   
 	/* free the memory containing the code-stream */
diff --git a/codec/j2k_to_image.dsp b/codec/j2k_to_image.dsp
index e0e98d9d..4d9e2f92 100644
--- a/codec/j2k_to_image.dsp
+++ b/codec/j2k_to_image.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "../libopenjpeg" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../libopenjpeg" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "OPJ_STATIC" /FD /c
 # SUBTRACT CPP /YX
 # ADD BASE RSC /l 0x40c /d "NDEBUG"
 # ADD RSC /l 0x40c /d "NDEBUG"
@@ -66,7 +66,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "OPJ_STATIC" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x40c /d "_DEBUG"
 # ADD RSC /l 0x40c /d "_DEBUG"
 BSC32=bscmake.exe