walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

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

This commit is contained in:
Francois-Olivier Devaux 2006-12-08 17:49:30 +00:00
parent b8445ebec0
commit acd2187a43
7 changed files with 276 additions and 338 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mj2/MJ2_codec/MJ2_Extractor.dsp
View File

@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # 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 BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -64,7 +64,7 @@ LINK32=link.exe
# PROP Intermediate_Dir "MJ2_Extractor___Win32_Debug" # PROP Intermediate_Dir "MJ2_Extractor___Win32_Debug"
# PROP Target_Dir "" # 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 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 BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -85,7 +85,7 @@ LINK32=link.exe
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\cio.c SOURCE=..\libopenjpeg_097\cio.c
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -93,7 +93,7 @@ SOURCE=.\extract_j2k_from_mj2.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\jp2.c SOURCE=..\libopenjpeg_097\jp2.c
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -105,15 +105,15 @@ SOURCE=.\mj2.c
# PROP Default_Filter "h;hpp;hxx;hm;inl" # PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\cio.h SOURCE=..\libopenjpeg_097\cio.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\j2k.h SOURCE=..\libopenjpeg_097\j2k.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\jp2.h SOURCE=..\libopenjpeg_097\jp2.h
# End Source File # End Source File
# Begin Source File # Begin Source File

18
mj2/MJ2_codec/MJ2_Wrapper.dsp
View File

@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # 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 BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -64,7 +64,7 @@ LINK32=link.exe
# PROP Intermediate_Dir "MJ2_Wrapper___Win32_Debug" # PROP Intermediate_Dir "MJ2_Wrapper___Win32_Debug"
# PROP Target_Dir "" # 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 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 BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -85,15 +85,15 @@ LINK32=link.exe
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\cio.c SOURCE=..\libopenjpeg_097\cio.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\int.c SOURCE=..\libopenjpeg_097\int.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\jp2.c SOURCE=..\libopenjpeg_097\jp2.c
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -109,19 +109,19 @@ SOURCE=.\wrap_j2k_in_mj2.c
# PROP Default_Filter "h;hpp;hxx;hm;inl" # PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\cio.h SOURCE=..\libopenjpeg_097\cio.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\int.h SOURCE=..\libopenjpeg_097\int.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\j2k.h SOURCE=..\libopenjpeg_097\j2k.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\jp2.h SOURCE=..\libopenjpeg_097\jp2.h
# End Source File # End Source File
# Begin Source File # Begin Source File

8
mj2/MJ2_codec/Makefile
View File

@ -1,4 +1,4 @@
# #
# Valentin Mesaros (Octalis | DICE/UCL Belgium) # Valentin Mesaros (Octalis | DICE/UCL Belgium)
# 19 April 2005 # 19 April 2005
# #
@ -6,7 +6,7 @@
# #
INCLUDES = -Imj2 \ INCLUDES = -Imj2 \
-I../libopenjpeg -I../libopenjpeg_097
C_OPT = -Wall C_OPT = -Wall
CFLAGS = $(INCLUDES) $(C_OPT) CFLAGS = $(INCLUDES) $(C_OPT)
@ -15,8 +15,8 @@ CC = gcc
OBJ_MJ2_DIR = obj OBJ_MJ2_DIR = obj
BIN_MJ2_DIR = bin BIN_MJ2_DIR = bin
LIB_OPENJPEG_DIR = ../libopenjpeg/lib LIB_OPENJPEG_DIR = ../libopenjpeg_097/lib
LIB_OPENJPEG = $(LIB_OPENJPEG_DIR)/libopenjpeg.a LIB_OPENJPEG = $(LIB_OPENJPEG_DIR)/libopenjpeg_097.a
all: $(OBJ_MJ2_DIR) $(BIN_MJ2_DIR) \ all: $(OBJ_MJ2_DIR) $(BIN_MJ2_DIR) \
$(BIN_MJ2_DIR)/frames_to_mj2 \ $(BIN_MJ2_DIR)/frames_to_mj2 \

87
mj2/MJ2_codec/frames_to_mj2.dsp
View File

