From 68e19d426ba6d9f048ebfdf337b93a85dc4d5b4c Mon Sep 17 00:00:00 2001 From: Arne Schwabe Date: Sun, 29 Jun 2014 18:18:50 +0200 Subject: Update lzo version --HG-- extra : rebase_source : 4310223035376c8ac1773fd03a43289aa96ce4f3 --- main/lzo/src/lzo1f_9x.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'main/lzo/src/lzo1f_9x.c') diff --git a/main/lzo/src/lzo1f_9x.c b/main/lzo/src/lzo1f_9x.c index 3846651a..eb78d8cb 100644 --- a/main/lzo/src/lzo1f_9x.c +++ b/main/lzo/src/lzo1f_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 @@ -112,7 +97,7 @@ static lzo_bytep STORE_RUN ( lzo_bytep op, const lzo_bytep ii, lzo_uint t, lzo_bytep out ) { if (t < 4 && op > out) - op[-2] |= LZO_BYTE(t); + op[-2] = LZO_BYTE(op[-2] | t); else if (t <= 31) *op++ = LZO_BYTE(t); else -- cgit v1.2.3