openjpeg.git
12 years ago[trunk] Pointer is opj_jp2_v2_t, not opj_jp2_t
Mathieu Malaterre [Mon, 14 May 2012 15:19:40 +0000 (15:19 +0000)]
[trunk] Pointer is opj_jp2_v2_t, not opj_jp2_t

12 years ago[trunk] Wrong struct size. Use opj_jp2_v2_t instead
Mathieu Malaterre [Mon, 14 May 2012 14:51:26 +0000 (14:51 +0000)]
[trunk] Wrong struct size. Use opj_jp2_v2_t instead

12 years ago[trunk] Make sure the memory is initialized. valgrind was complaning in mqc_init_enc...
Mathieu Malaterre [Mon, 14 May 2012 14:38:02 +0000 (14:38 +0000)]
[trunk] Make sure the memory is initialized. valgrind was complaning in mqc_init_enc we were reading uninit value. See also comment in r479: FIXME: mqc_init_enc and mqc_byteout underrun the buffer if we don't do this. Why?

12 years ago[trunk] Fix minor typo in error message.
Mathieu Malaterre [Mon, 14 May 2012 14:36:24 +0000 (14:36 +0000)]
[trunk] Fix minor typo in error message.

12 years agoadding jp2_encode_v2 from v2 branches; using the right return value for opj_stream_flush
Mickael Savinaud [Mon, 14 May 2012 11:04:59 +0000 (11:04 +0000)]
adding jp2_encode_v2 from v2 branches; using the right return value for opj_stream_flush

12 years agocorrect style in cio.c and use only op_bool return value; correct error in jp2.c...
Mickael Savinaud [Mon, 14 May 2012 10:02:59 +0000 (10:02 +0000)]
correct style in cio.c and use only op_bool return value; correct error in jp2.c and some style

12 years agoadd new functions in jp2 codec from v2 branches; solve bug in j2k_setup_encoder_v2
Mickael Savinaud [Mon, 14 May 2012 09:37:36 +0000 (09:37 +0000)]
add new functions in jp2 codec from v2 branches; solve bug in j2k_setup_encoder_v2

12 years ago[trunk] Fix remaining compilation errors
Mathieu Malaterre [Mon, 14 May 2012 07:17:42 +0000 (07:17 +0000)]
[trunk] Fix remaining compilation errors

12 years agoremove opj_event_mgr struct from test_tile_decoder
Mickael Savinaud [Mon, 14 May 2012 07:13:27 +0000 (07:13 +0000)]
remove opj_event_mgr struct from test_tile_decoder

12 years ago[trunk] Fix using proper v2 function
Mathieu Malaterre [Mon, 14 May 2012 07:11:02 +0000 (07:11 +0000)]
[trunk] Fix using proper v2 function

12 years ago[trunk] Import from v2 test_tile_decoder
Mathieu Malaterre [Mon, 14 May 2012 07:03:33 +0000 (07:03 +0000)]
[trunk] Import from v2 test_tile_decoder

12 years agoCorrect a mistake about declaration of j2k_write_eoc_v2
Mickael Savinaud [Mon, 14 May 2012 06:24:27 +0000 (06:24 +0000)]
Correct a mistake about declaration of j2k_write_eoc_v2

12 years agosolve problem with input of image_to_j2k; using the right return type comparison...
Mickael Savinaud [Sun, 13 May 2012 22:13:58 +0000 (22:13 +0000)]
solve problem with input of image_to_j2k; using the right return type comparison for opj_stream_flush; add j2k_write_com_v2, j2k_write_poc_v2, j2k_write_eoc_v2 and j2k_write_tlm_v2

12 years agoremove a fixme about tcd_deallocate and encodind precint
Mickael Savinaud [Sun, 13 May 2012 15:48:19 +0000 (15:48 +0000)]
remove a fixme about tcd_deallocate and encodind precint

12 years ago[trunk] style
Mickael Savinaud [Wed, 2 May 2012 13:37:54 +0000 (13:37 +0000)]
[trunk] style

12 years ago[trunk] correct a bug in jpip building induced by the previous commit
Mickael Savinaud [Wed, 2 May 2012 13:30:41 +0000 (13:30 +0000)]
[trunk] correct a bug in jpip building induced by the previous commit

12 years ago[trunk] Enhance support of events like the v2 branch. Use right name of variables.
Mickael Savinaud [Wed, 2 May 2012 07:01:13 +0000 (07:01 +0000)]
[trunk] Enhance support of events like the v2 branch. Use right name of variables.

