diff options
| author | Robin Watts <robin.watts@artifex.com> | 2017-07-05 18:46:47 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2017-07-19 19:41:23 +0100 |
| commit | e09d2d36fb0a31cceca82833c1312ac789cb29f6 (patch) | |
| tree | 6ece089ea79f00e7ff9a701e646c527acff91352 | |
| parent | 29cb4a2040860ce0a5e825aa6bcf10a0825d4831 (diff) | |
| download | mupdf-e09d2d36fb0a31cceca82833c1312ac789cb29f6.tar.xz | |
Keep fz_store_hash to declared size.
Could shrink this further, but we can't go below another 4 bytes
so it's not worth it.
| -rw-r--r-- | include/mupdf/fitz/store.h | 3 | ||||
| -rw-r--r-- | source/fitz/colorspace.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/include/mupdf/fitz/store.h b/include/mupdf/fitz/store.h index d014378c..274cc37a 100644 --- a/include/mupdf/fitz/store.h +++ b/include/mupdf/fitz/store.h @@ -139,8 +139,7 @@ typedef struct fz_store_hash_s { unsigned char src_md5[16]; unsigned char dst_md5[16]; - uint8_t ri; - uint8_t bp; + uint8_t ri_bp; uint8_t depth; uint8_t alpha; uint8_t proof; diff --git a/source/fitz/colorspace.c b/source/fitz/colorspace.c index 92367ff8..d9136086 100644 --- a/source/fitz/colorspace.c +++ b/source/fitz/colorspace.c @@ -256,9 +256,8 @@ fz_make_hash_link_key(fz_context *ctx, fz_store_hash *hash, void *key_) fz_link_key *key = (fz_link_key *)key_; memcpy(hash->u.link.dst_md5, key->dst_md5, 16); memcpy(hash->u.link.src_md5, key->src_md5, 16); - hash->u.link.ri = key->rend.ri; - hash->u.link.bp = key->rend.bp; hash->u.link.alpha = key->alpha; + hash->u.link.ri_bp = (key->rend.ri<<1) | key->rend.bp; hash->u.link.depth = key->depth; hash->u.link.proof = key->proof; return 1; |