MJ2 codec restructuration. Update of project files (dsp, vcproj and makefile)

diff --git a/mj2/MJ2_codec/MJ2_Extractor.dsp b/mj2/MJ2_codec/MJ2_Extractor.dsp
index b1bdf18a6de112b2417a19c4ce6f7e3dfdec442f..0d5654e74c5028fe0a50da6bc91cff332c1610b3 100644 (file)
--- a/mj2/MJ2_codec/MJ2_Extractor.dsp
+++ b/mj2/MJ2_codec/MJ2_Extractor.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../libopenjpeg" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../libopenjpeg_097" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -64,7 +64,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "MJ2_Extractor___Win32_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 /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../libopenjpeg_097" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -85,7 +85,7 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\libopenjpeg\cio.c
+SOURCE=..\libopenjpeg_097\cio.c
 # End Source File
 # Begin Source File
 
@@ -93,7 +93,7 @@ SOURCE=.\extract_j2k_from_mj2.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\jp2.c
+SOURCE=..\libopenjpeg_097\jp2.c
 # End Source File
 # Begin Source File
 
@@ -105,15 +105,15 @@ SOURCE=.\mj2.c
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\libopenjpeg\cio.h
+SOURCE=..\libopenjpeg_097\cio.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\j2k.h
+SOURCE=..\libopenjpeg_097\j2k.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\jp2.h
+SOURCE=..\libopenjpeg_097\jp2.h
 # End Source File
 # Begin Source File
 

diff --git a/mj2/MJ2_codec/MJ2_Wrapper.dsp b/mj2/MJ2_codec/MJ2_Wrapper.dsp
index e45777dd830b6beeb6c33a6ffab58eda4205c9b9..da3ee7bc1e2d769d4299a43304a1d0e6dd319a98 100644 (file)
--- a/mj2/MJ2_codec/MJ2_Wrapper.dsp
+++ b/mj2/MJ2_codec/MJ2_Wrapper.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "../libopenjpeg" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../libopenjpeg_097" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -64,7 +64,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "MJ2_Wrapper___Win32_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 /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../libopenjpeg_097" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -85,15 +85,15 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\libopenjpeg\cio.c
+SOURCE=..\libopenjpeg_097\cio.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\int.c
+SOURCE=..\libopenjpeg_097\int.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\jp2.c
+SOURCE=..\libopenjpeg_097\jp2.c
 # End Source File
 # Begin Source File
 
@@ -109,19 +109,19 @@ SOURCE=.\wrap_j2k_in_mj2.c
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\libopenjpeg\cio.h
+SOURCE=..\libopenjpeg_097\cio.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\int.h
+SOURCE=..\libopenjpeg_097\int.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\j2k.h
+SOURCE=..\libopenjpeg_097\j2k.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\jp2.h
+SOURCE=..\libopenjpeg_097\jp2.h
 # End Source File
 # Begin Source File
 

diff --git a/mj2/MJ2_codec/Makefile b/mj2/MJ2_codec/Makefile
index 0cc9030e8e5eb7b90ae8c2eaf67add44a1d443c6..04c59feeadfb29040557c09aa46f84fe7cd6922b 100644 (file)
--- a/mj2/MJ2_codec/Makefile
+++ b/mj2/MJ2_codec/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Valentin Mesaros (Octalis | DICE/UCL Belgium)
 # 19 April 2005
 # 
@@ -6,7 +6,7 @@
 # 
 
 INCLUDES = -Imj2 \
-           -I../libopenjpeg
+           -I../libopenjpeg_097
 
 C_OPT = -Wall
 CFLAGS = $(INCLUDES) $(C_OPT)
@@ -15,8 +15,8 @@ CC = gcc
 
 OBJ_MJ2_DIR = obj
 BIN_MJ2_DIR = bin
-LIB_OPENJPEG_DIR = ../libopenjpeg/lib
-LIB_OPENJPEG = $(LIB_OPENJPEG_DIR)/libopenjpeg.a
+LIB_OPENJPEG_DIR = ../libopenjpeg_097/lib
+LIB_OPENJPEG = $(LIB_OPENJPEG_DIR)/libopenjpeg_097.a
 
 all: $(OBJ_MJ2_DIR) $(BIN_MJ2_DIR) \
      $(BIN_MJ2_DIR)/frames_to_mj2 \

