Mathieu Malaterre
|
b9e216ac6f
|
[trunk] merge r1229 from branch 1.5 over to trunk
|
2012-03-02 15:24:12 +00:00 |
|
Mathieu Malaterre
|
e78e2885fe
|
[trunk] minor style to sync with branch 1.5
|
2012-03-02 15:21:51 +00:00 |
|
Mathieu Malaterre
|
777f2e7547
|
[trunk] convert from DOS eol to UNIX eol
|
2012-03-02 15:12:24 +00:00 |
|
Mathieu Malaterre
|
27e494d25c
|
[trunk] Sync with branch 1.5
|
2012-03-02 15:09:51 +00:00 |
|
Mathieu Malaterre
|
d88156d998
|
[trunk] merge r1234 from branch 1.5 over to trunk
|
2012-03-02 15:07:07 +00:00 |
|
Mathieu Malaterre
|
44a3af51f0
|
[trunk] merge r1322 from branch 1.5 over to trunk
|
2012-03-02 15:04:45 +00:00 |
|
Mathieu Malaterre
|
79f090d92b
|
[trunk] merge r1197, r1199, r1228, r1230 and r1232 from branch 1.5 over to trunk
|
2012-03-02 15:02:48 +00:00 |
|
Mathieu Malaterre
|
54c65fdad0
|
[trunk] merge r1479 from branch 1.5 over to trunk
|
2012-03-02 14:55:16 +00:00 |
|
Mathieu Malaterre
|
e917802316
|
[trunk] merge r1323 from branch 1.5 over to trunk
|
2012-03-02 14:52:18 +00:00 |
|
Mathieu Malaterre
|
6a19a31171
|
[trunk] Remove exe bit on CMakeLists.txt. Set from DOS eol to UNIX eol
|
2012-03-02 14:33:29 +00:00 |
|
Mathieu Malaterre
|
a06b7f2ae0
|
[trunk] Sync with 1.5 branch
|
2012-03-02 14:31:46 +00:00 |
|
Mathieu Malaterre
|
405b1067e2
|
[trunk] Backout r1513 for now.
|
2012-03-02 14:29:08 +00:00 |
|
Mathieu Malaterre
|
10cb93283a
|
[trunk] merge rev 1330/1331 from branch 1.5 onto trunk
|
2012-03-02 14:24:39 +00:00 |
|
Mathieu Malaterre
|
d28e8f537a
|
[trunk] merge rev 1333 from 1.5 to trunk
|
2012-03-02 14:19:44 +00:00 |
|
Mathieu Malaterre
|
24d7f54662
|
[trunk] merge rev 1228 from 1.5 to trunk
|
2012-03-02 14:14:31 +00:00 |
|
Mathieu Malaterre
|
687a43e199
|
[trunk] Import change from 1.5 branch over to trunk
|
2012-03-02 14:01:15 +00:00 |
|
Mathieu Malaterre
|
07ef7d750b
|
[trunk] Synchronize with 1.5 branch, installation convention
|
2012-03-02 13:59:12 +00:00 |
|
Mathieu Malaterre
|
ea2b1d36aa
|
[trunk] minor coding style change to match 1.5
|
2012-03-02 13:57:04 +00:00 |
|
Mathieu Malaterre
|
c7540fba94
|
[trunk] Import getopt modification from 1.5 branch
|
2012-03-02 13:50:29 +00:00 |
|
Mathieu Malaterre
|
3d9198592b
|
[trunk] Import remaning bits from JPIP/1.5 over to trunk
|
2012-03-02 11:09:16 +00:00 |
|
Mathieu Malaterre
|
d6357bacdd
|
[trunk] Merge rev 1068 into trunk
|
2012-03-02 10:58:43 +00:00 |
|
Mathieu Malaterre
|
647551b8e4
|
[trunk] Remove junk from merge
|
2012-03-02 10:49:53 +00:00 |
|
Mathieu Malaterre
|
b158c25dc3
|
[trunk] Import rev 1103 into trunk.
|
2012-03-02 10:46:04 +00:00 |
Mickael Savinaud
|
bc8a3c5b6f
|
[trunk] correct bug when we expand the list of marker in a tile
|
2012-03-02 10:42:11 +00:00 |
|
Mickael Savinaud
|
c149db2205
|
[trunk] check the PSot value during the reading of SOT marker
|
2012-03-02 10:38:01 +00:00 |
|
Mathieu Malaterre
|
b5495ec972
|
[trunk] do not distribute binary in the source code. Remove *.jar files
|
2012-03-02 10:35:42 +00:00 |
|
Mathieu Malaterre
|
472c390e75
|
[trunk] import JPIP modifications for build-system from 1.5
|
2012-03-02 10:23:20 +00:00 |
|
Mathieu Malaterre
|
3d9a41e4b4
|
[trunk] Import applications modifications from 1.5 over to trunk
|
2012-03-02 10:01:00 +00:00 |
|
Mathieu Malaterre
|
9f77b065d3
|
[trunk] Convert from DOS eol to UNIX eol
|
2012-03-02 09:55:28 +00:00 |
|
Mathieu Malaterre
|
7abbe1e8d8
|
[trunk] Backport from OPJViewer version 1.5 over to trunk
|
2012-03-02 09:47:55 +00:00 |
|
Mathieu Malaterre
|
004b6ed60f
|
[trunk] Remove left-over Makefile
|
2012-03-02 09:44:52 +00:00 |
|
Mathieu Malaterre
|
d12f30f90c
|
[trunk] Sync OPJViewer with 1.5 version
|
2012-03-02 09:41:31 +00:00 |
|
Mathieu Malaterre
|
c433c2f2e2
|
[trunk] Backport toplevel files from 1.5
|
2012-03-02 09:26:15 +00:00 |
|
Mathieu Malaterre
|
9e52c330ae
|
[trunk] Remove copyrighted material from java-jni. Import patch from 1.5 over to trunk/JavaOpenJPEG
|
2012-03-02 09:20:13 +00:00 |
|
Mathieu Malaterre
|
564deec2c4
|
[trunk] Backport toplevel changes from 1.5 over to trunk. Remove hand-generated CHANGES file
|
2012-03-02 09:11:48 +00:00 |
|
Mathieu Malaterre
|
6fd0ffccbf
|
[trunk] Merge the CMake/ dir from opj 1.5
|
2012-02-13 11:20:26 +00:00 |
|
Mathieu Malaterre
|
ee957a4285
|
Integrate some more diffs from the 1.5 branch
|
2012-02-13 09:42:26 +00:00 |
|
Mathieu Malaterre
|
c63331a303
|
Start merging of the 1.5 branch into trunk. Start with doc
|
2012-02-13 09:27:50 +00:00 |
Antonin Descampe
|
4d2c44ca87
|
add opj_logo.icns for trunk and 1.5
|
2012-01-11 12:19:18 +00:00 |
|
Mathieu Malaterre
|
596b5cd732
|
Fix test NR-ENC-Bretagne2.ppm-4-encode on linux.
|
2011-12-20 17:54:04 +00:00 |
|
Mathieu Malaterre
|
8ff1ba325d
|
Fix strange line, as reported by lockalsash (gmail.com)
|
2011-12-20 17:11:22 +00:00 |
|
Mathieu Malaterre
|
a19d7e3680
|
minor typo
|
2011-12-12 11:19:13 +00:00 |
|
Mickael Savinaud
|
90eeb25770
|
[trunk] remove some warnings detected by cppcheck
|
2011-12-07 09:53:46 +00:00 |
|
Mathieu Malaterre
|
bfe8b81d18
|
Add new mechanism for cppcheck
|
2011-12-06 16:03:05 +00:00 |
|
Mathieu Malaterre
|
ec71c19be7
|
Update changelog
|
2011-12-06 09:47:10 +00:00 |
|
Mathieu Malaterre
|
cce1fc9c65
|
Apply patch from Brad Hards to fix some typos.
|
2011-12-06 09:46:40 +00:00 |
|
Mathieu Malaterre
|
79fee501af
|
Apply doxygen fixes suggested by Brad Hards on opj mailing list.
|
2011-12-03 17:26:59 +00:00 |
|
Mathieu Malaterre
|
12dfaa2d74
|
Sorry. Reverting mistake.
|
2011-12-02 15:35:47 +00:00 |
|
Mathieu Malaterre
|
d4e5366fe6
|
Simplify code. Use standard find_package call instead. ctest script will need to handle this now
|
2011-12-02 15:30:19 +00:00 |
|
Mathieu Malaterre
|
d7388d7e80
|
Add CPack stuff
|
2011-12-02 14:52:34 +00:00 |