diff options
| author | Robin Watts <robin.watts@artifex.com> | 2012-07-05 17:55:18 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2012-07-05 18:02:03 +0100 |
| commit | eeaccf8444a4884801a92c0d23f66bd54c986a67 (patch) | |
| tree | fc9e254dfeef4d61a80aace2f5dbbcd985580a9a /cbz | |
| parent | b81be8d34b179d48e677463bd7b66ffdea129517 (diff) | |
| parent | 15fc25b0055dbdbfaf4257ac908d43fd5a2da19d (diff) | |
| download | mupdf-eeaccf8444a4884801a92c0d23f66bd54c986a67.tar.xz | |
Merge branch 'master' into forms
Diffstat (limited to 'cbz')
| -rw-r--r-- | cbz/mucbz.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cbz/mucbz.c b/cbz/mucbz.c index a8a1097a..f557236f 100644 --- a/cbz/mucbz.c +++ b/cbz/mucbz.c @@ -263,8 +263,8 @@ cbz_read_zip_dir(cbz_document *doc) fz_seek(file, 0, 2); filesize = fz_tell(file); - maxback = MIN(filesize, 0xFFFF + sizeof buf); - back = MIN(maxback, sizeof buf); + maxback = fz_mini(filesize, 0xFFFF + sizeof buf); + back = fz_mini(maxback, sizeof buf); while (back < maxback) { |