Wed, 25 Feb 2009 12:13:02 +0100
Correct C++ cast errors in iconv(3) characterset conversions.
sswf/sswf.patch | file | annotate | diff | comparison | revisions | |
sswf/sswf.spec | file | annotate | diff | comparison | revisions |
1.1 --- a/sswf/sswf.patch Wed Feb 25 12:10:46 2009 +0100 1.2 +++ b/sswf/sswf.patch Wed Feb 25 12:13:02 2009 +0100 1.3 @@ -37,3 +37,27 @@ 1.4 #include <inttypes.h> 1.5 #endif 1.6 #include <sswf/libsswf-config.h> 1.7 +Index: src/lib/libsswf_tag_header.c++ 1.8 +--- src/lib/libsswf_tag_header.c++.orig 2009-02-25 11:44:25.018888440 +0100 1.9 ++++ src/lib/libsswf_tag_header.c++ 2009-02-25 12:03:04.998881702 +0100 1.10 +@@ -745,7 +745,7 @@ 1.11 + } 1.12 + #endif 1.13 + 1.14 +- r = (int) iconv(f_iconvertor, ICONV_INPUT_CAST &string, &in, &p, &out); 1.15 ++ r = (int) iconv(f_iconvertor, ICONV_INPUT_CAST const_cast<char **>(&string), &in, &p, &out); 1.16 + if(r < 0) { 1.17 + if(s != buf) { 1.18 + MemFree(s); 1.19 +Index: src/lib/sswf_lexical.c++ 1.20 +--- src/sswf/sswf_lexical.c++.orig 2008-06-23 07:51:47.000000000 +0200 1.21 ++++ src/sswf/sswf_lexical.c++ 2009-02-25 12:06:36.214881561 +0100 1.22 +@@ -2026,7 +2026,7 @@ 1.23 + out = sizeof(outchar); 1.24 + output = (char *) &outchar; 1.25 + b = (int) f_mb_count; 1.26 +- a = (int) iconv(f_iconvertor, ICONV_INPUT_CAST &input, &f_mb_count, &output, &out); 1.27 ++ a = (int) iconv(f_iconvertor, ICONV_INPUT_CAST const_cast<char **>(&input), &f_mb_count, &output, &out); 1.28 + // the output buffer will usually be full before the 1.29 + // input is fully emptied! 1.30 + if(a < 0 && errno == E2BIG && out == 0 && b != (int) f_mb_count) {
2.1 --- a/sswf/sswf.spec Wed Feb 25 12:10:46 2009 +0100 2.2 +++ b/sswf/sswf.spec Wed Feb 25 12:13:02 2009 +0100 2.3 @@ -32,7 +32,7 @@ 2.4 Group: Flash 2.5 License: GPL 2.6 Version: 1.8.3 2.7 -Release: 20080914 2.8 +Release: 20090106 2.9 2.10 # list of sources 2.11 Source0: http://switch.dl.sourceforge.net/sswf/sswf-%{version}-src.tar.bz2