X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=images%2Fio-libmagick.c;h=fd9069f349d210297e53853dd9adc034f7a4cb77;hb=86b74f27a95b617008575a9088e4c675e9f956d6;hp=60d3615941c0330fa7fa833670ea394f5ef54026;hpb=bf5edbdd5b56a0d2e239e96dd476c7a9a562506a;p=libucw.git diff --git a/images/io-libmagick.c b/images/io-libmagick.c index 60d36159..fd9069f3 100644 --- a/images/io-libmagick.c +++ b/images/io-libmagick.c @@ -9,9 +9,9 @@ #undef LOCAL_DEBUG -#include "lib/lib.h" -#include "lib/mempool.h" -#include "lib/fastbuf.h" +#include "ucw/lib.h" +#include "ucw/mempool.h" +#include "ucw/fastbuf.h" #include "images/images.h" #include "images/error.h" #include "images/color.h" @@ -82,7 +82,7 @@ libmagick_read_header(struct image_io *io) DBG("libmagick_read_header()"); /* Read entire stream */ - sh_off_t file_size = bfilesize(io->fastbuf) - btell(io->fastbuf); + ucw_off_t file_size = bfilesize(io->fastbuf) - btell(io->fastbuf); if (unlikely(file_size > MAX_FILE_SIZE)) { IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Too long stream.");