]> granicus.if.org Git - openjpeg/commit
[1.5] backport r1017, r1030:1032 from trunk + additional fix for cmake and autotools
authorAntonin Descampe <antonin@gmail.com>
Wed, 2 Nov 2011 00:49:20 +0000 (00:49 +0000)
committerAntonin Descampe <antonin@gmail.com>
Wed, 2 Nov 2011 00:49:20 +0000 (00:49 +0000)
commit238b7679173c36fb3c838c252591278fa0e93c4d
tree22b4e021c7025a7d9cec042ba3238eb88765d06e
parent49a0f0db8fe8c85f3e808e4857ee48322c47dcea
[1.5] backport r1017, r1030:1032 from trunk + additional fix for cmake and autotools
84 files changed:
applications/jpip/CHANGES
applications/jpip/CMakeLists.txt
applications/jpip/Makefile.am
applications/jpip/Makefile.nix
applications/jpip/libopenjpip/CMakeLists.txt
applications/jpip/libopenjpip/Makefile.am
applications/jpip/libopenjpip/cache_manager.c [moved from applications/jpip/opj_client/opj_dec_server/cache_manager.c with 100% similarity]
applications/jpip/libopenjpip/cache_manager.h [moved from applications/jpip/opj_client/opj_dec_server/cache_manager.h with 100% similarity]
applications/jpip/libopenjpip/channel_manager.c [moved from applications/jpip/opj_server/channel_manager.c with 100% similarity]
applications/jpip/libopenjpip/channel_manager.h [moved from applications/jpip/opj_server/channel_manager.h with 100% similarity]
applications/jpip/libopenjpip/comMakefile.mk
applications/jpip/libopenjpip/dec_clientmsg_handler.c [moved from applications/jpip/opj_client/opj_dec_server/dec_clientmsg_handler.c with 63% similarity]
applications/jpip/libopenjpip/dec_clientmsg_handler.h [new file with mode: 0644]
applications/jpip/libopenjpip/imgsock_manager.c [moved from applications/jpip/opj_client/opj_dec_server/imgsock_manager.c with 100% similarity]
applications/jpip/libopenjpip/imgsock_manager.h [moved from applications/jpip/opj_client/opj_dec_server/imgsock_manager.h with 100% similarity]
applications/jpip/libopenjpip/jp2k_decoder.c [moved from applications/jpip/opj_client/opj_dec_server/jp2k_decoder.c with 98% similarity]
applications/jpip/libopenjpip/jp2k_decoder.h [moved from applications/jpip/opj_client/opj_dec_server/jp2k_decoder.h with 100% similarity]
applications/jpip/libopenjpip/jpip_parser.c [moved from applications/jpip/opj_server/jpip_parser.c with 80% similarity]
applications/jpip/libopenjpip/jpip_parser.h [new file with mode: 0644]
applications/jpip/libopenjpip/jpipstream_manager.c [moved from applications/jpip/opj_client/opj_dec_server/jpipstream_manager.c with 99% similarity]
applications/jpip/libopenjpip/jpipstream_manager.h [moved from applications/jpip/opj_client/opj_dec_server/jpipstream_manager.h with 100% similarity]
applications/jpip/libopenjpip/openjpip.c [new file with mode: 0644]
applications/jpip/libopenjpip/openjpip.h [new file with mode: 0644]
applications/jpip/libopenjpip/query_parser.c [moved from applications/jpip/opj_server/query_parser.c with 89% similarity]
applications/jpip/libopenjpip/query_parser.h [moved from applications/jpip/opj_server/query_parser.h with 91% similarity]
applications/jpip/libopenjpip/session_manager.c [moved from applications/jpip/opj_server/session_manager.c with 100% similarity]
applications/jpip/libopenjpip/session_manager.h [moved from applications/jpip/opj_server/session_manager.h with 100% similarity]
applications/jpip/opj_client/CMakeLists.txt [deleted file]
applications/jpip/opj_client/Makefile.am [deleted file]
applications/jpip/opj_client/opj_dec_server/CMakeLists.txt [deleted file]
applications/jpip/opj_client/opj_dec_server/Makefile.am [deleted file]
applications/jpip/opj_client/opj_dec_server/Makefile.nix [deleted file]
applications/jpip/opj_client/opj_viewer/dist/opj_viewer.jar [deleted symlink]
applications/jpip/opj_client/opj_viewer_xerces/dist/opj_viewer_xerces.jar [deleted symlink]
applications/jpip/opj_server/CMakeLists.txt [deleted file]
applications/jpip/opj_server/Makefile.am [deleted file]
applications/jpip/opj_server/Makefile.nix [deleted file]
applications/jpip/tools/CMakeLists.txt [deleted file]
applications/jpip/tools/Makefile.am [deleted file]
applications/jpip/tools/Makefile.nix [deleted file]
applications/jpip/tools/jpip_to_j2k.c [deleted file]
applications/jpip/tools/jpip_to_jp2.c [deleted file]
applications/jpip/util/CMakeLists.txt [new file with mode: 0644]
applications/jpip/util/Makefile.am [new file with mode: 0644]
applications/jpip/util/Makefile.nix [new file with mode: 0644]
applications/jpip/util/addXMLinJP2.c [moved from applications/jpip/tools/addXMLinJP2.c with 100% similarity]
applications/jpip/util/jpip_to_j2k.c [moved from applications/jpip/opj_server/jpip_parser.h with 62% similarity]
applications/jpip/util/jpip_to_jp2.c [moved from applications/jpip/opj_client/opj_dec_server/dec_clientmsg_handler.h with 62% similarity]
applications/jpip/util/opj_dec_server.c [moved from applications/jpip/opj_client/opj_dec_server/opj_dec_server.c with 78% similarity]
applications/jpip/util/opj_server.c [moved from applications/jpip/opj_server/opj_server.c with 73% similarity]
applications/jpip/util/opj_viewer/build.xml [moved from applications/jpip/opj_client/opj_viewer/build.xml with 100% similarity]
applications/jpip/util/opj_viewer/dist/manifest.txt [moved from applications/jpip/opj_client/opj_viewer/dist/manifest.txt with 100% similarity]
applications/jpip/util/opj_viewer/dist/opj_viewer-20111018.jar [moved from applications/jpip/opj_client/opj_viewer/dist/opj_viewer-20111018.jar with 100% similarity]
applications/jpip/util/opj_viewer/dist/opj_viewer-20111026.jar [new file with mode: 0644]
applications/jpip/util/opj_viewer/dist/opj_viewer.jar [new symlink]
applications/jpip/util/opj_viewer/src/ImageManager.java [moved from applications/jpip/opj_client/opj_viewer/src/ImageManager.java with 100% similarity]
applications/jpip/util/opj_viewer/src/ImageViewer.java [moved from applications/jpip/opj_client/opj_viewer/src/ImageViewer.java with 100% similarity]
applications/jpip/util/opj_viewer/src/ImageWindow.java [moved from applications/jpip/opj_client/opj_viewer/src/ImageWindow.java with 100% similarity]
applications/jpip/util/opj_viewer/src/ImgdecClient.java [moved from applications/jpip/opj_client/opj_viewer/src/ImgdecClient.java with 100% similarity]
applications/jpip/util/opj_viewer/src/JPIPHttpClient.java [moved from applications/jpip/opj_client/opj_viewer/src/JPIPHttpClient.java with 98% similarity]
applications/jpip/util/opj_viewer/src/MML.java [moved from applications/jpip/opj_client/opj_viewer/src/MML.java with 100% similarity]
applications/jpip/util/opj_viewer/src/PnmImage.java [moved from applications/jpip/opj_client/opj_viewer/src/PnmImage.java with 100% similarity]
applications/jpip/util/opj_viewer/src/RegimViewer.java [moved from applications/jpip/opj_client/opj_viewer/src/RegimViewer.java with 100% similarity]
applications/jpip/util/opj_viewer/src/ResizeListener.java [moved from applications/jpip/opj_client/opj_viewer/src/ResizeListener.java with 100% similarity]
applications/jpip/util/opj_viewer_xerces/build.xml [moved from applications/jpip/opj_client/opj_viewer_xerces/build.xml with 100% similarity]
applications/jpip/util/opj_viewer_xerces/dist/manifest.txt [moved from applications/jpip/opj_client/opj_viewer_xerces/dist/manifest.txt with 100% similarity]
applications/jpip/util/opj_viewer_xerces/dist/opj_viewer_xerces-20111010.jar [moved from applications/jpip/opj_client/opj_viewer_xerces/dist/opj_viewer_xerces-20111010.jar with 100% similarity]
applications/jpip/util/opj_viewer_xerces/dist/opj_viewer_xerces-20111026.jar [new file with mode: 0644]
applications/jpip/util/opj_viewer_xerces/dist/opj_viewer_xerces.jar [new symlink]
applications/jpip/util/opj_viewer_xerces/src/ImageManager.java [moved from applications/jpip/opj_client/opj_viewer_xerces/src/ImageManager.java with 100% similarity]
applications/jpip/util/opj_viewer_xerces/src/ImageViewer.java [moved from applications/jpip/opj_client/opj_viewer_xerces/src/ImageViewer.java with 100% similarity]
applications/jpip/util/opj_viewer_xerces/src/ImageWindow.java [moved from applications/jpip/opj_client/opj_viewer_xerces/src/ImageWindow.java with 100% similarity]
applications/jpip/util/opj_viewer_xerces/src/ImgdecClient.java [moved from applications/jpip/opj_client/opj_viewer_xerces/src/ImgdecClient.java with 100% similarity]
applications/jpip/util/opj_viewer_xerces/src/JP2XMLparser.java [moved from applications/jpip/opj_client/opj_viewer_xerces/src/JP2XMLparser.java with 100% similarity]
applications/jpip/util/opj_viewer_xerces/src/JPIPHttpClient.java [moved from applications/jpip/opj_client/opj_viewer_xerces/src/JPIPHttpClient.java with 100% similarity]
applications/jpip/util/opj_viewer_xerces/src/MML.java [moved from applications/jpip/opj_client/opj_viewer_xerces/src/MML.java with 100% similarity]
applications/jpip/util/opj_viewer_xerces/src/OptionPanel.java [moved from applications/jpip/opj_client/opj_viewer_xerces/src/OptionPanel.java with 100% similarity]
applications/jpip/util/opj_viewer_xerces/src/PnmImage.java [moved from applications/jpip/opj_client/opj_viewer_xerces/src/PnmImage.java with 100% similarity]
applications/jpip/util/opj_viewer_xerces/src/RegimViewer.java [moved from applications/jpip/opj_client/opj_viewer_xerces/src/RegimViewer.java with 100% similarity]
applications/jpip/util/opj_viewer_xerces/src/ResizeListener.java [moved from applications/jpip/opj_client/opj_viewer_xerces/src/ResizeListener.java with 100% similarity]
applications/jpip/util/test_index.c [moved from applications/jpip/tools/test_index.c with 57% similarity]
configure.ac
libopenjpeg/phix_manager.c
libopenjpeg/ppix_manager.c