Commit Graph

727 Commits

Author SHA1 Message Date
Antonin Descampe e36881487d Patch to support the MSVC Win 64 builds (from szekerest) 2010-10-22 09:45:53 +00:00
Antonin Descampe 56dd722fb4 Currently the Visual Studio builds are broken in the SVN. Attached a patch to fix this issue (from szekerest) 2010-10-22 09:43:06 +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
Winfried a55ea39677 M CHANGES
M    jpwl/Makefile.in
M    jpwl/Makefile.am
2010-10-22 04:11:41 +00:00
Winfried fc668f3ec3 M configure
M    Makefile.in
M    configure.ac
A    libopenjpeg.pc.in
M    doc/Makefile.in
M    doc/Makefile.am
M    CHANGES
M    Makefile.am
2010-10-22 03:07:12 +00:00
Antonin Descampe c515199674 fixed help display (patch from winfried) 2010-10-21 09:53:13 +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
Antonin Descampe ddc9a278aa fixed options and help display (patch from winfried) 2010-10-19 10:06:47 +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
Winfried 03133377fa 2010-10-13 14:49:39 +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 72b6fdb04b fixed a bug in mj2.c that prevented extract_j2k_from_mj2 to build properly. Patch from winfried 2010-10-08 10:16:27 +00:00
Antonin Descampe 453af11e2c fixed CMakeLists.txt typo 2010-10-05 19:17:01 +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 531c0cf26f Reverting the use of #include "openjpegConfigure.h" until we find a compatible
way of doing this with autoconf, and with the default VS project files.
2010-09-08 22:40:11 +00:00
Luis Ibanez b7208fb525 ENH: Now forcing openjpeg_JPWL to be a STATIC library. 2010-09-07 22:29:56 +00:00
Luis Ibanez dc700d5d50 ENH: Now verifies if the OPJ_STATIC macro is not
already defined, before it defines it.
2010-09-07 22:24:12 +00:00
Luis Ibanez 00f7af7748 ENH: Including the new header file openjpegConfigure.h
in order to carry the definition of OPJ_STATIC 
     when building static libraries.
2010-09-07 22:05:17 +00:00
Luis Ibanez 9989de4bd0 COMP: adding trunk/codec/compat to the list of directories
that must be searched for header files.
2010-09-05 22:52:44 +00:00
Luis Ibanez fcbf45ca64 ENH: Removed redundant copies of getopt.c and getopt.h.
Now reusing the ones in codec/compat.
2010-09-05 21:59:25 +00:00
Luis Ibanez 509f7a64ea ENH: The logic for defining OPJ_STATIC has now been moved to the
openjpegConfigure.h file.
2010-09-05 21:37:14 +00:00
Luis Ibanez e80d147957 ENH: Adding symbols from traditional checks.
NOTE: the LCMS may still require CMake code for detecting the
     prescence of the library, of the use of CMake options for letting
     the user choose based on her preference.
2010-09-05 21:34:07 +00:00
Luis Ibanez 2cea89dc7d ENH: Adding a configured header file at the image of config.h. 2010-09-05 21:14:47 +00:00
Luis Ibanez 1a79adb3a9 COMP: PNG_LIBRARIES were missing for the TARGET_LINK_LIBRARIES command
of the executable targets.
2010-09-05 20:54:55 +00:00
Luis Ibanez 8dbd92f6c2 ENH: jpwl subdirectory is now build also on Unix systems.
As pointed out by Winfried and Antonin, there is no reason
     to exclude jpwl in Unix systems.
2010-09-05 20:50:17 +00:00
Luis Ibanez d22912349b ENH: Grouping the logic that detects getopt.c into a single .cmake file.
Multiple directories were repeating this configuration independently.
The directory jp3d is expected to be self-suficient so it still does
the configuration directly.
2010-09-05 20:15:05 +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 86864a2f6c ENH: Silencing warnings from Visual Studio regardgin security of string functions, that can't be resolved in a multi-platform manner anywasys. 2010-08-31 23:44:21 +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 9427107b94 COMP: Remove requirement that png and tiff headers must be in a specific directory relative to this one. 2010-08-31 23:35:03 +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
Antonin Descampe 3e8cad7e39 Update the XCode project file with JPWL targets 2010-08-30 10:15:32 +00:00
Antonin Descampe e4c4d146e1 Update the README.cmake file : an instruction was missing to run the tests correctly. 2010-08-30 10:14:34 +00:00
Mathieu Malaterre 34e592341c Fix case 2010-08-11 08:47:21 +00:00
Antonin Descampe 94b9942cd9 Update README and Makefiles to promote cmake. Fix the README.cmake file. 2010-07-07 13:00:39 +00:00
Antonin Descampe d5f9ea9fc2 Change CMakeLists.txt to build examples by default (image_to_j2k and j2k_to_image). 2010-07-02 12:44:22 +00:00
Mathieu Malaterre f6ed93253b Need to include png/tiff include path 2010-07-01 17:33:51 +00:00
Mathieu Malaterre 3479749499 Synchronize branch and trunk cmakelists files 2010-06-29 19:09:10 +00:00
Mathieu Malaterre 89eafad589 Synchronize branch and trunk cmakelists files 2010-06-29 19:08:58 +00:00
Mathieu Malaterre 8bb5a19905 return error code upon errors 2010-06-29 19:08:45 +00:00
Mathieu Malaterre 84f77a71e5 Sync with v2 branch 2010-06-22 19:06:29 +00:00
Mathieu Malaterre da0d29e4ab Merge with v2 branch 2010-06-22 17:32:19 +00:00
Mathieu Malaterre f30f4c744e Also dump the image info as well as cp info. 2010-06-22 14:03:52 +00:00
Mathieu Malaterre 6621494d9d Apply patch from w. szukalski (sent to list). Mon, Jun 21, 2010 at 5:49 PM 2010-06-22 11:55:36 +00:00
Mathieu Malaterre 2374885ac0 adding j2k_dump executable 2010-06-21 13:21:11 +00:00
Luis Ibanez 784cf66dc2 ENH: Added custom configuration for CTest. This allows to fine tune
the selection of files for code coverage computation, and also
     allows to filter out acceptable compiler warnings.
2010-05-26 23:44:07 +00:00
Luis Ibanez 6c641471b2 ENH: Cleaning up the file comments. Setting the build time to 3am UTC. 2010-05-26 23:07:59 +00:00