X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fobject.c;h=9133b7e6d8ff16e4d74f631ad6e12088478caf34;hb=c8c688e0b06fdacb20b28b66b9b0608dae8ca0dc;hp=5e0fa825fc4773a8a729c84ce30016355103543b;hpb=c08e5b6cf16ac7fdf810a142bf2f1f48951ba3fc;p=libucw.git

diff --git a/images/object.c b/images/object.c
index 5e0fa825..9133b7e6 100644
--- a/images/object.c
+++ b/images/object.c
@@ -9,9 +9,9 @@
 #undef LOCAL_DEBUG
 
 #include "sherlock/sherlock.h"
-#include "lib/base224.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
+#include "ucw/base224.h"
+#include "ucw/mempool.h"
+#include "ucw/fastbuf.h"
 #include "sherlock/object.h"
 #include "images/images.h"
 #include "images/object.h"
@@ -29,7 +29,7 @@ get_image_obj_info(struct image_obj_info *ioi, struct odes *o)
       DBG("Missing image info attribute");
       return 0;
     }
-  byte color_space[MAX_ATTR_SIZE], thumb_format[MAX_ATTR_SIZE];
+  byte color_space[16], thumb_format[16];
   UNUSED uns cnt = sscanf(v, "%d%d%s%d%d%d%s", &ioi->cols, &ioi->rows, color_space,
       &ioi->colors, &ioi->thumb_cols, &ioi->thumb_rows, thumb_format);
   ASSERT(cnt == 7);
@@ -48,9 +48,13 @@ get_image_obj_thumb(struct image_obj_info *ioi, struct odes *o, struct mempool *
       return 0;
     }
   uns count = 0;
+  uns max_len = 0;
   for (struct oattr *b = a; b; b = b->same)
-    count++;
-  byte buf[count * MAX_ATTR_SIZE], *b = buf;
+    {
+      count++;
+      max_len += strlen(b->val);
+    }
+  byte buf[max_len + 1], *b = buf;
   for (; a; a = a->same)
     b += base224_decode(b, a->val, strlen(a->val));
   ASSERT(b != buf);
@@ -84,40 +88,23 @@ error:
   return NULL;
 }
 
-uns
-encode_image_obj_signature(byte *buf, struct image_signature *sig)
-{
-  /* signatures should be short enough to fit one attribute */
-  byte tmp[sizeof(struct image_signature)];
-  uns size = put_image_signature(tmp, sig);
-  ASSERT(MAX_ATTR_SIZE > BASE224_ENC_LENGTH(size));
-  uns len = base224_encode(buf, tmp, size);
-  buf[len] = 0;
-  return len;
-}
-
-uns
-decode_image_obj_signature(byte *buf, struct image_signature *sig)
-{
-  if (!buf)
-    return 0;
-  byte tmp[sizeof(struct image_signature)];
-  UNUSED uns size = base224_decode(tmp, buf, strlen(buf));
-  ASSERT(size == image_signature_size(*tmp));
-  get_image_signature(tmp, sig);
-  return 1;
-}
-
 void
 put_image_obj_signature(struct odes *o, struct image_signature *sig)
 {
-  byte buf[MAX_ATTR_SIZE];
-  encode_image_obj_signature(buf, sig);
+  /* signatures should be short enough to in a single attribute */
+  uns size = image_signature_size(sig->len);
+  byte buf[BASE224_ENC_LENGTH(size) + 1];
+  buf[base224_encode(buf, (byte *)sig, size)] = 0;
   obj_set_attr(o, 'H', buf);
 }
 
 uns
-get_image_obj_signature(struct odes *o, struct image_signature *sig)
+get_image_obj_signature(struct image_signature *sig, struct odes *o)
 {
-  return decode_image_obj_signature(obj_find_aval(o, 'H'), sig);
+  byte *a = obj_find_aval(o, 'H');
+  if (!a)
+    return 0;
+  UNUSED uns size = base224_decode((byte *)sig, a, strlen(a));
+  ASSERT(size == image_signature_size(sig->len));
+  return 1;
 }