diff --git a/mj2/MJ2_codec/frames_to_mj2.dsp b/mj2/MJ2_codec/frames_to_mj2.dsp
index e51185a1cfd26173ddeafa73badc370c7864674f..81982b47fd5b906c64669b05eff272ffa5b3538e 100644 (file)
--- a/mj2/MJ2_codec/frames_to_mj2.dsp
+++ b/mj2/MJ2_codec/frames_to_mj2.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 /W3 /GX /O2 /I "../libopenjpeg" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "DONT_HAVE_GETOPT" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../libopenjpeg_097" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "DONT_HAVE_GETOPT" /YX /FD /c
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -63,9 +63,10 @@ LINK32=link.exe
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "frames_to_mj2___Win32_Debug0"
 # PROP Intermediate_Dir "frames_to_mj2___Win32_Debug0"
+# PROP Ignore_Export_Lib 0
 # 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 /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DONT_HAVE_GETOPT" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../libopenjpeg_097" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DONT_HAVE_GETOPT" /YX /FD /GZ /c
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -121,149 +122,141 @@ SOURCE=.\mj2_convert.c
 # End Source File
 # End Group
 # End Group
-# Begin Group "OpenJPEG"
-
-# PROP Default_Filter ""
-# Begin Group "OpenJPEG Header Files"
+# Begin Group "Libopenjpeg_097"
 
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\libopenjpeg\bio.h
+SOURCE=..\libopenjpeg_097\bio.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\cio.h
+SOURCE=..\libopenjpeg_097\bio.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\dwt.h
+SOURCE=..\libopenjpeg_097\cio.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\fix.h
+SOURCE=..\libopenjpeg_097\cio.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\int.h
+SOURCE=..\libopenjpeg_097\dwt.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\j2k.h
+SOURCE=..\libopenjpeg_097\dwt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\jp2.h
+SOURCE=..\libopenjpeg_097\fix.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\jpt.h
+SOURCE=..\libopenjpeg_097\fix.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\mct.h
+SOURCE=..\libopenjpeg_097\int.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\mqc.h
+SOURCE=..\libopenjpeg_097\int.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\openjpeg.h
+SOURCE=..\libopenjpeg_097\j2k.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\pi.h
+SOURCE=..\libopenjpeg_097\j2k.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\raw.h
+SOURCE=..\libopenjpeg_097\jp2.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\t1.h
+SOURCE=..\libopenjpeg_097\jp2.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\t2.h
+SOURCE=..\libopenjpeg_097\jpt.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\tcd.h
+SOURCE=..\libopenjpeg_097\jpt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\tgt.h
+SOURCE=..\libopenjpeg_097\mct.c
 # End Source File
-# End Group
-# Begin Group "OpenJPEG Source Files"
-
-# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\libopenjpeg\bio.c
+SOURCE=..\libopenjpeg_097\mct.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\cio.c
+SOURCE=..\libopenjpeg_097\mqc.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\dwt.c
+SOURCE=..\libopenjpeg_097\mqc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\fix.c
+SOURCE=..\libopenjpeg_097\openjpeg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\int.c
+SOURCE=..\libopenjpeg_097\pi.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\j2k.c
+SOURCE=..\libopenjpeg_097\pi.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\jp2.c
+SOURCE=..\libopenjpeg_097\raw.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\jpt.c
+SOURCE=..\libopenjpeg_097\raw.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\mct.c
+SOURCE=..\libopenjpeg_097\t1.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\mqc.c
+SOURCE=..\libopenjpeg_097\t1.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\pi.c
+SOURCE=..\libopenjpeg_097\t2.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\raw.c
+SOURCE=..\libopenjpeg_097\t2.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\t1.c
+SOURCE=..\libopenjpeg_097\tcd.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\t2.c
+SOURCE=..\libopenjpeg_097\tcd.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\tcd.c
+SOURCE=..\libopenjpeg_097\tgt.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\tgt.c
+SOURCE=..\libopenjpeg_097\tgt.h
 # End Source File
 # End Group
-# End Group
 # End Target
 # End Project

diff --git a/mj2/MJ2_codec/mj2_to_frames.dsp b/mj2/MJ2_codec/mj2_to_frames.dsp
index d97546e1f1dbc336fc7fe20ecca98a4ac2d30b10..693dafcb05cc73856be21108cd08ac240cdc43c5 100644 (file)
--- a/mj2/MJ2_codec/mj2_to_frames.dsp
+++ b/mj2/MJ2_codec/mj2_to_frames.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 /W3 /GX /O2 /I "../libopenjpeg" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "../libopenjpeg_097" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
 # ADD BASE RSC /l 0x809 /d "NDEBUG"
 # ADD RSC /l 0x809 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -65,7 +65,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "mj2_to_frames___Win32_Debug0"
 # 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 /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../libopenjpeg_097" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# SUBTRACT CPP /X
 # ADD BASE RSC /l 0x809 /d "_DEBUG"
 # ADD RSC /l 0x809 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -157,149 +158,141 @@ SOURCE=.\mj2_to_frames.c
 # End Source File
 # End Group
 # End Group
