Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git#dev-threads

[libucw.git] / images / object.c

diff --git a/images/object.c b/images/object.c
index 3935f89b6e37712cd388b2548f4364720e046574..0375fdd906e9fb503fb96a68707d2ce7f5dea963 100644 (file)
--- 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));