12 years ago[trunk] apply patch from winfried on the mailing list. For more info see: https:...
Mathieu Malaterre [Mon, 23 Apr 2012 13:28:20 +0000 (13:28 +0000)]
[trunk] apply patch from winfried on the mailing list. For more info see: https://groups.google.com/group/openjpeg/msg/e631d586a31c6de4

12 years agoFix a set of warnings reported by gcc in cio.c. This patch impact the API directly...
Mathieu Malaterre [Mon, 23 Apr 2012 09:16:17 +0000 (09:16 +0000)]
Fix a set of warnings reported by gcc in cio.c. This patch impact the API directly (remove left over 32bits API)

12 years agoAdding sentinel code for debug
Mathieu Malaterre [Mon, 23 Apr 2012 09:15:29 +0000 (09:15 +0000)]
Adding sentinel code for debug

12 years ago[trunk] correct a wrong assert in j2k.c
Mickael Savinaud [Fri, 13 Apr 2012 14:36:30 +0000 (14:36 +0000)]
[trunk] correct a wrong assert in j2k.c

12 years ago[trunk] attempt to fix clang/3.1 compilation error remotely
Mathieu Malaterre [Tue, 27 Mar 2012 08:11:14 +0000 (08:11 +0000)]
[trunk] attempt to fix clang/3.1 compilation error remotely

12 years ago[trunk] fix compilation on OS where ssize_t is not defined.
Mathieu Malaterre [Tue, 27 Mar 2012 07:44:28 +0000 (07:44 +0000)]
[trunk] fix compilation on OS where ssize_t is not defined.

12 years ago[trunk] Final touch to get rid of most truncation warnings
Mathieu Malaterre [Mon, 26 Mar 2012 16:42:52 +0000 (16:42 +0000)]
[trunk] Final touch to get rid of most truncation warnings

12 years ago[trunk] one more round of warnings fixes
Mathieu Malaterre [Mon, 26 Mar 2012 16:18:58 +0000 (16:18 +0000)]
[trunk] one more round of warnings fixes

12 years ago[trunk] change char* to const char* when possible. Remove more warnings
Mathieu Malaterre [Mon, 26 Mar 2012 16:08:05 +0000 (16:08 +0000)]
[trunk] change char* to const char* when possible. Remove more warnings

12 years ago[trunk] remove warnings from jp2k decoder
Mathieu Malaterre [Mon, 26 Mar 2012 16:00:26 +0000 (16:00 +0000)]
[trunk] remove warnings from jp2k decoder

12 years ago[trunk] change char* to const char* when possible. Remove more warnings
Mathieu Malaterre [Mon, 26 Mar 2012 15:56:04 +0000 (15:56 +0000)]
[trunk] change char* to const char* when possible. Remove more warnings

12 years ago[trunk] another round of compilation fixes
Mathieu Malaterre [Mon, 26 Mar 2012 15:37:04 +0000 (15:37 +0000)]
[trunk] another round of compilation fixes

12 years ago[trunk] another set of warnings fixes for LFS support
Mathieu Malaterre [Mon, 26 Mar 2012 15:04:49 +0000 (15:04 +0000)]
[trunk] another set of warnings fixes for LFS support

12 years ago[trunk] Fix equality into test
Mathieu Malaterre [Mon, 26 Mar 2012 14:50:34 +0000 (14:50 +0000)]
[trunk] Fix equality into test

12 years ago[trunk] remove some simple warnings
Mathieu Malaterre [Mon, 26 Mar 2012 14:50:14 +0000 (14:50 +0000)]
[trunk] remove some simple warnings

12 years ago[trunk] According to JPIP/A.2.3 in class identifiers should be an unsigned integer...
Mathieu Malaterre [Mon, 26 Mar 2012 14:44:12 +0000 (14:44 +0000)]
[trunk] According to JPIP/A.2.3 in class identifiers should be an unsigned integer. Since portion of codes was using Byte8_t and other was using int, pick Byte8_t as best matching type

12 years ago[trunk] continue work on getting API to use off_t instead of long toward LFS support...
Mathieu Malaterre [Mon, 26 Mar 2012 14:23:33 +0000 (14:23 +0000)]
[trunk] continue work on getting API to use off_t instead of long toward LFS support in JPIP (sock_manager)

