[Scummvm-cvs-logs] scummvm master -> 8d8bf74ad6412bc8d23673c8874f7ace22ac3995

Strangerke Strangerke at scummvm.org
Sat Mar 1 16:39:02 CET 2014


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8d8bf74ad6 TONY: Remove unused function declaration in lzo


Commit: 8d8bf74ad6412bc8d23673c8874f7ace22ac3995
    https://github.com/scummvm/scummvm/commit/8d8bf74ad6412bc8d23673c8874f7ace22ac3995
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-01T07:37:22-08:00

Commit Message:
TONY: Remove unused function declaration in lzo

Changed paths:
    engines/tony/mpal/lzo.cpp
    engines/tony/mpal/lzo.h



diff --git a/engines/tony/mpal/lzo.cpp b/engines/tony/mpal/lzo.cpp
index 62b882a..b681cdb 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 4384e3f..a95a14b 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 */






More information about the Scummvm-git-logs mailing list