-# Begin Group "OpenJPEG"
+# Begin Group "Libopenjpeg_097"
 
 # PROP Default_Filter ""
-# Begin Group "OpenJPEG Header Files"
-
-# PROP Default_Filter ".h"
 # Begin Source File
 
-SOURCE=..\libopenjpeg\bio.h
+SOURCE=..\libopenjpeg_097\bio.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\cio.h
+SOURCE=..\libopenjpeg_097\bio.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\dwt.h
+SOURCE=..\libopenjpeg_097\cio.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\fix.h
+SOURCE=..\libopenjpeg_097\cio.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\int.h
+SOURCE=..\libopenjpeg_097\dwt.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\j2k.h
+SOURCE=..\libopenjpeg_097\dwt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\jp2.h
+SOURCE=..\libopenjpeg_097\fix.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\jpt.h
+SOURCE=..\libopenjpeg_097\fix.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\mct.h
+SOURCE=..\libopenjpeg_097\int.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\mqc.h
+SOURCE=..\libopenjpeg_097\int.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\openjpeg.h
+SOURCE=..\libopenjpeg_097\j2k.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\pi.h
+SOURCE=..\libopenjpeg_097\j2k.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\raw.h
+SOURCE=..\libopenjpeg_097\jp2.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\t1.h
+SOURCE=..\libopenjpeg_097\jp2.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\t2.h
+SOURCE=..\libopenjpeg_097\jpt.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\tcd.h
+SOURCE=..\libopenjpeg_097\jpt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\tgt.h
+SOURCE=..\libopenjpeg_097\mct.c
 # End Source File
-# End Group
-# Begin Group "OpenJPEG Source Files"
-
-# PROP Default_Filter ".c"
 # Begin Source File
 
-SOURCE=..\libopenjpeg\bio.c
+SOURCE=..\libopenjpeg_097\mct.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\cio.c
+SOURCE=..\libopenjpeg_097\mqc.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\dwt.c
+SOURCE=..\libopenjpeg_097\mqc.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\fix.c
+SOURCE=..\libopenjpeg_097\openjpeg.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\int.c
+SOURCE=..\libopenjpeg_097\pi.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\j2k.c
+SOURCE=..\libopenjpeg_097\pi.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\jp2.c
+SOURCE=..\libopenjpeg_097\raw.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\jpt.c
+SOURCE=..\libopenjpeg_097\raw.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\mct.c
+SOURCE=..\libopenjpeg_097\t1.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\mqc.c
+SOURCE=..\libopenjpeg_097\t1.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\pi.c
+SOURCE=..\libopenjpeg_097\t2.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\raw.c
+SOURCE=..\libopenjpeg_097\t2.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\t1.c
+SOURCE=..\libopenjpeg_097\tcd.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\t2.c
+SOURCE=..\libopenjpeg_097\tcd.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\tcd.c
+SOURCE=..\libopenjpeg_097\tgt.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\libopenjpeg\tgt.c
+SOURCE=..\libopenjpeg_097\tgt.h
 # End Source File
 # End Group
-# End Group
 # End Target
 # End Project

diff --git a/mj2/MJ2_codec/mj2_to_metadata.dsp b/mj2/MJ2_codec/mj2_to_metadata.dsp
index 065904e2ec652f766049bb750852ad80a623e481..8878cfa212be6cbdfd9192b378351480480a8bfc 100644 (file)
--- a/mj2/MJ2_codec/mj2_to_metadata.dsp
+++ b/mj2/MJ2_codec/mj2_to_metadata.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c\r
-# ADD CPP /nologo /W3 /GX /O2 /I "../libopenjpeg" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "DONT_HAVE_GETOPT" /YX /FD /c\r
+# ADD CPP /nologo /W3 /GX /O2 /I "../libopenjpeg_097" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "DONT_HAVE_GETOPT" /YX /FD /c\r
 # ADD BASE RSC /l 0x809 /d "NDEBUG"\r
 # ADD RSC /l 0x809 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -64,7 +64,7 @@ LINK32=link.exe
 # PROP Intermediate_Dir "mj2_to_metadata___Win32_Debug0"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c\r
-# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../libopenjpeg" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DONT_HAVE_GETOPT" /FR /YX /FD /GZ /c\r
+# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../libopenjpeg_097" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "DONT_HAVE_GETOPT" /FR /YX /FD /GZ /c\r
 # ADD BASE RSC /l 0x809 /d "_DEBUG"\r
 # ADD RSC /l 0x809 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -102,6 +102,10 @@ SOURCE=.\mj2.h
 \r
 SOURCE=.\mj2_convert.h\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\mj2_to_metadata.h\r
+# End Source File\r
 # End Group\r
 # Begin Group "MJ2 Source Files"\r
 \r
@@ -128,149 +132,141 @@ SOURCE=.\mj2_to_metadata.c
 # End Source File\r
 # End Group\r
 # End Group\r
-# Begin Group "OpenJPEG"\r
+# Begin Group "Libopenjpeg_097"\r
 \r
 # PROP Default_Filter ""\r
-# Begin Group "OpenJPEG Header Files"\r
-\r
-# PROP Default_Filter ".h"\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\bio.h\r
+SOURCE=..\libopenjpeg_097\bio.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\cio.h\r
+SOURCE=..\libopenjpeg_097\bio.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\dwt.h\r
+SOURCE=..\libopenjpeg_097\cio.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\fix.h\r
+SOURCE=..\libopenjpeg_097\cio.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\int.h\r
+SOURCE=..\libopenjpeg_097\dwt.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\j2k.h\r
+SOURCE=..\libopenjpeg_097\dwt.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\jp2.h\r
+SOURCE=..\libopenjpeg_097\fix.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\jpt.h\r
+SOURCE=..\libopenjpeg_097\fix.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\mct.h\r
+SOURCE=..\libopenjpeg_097\int.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\mqc.h\r
+SOURCE=..\libopenjpeg_097\int.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\openjpeg.h\r
+SOURCE=..\libopenjpeg_097\j2k.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\pi.h\r
+SOURCE=..\libopenjpeg_097\j2k.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\raw.h\r
+SOURCE=..\libopenjpeg_097\jp2.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\t1.h\r
+SOURCE=..\libopenjpeg_097\jp2.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\t2.h\r
+SOURCE=..\libopenjpeg_097\jpt.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\tcd.h\r
+SOURCE=..\libopenjpeg_097\jpt.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\tgt.h\r
+SOURCE=..\libopenjpeg_097\mct.c\r
 # End Source File\r
-# End Group\r
-# Begin Group "OpenJPEG Source Files"\r
-\r
-# PROP Default_Filter ".c"\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\bio.c\r
+SOURCE=..\libopenjpeg_097\mct.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\cio.c\r
+SOURCE=..\libopenjpeg_097\mqc.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\dwt.c\r
+SOURCE=..\libopenjpeg_097\mqc.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\fix.c\r
+SOURCE=..\libopenjpeg_097\openjpeg.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\int.c\r
+SOURCE=..\libopenjpeg_097\pi.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\j2k.c\r
+SOURCE=..\libopenjpeg_097\pi.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\jp2.c\r
+SOURCE=..\libopenjpeg_097\raw.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\jpt.c\r
+SOURCE=..\libopenjpeg_097\raw.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\mct.c\r
+SOURCE=..\libopenjpeg_097\t1.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\mqc.c\r
+SOURCE=..\libopenjpeg_097\t1.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\pi.c\r
+SOURCE=..\libopenjpeg_097\t2.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\raw.c\r
+SOURCE=..\libopenjpeg_097\t2.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\t1.c\r
+SOURCE=..\libopenjpeg_097\tcd.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\t2.c\r
+SOURCE=..\libopenjpeg_097\tcd.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\tcd.c\r
+SOURCE=..\libopenjpeg_097\tgt.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\libopenjpeg\tgt.c\r
+SOURCE=..\libopenjpeg_097\tgt.h\r
 # End Source File\r
 # End Group\r
-# End Group\r
 # End Target\r
 # End Project\r

diff --git a/mj2/MJ2_codec/mj2_to_metadata.vcproj b/mj2/MJ2_codec/mj2_to_metadata.vcproj
index a35f07d0586e312db50730de5ce752a4827bf849..2e058f865f63f1b4f2d10780360945bff00ec91b 100644 (file)
--- a/mj2/MJ2_codec/mj2_to_metadata.vcproj
+++ b/mj2/MJ2_codec/mj2_to_metadata.vcproj
@@ -22,7 +22,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                InlineFunctionExpansion="1"\r
-                               AdditionalIncludeDirectories="../libopenjpeg"\r
+                               AdditionalIncludeDirectories="../libopenjpeg_097"\r
                                PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,DONT_HAVE_GETOPT,NO_PACKETS_DECODING"\r
                                StringPooling="TRUE"\r
                                RuntimeLibrary="4"\r