12 years ago[trunk] continue work on getting API to use off_t instead of long toward LFS support...
Mathieu Malaterre [Mon, 26 Mar 2012 14:14:19 +0000 (14:14 +0000)]
[trunk] continue work on getting API to use off_t instead of long toward LFS support in JPIP (auxtrans_manager)

12 years ago[trunk] continue work on getting API to use off_t instead of long toward LFS support...
Mathieu Malaterre [Mon, 26 Mar 2012 13:53:25 +0000 (13:53 +0000)]
[trunk] continue work on getting API to use off_t instead of long toward LFS support in JPIP (metadata_manager)

12 years ago[trunk] continue work on getting API to use off_t instead of long toward LFS support...
Mathieu Malaterre [Mon, 26 Mar 2012 13:49:32 +0000 (13:49 +0000)]
[trunk] continue work on getting API to use off_t instead of long toward LFS support in JPIP (manfbox_manager)

12 years ago[trunk] continue work on getting API to use off_t instead of long toward LFS support...
Mathieu Malaterre [Mon, 26 Mar 2012 13:47:52 +0000 (13:47 +0000)]
[trunk] continue work on getting API to use off_t instead of long toward LFS support in JPIP (j2kheader_manager)

12 years ago[trunk] continue work on getting API to use off_t instead of long toward LFS support...
Mathieu Malaterre [Mon, 26 Mar 2012 13:34:16 +0000 (13:34 +0000)]
[trunk] continue work on getting API to use off_t instead of long toward LFS support in JPIP (index_manager)

12 years ago[trunk] continue work on getting API to use off_t instead of long toward LFS support...
Mathieu Malaterre [Mon, 26 Mar 2012 13:18:09 +0000 (13:18 +0000)]
[trunk] continue work on getting API to use off_t instead of long toward LFS support in JPIP (marker_param_t)

12 years ago[trunk] fix another simple warning
Mathieu Malaterre [Mon, 26 Mar 2012 13:15:40 +0000 (13:15 +0000)]
[trunk] fix another simple warning

12 years ago[trunk] explicit cast missing
Mathieu Malaterre [Mon, 26 Mar 2012 13:02:40 +0000 (13:02 +0000)]
[trunk] explicit cast missing

12 years ago[trunk] remove simple warnings.
Mathieu Malaterre [Mon, 26 Mar 2012 13:01:41 +0000 (13:01 +0000)]
[trunk] remove simple warnings.

12 years ago[trunk] continue work on getting API to use off_t instead of long toward LFS support...
Mathieu Malaterre [Mon, 26 Mar 2012 12:59:33 +0000 (12:59 +0000)]
[trunk] continue work on getting API to use off_t instead of long toward LFS support in JPIP (codestream_param_t)

12 years ago[trunk] continue work on getting API to use off_t instead of long toward LFS support...
Mathieu Malaterre [Mon, 26 Mar 2012 12:31:27 +0000 (12:31 +0000)]
[trunk] continue work on getting API to use off_t instead of long toward LFS support in JPIP

12 years ago[trunk] Start working on LFS support in JPIP code section
Mathieu Malaterre [Mon, 26 Mar 2012 09:48:53 +0000 (09:48 +0000)]
[trunk] Start working on LFS support in JPIP code section

12 years ago[trunk] ICC profile length is always an unsigned integer
Mathieu Malaterre [Mon, 26 Mar 2012 09:19:45 +0000 (09:19 +0000)]
[trunk] ICC profile length is always an unsigned integer

12 years ago[trunk] make openjpeg consistant with itself, and adapt sign of struct variables
Mathieu Malaterre [Mon, 26 Mar 2012 09:15:26 +0000 (09:15 +0000)]
[trunk] make openjpeg consistant with itself, and adapt sign of struct variables

12 years ago[trunk] Fix a potential issue with truncation of pointers diff
Mathieu Malaterre [Mon, 26 Mar 2012 08:51:12 +0000 (08:51 +0000)]
[trunk] Fix a potential issue with truncation of pointers diff

12 years ago[trunk] Fix some simple warnings reported by -Wconversion
Mathieu Malaterre [Mon, 26 Mar 2012 08:47:06 +0000 (08:47 +0000)]
[trunk] Fix some simple warnings reported by -Wconversion

12 years ago[trunk] fix compilation when jpwl option is ON.
Mathieu Malaterre [Mon, 26 Mar 2012 08:41:48 +0000 (08:41 +0000)]
[trunk] fix compilation when jpwl option is ON.

