Commit Graph

37 Commits

Author SHA1 Message Date
Antonin Descampe 75fa7a8d87 remove more obsolete VS files. Left only mj2_to_metadata VS files, as this is the only executable not yet handled by CMake 2011-01-24 22:28:21 +00:00
Rex Dieter 3f234ac21b remove (autotools) generated files 2011-01-17 18:45:33 +00:00
Winfried 7441340ab5 changed report code in Makefile.am 2011-01-07 03:20:58 +00:00
Antonin Descampe 73a6ed7c21 bug fixes to enable cmake compilation on WIN32 platform (see CHANGES for details) 2011-01-02 18:10:09 +00:00
Winfried 398b3f08b0 Adapted Makefile.am/Makefile.nix to build choice: shared xor static 2010-12-14 03:33:31 +00:00
Antonin Descampe 1dd92890d7 fixed flags when building jp3d with MinGW 2010-12-11 23:23:02 +00:00
Winfried 436d2f4bb9 Changed build choice in configure.ac/Makefile.am/Makefile.nix: shared xor static 2010-12-10 04:27:40 +00:00
Antonin Descampe 0264197f3f removed LCMS dependency in jp3d/libjp3dvm/CMakeLists.txt 2010-12-09 21:44:20 +00:00
Antonin Descampe 816d914c4e renamed jp3d/libjp3dvm/openjpeg.h => jp3d/libjp3dvm/openjpeg3d.h 2010-12-09 10:34:47 +00:00
Winfried ebcda80583 Updated Makefile.in 2010-12-09 01:23:46 +00:00
Antonin Descampe d08a96e251 (thanks to Winfried for his help)
* [antonin] changed remaining "WIN32" to "_WIN32"
! [antonin] libopenjpeg has no more dependency on LCMS lib. Everything concerning color (icc profile, conversion to rgb, etc) has been put outside libopenjpeg and is used in j2k_to_image.c and mj2_to_frames.c.
- [antonin] removed "opj_convert{.c,.h}"
+ [antonin] added a directory "common/" that contains "getopt{.c,.h}" (previously in "codec/compat").
+ [antonin] added files "color{.c,.h}" in "common/" that define the code for icc profile management and sycc_to_rgb conversion
+ [antonin] added "common/format_defs.h" that contains common definitions used in image_to_j2k, j2k_to_image, j2k_dump.
2010-12-08 11:06:41 +00:00
Antonin Descampe 59d9b97ffe revert to previous behaviour for cmake: builds (and links) dynamically by default. Static build only if -DBUILD_SHARED_LIBS is set to OFF. 2010-12-05 15:19:57 +00:00
Antonin Descampe eb5694ca2a changed cmake behaviour: executables are now always statically linked. When -DBUIL_SHARED_LIBS option is ON (the default), the shared versions of the libraries are also built (but executables remain linked against the static libraries). 2010-11-28 17:07:04 +00:00
Antonin Descampe 223a39b51e minor changes in cmake files (from winfried) 2010-11-17 10:26:05 +00:00
Antonin Descampe 005b1b1a4b removed call to dirent.h in jp3d 2010-11-11 11:37:45 +00:00
Ben Boeckel af32de46a2 Installation fixes when using CMake 2010-10-26 16:46:01 +00:00
Ben Boeckel f35d25c674 Fix jp3dvm version 2010-10-25 16:04:09 +00:00
Ben Boeckel bb9232c9d9 Don't clobber openjpeg.h from jp3d 2010-10-22 18:41:49 +00:00
Winfried c2f441840f M libopenjpeg/Makefile.in
M    libopenjpeg/Makefile.am
M    jp3d/libjp3dvm/Makefile.in
M    jp3d/libjp3dvm/Makefile.am
M    CHANGES
M    jpwl/Makefile.in
M    jpwl/Makefile.am
2010-10-22 08:51:38 +00:00
Antonin Descampe b6102e207c fixed paths to png and tiff in CMakeLists.txt and fixed link to lcms library (patch from winfried) 2010-10-21 09:49:54 +00:00
Winfried e65ef3a24f M jp3d/Makefile.nix
M    config.nix
M    doc/Makefile.in
M    doc/Makefile.am
M    doc/Makefile.nix
M    CHANGES
M    jpwl/Makefile.nix
M    Makefile.nix
2010-10-18 00:17:19 +00:00
Winfried f4b08bacb0 -This line, and those below, will be ignored--
M    configure
M    Makefile.in
M    opj_config.h.in.user
M    mj2/Makefile.in
M    mj2/Makefile.am
M    mj2/Makefile.nix
M    libopenjpeg/Makefile.in
M    jp3d/Makefile.in
M    jp3d/libjp3dvm/Makefile.in
M    jp3d/Makefile.nix
M    jp3d/codec/Makefile.in
M    jp3d/codec/Makefile.am
M    config.nix
M    configure.ac
M    doc/Makefile.in
M    doc/Makefile.am
M    doc/Makefile.nix
M    INSTALL
M    CHANGES
M    jpwl/Makefile.in
M    jpwl/Makefile.am
M    jpwl/Makefile.nix
M    Makefile.am
M    Makefile.nix
M    codec/Makefile.in
M    codec/Makefile.am
2010-10-17 22:42:46 +00:00
Winfried ae6cf3da7d 2010-10-13 15:16:48 +00:00
Antonin Descampe 106da2f51e 1. The jp3d/libjp3dvm/Makefile.am has been changed:
Installing: /usr/local/TEST_CONFIG/include/openjpeg3d-1.3/
Installing: /usr/local/TEST_CONFIG/include/openjpeg3d-1.3/openjpeg3d.h

