diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-01-26 16:01:57 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-04-23 20:29:28 +0200 |
| commit | 84b9276e8ccc4e5c73f9aa7c59bcb3f9d6c3e190 (patch) | |
| tree | a2455eab424851d0895f8faeaaa97b149e8d34a4 /include | |
| parent | a3756d8e1c2d559a7a60056a43182044998d85af (diff) | |
ofz: tidy up eps preview import
a) check that the remaining stream length is >= the 14 bytes that are
unconditionally skipped
b) make the initial security count the min of the arbitrary 100 and the
remaining stream len less that 14 bytes
c) tweak ImplGetNumber not to reduce nSecurityCount if its already 0
(cherry picked from commit 94ffb720b889c51665ebb789d84aee3b3bacb456)
ofz: check eps seeks are sane and succeeded
(cherry picked from commit f85fb724d52a0fff9c64365cd202ae8975492c05)
ofz: check if the stream is able to meet the eps len claim before reading
(cherry picked from commit e17a34e957c21a8cd2977b1b0e1c9a427c244aed)
ofz: check if the stream is able to meet the eps len claim before reading
(cherry picked from commit d1f31681623696e99b0bd9e98570cb1ebac518cc)
make this a little more readable
(cherry picked from commit cf06348d9d4be8b8460d202cebf0d995fd4f6abf)
move deref inside (laughable) nSecurityCount check
(cherry picked from commit 521723b1180a32c02a88ed47137d4242c06eaca7)
0eb45e1c1ffd91682ed0ce6a6a74eab54666d715
65407bffb67449e203b8ead23554a4e88387d214
440c7f38d6588c570a411f2a97c0164e5d7d646f
83b6b0bd636b639ce0892f22f216410ce79dee03
df9a83ffa80137967d8c77d7a9b5133529fc2858
Reviewed-on: https://gerrit.libreoffice.org/33635
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 390c730b460054ec41e0ab1b807ea0c2bba4ecbd)
(cherry picked from commit 63ef07111568a2f2f95d6f1ab45a70a2b5ae2ccd)
Change-Id: Ifffa6d02d492affd578fb48007704457ad635b39
Diffstat (limited to 'include')
| -rw-r--r-- | include/sal/log-areas.dox | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index d734876a8a75..aa772567015f 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -173,6 +173,7 @@ certain functionality. @section Filter @li @c filter.config +@li @c filter.eps @li @c filter.ms - escher import/export @li @c filter.odfflatxml @li @c filter.os2met |