X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fobject.c;h=0375fdd906e9fb503fb96a68707d2ce7f5dea963;hb=0e5c5828c3f3e1abd14bd012827e6b467075290b;hp=3935f89b6e37712cd388b2548f4364720e046574;hpb=32a626b1e7d24c528b5c863d79713c3f3f62a068;p=libucw.git diff --git a/images/object.c b/images/object.c index 3935f89b..0375fdd9 100644 --- a/images/object.c +++ b/images/object.c @@ -6,7 +6,7 @@ * This software may be freely distributed and used according to the terms */ -#define LOCAL_DEBUG +#undef LOCAL_DEBUG #include "sherlock/sherlock.h" #include "lib/base224.h" @@ -75,9 +75,8 @@ read_image_obj_thumb(struct image_obj_info *ioi, struct fastbuf *fb, struct imag if (!io->background_color.color_space) io->background_color = color_white; struct image *img; - if (!(img = image_io_read_data(io, 0))) + if (!(img = image_io_read_data(io, 1))) goto error; - ASSERT(img->cols == ioi->thumb_cols && img->rows == ioi->thumb_rows); DBG("Decompressed thumbnail: size=%ux%u", img->cols, img->rows); return img; error: @@ -88,7 +87,7 @@ error: void put_image_obj_signature(struct odes *o, struct image_signature *sig) { - /* signatures should be short enough to fit one attribute */ + /* signatures should be short enough to in a single attribute */ byte buf[MAX_ATTR_SIZE]; uns size = image_signature_size(sig->len); ASSERT(MAX_ATTR_SIZE > BASE224_ENC_LENGTH(size));