12 years ago[trunk] add missing file needed to compile last commit
Mickael Savinaud [Mon, 26 Mar 2012 06:48:45 +0000 (06:48 +0000)]
[trunk] add missing file needed to compile last commit

12 years ago[trunk] add test_tile_encoder test and function related
Mickael Savinaud [Fri, 23 Mar 2012 17:47:53 +0000 (17:47 +0000)]
[trunk] add test_tile_encoder test and function related

12 years ago[trunk] Fix invalid truncation from off_t to int (thanks to -Wconversion for report)
Mathieu Malaterre [Mon, 19 Mar 2012 14:24:26 +0000 (14:24 +0000)]
[trunk] Fix invalid truncation from off_t to int (thanks to -Wconversion for report)

12 years ago[trunk] Missing PRId64 for MS compilers
Mathieu Malaterre [Mon, 19 Mar 2012 13:46:34 +0000 (13:46 +0000)]
[trunk] Missing PRId64 for MS compilers

12 years ago[trunk] Forgot portion of the previous commit.
Mathieu Malaterre [Mon, 19 Mar 2012 13:42:53 +0000 (13:42 +0000)]
[trunk] Forgot portion of the previous commit.

12 years ago[trunk] use autotools convention where #ifdef BLA, should be provided by #define...
Mathieu Malaterre [Mon, 19 Mar 2012 13:10:46 +0000 (13:10 +0000)]
[trunk] use autotools convention where #ifdef BLA, should be provided by #define BLA 1. This is to cope with pseudo autotools generated tif header.

12 years ago[trunk] start using new functionalities from opj_inttypes in jpip code and main openjpeg
Mathieu Malaterre [Mon, 19 Mar 2012 11:18:24 +0000 (11:18 +0000)]
[trunk] start using new functionalities from opj_inttypes in jpip code and main openjpeg

12 years ago[trunk] move functionalities of stdint/inttype into opj_stdint/opj_inttypes
Mathieu Malaterre [Mon, 19 Mar 2012 10:15:46 +0000 (10:15 +0000)]
[trunk] move functionalities of stdint/inttype into opj_stdint/opj_inttypes

12 years ago[trunk] Remove remaining of OPJ_INT64_F/OPJ_UINT64_F before move to C99 convention
Mathieu Malaterre [Mon, 19 Mar 2012 10:00:06 +0000 (10:00 +0000)]
[trunk] Remove remaining of OPJ_INT64_F/OPJ_UINT64_F before move to C99 convention

12 years ago[trunk] replace more void* object pointer to proper function pointer: opj_procedure...
Mathieu Malaterre [Mon, 19 Mar 2012 09:51:23 +0000 (09:51 +0000)]
[trunk] replace more void* object pointer to proper function pointer: opj_procedure. Remove some warnings reported by gcc -pedantic

12 years ago[trunk] add debug statement for Win7-VS2008-32bits-trunk-Debug-OSGeo4W
Mathieu Malaterre [Mon, 19 Mar 2012 09:11:58 +0000 (09:11 +0000)]
[trunk] add debug statement for Win7-VS2008-32bits-trunk-Debug-OSGeo4W

12 years ago[trunk] Quick fix for MS compilers which do not ship inttypes.h
Mathieu Malaterre [Sat, 17 Mar 2012 18:20:52 +0000 (18:20 +0000)]
[trunk] Quick fix for MS compilers which do not ship inttypes.h

12 years ago[trunk] Fix compilation win32 with shared libs on (export symbol name)
Mathieu Malaterre [Sat, 17 Mar 2012 18:06:54 +0000 (18:06 +0000)]
[trunk] Fix compilation win32 with shared libs on (export symbol name)

12 years ago[trunk] Fix numerous warnings about signed vs unsigned comparison. Adapt opj_procedur...
Mathieu Malaterre [Sat, 17 Mar 2012 18:06:22 +0000 (18:06 +0000)]
[trunk] Fix numerous warnings about signed vs unsigned comparison. Adapt opj_procedure type to what it should hev been IMHO. Start using PRIi64 for printf and int64_t

12 years ago[trunk] remove a warning, about ISO C restricts enumerator values to range of 'int'
Mathieu Malaterre [Sat, 17 Mar 2012 17:03:16 +0000 (17:03 +0000)]
[trunk] remove a warning, about ISO C restricts enumerator values to range of 'int'

