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

renamed jp3d/libjp3dvm/openjpeg.h => jp3d/libjp3dvm/openjpeg3d.h

This commit is contained in:
Antonin Descampe 2010-12-09 10:34:47 +00:00
parent c0fd0c8f89
commit 816d914c4e
16 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -6,6 +6,7 @@ What's New for OpenJPEG
+ : added + : added
December 9, 2010 December 9, 2010
! [antonin] renamed jp3d/libjp3dvm/openjpeg.h => jp3d/libjp3dvm/openjpeg3d.h
- [antonin] removed "codec/compat/" directory - [antonin] removed "codec/compat/" directory
* [szukw000] updated Makefile.in * [szukw000] updated Makefile.in
! [szukw000] removed LCMS dependencies from Makefile.am/Makefile.nix ! [szukw000] removed LCMS dependencies from Makefile.am/Makefile.nix

6
jp3d/DllJp3dVM.dsp
View File

@ -57,7 +57,7 @@ LINK32=link.exe
# 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 /nologo /dll /machine:I386 /out:"Release/OpenJPEG.dll" # 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 /nologo /dll /machine:I386 /out:"Release/OpenJPEG.dll"
# Begin Special Build Tool # Begin Special Build Tool
SOURCE="$(InputPath)" SOURCE="$(InputPath)"
PostBuild_Cmds=if not exist dist mkdir dist copy libopenjpeg\openjpeg.h dist copy Release\OpenJPEG.dll dist copy Release\OpenJPEG.lib dist PostBuild_Cmds=if not exist dist mkdir dist copy libopenjpeg\openjpeg3d.h dist copy Release\OpenJPEG.dll dist copy Release\OpenJPEG.lib dist
# End Special Build Tool # End Special Build Tool
!ELSEIF "$(CFG)" == "DllOpenJPEG - Win32 Debug" !ELSEIF "$(CFG)" == "DllOpenJPEG - Win32 Debug"
@ -88,7 +88,7 @@ LINK32=link.exe
# 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 /nologo /dll /debug /machine:I386 /out:"Debug/OpenJPEGd.dll" /pdbtype:sept # 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 /nologo /dll /debug /machine:I386 /out:"Debug/OpenJPEGd.dll" /pdbtype:sept
# Begin Special Build Tool # Begin Special Build Tool
SOURCE="$(InputPath)" SOURCE="$(InputPath)"
PostBuild_Cmds=if not exist dist mkdir dist copy libopenjpeg\openjpeg.h dist copy Debug\OpenJPEGd.dll dist copy Debug\OpenJPEGd.lib dist PostBuild_Cmds=if not exist dist mkdir dist copy libopenjpeg\openjpeg3d.h dist copy Debug\OpenJPEGd.dll dist copy Debug\OpenJPEGd.lib dist
# End Special Build Tool # End Special Build Tool
!ENDIF !ENDIF
@ -230,7 +230,7 @@ SOURCE=.\libopenjpeg\mqc.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\libopenjpeg\openjpeg.h SOURCE=.\libopenjpeg\openjpeg3d.h
# End Source File # End Source File
# Begin Source File # Begin Source File

6
jp3d/DllJp3dVM.vcproj
View File

@ -54,7 +54,7 @@
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="if not exist bin mkdir bin CommandLine="if not exist bin mkdir bin
copy libjp3dvm\openjpeg.h bin copy libjp3dvm\openjpeg3d.h bin
copy Release\OpenJP3D.dll bin copy Release\OpenJP3D.dll bin
copy Release\OpenJP3D.lib bin copy Release\OpenJP3D.lib bin
"/> "/>
@ -120,7 +120,7 @@ copy Release\OpenJP3D.lib bin
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="if not exist bin mkdir bin CommandLine="if not exist bin mkdir bin
copy libjp3dvm\openjpeg.h bin copy libjp3dvm\openjpeg3d.h bin
copy Debug\OpenJP3D.dll bin copy Debug\OpenJP3D.dll bin
"/> "/>
<Tool <Tool
@ -238,7 +238,7 @@ copy Debug\OpenJP3D.dll bin
RelativePath=".\libjp3dvm\mqc.h"> RelativePath=".\libjp3dvm\mqc.h">
</File> </File>
<File <File
RelativePath=".\libjp3dvm\openjpeg.h"> RelativePath=".\libjp3dvm\openjpeg3d.h">
</File> </File>
<File <File
RelativePath=".\libjp3dvm\opj_includes.h"> RelativePath=".\libjp3dvm\opj_includes.h">

6
jp3d/LibJp3dVM.vcproj
View File