PREFIX/include:

   23  openjpeg.h -> openjpeg-1.4/openjpeg.h
   27  openjpeg3d.h -> openjpeg3d-1.3/openjpeg3d.h

28773  openjpeg-1.4/openjpeg.h
22158  openjpeg3d-1.3/openjpeg3d.h
	
2. The jp3d/Makefile.nix has been changed respectivly.
	
3. The mj2/Makefile.nix contained a wrong path to 'compat/'
	
4. opj_config.h.in.user contained a comment within a comment.
	
5. 'autoreconf' reported that AC_PROG_RANLIB is no longer necessary in 'configure.ac'.
2010-10-10 21:17:18 +00:00
Antonin Descampe eeefefd56c Added files to let people build openjpeg with configure tools ; Added makefiles to let people manually build openjpeg on *nix platforms ; Removed obsolete Makefiles ; Renamed dirent.h to windirent.h ; Made optional the PNG, TIFF, and LCMS support in CMake files ; Added opj_config* files to configure openjpeg before building it (opj_config.h generated by configure, cmake, or manually by the user) ; Renamed this file from ChangeLog to CHANGES ; Renamed License.txt to LICENSE ; Updated README files ; Added INSTALL and LICENSE files ; Added man pages 2010-10-05 10:33:15 +00:00
Luis Ibanez 26e8f3fd28 COMP: Fixing configuration for static builds. Fixing dependencies that several
executables have on getopt.c, convert.c and index.c.

Some refactoring is going to be required in order to have a cleaner
configuration process and make it easier to maintain.
2010-09-01 00:52:26 +00:00
Luis Ibanez 7c65e4c14b STYLE: This file had inconsistent ends of line (mixture of DOS and UNIX). 2010-08-31 23:38:44 +00:00
Luis Ibanez a56fbe42a4 COMP: Moving to the parent directory the set INCLUDE_DIRECTORIES command.
Given that files in "codec" look for files in "libjp3dvm", and files in
"libjp3dvm" look for header files in "codec".
2010-08-31 23:37:21 +00:00
Luis Ibanez 75c589958a BUG: The directory compat doesn't exist. The file getopt.c is actually at this level. 2010-08-31 23:27:19 +00:00
Francois-Olivier Devaux 203a264f96 [v1.4] Fixed pi.c bug (issue 15 on google code). Thanks to Anton Lionel for catching this. 2010-04-08 18:43:03 +00:00
Francois-Olivier Devaux 6628a4df45 Fixed JP3D codec file format analyzer. Thanks to Kristóf Ralovich for this patch. 2010-04-08 17:34:40 +00:00
Francois-Olivier Devaux 34c485169e Applied changes to jp3d_to_volume.c that didn't pass in previous revision (rev545) 2010-02-19 13:37:27 +00:00
Francois-Olivier Devaux cb4702b4c5 JP3D Module. Fixed issue when computing the number of elements in an array that leads to crash (thanks Kristof). Updated JP3D makefiles. 2010-02-18 16:36:21 +00:00
Mathieu Malaterre b4dc6fc133 ENH: add cmake for jp3d 2007-09-06 10:51:38 +00:00
Mathieu Malaterre 0533b5b78e Move include file that collides with system include to the correct directory (no need to be present for the lib, only codec need it) 2007-09-06 10:49:19 +00:00
Francois-Olivier Devaux 38137b033a JP3D library Binaries removed from SVN. 2007-05-10 14:34:05 +00:00
Antonin Descampe 480021bc33 initial release of jp3d library and codec 2006-10-30 15:32:50 +00:00