diff options
author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-02-03 15:38:26 +0000 |
---|---|---|
committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-02-03 16:11:17 +0000 |
commit | 4a0890daf4c9839711f9013a35b1912ed341e956 (patch) | |
tree | 8ae5c6780a1fcd2124e71f27ad9b4256acd24268 /src/lzo1c_9x.c | |
parent | 2cdfe9375f1145603d002c12be950062ae54da21 (diff) | |
download | lzo-baserock/tiagogomes/armv8l64.tar.gz |
Import 2.08 tarballbaserock/tiagogomes/armv8l64
Diffstat (limited to 'src/lzo1c_9x.c')
-rw-r--r-- | src/lzo1c_9x.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/lzo1c_9x.c b/src/lzo1c_9x.c index 4b7091f..9a7d6d0 100644 --- a/src/lzo1c_9x.c +++ b/src/lzo1c_9x.c @@ -2,22 +2,7 @@ This file is part of the LZO real-time data compression library. - Copyright (C) 2011 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2010 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2009 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2008 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2007 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2006 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2005 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2004 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1997 Markus Franz Xaver Johannes Oberhumer - Copyright (C) 1996 Markus Franz Xaver Johannes Oberhumer + Copyright (C) 1996-2014 Markus Franz Xaver Johannes Oberhumer All Rights Reserved. The LZO library is free software; you can redistribute it and/or @@ -306,7 +291,7 @@ lzo1c_999_compress_callback ( const lzo_bytep in , lzo_uint in_len, else if (lit < 4 && op == c->m3) { assert((c->m3[-2] >> M3O_BITS) == 0); - c->m3[-2] |= LZO_BYTE(lit << M3O_BITS); + c->m3[-2] = LZO_BYTE(c->m3[-2] | (lit << M3O_BITS)); MEMCPY_DS(op, ii, lit); assert(ii + ahead == c->ip - c->look); c->m3_r++; |