@ -46,7 +46,7 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="if not exist bin mkdir bin CommandLine="if not exist bin mkdir bin
copy Release\LibJp3dVM.lib bin copy Release\LibJp3dVM.lib bin
copy libjp3dvm\openjpeg.h bin copy libjp3dvm\openjpeg3d.h bin
"/> "/>
<Tool <Tool
Name="VCPreBuildEventTool"/> Name="VCPreBuildEventTool"/>
@ -98,7 +98,7 @@ copy libjp3dvm\openjpeg.h bin
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="if not exist bin mkdir bin CommandLine="if not exist bin mkdir bin
copy Debug\LibJp3dVM.lib bin copy Debug\LibJp3dVM.lib bin
copy libjp3dvm\openjpeg.h bin copy libjp3dvm\openjpeg3d.h bin
"/> "/>
<Tool <Tool
Name="VCPreBuildEventTool"/> Name="VCPreBuildEventTool"/>
@ -213,7 +213,7 @@ copy libjp3dvm\openjpeg.h bin
RelativePath=".\libjp3dvm\mqc.h"> RelativePath=".\libjp3dvm\mqc.h">
</File> </File>
<File <File
RelativePath=".\libjp3dvm\openjpeg.h"> RelativePath=".\libjp3dvm\openjpeg3d.h">
</File> </File>
<File <File
RelativePath=".\libjp3dvm\opj_includes.h"> RelativePath=".\libjp3dvm\opj_includes.h">

6
jp3d/Makefile.nix
View File

@ -15,7 +15,7 @@ INCLS = ./libjp3dvm/t1_3d.h ./libjp3dvm/bio.h ./libjp3dvm/cio.h \
./libjp3dvm/dwt.h ./libjp3dvm/event.h ./libjp3dvm/fix.h \ ./libjp3dvm/dwt.h ./libjp3dvm/event.h ./libjp3dvm/fix.h \
./libjp3dvm/int.h ./libjp3dvm/jp3d.h ./libjp3dvm/jp3d_lib.h \ ./libjp3dvm/int.h ./libjp3dvm/jp3d.h ./libjp3dvm/jp3d_lib.h \
./libjp3dvm/volume.h ./libjp3dvm/mct.h ./libjp3dvm/mqc.h \ ./libjp3dvm/volume.h ./libjp3dvm/mct.h ./libjp3dvm/mqc.h \
./libjp3dvm/openjpeg.h ./libjp3dvm/pi.h ./libjp3dvm/raw.h \ ./libjp3dvm/openjpeg3d.h ./libjp3dvm/pi.h ./libjp3dvm/raw.h \
./libjp3dvm/t1.h ./libjp3dvm/t2.h ./libjp3dvm/tcd.h \ ./libjp3dvm/t1.h ./libjp3dvm/t2.h ./libjp3dvm/tcd.h \
./libjp3dvm/tgt.h ./libjp3dvm/opj_includes.h ./libjp3dvm/tgt.h ./libjp3dvm/opj_includes.h
@ -83,8 +83,8 @@ ifeq ($(ENABLE_SHARED),yes)
endif endif
$(LDCONFIG) $(LDCONFIG)
install -d $(DESTDIR)$(INSTALL_INCLUDE) install -d $(DESTDIR)$(INSTALL_INCLUDE)
rm -f $(DESTDIR)$(INSTALL_INCLUDE)/openjpeg.h rm -f $(DESTDIR)$(INSTALL_INCLUDE)/openjpeg3d.h
install -m 644 -o root -g root libjp3dvm/openjpeg.h \ install -m 644 -o root -g root libjp3dvm/openjpeg3d.h \
$(DESTDIR)$(INSTALL_INCLUDE)/openjpeg3d.h $(DESTDIR)$(INSTALL_INCLUDE)/openjpeg3d.h
(cd $(DESTDIR)$(prefix)/include && \ (cd $(DESTDIR)$(prefix)/include && \
ln -sf $(headerdir)/openjpeg3d.h openjpeg3d.h) ln -sf $(headerdir)/openjpeg3d.h openjpeg3d.h)

2
jp3d/codec/convert.c
View File

@ -31,7 +31,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "../libjp3dvm/openjpeg.h" #include "../libjp3dvm/openjpeg3d.h"
#ifdef _WIN32 #ifdef _WIN32
#include "windirent.h" #include "windirent.h"
#else #else

2
jp3d/codec/jp3d_to_volume.c
View File

@ -33,7 +33,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>
#include "../libjp3dvm/openjpeg.h" #include "../libjp3dvm/openjpeg3d.h"
#include "getopt.h" #include "getopt.h"
#include "convert.h" #include "convert.h"

2
jp3d/codec/volume_to_jp3d.c
View File

@ -32,7 +32,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "../libjp3dvm/openjpeg.h" #include "../libjp3dvm/openjpeg3d.h"
#include "getopt.h" #include "getopt.h"
#include "convert.h" #include "convert.h"

4
jp3d/libjp3dvm/CMakeLists.txt
View File

@ -37,8 +37,8 @@ DESTINATION ${OPENJPEG_INSTALL_LIB_DIR} COMPONENT Libraries
) )
# Install includes files # Install includes files
INSTALL(FILES openjpeg.h INSTALL(FILES openjpeg3d.h
DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg3d-1.3 DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg3d-1.3
RENAME openjpeg3d.h) )
INSTALL(CODE INSTALL(CODE
"EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg3d-1.3/openjpeg3d.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg3d.h)") "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg3d-1.3/openjpeg3d.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg3d.h)")

