[Scummvm-cvs-logs] scummvm master -> f2511e5a9ecfebdf5c03319acb9466e070fa3d06

bluegr bluegr at gmail.com
Sun Dec 7 16:51:41 CET 2014


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

Summary:
fa9e2f7b29 SWORD25: Disable unused code
bb120d0fd4 COMMON: Disable unused string
f2511e5a9e IMAGE: Disable unused MJPEG array


Commit: fa9e2f7b29a487d0bcfc697b3f4a71c9387fe7ba
    https://github.com/scummvm/scummvm/commit/fa9e2f7b29a487d0bcfc697b3f4a71c9387fe7ba
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-07T17:49:52+02:00

Commit Message:
SWORD25: Disable unused code

Thanks to fingolfin for pointing out this unused code

Changed paths:
    engines/sword25/sword25.cpp
    engines/sword25/util/lua/lapi.cpp
    engines/sword25/util/lua/liolib.cpp



diff --git a/engines/sword25/sword25.cpp b/engines/sword25/sword25.cpp
index bb0aab3..76142c2 100644
--- a/engines/sword25/sword25.cpp
+++ b/engines/sword25/sword25.cpp
@@ -57,7 +57,6 @@ DECLARE_SINGLETON(Sword25::RenderObjectRegistry);
 
 namespace Sword25 {
 
-const char *const PACKAGE_MANAGER = "archiveFS";
 const char *const DEFAULT_SCRIPT_FILE = "/system/boot.lua";
 
 Sword25Engine::Sword25Engine(OSystem *syst, const ADGameDescription *gameDesc):
diff --git a/engines/sword25/util/lua/lapi.cpp b/engines/sword25/util/lua/lapi.cpp
index b97e900..d7ebdcb 100644
--- a/engines/sword25/util/lua/lapi.cpp
+++ b/engines/sword25/util/lua/lapi.cpp
@@ -30,11 +30,12 @@
 #include "common/textconsole.h"
 
 
+#if 0
 const char lua_ident[] =
   "Lua: " LUA_RELEASE " " LUA_COPYRIGHT " \n"
   "Authors: " LUA_AUTHORS " \n"
   "URL: www.lua.org\n";
-
+#endif
 
 
 #define api_checknelems(L, n)	api_check(L, (n) <= (L->top - L->base))
diff --git a/engines/sword25/util/lua/liolib.cpp b/engines/sword25/util/lua/liolib.cpp
index 0d27f96..403dea2 100644
--- a/engines/sword25/util/lua/liolib.cpp
+++ b/engines/sword25/util/lua/liolib.cpp
@@ -24,7 +24,7 @@
 #define IO_OUTPUT	2
 
 
-static const char *const fnames[] = {"input", "output"};
+//static const char *const fnames[] = {"input", "output"};
 
 
 static int pushresult (lua_State *L, int i, const char *filename) {


Commit: bb120d0fd4f6b32f9b9d76d9d3b334eef58cbfb8
    https://github.com/scummvm/scummvm/commit/bb120d0fd4f6b32f9b9d76d9d3b334eef58cbfb8
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-07T17:49:55+02:00

Commit Message:
COMMON: Disable unused string

Changed paths:
    common/unzip.cpp



diff --git a/common/unzip.cpp b/common/unzip.cpp
index 716c8c2..1f4e601 100644
--- a/common/unzip.cpp
+++ b/common/unzip.cpp
@@ -334,8 +334,10 @@ int unzGetLocalExtrafield(unzFile file, voidp buf, unsigned len);
 #define SIZEZIPLOCALHEADER (0x1e)
 
 
+#if 0
 const char unz_copyright[] =
    " unzip 0.15 Copyright 1998 Gilles Vollant ";
+#endif
 
 /* unz_file_info_interntal contain internal info about a file in zipfile*/
 typedef struct {


Commit: f2511e5a9ecfebdf5c03319acb9466e070fa3d06
    https://github.com/scummvm/scummvm/commit/f2511e5a9ecfebdf5c03319acb9466e070fa3d06
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-12-07T17:49:57+02:00

Commit Message:
IMAGE: Disable unused MJPEG array

Thanks to fingolfin for pointing that out

Changed paths:
    image/codecs/mjpeg.cpp



diff --git a/image/codecs/mjpeg.cpp b/image/codecs/mjpeg.cpp
index 4ad72f2..6e7faf1 100644
--- a/image/codecs/mjpeg.cpp
+++ b/image/codecs/mjpeg.cpp
@@ -87,9 +87,11 @@ static const byte s_mjpegValDC[12] = {
 	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11
 };
 
+#if 0
 static const byte s_mjpegBitsDCChrominance[17] = {
 	/* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0
 };
+#endif
 
 static const byte s_mjpegBitsACLuminance[17] = {
 	/* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d






More information about the Scummvm-git-logs mailing list