Stephan Mühlstrasser
d6b51b7041
Added missing casts for return values of opj_malloc()/opj_calloc().
2015-10-06 15:33:46 +02:00
mayeut
db23831d57
Add check for seek support before trying TPsot==TNsot workaround
2015-10-02 22:33:44 +02:00
mayeut
cf352af089
Fix up-scaling bit depth
...
Fixes #609
2015-09-29 09:28:34 +02:00
Stefan Weil
05235963d9
Fix typo in variable name
...
This makes checks with codespell easier.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-09-29 05:57:09 +02:00
Stefan Weil
99fc1ab306
Fix typos in comments and string
...
Most typos were found by codespell.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2015-09-29 05:55:43 +02:00
mayeut
838dfb8058
Provide safer string copy than strncpy
...
As per @boxerab suggestion in commit
b9ca882749
2015-09-25 22:04:58 +02:00
mayeut
4da7e9617f
Fix resource leak
2015-09-25 00:39:05 +02:00
mayeut
b9ca882749
Fix resource leaks & unchecked resource allocations
2015-09-25 00:08:34 +02:00
mayeut
f9df8ba19a
Fix some resource leaks
2015-09-24 23:32:03 +02:00
mayeut
f82d7f3a63
Use buffer on stack to read TGA header
...
Fixes a potential leak
Fixes #601
2015-09-23 21:17:06 +02:00
mayeut
faf63fddad
Fix warning in rle4 decoding
2015-09-23 21:09:19 +02:00
mayeut
55dbf8acff
Fix resource leak in opj_j2k_create_cstr_index
...
Fixes #599
2015-09-17 12:46:42 +02:00
mayeut
c16c91797f
Fix resource leak in opj_j2k_encode
...
Fixes #598
2015-09-17 12:41:41 +02:00
mayeut
a4e93c3b0a
fix resource leak in opj_j2k_decode_one_tile
...
Fixes #597
2015-09-17 12:31:18 +02:00
mayeut
4bb5e24d23
Merge branch 'master' into coc-qcc
2015-09-17 02:12:27 +02:00
mayeut
c8a3117659
Fix function name
2015-09-13 14:51:00 +02:00
mayeut
49cbc11a19
Correct leak in color_cielab_to_rgb
2015-09-13 14:42:56 +02:00
Matthieu Darbois
bac2c9e0a3
Change test in opj_tcd_makelayer
...
Remove float equality test. Such a test has no meaning.
2015-09-11 14:17:30 +02:00
Matthieu Darbois
ee0f313848
Update check in opj_tcd_makelayer to be robust to different float precisions
2015-09-10 15:46:51 +02:00
Matthieu Darbois
ccdce606f1
Fix threshold calculation
...
It doesn't change the outcome of the test suite, that's weird...
2015-09-10 15:10:14 +02:00
mayeut
5f02757eef
Correct lossless issue on linux x86
...
Update uclouvain/openjpeg#571
2015-09-10 00:39:23 +02:00
mayeut
4f5ec07c31
Remove C++ comment
2015-09-09 23:38:46 +02:00
mayeut
66d890bf22
Merge remote-tracking branch 'uclouvain/master' into coc-qcc
2015-09-08 22:33:07 +02:00
mayeut
29c644ec49
Correct mismatching delete
...
Fixes #575
2015-09-07 19:24:20 +02:00
mayeut
940100c28a
Fix potential use-after-free in opj_j2k_write_mco function
...
Fixes #563
2015-09-06 17:24:03 +02:00
mayeut
c31fb68ccc
fix resource leak in jpwl
...
Fixes #573
2015-09-06 17:18:37 +02:00
mayeut
c5dd6035c9
Correct CMake version requirements
...
Update uclouvain/openjpeg#488
2015-09-01 20:43:43 +02:00
mayeut
8a95efcd3f
Fix some UBSan warnings
2015-08-23 11:43:38 +02:00
mayeut
38770403d4
Fix some calculations in opj_tcd_init_tile
...
Fixes #486
Fixes #394
Update #480
Update #388
2015-08-23 11:38:04 +02:00
mayeut
a521472427
Add tests for CMYK/esYCC/CIELab
2015-08-21 21:41:50 +02:00
mayeut
d4ac2f613d
Fix formatting
2015-08-21 20:17:55 +02:00
mayeut
fa9142b7e4
Fix formatting
2015-08-21 20:15:50 +02:00
mayeut
f98df1c715
TIFF can output CMYK
2015-08-21 19:54:22 +02:00
Matthieu Darbois
3109759fd7
Merge pull request #559 from szukw000/cmyk-cielab-esycc
...
Add support for CIELab, EYCC and CMYK
2015-08-21 19:48:31 +02:00
szukw000
238f4419ab
Defines three new functions
...
Declares three new functions
Calls the three new functions
Collects data for CIELab, sets the color_space for EYCC and CMYK
2015-07-30 23:31:12 +00:00
mayeut
60301842c7
Sync coc-qcc branch with master
2015-07-31 01:07:14 +02:00
ak-dxdy
acbb297a0a
Small correction + attempt to understand git-openjpeg workflow
2015-07-31 00:51:31 +02:00
ak-dxdy
4fc1073809
French comments replaced by English ones
2015-07-31 00:51:08 +02:00
Matthieu Darbois
7c688c3453
Merge pull request #558 from mayeut/remove-printf
...
Remove printf/fprintf to stdout/stderr throughout openjp2 lib
2015-07-30 23:37:20 +02:00
mayeut
372c887aad
Fix typo (that brakes building with '-DBUILD_MJ2:bool=on')
...
Fixes #556
2015-07-30 23:34:12 +02:00
mayeut
0df90afdf7
Remove printf/fprintf to stdout/stderr throughout openjp2 lib
...
Update uclouvain/openjpeg#246
2015-07-30 23:26:31 +02:00
Rex Dieter
e4735c703d
better -ffast-math handling
...
issue #488
See also
http://public.kitware.com/pipermail/cmake/2015-April/060479.html
2015-07-30 09:54:07 -05:00
mayeut
c3d9719cd4
Write COC/QCC in Main Header
...
Update uclouvain/openjpeg#459
2015-07-29 00:29:49 +02:00
mayeut
2263b6bacc
Start support for qcc/coc
2015-07-28 23:58:10 +02:00
mayeut
b0035538af
Use __emul under msvc x86 for fast 64 = 32 * 32
...
Update uclouvain/openjpeg#220
2015-07-27 20:12:48 +02:00
mayeut
45ccf501f0
Fix ARM build with Visual Studio
2015-07-26 21:12:36 +02:00
mayeut
15e4168ee2
Remove some warnings when building
...
Update #442
2015-07-26 19:19:31 +02:00
mayeut
2452bb7c45
Remove some warnings when building
...
Update #442
2015-07-26 19:01:52 +02:00
mayeut
f3dad25c77
Update convert for PNG output
...
Update uclouvain/openjpeg#264
2015-07-26 18:28:03 +02:00
mayeut
e6cf1744d4
Remove some warnings when building
...
Update #442
2015-07-26 13:41:59 +02:00
mayeut
c423cc84e7
Remove some warnings when building
...
Update #442
2015-07-26 02:41:39 +02:00
Matthieu Darbois
8c4afeff40
Merge pull request #521 from manisandro/bigendian
...
Fix opj_write_bytes_BE
Fixes #472
Fixes #345
Fixes #518
2015-07-25 15:54:26 +02:00
mayeut
ffd9db9700
Remove some warnings when building
...
Update #442
2015-07-25 03:16:16 +02:00
mayeut
b190a91ab5
Remove some warnings when building
...
Update #442
2015-07-24 23:55:45 +02:00
mayeut
a56819eaab
Add some missing static keywords
...
Update uclouvain/openjpeg#243
2015-07-23 07:48:42 +02:00
mayeut
9ac3a1572e
Prevent overflow when coding 16 bits images
...
Update uclouvain/openjpeg#539
2015-07-22 00:10:32 +02:00
Matthieu Darbois
28c6f54798
Merge pull request #533 from mayeut/refactor-read-ppX
...
Refactor opj_j2k_read_ppm & opj_j2k_read_ppt
Fixes uclouvain/openjpeg#470
Fixes uclouvain/openjpeg#288
Fixes uclouvain/openjpeg#532
2015-07-21 01:26:02 +02:00
mayeut
1bbb607069
Merge remote-tracking branch 'uclouvain/master' into issue-235
2015-07-21 00:20:05 +02:00
mayeut
5bb074611a
Update PNG support
...
Only input modified for now
Update uclouvain/openjpeg#536
Update uclouvain/openjpeg#264
2015-07-19 17:42:11 +02:00
mayeut
46c1dd22fc
Correct error message for invalid TIFF input
2015-07-19 15:01:12 +02:00
mayeut
ae4799ad07
Add some missing static
...
Still needs to check j2k.c & jp2.c
Update uclouvain/openjpeg#243
2015-07-18 02:39:32 +02:00
mayeut
b88025b38f
Add headers to CMake target
2015-07-18 01:50:17 +02:00
mayeut
8048bbc7a2
Add tests for TIFF input with Alpha channel
...
Update uclouvain/openjpeg#322
2015-07-18 00:07:04 +02:00
mayeut
635a358962
Fix build warnings in converttif.c
2015-07-16 06:51:21 +02:00
mayeut
8f798864a9
Update imagetotif to support more output TIF formats
...
Update uclouvain/openjpeg#322
Update uclouvain/openjpeg#264
2015-07-16 00:26:02 +02:00
mayeut
ac9fb5a302
Update tiftoimage to support more input TIF formats
...
Update uclouvain/openjpeg#322
Update uclouvain/openjpeg#264
2015-07-14 23:51:02 +02:00
mayeut
775ee87776
Add checks for odd looking cmap & for cmap outside jp2h box
...
Update uclouvain/openjpeg#235
Update uclouvain/openjpeg#447
2015-07-12 19:39:30 +02:00
mayeut
0b1f8eb6f7
Merge pull request #529 from renevanderark/master
...
fix Suspicious code in j2k.c
Fixes #517
2015-07-12 19:20:57 +02:00
mayeut
c887df12a3
Refactor opj_read_ppm
...
Update uclouvain/openjpeg#470
Update uclouvain/openjpeg#288
2015-07-12 18:09:30 +02:00
mayeut
d1b053afe2
Refactor opj_j2k_read_ppt
...
Update uclouvain/openjpeg#470
Update uclouvain/openjpeg#532
2015-07-12 15:55:58 +02:00
mayeut
dc43ebf96c
Add option to force component splitting in imagetopnm
...
Update uclouvain/openjpeg#289
2015-07-11 11:35:21 +02:00
Rene van der Ark
ba05549b0f
fix Suspicious code in j2k.c #517
2015-07-08 11:13:31 +02:00
mayeut
237ddd72f1
Merge pull request #514 from mayeut/issue-254
...
Correctly decode files with incorrect tile-part header fields (TPsot==TNsot)
Fixes uclouvain/openjpeg#254
2015-07-04 00:47:59 +02:00
mayeut
c999b6c0f0
uclouvain/openjpeg#254 Add build option to disable the fix
2015-07-04 00:04:55 +02:00
Antonin Descampe
eadfad7a50
commented out printf line
2015-07-03 17:36:39 +02:00
Antonin Descampe
14361eee24
commented out a printf line
2015-07-03 16:35:16 +02:00
Aaron Boxer
c9e231508b
various small T1 optimizations
2015-07-03 15:23:15 +02:00
Aaron Boxer
6347686385
fixed a few bugs
2015-07-03 15:22:58 +02:00
Aaron Boxer
1a8f929111
visual studio lrintf is very slow - do not use
2015-07-03 15:22:42 +02:00
Aaron Boxer
56d3f5af6e
add timing to compress and decompress
2015-07-03 15:20:11 +02:00
Sandro Mani
c665e81a39
Fix opj_write_bytes_BE ( #518 )
2015-06-25 23:11:22 +02:00
mayeut
c7535d084e
Merge branch 'master' into issue-254
2015-06-05 20:42:57 +02:00
Matthieu Darbois
c0d7afe15c
[trunk] Fix offset computations in opj_j2k_update_image_data
...
Update issue 481
2015-06-03 20:56:13 +00:00
Matthieu Darbois
6def7e38b4
[trunk] Fix wrong return value for opj_setup_encoder & opj_set_decoded_resolution_factor (fixes issue 497)
...
Thanks Aaron.
2015-05-29 21:58:08 +00:00
Matthieu Darbois
73881d0e52
[trunk] Fix sscanf format specifier (fixes issue 494)
...
Thanks Aaron.
2015-05-28 22:16:49 +00:00
Matthieu Darbois
e3291c4e1f
[trunk] Fix overflow in opj_image_comp_header_update (fixes issue 495)
2015-05-27 23:05:16 +00:00
Matthieu Darbois
0fa5a17c98
[trunk] Correct potential double free on malloc failure in opj_j2k_copy_default_tcp_and_create_tcp (fixes issue 492)
2015-05-19 21:57:27 +00:00
Matthieu Darbois
757f9394bf
[trunk] Add check for number of layers & cblkw/cblkh values (fixes issue 475)
2015-05-19 21:24:44 +00:00
Matthieu Darbois
daed8cc919
[trunk] Add check for at most 1 COD marker per tile. 1 COD marker for MH (fixes issue 476)
2015-05-19 20:13:37 +00:00
mayeut
d1a941ea50
Revert "Correct overflows in opj_j2k_update_image_data"
...
This reverts commit 1fb24aba4b
.
2015-05-16 14:22:16 +02:00
mayeut
00a47c1e06
Implement TNsot correction for non conforming files
2015-05-16 11:15:29 +02:00
mayeut
1fb24aba4b
Correct overflows in opj_j2k_update_image_data
2015-05-16 02:51:31 +02:00
Antonin Descampe
2d24b6000d
[trunk] added overflow checks (fixes issue 431)
...
Thanks mdarbois
2015-02-02 16:11:31 +00:00
Antonin Descampe
8b5e2a5143
[trunk] fixes a bug that prevented opj_decompress to take directory as input (fixes issue 463)
...
Thanks Aaron.
2015-02-02 16:11:23 +00:00
Matthieu Darbois
3ed5858902
[trunk] use hidden visibility for static library (fixes issue 354)
2015-01-25 16:59:39 +00:00
Antonin Descampe
7a8cdc4bb0
[trunk] fixed a bug encoutntered when multiple MCT markers are provided
...
Update issue 430
Cc: savmickael@gmail.com
@Mickael: this revision affects your work on custom MCT. Is there a way
you could provide test data to add to our test suite ? Thanks
2015-01-20 16:29:16 +00:00
Antonin Descampe
4c0ed02806
[trunk] checks for JP2 signature and file type boxes more carefully
...
Update issue 430
2015-01-20 14:27:20 +00:00
Antonin Descampe
5d00b719f4
[trunk] fixed a buffer overflow in opj_tcd_init_decode_tile
...
Update issue 431
2015-01-15 18:16:29 +00:00
Matthieu Darbois
42132ed6b5
[trunk] removed warning from convertbmp.c
...
Update issue 442
2014-12-27 11:31:43 +00:00
Matthieu Darbois
31f5efe453
[trunk] fixed typo in opj_decompress (fixes issue 465)
2014-12-26 15:37:16 +00:00
Matthieu Darbois
78a7762e3f
[trunk] removed unnecessary operation in opj_bio_flush (fixes issue 461)
2014-12-23 16:05:19 +00:00
Matthieu Darbois
33f52fb611
[trunk] removed warning from convert.c
...
Update issue 442
2014-12-23 16:03:45 +00:00
Matthieu Darbois
81abe5b3bb
[trunk] fixed imagetoraw unsigned 16bits conversion (fixes issue 460)
2014-12-23 15:06:23 +00:00
Matthieu Darbois
4a09296771
[trunk] removed warning from convertbmp.c
...
Update issue 442
2014-12-23 10:13:28 +00:00
Matthieu Darbois
6922124c4c
[trunk] fixed colorspace mapping for raw grayscale images (fixes issue 456)
2014-12-22 18:39:14 +00:00
Matthieu Darbois
59b844347c
[trunk] fixed component precision upscaling in opj_decompress (fixes issue 458)
2014-12-22 15:50:32 +00:00
Matthieu Darbois
bde5ba6ae8
[trunk] fixed compression check for 1 bit unsigned component (fixes issue 457)
2014-12-22 15:00:12 +00:00
Matthieu Darbois
16240e21f9
[trunk] updated BMP format input support
...
Update issue 203
2014-12-22 14:40:31 +00:00
Matthieu Darbois
33a0e66eb1
[trunk] updated BMP format input support
...
Update issue 203
2014-12-22 13:14:37 +00:00
Matthieu Darbois
f1bae45c76
[trunk] fixed BMP reading for 8bpp when width & 3 == 1
...
Update issue 203
2014-12-20 18:45:53 +00:00
Matthieu Darbois
e966fef3eb
[trunk] fixed a possible overflow in opj_t1_encode_cblks call to opj_int_fix_mul (fixes issue 141)
2014-12-20 13:03:11 +00:00
Matthieu Darbois
dde788b59e
[trunk] Updated checks regarding number of decomposition levels when compressing
...
Update issue 215
2014-12-19 22:56:00 +00:00
Matthieu Darbois
58fc86452d
[trunk] Fixed a crash on illegal tile offset when decoding
...
Update issue 427
2014-12-18 22:56:38 +00:00
Matthieu Darbois
c0cb119c0e
[trunk] Fixed a crash on 0xh or wx0 image size decoding
...
Update issue 427
2014-12-18 22:19:52 +00:00
Matthieu Darbois
9a21e1eef0
[trunk] removed warnings when building tcd.c (Update issue 442)
2014-12-15 18:48:50 +00:00
Matthieu Darbois
a0688a9874
[trunk] Add SSE2/SSE41 implementations for mct.c (fixes issue 451)
2014-12-13 12:29:22 +00:00
Matthieu Darbois
d0ce2ced53
[trunk] Speed-up opj_int_fix_mul by removing unneeded operation
...
Update issue 220
2014-12-13 10:27:21 +00:00
Matthieu Darbois
e05d2901ec
[trunk] Reduce encoder code block memory usage for non 64x64 code block sizes (fixes issue 444)
2014-12-12 21:54:22 +00:00
Matthieu Darbois
c0710f557c
[trunk] Fixed invalid check in in tiff reading method (fixes issue 449)
2014-12-11 20:21:26 +00:00
Antonin Descampe
8d320bbdf8
[trunk] check number of components when getting mct norm (fixes issue 436)
2014-12-09 12:09:08 +00:00
Matthieu Darbois
776b83ddbc
[trunk] Fixed compilation error under Visual Studio 2003 (fixes issue 351)
2014-12-09 05:44:55 +00:00
Matthieu Darbois
04ace2a558
[trunk] Fixed typo in opj_compress error report (fixes issue 350)
2014-12-02 20:18:50 +00:00
Matthieu Darbois
570dd13f55
[trunk] removed some warnings when configuring with CMake 3.x on MacOS
...
Update issue 443
Warnings related to OPJ_USE_DSYMUTIL are fixed
2014-11-25 21:52:24 +00:00
Matthieu Darbois
63f877769c
[trunk] removed some warnings when building src/bin/jp2/convert.c
...
Update issue 442
2014-11-25 20:06:12 +00:00
Matthieu Darbois
04c6bb4a72
[trunk] removed warnings when building jp2.c (Update issue 442)
2014-11-24 21:31:09 +00:00
Matthieu Darbois
131cc98491
[trunk] added an option to upsample image components in opj_decompress
...
Update issue 289
Issue is left open since there's still one image failing the tests.
2014-11-22 17:59:07 +00:00
Matthieu Darbois
13bcb63b73
[trunk] fixed pnmtoimage for odd pgm files (fixes issue 294)
2014-11-22 14:09:16 +00:00
Matthieu Darbois
0ba5d15b58
[trunk] fixed warning in option to force rgb output in opj_decompress (fixes issue 282)
2014-11-22 12:30:04 +00:00
Matthieu Darbois
7e38446075
[trunk] added option to force rgb output in opj_decompress (fixes issue 282 , fixes issue 286)
2014-11-22 00:04:39 +00:00
Matthieu Darbois
548aff34f4
[trunk] added check for tile component data size overflow (fixes issue 432)
2014-11-21 21:35:43 +00:00
Matthieu Darbois
8397eac382
[trunk] added check for pclr box validity (fixes issue 429)
2014-11-20 23:47:09 +00:00
Matthieu Darbois
a2c2d86d3d
[trunk] fixed memleak in abnormal condition (fixes issue 437)
2014-11-20 20:13:47 +00:00
Matthieu Darbois
3bc360fc9d
[trunk] added option to force output bit depth in opj_decompress (fixes issue 283)
2014-11-19 20:05:39 +00:00
Matthieu Darbois
ae1da37558
[trunk] replace OPJ_MACRO_TCD_ALLOCATE macro by inlined function (fixes issue 433)
2014-11-19 19:08:09 +00:00
Matthieu Darbois
f57f59b10d
[trunk] remove warning during build (fixes issue 435)
2014-11-18 18:30:44 +00:00
Matthieu Darbois
b65e3ebdb6
[trunk] fixed a bug leading to jpwl build failure & add related odd width/height sYCC tests (fixes issue 422)
2014-11-18 00:07:50 +00:00
Matthieu Darbois
f123ce8f8a
[trunk] fixed a bug preventing palette image with cdef to decode properly using opj_get_decoded_tile (fixes issue 428)
2014-11-17 21:46:43 +00:00
Antonin Descampe
c3629e37a2
[trunk] significantly reduces memory for single tile RGB encoding (fixes
...
issue 375)
2014-11-03 14:51:41 +00:00
Antonin Descampe
cf5153c518
[trunk] add a cdef box when alpha component is present (fixes issue 416)
2014-11-03 14:12:01 +00:00
Antonin Descampe
3b7dced8e6
[trunk] fixed a bug preventing palette image with cdef to decode properly (fixes issue 412)
2014-10-30 18:26:10 +00:00
Antonin Descampe
03a410e03d
[trunk] fixed a bug that was preventing image with per channel alpha to decode properly (fixes issue 414)
2014-10-30 18:26:04 +00:00
Antonin Descampe
0a6eaaa605
[trunk] add a check on precinct size (fixes issue 420)
2014-10-30 18:00:45 +00:00
Antonin Descampe
7f8f284ee5
[trunk] prevent overflow in j2k.c
...
Update issue 392
Issue left open to solve problem on x64-Asan and to investigate Matthieu's suggestion
2014-10-30 11:53:06 +00:00
Antonin Descampe
3e1fad2da4
[trunk] resets resno_decoded for each tile (fixes issue 399)
2014-10-22 13:16:35 +00:00
Antonin Descampe
d72940c56b
[trunk] resets code-blocks reused for other tiles than the first one (fixes issue 418)
2014-10-22 13:16:12 +00:00
Antonin Descampe
ad4fad0965
[trunk] add a check on mandatory headers in Main Header (fixes issue 408)
2014-10-22 10:30:35 +00:00
Antonin Descampe
aff9cb39ed
[trunk] fixed invalid member values from opj_read_header or opj_decode (fixes issue 411)
2014-10-21 15:22:22 +00:00
Antonin Descampe
0a3f234df7
[trunk] verify channel definitions is complete when cdef is present (fixes issue 397)
2014-10-21 12:54:08 +00:00
Antonin Descampe
efb70af001
[trunk] add a check on the number of resolution passed to cmdline (fixes issue 352)
2014-10-21 12:47:48 +00:00
Antonin Descampe
e65303b903
[trunk] added check on JP2_IHDR box (fixes issue 364)
2014-10-21 12:35:16 +00:00
Antonin Descampe
413de4fbfa
[trunk] add a check on Zppm value in PPM markers (fixes issue 393)
2014-10-21 12:27:58 +00:00
Antonin Descampe
984351f86f
[trunk] Add option to call dsymutil on built binaries (fixes issue 409)
2014-10-15 10:24:49 +00:00
Antonin Descampe
f8796711e8
[trunk] add a check on progression order (fixes issue 413)
2014-10-15 10:14:54 +00:00
Antonin Descampe
0b540067b1
[trunk] add a check for illegal SCod value (fixes issue 400)
2014-10-15 08:48:19 +00:00
Antonin Descampe
3df347eded
[trunk] additional checks for marker size inconsistency (fixes issue 363)
2014-10-14 15:15:09 +00:00
Antonin Descampe
eb7c6d295a
[trunk] fixed potential negative size params (fixes issue 390)
2014-10-06 21:05:32 +00:00
Antonin Descampe
f126eb0d41
[trunk] added box length inconsistency check
...
Update issue 364
issue364-38.patch applied. Thanks Matthieu.
2014-10-06 21:05:27 +00:00
Antonin Descampe
7256e43c48
[trunk] fixed PDF crash in Chrome (fixes issue 362)
2014-10-06 21:05:21 +00:00
Antonin Descampe
a0a3af1dee
[trunk] removed illegal character in comment
2014-10-03 19:52:20 +00:00
Antonin Descampe
48832d944f
[trunk]fixes buffer overflow in t2.c
...
Update issue 390
Summary: check for negative-size params in code
Patch from Matthieu applied. Left open to apply this to other places in
code.
2014-10-03 10:15:28 +00:00
Antonin Descampe
06bd61b571
[trunk] c++-style comment removed (fixes issue 407)
2014-10-02 07:44:53 +00:00
Antonin Descampe
a1c754c737
[trunk] fixed warning from r2891
2014-10-01 12:11:43 +00:00
Antonin Descampe
fef1276901
[trunk] fixed bad use of case statement (fixes issue 381)
2014-09-30 12:19:13 +00:00
Antonin Descampe
45f33cdbd6
[trunk] check possible overflow on size in opj_t2_read_packet_data
...
Update issue 390
Labels: Priority-Critical
Should be rechecked with ASan and pdfium
2014-09-30 10:07:09 +00:00
Antonin Descampe
1acfa211ae
[trunk] fixes heap-buffer-overflow in parse_cmdline_encoder
...
Fixes issue 403
Thanks Matthieu
2014-09-30 09:48:26 +00:00
Antonin Descampe
2f3fd1194e
[trunk] prevent overflow in opj_t2_read_packet_header (update issue 389)
2014-09-30 09:26:44 +00:00
Antonin Descampe
f08af3ed82
[trunk] Ensure cblk->data pointer is correctly initialized (updates issue 391). Still need to check if it does not fail anymore with ASan.
2014-09-29 12:03:50 +00:00
Antonin Descampe
2720a1a405
[trunk] fixed tile numbering in output message (fixes issue 370)
2014-09-29 12:03:36 +00:00
Antonin Descampe
6868ee373e
added memory allocation checks (fixes issue 355)
2014-09-19 10:26:35 +00:00
Antonin Descampe
50a205d20f
[trunk] improve memory management (fixes issue 359)
2014-09-16 15:48:04 +00:00
Antonin Descampe
b0072bf658
[trunk] allow compilation with MinGW32 (fixes issue 361)
2014-09-16 15:38:11 +00:00
Antonin Descampe
2c810567dd
[trunk] Changed error to warning when no EOC found in codestream (fixes
...
issue 366)
2014-07-14 07:42:50 +00:00
Antonin Descampe
0a1a29a7fe
[trunk] replaced malloc with opj_malloc. (Fixes issue 368).
2014-07-03 16:05:56 +00:00
Antonin Descampe
7d21871ed8
[trunk] fixes issue #357 . MCT is automatically disabled when
...
subsamppling is detected.
2014-07-03 09:15:13 +00:00
Antonin Descampe
a38b97fae0
[trunk] moved comment marker setup from opj_compress to the library
2014-07-01 13:51:55 +00:00
Antonin Descampe
45313a8dfa
[trunk] fixed warning in j2k.c about sign conversion
2014-04-28 09:38:44 +00:00
Mathieu Malaterre
b08135e7c1
[trunk] Finalize API for openjpeg 2.1
...
public header will only contains minimal information: major, minor and build version
Prefix has been changed from OPENJPEG to OPJ for consistency
SOVERSION has been removed from header (ABI vs API info)
OPJ_VERSION string has been removed, since it is accessible already (PACKAGE_VERSION)
Fixes issue 342
2014-04-28 09:17:31 +00:00
Mathieu Malaterre
4bac8488df
[trunk] Properly handle failure to compress (remove file)
...
Fixes issue 323
2014-04-28 07:54:33 +00:00
Mathieu Malaterre
de04302c15
[trunk] Missing endianess setting
...
Fixes issue 337
2014-04-28 07:44:39 +00:00
Mathieu Malaterre
997758f91c
[trunk] properly handle pkg-config on non-UNIX hosts
...
Fixes issue 340
2014-04-28 07:34:26 +00:00
Mathieu Malaterre
763214f7c0
[trunk] Provide #ifdef blockers for OpenJPEG Version
...
Fixes issue 342
2014-04-28 07:32:35 +00:00
Mathieu Malaterre
7a77a8047d
[trunk] Make sure OpenJPIP compiles on WIN32
2014-04-24 11:24:56 +00:00
Antonin Descampe
d8767cbcb7
[trunk] fixed reference to opj_stream_set_user_data_v3 in jpip sources.
2014-04-24 08:51:29 +00:00
Antonin Descampe
7924d3a456
[trunk]removed '-x' option for index file as long as it's broken
2014-04-23 15:19:57 +00:00
Antonin Descampe
ec84bafcd8
[trunk]re-formatted help display in executables
2014-04-23 14:09:20 +00:00
Antonin Descampe
08c09b74cf
[trunk]formatted some messages. Removed -version option to disambiguate
...
with -v(erbose) option, added version info in help display
2014-04-23 09:12:30 +00:00
Antonin Descampe
7aece5e8e7
[trunk]Replaced deprecated opj_stream_set_user_data function from API
...
with its 'v3' version, and removed all other 'v3' suffixes from API.
2014-04-23 07:46:11 +00:00
Antonin Descampe
8d93eae64a
[trunk] fixed some warning and errors formatting and add a '-version'
...
option to opj_compress and opj_decompress binaries
2014-04-22 21:22:49 +00:00
Antonin Descampe
9a3d660d1b
[trunk] fixed warning related to r2837 and move new field at the end of
...
parameters structure.
2014-04-17 09:54:38 +00:00
Antonin Descampe
7199d9b5d3
[trunk] refactoring of rsiz, profiles, and extensions management
2014-04-17 09:31:37 +00:00
Antonin Descampe
d19a4ab676
[trunk] updated copyright and added copyright notice required by ISO, in each file; updated AUTHORS, NEWS
2014-04-03 15:30:57 +00:00
Antonin Descampe
4db4198722
[trunk] fixed a bug triggering SEGFAULT on debug mode (uninitialized
...
structure)
2014-04-02 16:25:40 +00:00
Antonin Descampe
a54d757a3e
[trunk] fixed warnings triggered on linux related to r2802
2014-03-26 15:17:17 +00:00
Antonin Descampe
f1d69068c7
[trunk] add ability in opj_compress to input subsampled images through
...
'-F' (aka raw option). Let the user input raw images with 444, 422, 420
(etc) subsampling. To be used in conjunction with '-mct 0' option to
compress subsampled YCC images.
2014-03-26 14:26:49 +00:00
Mathieu Malaterre
9ba6bc6042
[trunk] Make sure to test value not pointer
...
Update issue 302
2014-03-25 16:34:59 +00:00
Antonin Descampe
5e1a0fad08
[trunk] fixed bug related to r2791
2014-03-25 15:35:33 +00:00
Antonin Descampe
666f71b2a1
[trunk] fixed warning due induced by r2791
2014-03-25 13:29:11 +00:00
Antonin Descampe
2b7d5b18f3
[trunk] add "-mct {0,1,2}" option to opj_compress to allow MCT to be
...
disabled if needed.
2014-03-25 12:38:29 +00:00
Mathieu Malaterre
18d5d25cb6
[trunk] Make sure to not use alpha pointer if it is not an RGBA input
...
Fixes issue 310
2014-03-25 11:47:34 +00:00
Mathieu Malaterre
492d8ab7d9
[trunk] Rework previous commit r2610
...
This way we are able to gently deprecate the old API, and preserve ABI
Update issue 306
2014-03-25 10:23:40 +00:00
Mathieu Malaterre
18c5be69e9
[trunk] Make sure to exit early instead of looping on every single pixels
2014-03-24 16:01:51 +00:00
Mathieu Malaterre
5a70e97f51
[trunk] Fix typo in comment (this is not j2k_dump)
2014-03-24 09:49:04 +00:00
Mathieu Malaterre
f4707da97a
[trunk] Revert r2764. It breaks ~230 tests as seen on continuous. Since no dataset is available, the issue 296 will be left open.
...
Update issue 296
2014-03-18 15:19:29 +00:00
Mathieu Malaterre
51ab074d50
[trunk] User can now control source/target java version
...
Fixes issue 303
2014-03-18 15:00:23 +00:00
Mathieu Malaterre
6d9e8a5a63
[trunk] Import git commit fc884aee2b69c78500e65c3d05bf216791a9ea4a from ghostscript team
...
Fixes issue 296
2014-03-18 14:43:47 +00:00
Mathieu Malaterre
008de86533
[trunk] Import git commit 99a6f1af177c15f4db475186b79d169c993494ef from ghostscript team
...
Update issue 296
2014-03-18 14:43:18 +00:00
Mathieu Malaterre
ae49fd1aa9
[trunk] Update big endian handling no such thing as WORDS_BIGENDIAN (prefer OPJ_BIG_ENDIAN)
...
Update issue 302
2014-03-18 14:37:33 +00:00
Mathieu Malaterre
79d18f7fd0
[trunk] Now that dataset from issue 297 have been imported, run test suite.
...
None of the dataset triggered any buffer overflow. Recent changes in trunk handle all those cases.
Update issue 297
2014-03-18 10:21:11 +00:00
Mathieu Malaterre
866cd28ad4
[trunk] Update BSD-4 copyright into a BSD-3 copyright
...
Fixes issue 300
2014-03-17 15:02:49 +00:00
Mathieu Malaterre
15863e7170
[trunk] rework code from r2463. Really there has been some code duplication from r2413
...
Thanks to John Rogers (oracle.com) for report
2014-03-14 15:06:20 +00:00
Mathieu Malaterre
5e91877636
[trunk] rework code from r2463. Really there has been some code duplication from r2413
...
Thanks to John Rogers (oracle.com) for report
2014-03-14 15:04:24 +00:00
Mathieu Malaterre
7e1d012161
[trunk] Now that issue 165 dataset is in non regression repository, activate code to reject them
...
Fixes issue 165
2014-03-14 15:01:13 +00:00
Mathieu Malaterre
de74605777
[trunk] Fix issue with & vs &&
...
Fixes issue 277
2014-03-14 14:46:40 +00:00
Mathieu Malaterre
e8abf1fb25
[trunk] Add internal implementation to dump all tiles/comp info
...
Eg: opj_dump -f 8 -i input.j2k
Update issue 3
2014-03-14 13:53:36 +00:00
Mathieu Malaterre
b7fe7d25e1
[trunk] Prevent a leak when reading PPT markers
...
Update issue 295
2014-03-14 12:27:01 +00:00
Mathieu Malaterre
138a65d6c1
[trunk] Move INLINE definition within openjpeg.h header since application may use it
2014-03-14 12:02:05 +00:00
Mathieu Malaterre
9d0bdf69e5
[trunk] Apply final missing patch from sumatrapdf team:
...
http://bugs.ghostscript.com/show_bug.cgi?id=694893
Update issue 231
2014-03-14 11:59:18 +00:00
Mathieu Malaterre
3a80b72ac8
[trunk] Add a temporary work around for issue 293
...
As described in the bug report the default allocation mecanism for codeblock data is too small for those dataset (16bits). We would need a finer (more granular) mecanism to reallocated only on demand. For now this help the two failing tests to pass.
Fixes issue 293
2014-03-14 10:54:08 +00:00
Mathieu Malaterre
fd3f7ca2bb
[trunk] Remove warnings about unused values introduced in r2710
...
Thanks to Matthieu Darbois for patch
Fixes issue 290
2014-03-14 08:44:53 +00:00
Mathieu Malaterre
6e22c4f68a
[trunk] Add some sanity checks when reading Ippm(i) segments
...
Update issue 288
2014-03-13 15:34:36 +00:00
Mathieu Malaterre
565ef29ae3
[trunk] Make sure to reallocate ppm data buffer when multiple Ippm(i) buffer are found
...
This handle the case where remaining data is exactly Nppm(i)
Fixes issue 287
2014-03-13 13:47:44 +00:00
Mathieu Malaterre
5624e4a25f
[trunk] Always report when decompression failed as return code value
2014-03-13 12:31:41 +00:00
Mathieu Malaterre
320784659d
[trunk] Just in case this would be helpful for other, here is the code used to track issue 80
...
Update issue 80
2014-03-13 10:56:48 +00:00
Mathieu Malaterre
51ab8cd67d
[trunk] Tweak documentation in t2.c. Be more verbose in case of failure.
2014-03-13 10:46:54 +00:00
Mathieu Malaterre
237253d83b
[trunk] Add some documention in the pi code
2014-03-13 10:42:06 +00:00
Mathieu Malaterre
fe100fb490
[trunk] Add debug code to extract decompressed image right before PCLR handling
...
Update issue 235
2014-03-13 10:35:41 +00:00
Mathieu Malaterre
41add6882b
[trunk] Make sure to use 8bits buffer when applying the ICC profile.
...
Fixes issue 281
2014-03-12 14:18:25 +00:00
Mathieu Malaterre
dd0d2c2f0a
[trunk] Add debug info to be able to test integration with littlecms
2014-03-12 13:55:41 +00:00
Mathieu Malaterre
6b51d11d08
[trunk] Make sure when reading POC that number of layers (layer end) is within acceptable bound.
...
Fixes issue 80
2014-03-12 10:10:21 +00:00
Mathieu Malaterre
59270c39a7
[trunk] Re-active old warning about missing SOP marker
2014-03-11 15:21:12 +00:00
Mathieu Malaterre
db82cf7778
[trunk] Add debug info to track issue 80
...
Update issue 80
2014-03-11 15:17:39 +00:00
Mathieu Malaterre
ddb1d57766
[trunk] Rework assertion to work on 32bits system
2014-03-11 12:56:52 +00:00
Mathieu Malaterre
5dd770746b
[trunk] Fix remainings warnings on linux/32bits arch
2014-03-11 10:28:04 +00:00
Mathieu Malaterre
fa436eb368
[trunk] Rework fseek ifdefs blockers, it breaks the 64bits behavior for fseeko
2014-03-11 10:27:01 +00:00
Mathieu Malaterre
fcc658f106
[trunk] Fix compilation errors when JPWL and/or MJ2 are build
2014-03-11 09:11:35 +00:00
Mathieu Malaterre
2e7b8fb9a1
[trunk] Another final round of fixes for sign conversion warnings.
...
Fixes issue 256
2014-03-10 16:43:04 +00:00
Mathieu Malaterre
1778e2576e
[trunk] Another round of fixes for sign conversion warnings.
...
Update issue 256
2014-03-10 16:17:12 +00:00
Mathieu Malaterre
73c9e85642
[trunk] Another round of fixes for sign conversion warnings.
...
Update issue 256
2014-03-10 16:17:01 +00:00
Mathieu Malaterre
76557d2eb3
[trunk] Another round of fixes for sign conversion warnings.
...
Update issue 256
2014-03-10 15:51:05 +00:00
Mathieu Malaterre
c02c1432e8
[trunk] Remove a set of warning about sign conversion
...
Update issue 266
2014-03-10 14:15:27 +00:00
Mathieu Malaterre
8411ed4f80
[trunk] Remove warning about sign conversion in color.c
...
Update issue 256
2014-03-10 14:05:25 +00:00
Mathieu Malaterre
b01c1240cf
[trunk] Fix simple sign conversion warnings only visible on 32bits arch
2014-03-10 12:22:56 +00:00
Mathieu Malaterre
9a52b30c3d
[trunk] Properly handle PGM file generation when fullpath is specified in the cmd line
...
This will break a very old behavior (since 2005), but avoid writing in un-expected places for users
This also make the behavior similar with PGX file generation
2014-03-10 10:52:09 +00:00
Mathieu Malaterre
666ef53fd2
[trunk] Make sure to always initialize variable
2014-03-10 08:40:02 +00:00
Mathieu Malaterre
e02ba05034
[trunk] Fix warnings about shadow variables
2014-03-10 08:25:08 +00:00
Mathieu Malaterre
b478912910
[trunk] remove a warning when using strict prototype
2014-03-10 08:15:43 +00:00
Mathieu Malaterre
2001932c56
[trunk] Remove 2 warnings about set but not used variables
2014-03-10 08:13:05 +00:00
Mathieu Malaterre
f54de95802
[trunk] Upon failure, need to return proper return code
2014-03-07 17:23:19 +00:00
Mathieu Malaterre
ffad2fbe55
[trunk] Another round of fixes for sign conversion warnings.
...
Update issue 256
2014-03-07 14:14:31 +00:00
Mathieu Malaterre
cc1354ebfa
[trunk] Another round of fixes for sign conversion warnings.
...
Update issue 256
2014-03-07 14:00:47 +00:00
Mathieu Malaterre
581d2ba8b4
[trunk] Rework r2597, make sure test suite is passing now.
...
Update issue 256
2014-03-07 13:50:58 +00:00
Mathieu Malaterre
61348b20b4
[trunk] Another round of fixes for sign conversion warnings.
...
Update issue 256
2014-03-07 13:43:15 +00:00
Mathieu Malaterre
e619e06078
[trunk] Another round of fixes for sign conversion warnings.
...
Update issue 256
2014-03-07 13:40:54 +00:00
Mathieu Malaterre
4f84d1693a
[trunk] Another round of fixes for sign conversion warnings.
...
Update issue 256
2014-03-07 13:37:45 +00:00
Mathieu Malaterre
71d244a5b6
[trunk] Another round of fixes for sign conversion warnings.
...
Update issue 256
2014-03-07 13:33:47 +00:00
Mathieu Malaterre
f9a0f869e3
[trunk] Another round of fixes for sign conversion warnings.
...
Update issue 256
2014-03-07 13:31:25 +00:00
Mathieu Malaterre
33c472d734
[trunk] Redo r2623, and remove guilty section
...
Update issue 256
2014-03-07 13:29:35 +00:00
Mathieu Malaterre
a8eb122c1f
[trunk] Revert r2623 for now
2014-03-07 13:14:26 +00:00
Mathieu Malaterre
956b1a7697
[trunk] Another round of fixes for sign conversion warnings.
...
Update issue 256
2014-03-07 12:06:00 +00:00
Mathieu Malaterre
472ce19183
[trunk] Another round of fixes for sign conversion warnings.
...
Update issue 256
2014-03-07 12:01:41 +00:00
Mathieu Malaterre
740924fa61
[trunk] Another round of fixes for sign conversion warnings.
...
Update issue 256
2014-03-07 11:59:29 +00:00
Mathieu Malaterre
01b4bb5447
[trunk] Another round of fixes for sign conversion warnings.
...
Update issue 256
2014-03-07 11:57:37 +00:00
Mathieu Malaterre
ee3b02932a
[trunk] Another round of fixes for sign conversion warnings.
...
Update issue 256
2014-03-07 11:43:50 +00:00
Mathieu Malaterre
2a07d3d26b
[trunk] Another round of fixes for sign conversion warnings.
...
Update issue 256
2014-03-07 11:28:34 +00:00
Mathieu Malaterre
e238148d42
[trunk] Another round of fixes for sign conversion warnings.
...
Update issue 256
2014-03-07 11:27:34 +00:00
Mathieu Malaterre
9d21695476
[trunk] As reported by clang analyzer thoses values were never read
2014-03-07 11:20:59 +00:00
Mathieu Malaterre
22d11a9ccb
[trunk] Remove mem leak and warning reported by clang
2014-03-07 11:17:51 +00:00
Mathieu Malaterre
fc9248ea2b
[trunk] Remove simple warnings about format
2014-03-07 11:11:43 +00:00
Mathieu Malaterre
c302979738
[trunk] Remove simple warning about functions not used
2014-03-07 11:08:35 +00:00
Mathieu Malaterre
e4d077bc98
[trunk] Another round of fixes for sign conversion warnings.
...
Update issue 256
2014-03-07 11:06:13 +00:00
Mathieu Malaterre
76cd9b7f72
[trunk] Another round of fixes for sign conversion warnings.
...
Update issue 256
2014-03-07 10:25:16 +00:00
Mathieu Malaterre
e71431ec78
[trunk] Fix simple warning about sign conversion
...
Update issue 256
2014-03-07 10:21:51 +00:00
Mathieu Malaterre
7b335eb635
[trunk] Another of fixes for warning about sign conversion
...
Update issue 256
2014-03-07 10:19:39 +00:00
Mathieu Malaterre
c0c086388b
[trunk] Fix warning about sign conversion
...
Update issue 256
2014-03-07 10:03:56 +00:00
Mathieu Malaterre
048c8302fe
[trunk] un-deprecated opj_stream_destroy API, import patch manually
...
In some case user still want to be able to call opj_stream_destroy.
Fixes issue 227
2014-03-07 09:58:32 +00:00
Mathieu Malaterre
a7b051b172
[trunk] Update memory management mecanism
...
Fixes issue 253
2014-03-07 09:44:32 +00:00
Mathieu Malaterre
5f7ad58f48
[trunk] Remove self-assignement.
...
Fixes issue 273
2014-03-07 09:33:32 +00:00
Mathieu Malaterre
016b9fc052
[trunk] Fix compilation in visual studio, inline cannot be used directly.
...
Fixes issue 272
2014-03-07 09:15:27 +00:00
Mathieu Malaterre
37128c34a9
[trunk] Fix mem leaks reported by cppcheck
2014-03-07 08:48:47 +00:00
Mathieu Malaterre
6790587db8
[trunk] Revert r2597 for now, since it breaks a lot of tests
2014-03-06 17:25:08 +00:00
Mathieu Malaterre
445f696dc6
[trunk] Remove warning about sign conversion.
...
Update issue 256
2014-03-06 16:59:34 +00:00
Mathieu Malaterre
dd5c3a9c8e
[trunk] Remove some easy warnings
2014-03-06 16:29:03 +00:00
Mathieu Malaterre
0f45e38b52
[trunk] Remove warning about sign conversion.
...
Update issue 256
2014-03-06 16:26:24 +00:00
Mathieu Malaterre
93bc3cb628
[trunk] Remove warning about sign conversion.
...
Update issue 256
2014-03-06 16:01:23 +00:00
Mathieu Malaterre
7e64eb5414
[trunk] Remove some easy warnings about sign compare reported by gcc
2014-03-06 15:00:41 +00:00
Mathieu Malaterre
4d5d1f0f66
[trunk] Handle cmap where direct use is specified (issue235_cmapsubbox.jp2)
...
I doubt the old code ever work. The new code copy the old codestream bytes into the new components (instead of copying the pointer).
Technically the issue235.jp2 file should be handled since I.5.3.5 specifies that:
...
If the JP2 Header box does not contain a Component Mapping box, the components shall be mapped directly to channels,
such that component i is mapped to channel i.
...
Update issue 235
2014-03-05 09:45:04 +00:00
Mathieu Malaterre
1ef677f264
[trunk] Make sure to reject images such as 1336.pdf.asan.47.376.jp2
...
Fixes issue 267
2014-03-04 10:32:26 +00:00
Mathieu Malaterre
07193e2a34
[trunk] remove more conversion warning in multi-lines macro.
...
C allow simple tricks such as to find those:
gcc -E tcd.c | sed '/^\#/d' | indent -st -i2 > clean.c
Update issue 256
2014-03-04 09:58:07 +00:00
Mathieu Malaterre
f7da94610d
[trunk] Remove some conversion warnings reported by gcc
...
Update issue 256
2014-03-04 09:55:38 +00:00
Mathieu Malaterre
872368d25c
[trunk] Remove another warning. ftell returns long int
...
Update issue 256
2014-03-04 09:32:19 +00:00
Mathieu Malaterre
36320b4bf4
[trunk] Remove more conversion warnings.
...
Update issue 256
2014-03-04 09:30:07 +00:00
Mathieu Malaterre
7185faa857
[trunk] Remove warning about conversion.
...
Update issue 256
2014-03-04 09:19:49 +00:00
Mathieu Malaterre
51caff5dcf
[trunk] Revert portion of r2562, need to investigate issue.
...
Update issue 269
2014-03-04 08:40:06 +00:00
Mathieu Malaterre
d643ff5dbc
[trunk] Remove remaining conversion issues in mqc.c
2014-03-03 16:11:41 +00:00
Mathieu Malaterre
44ca89eff7
[trunk] Remove remainings conversion issues in t2.c + clock.c
2014-03-03 16:08:03 +00:00
Mathieu Malaterre
7afad19c77
[trunk] Remove a simple warning about int -> float conversion
2014-03-03 16:02:36 +00:00
Mathieu Malaterre
765c4ab4f4
[trunk] rework code to avoid a warning. this also remove a division and prefer bit-shift
2014-03-03 16:02:16 +00:00
Mathieu Malaterre
24eca792ff
[trunk] Remove some more warnings about conversion
2014-03-03 15:55:27 +00:00
Mathieu Malaterre
b1b17ee264
[trunk] Prefer compile time constant to avoid conversion double -> int
2014-03-03 15:55:06 +00:00
Mathieu Malaterre
74600cfb14
[trunk] Review warning about types conversion, and add cast when needed
2014-03-03 15:47:23 +00:00