12 years ago[trunk] HACK: This commit remove some JPWL related code just to allow compilation...
Mathieu Malaterre [Sat, 17 Mar 2012 15:05:38 +0000 (15:05 +0000)]
[trunk] HACK: This commit remove some JPWL related code just to allow compilation. See r1564 for more info

12 years ago[trunk] Fix compilation when zlib.h is in user specified directory.
Mathieu Malaterre [Sat, 17 Mar 2012 14:51:40 +0000 (14:51 +0000)]
[trunk] Fix compilation when zlib.h is in user specified directory.

12 years ago[trunk] Fix compilation on 32bits/PowerPC arch (debian/linux)
Mathieu Malaterre [Thu, 15 Mar 2012 13:36:12 +0000 (13:36 +0000)]
[trunk] Fix compilation on 32bits/PowerPC arch (debian/linux)

12 years ago[trunk] make sure to build as universal build when OS is APPLE
Mathieu Malaterre [Thu, 15 Mar 2012 13:35:30 +0000 (13:35 +0000)]
[trunk] make sure to build as universal build when OS is APPLE

12 years ago[trunk] remove a warning about no end of file
Mathieu Malaterre [Thu, 15 Mar 2012 13:35:04 +0000 (13:35 +0000)]
[trunk] remove a warning about no end of file

12 years ago[trunk] modify image_to_j2k and the lib to support functionalities given by the v2...
Mickael Savinaud [Thu, 15 Mar 2012 10:23:20 +0000 (10:23 +0000)]
[trunk] modify image_to_j2k and the lib to support functionalities given by the v2 alpha branch

12 years ago[trunk] Fix issue with space
Mathieu Malaterre [Mon, 12 Mar 2012 16:43:27 +0000 (16:43 +0000)]
[trunk] Fix issue with space

12 years ago[trunk] Add support for compiling libtiff with VS2008
Mathieu Malaterre [Mon, 12 Mar 2012 16:40:29 +0000 (16:40 +0000)]
[trunk] Add support for compiling libtiff with VS2008

12 years ago[trunk] Add support for MSVC 2010 compiler (32bits)
Mathieu Malaterre [Mon, 12 Mar 2012 15:40:22 +0000 (15:40 +0000)]
[trunk] Add support for MSVC 2010 compiler (32bits)

12 years ago[trunk] Update libtiff to 4.0.1 to support BigTIFF. openjpeg/tiff 4.0.1 currently...
Mathieu Malaterre [Mon, 12 Mar 2012 11:35:35 +0000 (11:35 +0000)]
[trunk] Update libtiff to 4.0.1 to support BigTIFF. openjpeg/tiff 4.0.1 currently builds on linux/x86_64 and linux/mingw32.

12 years ago[trunk] Use stdint.h when available to compute fixed-type definition.
Mathieu Malaterre [Sun, 11 Mar 2012 15:12:31 +0000 (15:12 +0000)]
[trunk] Use stdint.h when available to compute fixed-type definition.

12 years ago[trunk] Backport diff from openjpeg 1.5 branch
Mathieu Malaterre [Sun, 11 Mar 2012 14:56:29 +0000 (14:56 +0000)]
[trunk] Backport diff from openjpeg 1.5 branch

12 years ago[trunk] reverted to revision 1536
Mickael Savinaud [Fri, 9 Mar 2012 17:34:05 +0000 (17:34 +0000)]
[trunk] reverted to revision 1536

12 years ago[trunk] add j2k_post_write_tile in trunk from branch v2
Mickael Savinaud [Fri, 9 Mar 2012 17:16:24 +0000 (17:16 +0000)]
[trunk] add j2k_post_write_tile in trunk from branch v2

12 years ago[trunk] add j2k_get_tile_data in trunk from branch v2
Mickael Savinaud [Fri, 9 Mar 2012 17:16:16 +0000 (17:16 +0000)]
[trunk] add j2k_get_tile_data in trunk from branch v2

12 years ago[trunk] add tcd_get_encoded_tile_size in trunk from branch v2alpha
Mickael Savinaud [Fri, 9 Mar 2012 17:16:04 +0000 (17:16 +0000)]
[trunk] add tcd_get_encoded_tile_size in trunk from branch v2alpha

12 years ago[trunk] add j2k_pre_write_tile function in trunk from v2alpha
Mickael Savinaud [Fri, 9 Mar 2012 17:15:55 +0000 (17:15 +0000)]
[trunk] add j2k_pre_write_tile function in trunk from v2alpha

