Commit Graph

177 Commits

Author SHA1 Message Date
Antonin Descampe c0fd0c8f89 removed "codec/compat/" directory 2010-12-09 10:23:13 +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 cf39198a9a added a definition in getopt.h and an initial value in convert.c 2010-12-05 15:10:10 +00:00
Antonin Descampe 1c2ed5cc33 fixed a bug in codec/convert.c that prevented to build executables with WIN32 compiler (thanks winfried) 2010-11-28 18:40: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 d5b44a98bc reverted 'include "../opj_config.h"' to 'include "opj_config.h"' 2010-11-22 11:48:19 +00:00
Antonin Descampe 3afd3b1afd install man pages by default. install CHANGES and LICENSE 2010-11-17 10:59:21 +00:00
Antonin Descampe 161891a06e changed imagetopng() function to correctly deal with non-standard bit-depths. Add png support for win32. (from winfried) 2010-11-15 11:10:26 +00:00
Antonin Descampe 709068ef5b minor changes in header inclusions 2010-11-15 11:08:03 +00:00
Antonin Descampe c515199674 fixed help display (patch from winfried) 2010-10-21 09:53:13 +00:00
Antonin Descampe ddc9a278aa fixed options and help display (patch from winfried) 2010-10-19 10:06:47 +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 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 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 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 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 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
Mathieu Malaterre f6ed93253b Need to include png/tiff include path 2010-07-01 17:33:51 +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
Mathieu Malaterre a1b6f1e096 Reactivate ctest 2010-05-26 09:45:12 +00:00
Francois-Olivier Devaux d03779ee2a Added support for "jpc" codestreams which are equivalent to "j2c" codestreams [v1.4]. Thanks to Winfried for this patch 2010-03-26 16:07:08 +00:00
Francois-Olivier Devaux 3e4b0ee509 Added support for PNG image format [Not yet functional under WIN32]. Thanks to Winfried for this patch. See details here http://code.google.com/p/openjpeg/issues/detail?id=16 2010-03-26 15:46:17 +00:00
Francois-Olivier Devaux 54214fb65f Code improvements using 'g++-4.4.0' to trace the code (v1.4). Thanks to Winfried for this patch. 2010-03-24 11:20:45 +00:00
Francois-Olivier Devaux 3ecae15da2 Fixed small compatibility issues with win32 in codec (moved include <strings.h>) 2010-03-07 21:27:37 +00:00
Antonin Descampe 449d7bedb6 fixed "tiffio" header inclusion to use user version on Win32 system only (otherwise assume its existence in system headers). 2009-11-05 16:39:02 +00:00
Antonin Descampe bfd3fe8a4a fixed minor bugs which were triggering warnings at compilation (different signedness, wrong pointer type, etc) 2009-09-10 12:29:51 +00:00
Mathieu Malaterre a69db02b7f COMP: minor compilation warning 2008-10-01 16:00:42 +00:00
Antonin Descampe 4a90f97639 fixed a bug in image_to_j2k.c that was preventing the 'r' option to work properly (everything was compressed lossless regardless of the specified rate). 2008-08-21 16:00:44 +00:00
Francois-Olivier Devaux 4da178b0d8 Modified the way raw images with more that 8bpp are read and written 2008-08-08 13:15:36 +00:00
Antonin Descampe 846bd364be fixed a bug in dirent.h that prevented codec on Linux Alpha Systems to compile correctly. Thanks to RobinC. 2008-06-12 14:55:12 +00:00
Giuseppe Baruffa a92cc111a2 Added help line for the -F option in j2k_to_image 2008-03-12 10:40:42 +00:00
Giuseppe Baruffa ac0cc6df62 Minor style modifications to comply with c99 compiler flag; removed Microsoft-specific "union-in-struct" syntax; Re-enabled cstr_info struct creation when -W switch is specified. Changed a number of things in opjviewer (e.g., decoding thread does not execute GUI calls anymore), to have it running under linux --> it is better than before, but still crashes 2008-02-11 14:43:11 +00:00
Parvatha Elangovan 29ea3dde47 In convert.c, corrected imagetobmp() conversion for grayscale. In tcd.c, corrected Rate modification in tcd_init_encode(). 2008-02-05 15:15:38 +00:00
Francois-Olivier Devaux 26606c71c8 First import of JAVAOpenJPEG, a Java wrapper of OpenJPEG, developed by Patrick Piscaglia of Telemis (www.telemis.com). Thank you Patrick for this new module ! 2007-12-10 13:16:01 +00:00
Giuseppe Baruffa e06bcd027f Added index.h and index.c in VC6 projects; wrapped index.h in the C++ preprocessor; modified OPJViewer project and some files. 2007-11-29 14:38:26 +00:00
Francois-Olivier Devaux efa5f7977c Created the file index.c in the codec directory. This file handles the creation of index files, at encoding and decoding.
Fixed bugs during the creation of the index (PCRL progression order)
2007-11-27 12:38:52 +00:00
Giuseppe Baruffa 95d760a173 Fixed a bug which prevented JPWL from working on multi-tiled images; added some more fields in the interface info structures (keep a list of markers, save start packet number for each tile) 2007-11-05 13:05:07 +00:00
Francois-Olivier Devaux 5fdc05d18d Changed the ROI parameter in the image_to_j2k codec to make it correspond to the documentation (i.e. -ROI c=0,U=25) 2007-10-18 08:14:43 +00:00
Francois-Olivier Devaux 1f11a4fe90 Changed the way the image structure is allocated when the decoding parameters include some resolutions to discard. This should have a significant impact for the decoding of huge images when some resolutions are discarder (-r parameter)
Warning: The output image size is now reduced when discarding resolutions !
2007-10-12 15:04:34 +00:00