@@ -80,7 +80,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../libopenjpeg"\r
+                               AdditionalIncludeDirectories="../libopenjpeg_097"\r
                                PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE,DONT_HAVE_GETOPT,NO_PACKETS_DECODING"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="5"\r
@@ -91,7 +91,7 @@
                                ProgramDataBaseFileName=".\mj2_to_metadata___Win32_Debug0/"\r
                                WarningLevel="3"\r
                                SuppressStartupBanner="TRUE"\r
-                               DebugInformationFormat="4"/>\r
+                               DebugInformationFormat="0"/>\r
                        <Tool\r
                                Name="VCCustomBuildTool"/>\r
                        <Tool\r
@@ -137,183 +137,139 @@
                <Filter\r
                        Name="MJ2"\r
                        Filter="">\r
-                       <Filter\r
-                               Name="MJ2 Header Files"\r
-                               Filter="">\r
-                               <File\r
-                                       RelativePath=".\compat\getopt.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="meta_out.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\mj2.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\mj2_convert.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="mj2_to_metadata.h">\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="MJ2 Source Files"\r
-                               Filter="">\r
-                               <File\r
-                                       RelativePath=".\compat\getopt.c">\r
-                                       <FileConfiguration\r
-                                               Name="Debug|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCLCompilerTool"\r
-                                                       AdditionalIncludeDirectories="../libopenjpeg;$(NoInherit)"\r
-                                                       CompileAs="0"/>\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="meta_out.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\mj2.c">\r
-                                       <FileConfiguration\r
-                                               Name="Debug|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCLCompilerTool"\r
-                                                       AdditionalIncludeDirectories="../libopenjpeg;$(NoInherit)"\r
-                                                       CompileAs="0"/>\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\mj2_convert.c">\r
-                                       <FileConfiguration\r
-                                               Name="Debug|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCLCompilerTool"\r
-                                                       AdditionalIncludeDirectories="../libopenjpeg;$(NoInherit)"\r
-                                                       CompileAs="0"/>\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\mj2_to_metadata.c">\r
-                                       <FileConfiguration\r
-                                               Name="Debug|Win32">\r
-                                               <Tool\r
-                                                       Name="VCCLCompilerTool"\r
-                                                       AdditionalIncludeDirectories="../libopenjpeg;$(NoInherit)"\r
-                                                       CompileAs="0"/>\r
-                                       </FileConfiguration>\r
-                               </File>\r
-                       </Filter>\r
+                       <File\r
+                               RelativePath=".\compat\getopt.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\compat\getopt.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\meta_out.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\meta_out.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\mj2.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\mj2.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\mj2_convert.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\mj2_convert.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\mj2_to_metadata.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\mj2_to_metadata.h">\r
+                       </File>\r
                </Filter>\r
                <Filter\r
-                       Name="OpenJPEG"\r
+                       Name="libopenjpeg_097"\r
                        Filter="">\r
-                       <Filter\r
-                               Name="OpenJPEG Header Files"\r
-                               Filter=".h">\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\bio.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\cio.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\dwt.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\fix.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\int.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\j2k.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\jp2.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\jpt.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\mct.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\mqc.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\openjpeg.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\pi.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\raw.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\t1.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\t2.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\tcd.h">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\tgt.h">\r
-                               </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="OpenJPEG Source Files"\r
-                               Filter=".c">\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\bio.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\cio.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\dwt.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\fix.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\int.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\j2k.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\jp2.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\jpt.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\mct.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\mqc.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\pi.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\raw.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\t1.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\t2.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\tcd.c">\r
-                               </File>\r
-                               <File\r
-                                       RelativePath="..\libopenjpeg\tgt.c">\r
-                               </File>\r
-                       </Filter>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\bio.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\bio.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\cio.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\cio.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\dwt.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\dwt.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\fix.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\fix.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\int.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\int.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\j2k.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\j2k.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\jp2.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\jp2.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\jpt.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\jpt.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\mct.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\mct.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\mqc.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\mqc.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\openjpeg.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\pi.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\pi.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\raw.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\raw.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\t1.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\t1.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\t2.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\t2.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\tcd.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\tcd.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\tgt.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\libopenjpeg_097\tgt.h">\r
+                       </File>\r
                </Filter>\r
                <File\r
                        RelativePath="resource.h">\r