4
jp3d/libjp3dvm/Makefile.am
View File

@ -19,7 +19,7 @@ INCLS = t1_3d.h bio.h cio.h dwt.h event.h fix.h int.h jp3d.h jp3d_lib.h \
libopenjp3dvm_la_SOURCES = $(SRCS) $(INCLS) libopenjp3dvm_la_SOURCES = $(SRCS) $(INCLS)
includedir = ${prefix}/include/openjpeg3d-$(MAJOR).$(MINOR) includedir = ${prefix}/include/openjpeg3d-$(MAJOR).$(MINOR)
include_HEADERS = openjpeg.h include_HEADERS = openjpeg3d.h
# Converts cr/lf to just lf # Converts cr/lf to just lf
DOS2UNIX = dos2unix DOS2UNIX = dos2unix
@ -56,7 +56,7 @@ all-local:
install-data-hook: install-data-hook:
(cd $(DESTDIR)${prefix}/include && rm -f openjpeg3d.h) (cd $(DESTDIR)${prefix}/include && rm -f openjpeg3d.h)
(cd ${prefix}/include/${headerdir} && mv openjpeg.h openjpeg3d.h) (cd ${prefix}/include/${headerdir} && mv openjpeg3d.h openjpeg3d.h)
(cd $(DESTDIR)${prefix}/include && \ (cd $(DESTDIR)${prefix}/include && \
$(LN_S) ${headerdir}/openjpeg3d.h openjpeg3d.h) $(LN_S) ${headerdir}/openjpeg3d.h openjpeg3d.h)

4
jp3d/libjp3dvm/Makefile.in
View File

@ -258,7 +258,7 @@ INCLS = t1_3d.h bio.h cio.h dwt.h event.h fix.h int.h jp3d.h jp3d_lib.h \
volume.h mct.h mqc.h pi.h raw.h t1.h t2.h tcd.h tgt.h opj_includes.h volume.h mct.h mqc.h pi.h raw.h t1.h t2.h tcd.h tgt.h opj_includes.h
libopenjp3dvm_la_SOURCES = $(SRCS) $(INCLS) libopenjp3dvm_la_SOURCES = $(SRCS) $(INCLS)
include_HEADERS = openjpeg.h include_HEADERS = openjpeg3d.h
# Converts cr/lf to just lf # Converts cr/lf to just lf
DOS2UNIX = dos2unix DOS2UNIX = dos2unix
@ -634,7 +634,7 @@ all-local:
install-data-hook: install-data-hook:
(cd $(DESTDIR)${prefix}/include && rm -f openjpeg3d.h) (cd $(DESTDIR)${prefix}/include && rm -f openjpeg3d.h)
(cd ${prefix}/include/${headerdir} && mv openjpeg.h openjpeg3d.h) (cd ${prefix}/include/${headerdir} && mv openjpeg3d.h openjpeg3d.h)
(cd $(DESTDIR)${prefix}/include && \ (cd $(DESTDIR)${prefix}/include && \
$(LN_S) ${headerdir}/openjpeg3d.h openjpeg3d.h) $(LN_S) ${headerdir}/openjpeg3d.h openjpeg3d.h)

2
jp3d/libjp3dvm/cio.h
View File

@ -40,7 +40,7 @@ The functions in CIO.C have for goal to realize a byte input / output process.
/** @defgroup CIO CIO - byte input-output stream */ /** @defgroup CIO CIO - byte input-output stream */
/*@{*/ /*@{*/
/** @name Funciones generales (see also openjpeg.h) */ /** @name Funciones generales (see also openjpeg3d.h) */
/*@{*/ /*@{*/
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
/** /**

2
jp3d/libjp3dvm/event.h
View File

@ -39,7 +39,7 @@ The functions in EVENT.C have for goal to send output messages (errors, warnings
/** @defgroup EVENT EVENT - Implementation of a event callback system */ /** @defgroup EVENT EVENT - Implementation of a event callback system */
/*@{*/ /*@{*/
/** @name Funciones generales (see also openjpeg.h) */ /** @name Funciones generales (see also openjpeg3d.h) */
/*@{*/ /*@{*/
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
/** /**

2
jp3d/libjp3dvm/int.h
View File

@ -39,7 +39,7 @@ The functions in INT.H have for goal to realize operations on integers.
/** @defgroup INT INT - Implementation of operations on integers */ /** @defgroup INT INT - Implementation of operations on integers */
/*@{*/ /*@{*/
/** @name Funciones generales (see also openjpeg.h) */ /** @name Funciones generales (see also openjpeg3d.h) */
/*@{*/ /*@{*/
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
/** /**

0
jp3d/libjp3dvm/openjpeg.h → jp3d/libjp3dvm/openjpeg3d.h
View File

2
jp3d/libjp3dvm/opj_includes.h
View File

@ -46,7 +46,7 @@
OpenJPEG interface OpenJPEG interface
========================================================== ==========================================================
*/ */
#include "openjpeg.h" #include "openjpeg3d.h"
/* /*
========================================================== ==========================================================