@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # 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 BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -63,9 +63,10 @@ LINK32=link.exe
# PROP Use_Debug_Libraries 1 # PROP Use_Debug_Libraries 1
# PROP Output_Dir "frames_to_mj2___Win32_Debug0" # PROP Output_Dir "frames_to_mj2___Win32_Debug0"
# PROP Intermediate_Dir "frames_to_mj2___Win32_Debug0" # PROP Intermediate_Dir "frames_to_mj2___Win32_Debug0"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # 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 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 BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -121,149 +122,141 @@ SOURCE=.\mj2_convert.c
# End Source File # End Source File
# End Group # End Group
# End Group # End Group
# Begin Group "OpenJPEG" # Begin Group "Libopenjpeg_097"
# PROP Default_Filter ""
# Begin Group "OpenJPEG Header Files"
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\bio.h SOURCE=..\libopenjpeg_097\bio.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\cio.h SOURCE=..\libopenjpeg_097\bio.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\dwt.h SOURCE=..\libopenjpeg_097\cio.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\fix.h SOURCE=..\libopenjpeg_097\cio.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\int.h SOURCE=..\libopenjpeg_097\dwt.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\j2k.h SOURCE=..\libopenjpeg_097\dwt.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\jp2.h SOURCE=..\libopenjpeg_097\fix.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\jpt.h SOURCE=..\libopenjpeg_097\fix.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\mct.h SOURCE=..\libopenjpeg_097\int.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\mqc.h SOURCE=..\libopenjpeg_097\int.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\openjpeg.h SOURCE=..\libopenjpeg_097\j2k.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\pi.h SOURCE=..\libopenjpeg_097\j2k.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\raw.h SOURCE=..\libopenjpeg_097\jp2.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\t1.h SOURCE=..\libopenjpeg_097\jp2.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\t2.h SOURCE=..\libopenjpeg_097\jpt.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\tcd.h SOURCE=..\libopenjpeg_097\jpt.h
# End Source File # End Source File
# Begin 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
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\cio.c SOURCE=..\libopenjpeg_097\mct.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\dwt.c SOURCE=..\libopenjpeg_097\mqc.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\fix.c SOURCE=..\libopenjpeg_097\mqc.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\int.c SOURCE=..\libopenjpeg_097\openjpeg.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\j2k.c SOURCE=..\libopenjpeg_097\pi.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\jp2.c SOURCE=..\libopenjpeg_097\pi.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\jpt.c SOURCE=..\libopenjpeg_097\raw.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\mct.c SOURCE=..\libopenjpeg_097\raw.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\mqc.c SOURCE=..\libopenjpeg_097\t1.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\pi.c SOURCE=..\libopenjpeg_097\t1.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\raw.c SOURCE=..\libopenjpeg_097\t2.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\t1.c SOURCE=..\libopenjpeg_097\t2.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\t2.c SOURCE=..\libopenjpeg_097\tcd.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\tcd.c SOURCE=..\libopenjpeg_097\tcd.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\tgt.c SOURCE=..\libopenjpeg_097\tgt.c
# End Source File
# Begin Source File
SOURCE=..\libopenjpeg_097\tgt.h
# End Source File # End Source File
# End Group
# End Group # End Group
# End Target # End Target
# End Project # End Project

87
mj2/MJ2_codec/mj2_to_frames.dsp
View File

@ -42,7 +42,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # 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 BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -65,7 +65,8 @@ LINK32=link.exe
# PROP Intermediate_Dir "mj2_to_frames___Win32_Debug0" # PROP Intermediate_Dir "mj2_to_frames___Win32_Debug0"
# PROP Target_Dir "" # 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 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 BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -157,149 +158,141 @@ SOURCE=.\mj2_to_frames.c
# End Source File # End Source File
# End Group # End Group
# End Group # End Group
# Begin Group "OpenJPEG" # Begin Group "Libopenjpeg_097"
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Group "OpenJPEG Header Files"
# PROP Default_Filter ".h"
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\bio.h SOURCE=..\libopenjpeg_097\bio.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\cio.h SOURCE=..\libopenjpeg_097\bio.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\dwt.h SOURCE=..\libopenjpeg_097\cio.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\fix.h SOURCE=..\libopenjpeg_097\cio.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\int.h SOURCE=..\libopenjpeg_097\dwt.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\j2k.h SOURCE=..\libopenjpeg_097\dwt.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\jp2.h SOURCE=..\libopenjpeg_097\fix.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\jpt.h SOURCE=..\libopenjpeg_097\fix.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\mct.h SOURCE=..\libopenjpeg_097\int.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\mqc.h SOURCE=..\libopenjpeg_097\int.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\openjpeg.h SOURCE=..\libopenjpeg_097\j2k.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\pi.h SOURCE=..\libopenjpeg_097\j2k.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\raw.h SOURCE=..\libopenjpeg_097\jp2.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\t1.h SOURCE=..\libopenjpeg_097\jp2.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\t2.h SOURCE=..\libopenjpeg_097\jpt.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\tcd.h SOURCE=..\libopenjpeg_097\jpt.h
# End Source File # End Source File
# Begin 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
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\cio.c SOURCE=..\libopenjpeg_097\mct.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\dwt.c SOURCE=..\libopenjpeg_097\mqc.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\fix.c SOURCE=..\libopenjpeg_097\mqc.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\int.c SOURCE=..\libopenjpeg_097\openjpeg.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\j2k.c SOURCE=..\libopenjpeg_097\pi.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\jp2.c SOURCE=..\libopenjpeg_097\pi.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\jpt.c SOURCE=..\libopenjpeg_097\raw.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\mct.c SOURCE=..\libopenjpeg_097\raw.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\mqc.c SOURCE=..\libopenjpeg_097\t1.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\pi.c SOURCE=..\libopenjpeg_097\t1.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\raw.c SOURCE=..\libopenjpeg_097\t2.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\t1.c SOURCE=..\libopenjpeg_097\t2.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\t2.c SOURCE=..\libopenjpeg_097\tcd.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\tcd.c SOURCE=..\libopenjpeg_097\tcd.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\tgt.c SOURCE=..\libopenjpeg_097\tgt.c
# End Source File
# Begin Source File
SOURCE=..\libopenjpeg_097\tgt.h
# End Source File # End Source File
# End Group
# End Group # End Group
# End Target # End Target
# End Project # End Project