12 years ago[trunk] first steps about merge compression WIP
Mickael Savinaud [Fri, 9 Mar 2012 17:15:41 +0000 (17:15 +0000)]
[trunk] first steps about merge compression WIP

12 years ago[trunk] Fix a bunch of warning about C++ comments in C code.
Mathieu Malaterre [Fri, 2 Mar 2012 15:53:14 +0000 (15:53 +0000)]
[trunk] Fix a bunch of warning about C++ comments in C code.

12 years ago[trunk] merge r1229 from branch 1.5 over to trunk
Mathieu Malaterre [Fri, 2 Mar 2012 15:24:12 +0000 (15:24 +0000)]
[trunk] merge r1229 from branch 1.5 over to trunk

12 years ago[trunk] minor style to sync with branch 1.5
Mathieu Malaterre [Fri, 2 Mar 2012 15:21:51 +0000 (15:21 +0000)]
[trunk] minor style to sync with branch 1.5

12 years ago[trunk] convert from DOS eol to UNIX eol
Mathieu Malaterre [Fri, 2 Mar 2012 15:12:24 +0000 (15:12 +0000)]
[trunk] convert from DOS eol to UNIX eol

12 years ago[trunk] Sync with branch 1.5
Mathieu Malaterre [Fri, 2 Mar 2012 15:09:51 +0000 (15:09 +0000)]
[trunk] Sync with branch 1.5

12 years ago[trunk] merge r1234 from branch 1.5 over to trunk
Mathieu Malaterre [Fri, 2 Mar 2012 15:07:07 +0000 (15:07 +0000)]
[trunk] merge r1234 from branch 1.5 over to trunk

12 years ago[trunk] merge r1322 from branch 1.5 over to trunk
Mathieu Malaterre [Fri, 2 Mar 2012 15:04:45 +0000 (15:04 +0000)]
[trunk] merge r1322 from branch 1.5 over to trunk

12 years ago[trunk] merge r1197, r1199, r1228, r1230 and r1232 from branch 1.5 over to trunk
Mathieu Malaterre [Fri, 2 Mar 2012 15:02:48 +0000 (15:02 +0000)]
[trunk] merge r1197, r1199, r1228, r1230 and r1232 from branch 1.5 over to trunk

12 years ago[trunk] merge r1479 from branch 1.5 over to trunk
Mathieu Malaterre [Fri, 2 Mar 2012 14:55:16 +0000 (14:55 +0000)]
[trunk] merge r1479 from branch 1.5 over to trunk

12 years ago[trunk] merge r1323 from branch 1.5 over to trunk
Mathieu Malaterre [Fri, 2 Mar 2012 14:52:18 +0000 (14:52 +0000)]
[trunk] merge r1323 from branch 1.5 over to trunk

12 years ago[trunk] Remove exe bit on CMakeLists.txt. Set from DOS eol to UNIX eol
Mathieu Malaterre [Fri, 2 Mar 2012 14:33:29 +0000 (14:33 +0000)]
[trunk] Remove exe bit on CMakeLists.txt. Set from DOS eol to UNIX eol

12 years ago[trunk] Sync with 1.5 branch
Mathieu Malaterre [Fri, 2 Mar 2012 14:31:46 +0000 (14:31 +0000)]
[trunk] Sync with 1.5 branch

12 years ago[trunk] Backout r1513 for now.
Mathieu Malaterre [Fri, 2 Mar 2012 14:29:08 +0000 (14:29 +0000)]
[trunk] Backout r1513 for now.

12 years ago[trunk] merge rev 1330/1331 from branch 1.5 onto trunk
Mathieu Malaterre [Fri, 2 Mar 2012 14:24:39 +0000 (14:24 +0000)]
[trunk] merge rev 1330/1331 from branch 1.5 onto trunk

12 years ago[trunk] merge rev 1333 from 1.5 to trunk
Mathieu Malaterre [Fri, 2 Mar 2012 14:19:44 +0000 (14:19 +0000)]
[trunk] merge rev 1333 from 1.5 to trunk

12 years ago[trunk] merge rev 1228 from 1.5 to trunk
Mathieu Malaterre [Fri, 2 Mar 2012 14:14:31 +0000 (14:14 +0000)]
[trunk] merge rev 1228 from 1.5 to trunk