Modified JPWL libopenjpeg library by directly embedding the JPWL functions

diff --git a/jpwl/JPWL_image_to_j2k.dsp b/jpwl/JPWL_image_to_j2k.dsp
index f924ee187a680f63102c1a09f9937b950db7f2b8..3ba575fe9b778577e7f5fc5e8ceba776c4f83a88 100644 (file)
--- a/jpwl/JPWL_image_to_j2k.dsp
+++ b/jpwl/JPWL_image_to_j2k.dsp
@@ -50,7 +50,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib  LibOpenJPEG_JPWL.lib /nologo /subsystem:console /machine:I386 /libpath:"Release"\r
 \r
 !ELSEIF  "$(CFG)" == "JPWL_image_to_j2k - Win32 Debug"\r
 \r
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib LibOpenJPEG_JPWLd.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"Debug"\r
 \r
 !ENDIF \r
 \r
@@ -91,28 +91,12 @@ SOURCE=..\codec\convert.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\crc.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\codec\compat\getopt.c\r
 # End Source File\r
 # Begin Source File\r
 \r
 SOURCE=..\codec\image_to_j2k.c\r
 # End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\jpwl.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\jpwl_lib.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\rs.c\r
-# End Source File\r
 # End Group\r
 # Begin Group "Header Files"\r
 \r
@@ -123,24 +107,12 @@ SOURCE=..\codec\convert.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\crc.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\codec\compat\getopt.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\jpwl.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\libopenjpeg\openjpeg.h\r
 # End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\rs.h\r
-# End Source File\r
 # End Group\r
 # End Target\r
 # End Project\r

diff --git a/jpwl/LibOpenJPEG_JPWL.dsp b/jpwl/LibOpenJPEG_JPWL.dsp
index 68ee908cf482feee605e3107ca953b188d51a0f3..ec9870bd707540b4fcd3af87bc1ebb3271feec39 100644 (file)
--- a/jpwl/LibOpenJPEG_JPWL.dsp
+++ b/jpwl/LibOpenJPEG_JPWL.dsp
@@ -72,7 +72,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LIB32=link.exe -lib\r
 # ADD BASE LIB32 /nologo\r
-# ADD LIB32 /nologo\r
+# ADD LIB32 /nologo /out:"Debug\LibOpenJPEG_JPWLd.lib"\r
 \r
 !ENDIF \r
 \r
@@ -93,6 +93,10 @@ SOURCE=..\libopenjpeg\cio.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\crc.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\libopenjpeg\dwt.c\r
 # End Source File\r
 # Begin Source File\r
@@ -121,6 +125,14 @@ SOURCE=..\libopenjpeg\jpt.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\jpwl.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\jpwl_lib.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\libopenjpeg\mct.c\r
 # End Source File\r
 # Begin Source File\r
@@ -141,6 +153,10 @@ SOURCE=..\libopenjpeg\raw.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\rs.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\libopenjpeg\t1.c\r
 # End Source File\r
 # Begin Source File\r
@@ -169,6 +185,10 @@ SOURCE=..\libopenjpeg\cio.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\crc.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\libopenjpeg\dwt.h\r
 # End Source File\r
 # Begin Source File\r
@@ -205,6 +225,10 @@ SOURCE=..\libopenjpeg\jpt.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\jpwl.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\libopenjpeg\mct.h\r
 # End Source File\r
 # Begin Source File\r
@@ -229,6 +253,10 @@ SOURCE=..\libopenjpeg\raw.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\rs.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\libopenjpeg\t1.h\r
 # End Source File\r
 # Begin Source File\r