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 /xps/xps_zip.c | |
parent | b81be8d34b179d48e677463bd7b66ffdea129517 (diff) | |
parent | 15fc25b0055dbdbfaf4257ac908d43fd5a2da19d (diff) | |
download | mupdf-eeaccf8444a4884801a92c0d23f66bd54c986a67.tar.xz |
Merge branch 'master' into forms
Diffstat (limited to 'xps/xps_zip.c')
-rw-r--r-- | xps/xps_zip.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xps/xps_zip.c b/xps/xps_zip.c index f82343bc..58f04009 100644 --- a/xps/xps_zip.c +++ b/xps/xps_zip.c @@ -302,8 +302,8 @@ xps_find_and_read_zip_dir(xps_document *doc) fz_seek(doc->file, 0, SEEK_END); file_size = fz_tell(doc->file); - maxback = MIN(file_size, 0xFFFF + sizeof buf); - back = MIN(maxback, sizeof buf); + maxback = fz_mini(file_size, 0xFFFF + sizeof buf); + back = fz_mini(maxback, sizeof buf); while (back < maxback) { |