diff options
| -rw-r--r-- | engines/tony/mpal/lzo.cpp | 19 | ||||
| -rw-r--r-- | engines/tony/mpal/lzo.h | 13 |
2 files changed, 14 insertions, 18 deletions
diff --git a/engines/tony/mpal/lzo.cpp b/engines/tony/mpal/lzo.cpp index 62b882aa39..b681cdbfc3 100644 --- a/engines/tony/mpal/lzo.cpp +++ b/engines/tony/mpal/lzo.cpp @@ -209,8 +209,11 @@ match: NEED_OP(t + 3 - 1); { copy_match: - *op++ = *m_pos++; *op++ = *m_pos++; - do *op++ = *m_pos++; while (--t > 0); + *op++ = *m_pos++; + *op++ = *m_pos++; + do + *op++ = *m_pos++; + while (--t > 0); } match_done: @@ -219,9 +222,16 @@ match_done: break; match_next: - assert(t > 0); assert(t < 4); NEED_OP(t); NEED_IP(t+1); + assert(t > 0); + assert(t < 4); + NEED_OP(t); + NEED_IP(t + 1); *op++ = *ip++; - if (t > 1) { *op++ = *ip++; if (t > 2) { *op++ = *ip++; } } + if (t > 1) { + *op++ = *ip++; + if (t > 2) + *op++ = *ip++; + } t = *ip++; } while (TEST_IP && TEST_OP); } @@ -235,5 +245,4 @@ eof_found: } } // end of namespace MPAL - } // end of namespace Tony diff --git a/engines/tony/mpal/lzo.h b/engines/tony/mpal/lzo.h index 4384e3fb33..a95a14b267 100644 --- a/engines/tony/mpal/lzo.h +++ b/engines/tony/mpal/lzo.h @@ -86,25 +86,12 @@ namespace MPAL { #define LZO_E_NOT_YET_IMPLEMENTED (-9) /* [not used right now] */ #define LZO_E_INVALID_ARGUMENT (-10) -#define LZO1X_999_MEM_COMPRESS ((uint32) (14 * 16384L * sizeof(uint16))) - /** * Decompresses an LZO compressed resource */ int lzo1x_decompress(const byte *src, uint32 src_len, byte *dst, uint32 *dst_len); -/** - * Comrpess a data block into an LZO stream - */ -int lzo1x_1_compress(const byte *src, uint32 src_len, byte *dst, uint32 *dst_len, void *wrkmem); - -/** - * better compression ratio at the cost of more memory and time - */ -int lzo1x_999_compress(const byte *src, uint32 src_len, byte *dst, uint32 *dst_len, void *wrkmem); - } // end of namespace MPAL - } // end of namespace Tony #endif /* already included */ |