summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--src/base64.cpp63
-rw-r--r--src/base64.h11
-rw-r--r--src/resources/mapreader.cpp2
4 files changed, 41 insertions, 46 deletions
diff --git a/ChangeLog b/ChangeLog
index b0bb93f8..e252142b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,16 @@
-2006-12-06 Eugenio Favalli <elvenprogrammer@gmail.com>
+2006-12-08 Bjørn Lindeijer <bjorn@lindeijer.nl>
+
+ * src/base64.cpp, src/base64.h, src/resources/mapreader.cpp:
+ Downgraded to base64 codec from PHP 3 to resolve licensing issues.
+
+2006-12-06 Eugenio Favalli <elvenprogrammer@gmail.com>
* The Mana World.dev, tmw.cbp: Updated project files.
2006-12-06 Philipp Sehmisch <tmw@crushnet.org>
- * src/net/beinghandler.cpp: Fixed crashs when changing equipment.
- data/graphics/tiles/desert1.png, data/graphics/tiles/desert2.png:
+ * src/net/beinghandler.cpp: Fixed crashs when changing equipment.
+ * data/graphics/tiles/desert1.png, data/graphics/tiles/desert2.png:
More tiling related fixes at the cliffs.
2006-12-06 Bjørn Lindeijer <bjorn@lindeijer.nl>
diff --git a/src/base64.cpp b/src/base64.cpp
index 6d503a53..9a8f6356 100644
--- a/src/base64.cpp
+++ b/src/base64.cpp
@@ -1,16 +1,27 @@
/*
+----------------------------------------------------------------------+
- | PHP version 4.0 |
+ | PHP HTML Embedded Scripting Language Version 3.0 |
+----------------------------------------------------------------------+
- | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group |
+ | Copyright (c) 1997-2000 PHP Development Team (See Credits file) |
+----------------------------------------------------------------------+
- | This source file is subject to version 2.02 of the PHP license, |
- | that is bundled with this package in the file LICENSE, and is |
- | available at through the world-wide-web at |
- | http://www.php.net/license/2_02.txt. |
- | If you did not receive a copy of the PHP license and are unable to |
- | obtain it through the world-wide-web, please send a note to |
- | license@php.net so we can mail you a copy immediately. |
+ | This program is free software; you can redistribute it and/or modify |
+ | it under the terms of one of the following licenses: |
+ | |
+ | A) the GNU General Public License as published by the Free Software |
+ | Foundation; either version 2 of the License, or (at your option) |
+ | any later version. |
+ | |
+ | B) the PHP License as published by the PHP Development Team and |
+ | included in the distribution in the file: LICENSE |
+ | |
+ | This program is distributed in the hope that it will be useful, |
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
+ | GNU General Public License for more details. |
+ | |
+ | You should have received a copy of both licenses referred to here. |
+ | If you did not, or have any questions about PHP licensing, please |
+ | contact core@php.net. |
+----------------------------------------------------------------------+
| Author: Jim Winstead (jimw@php.net) |
+----------------------------------------------------------------------+
@@ -32,8 +43,8 @@ static char base64_table[] =
};
static char base64_pad = '=';
-unsigned char *php_base64_encode(const unsigned char *str, int length, int *ret_length) {
- const unsigned char *current = str;
+unsigned char *php3_base64_encode(const unsigned char *string, int length, int *ret_length) {
+ const unsigned char *current = string;
int i = 0;
unsigned char *result = (unsigned char *)malloc(((length + 3 - length % 3) * 4 / 3 + 1) * sizeof(char));
@@ -69,27 +80,13 @@ unsigned char *php_base64_encode(const unsigned char *str, int length, int *ret_
}
/* as above, but backwards. :) */
-unsigned char *php_base64_decode(const unsigned char *str, int length, int *ret_length) {
- const unsigned char *current = str;
+unsigned char *php3_base64_decode(const unsigned char *string, int length, int *ret_length) {
+ const unsigned char *current = string;
int ch, i = 0, j = 0, k;
- /* this sucks for threaded environments */
- static short reverse_table[256];
- static int table_built;
- unsigned char *result;
-
- if (++table_built == 1) {
- char *chp;
- for(ch = 0; ch < 256; ch++) {
- chp = strchr(base64_table, ch);
- if(chp) {
- reverse_table[ch] = chp - base64_table;
- } else {
- reverse_table[ch] = -1;
- }
- }
- }
+ char *chp;
+
+ unsigned char *result = (unsigned char *)malloc(length + 1);
- result = (unsigned char *)malloc(length + 1);
if (result == NULL) {
return NULL;
}
@@ -107,8 +104,9 @@ unsigned char *php_base64_decode(const unsigned char *str, int length, int *ret_
if (ch == ' ') ch = '+';
- ch = reverse_table[ch];
- if (ch < 0) continue;
+ chp = strchr(base64_table, ch);
+ if (chp == NULL) continue;
+ ch = chp - base64_table;
switch(i % 4) {
case 0:
@@ -149,4 +147,3 @@ unsigned char *php_base64_decode(const unsigned char *str, int length, int *ret_
result[k] = '\0';
return result;
}
-
diff --git a/src/base64.h b/src/base64.h
index 5b275c45..ff20ac53 100644
--- a/src/base64.h
+++ b/src/base64.h
@@ -31,14 +31,7 @@
#ifndef _TMW_BASE64_H
#define _TMW_BASE64_H
-extern unsigned char *php_base64_encode(const unsigned char *, int, int *);
-extern unsigned char *php_base64_decode(const unsigned char *, int, int *);
+extern unsigned char *php3_base64_encode(const unsigned char *, int, int *);
+extern unsigned char *php3_base64_decode(const unsigned char *, int, int *);
#endif /* _TMW_BASE64_H */
-
-/*
- * Local variables:
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index cd74ded6..09a6eb74 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -309,7 +309,7 @@ MapReader::readLayer(xmlNodePtr node, Map *map, int layer)
int binLen;
unsigned char *binData =
- php_base64_decode(charData, strlen((char*)charData), &binLen);
+ php3_base64_decode(charData, strlen((char*)charData), &binLen);
delete[] charData;