90
mj2/MJ2_codec/mj2_to_metadata.dsp
View File

@ -41,7 +41,7 @@ RSC=rc.exe
# PROP Intermediate_Dir "Release" # PROP Intermediate_Dir "Release"
# PROP Target_Dir "" # PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # 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 BASE RSC /l 0x809 /d "NDEBUG"
# ADD RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -64,7 +64,7 @@ LINK32=link.exe
# PROP Intermediate_Dir "mj2_to_metadata___Win32_Debug0" # PROP Intermediate_Dir "mj2_to_metadata___Win32_Debug0"
# PROP Target_Dir "" # 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 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" /FR /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" /FR /YX /FD /GZ /c
# ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD BASE RSC /l 0x809 /d "_DEBUG"
# ADD RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG"
BSC32=bscmake.exe BSC32=bscmake.exe
@ -102,6 +102,10 @@ SOURCE=.\mj2.h
SOURCE=.\mj2_convert.h SOURCE=.\mj2_convert.h
# End Source File # End Source File
# Begin Source File
SOURCE=.\mj2_to_metadata.h
# End Source File
# End Group # End Group
# Begin Group "MJ2 Source Files" # Begin Group "MJ2 Source Files"
@ -128,149 +132,141 @@ SOURCE=.\mj2_to_metadata.c
# End Source File # End Source File
# End Group # End Group
# End Group # End Group
# Begin Group "OpenJPEG" # Begin Group "Libopenjpeg_097"
# PROP Default_Filter "" # PROP Default_Filter ""
# Begin Group "OpenJPEG Header Files"
# PROP Default_Filter ".h"
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\bio.h SOURCE=..\libopenjpeg_097\bio.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\cio.h SOURCE=..\libopenjpeg_097\bio.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\dwt.h SOURCE=..\libopenjpeg_097\cio.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\fix.h SOURCE=..\libopenjpeg_097\cio.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\int.h SOURCE=..\libopenjpeg_097\dwt.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\j2k.h SOURCE=..\libopenjpeg_097\dwt.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\jp2.h SOURCE=..\libopenjpeg_097\fix.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\jpt.h SOURCE=..\libopenjpeg_097\fix.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\mct.h SOURCE=..\libopenjpeg_097\int.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\mqc.h SOURCE=..\libopenjpeg_097\int.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\openjpeg.h SOURCE=..\libopenjpeg_097\j2k.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\pi.h SOURCE=..\libopenjpeg_097\j2k.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\raw.h SOURCE=..\libopenjpeg_097\jp2.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\t1.h SOURCE=..\libopenjpeg_097\jp2.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\t2.h SOURCE=..\libopenjpeg_097\jpt.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\tcd.h SOURCE=..\libopenjpeg_097\jpt.h
# End Source File # End Source File
# Begin 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
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\cio.c SOURCE=..\libopenjpeg_097\mct.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\dwt.c SOURCE=..\libopenjpeg_097\mqc.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\fix.c SOURCE=..\libopenjpeg_097\mqc.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\int.c SOURCE=..\libopenjpeg_097\openjpeg.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\j2k.c SOURCE=..\libopenjpeg_097\pi.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\jp2.c SOURCE=..\libopenjpeg_097\pi.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\jpt.c SOURCE=..\libopenjpeg_097\raw.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\mct.c SOURCE=..\libopenjpeg_097\raw.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\mqc.c SOURCE=..\libopenjpeg_097\t1.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\pi.c SOURCE=..\libopenjpeg_097\t1.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\raw.c SOURCE=..\libopenjpeg_097\t2.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\t1.c SOURCE=..\libopenjpeg_097\t2.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\t2.c SOURCE=..\libopenjpeg_097\tcd.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\tcd.c SOURCE=..\libopenjpeg_097\tcd.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\libopenjpeg\tgt.c SOURCE=..\libopenjpeg_097\tgt.c
# End Source File
# Begin Source File
SOURCE=..\libopenjpeg_097\tgt.h
# End Source File # End Source File
# End Group
# End Group # End Group
# End Target # End Target
# End Project # End Project

310
mj2/MJ2_codec/mj2_to_metadata.vcproj
View File

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