# HG changeset patch # User Michael Schloh von Bennewitz # Date 1235560382 -3600 # Node ID 7f3c34b6208f9f731d2bf69bbd5e910701ab17b2 # Parent b70af19a34654d7707ed373bcd08b878e1efc1f0 Correct C++ cast errors in iconv(3) characterset conversions. diff -r b70af19a3465 -r 7f3c34b6208f sswf/sswf.patch --- a/sswf/sswf.patch Wed Feb 25 12:10:46 2009 +0100 +++ b/sswf/sswf.patch Wed Feb 25 12:13:02 2009 +0100 @@ -37,3 +37,27 @@ #include #endif #include +Index: src/lib/libsswf_tag_header.c++ +--- src/lib/libsswf_tag_header.c++.orig 2009-02-25 11:44:25.018888440 +0100 ++++ src/lib/libsswf_tag_header.c++ 2009-02-25 12:03:04.998881702 +0100 +@@ -745,7 +745,7 @@ + } + #endif + +- r = (int) iconv(f_iconvertor, ICONV_INPUT_CAST &string, &in, &p, &out); ++ r = (int) iconv(f_iconvertor, ICONV_INPUT_CAST const_cast(&string), &in, &p, &out); + if(r < 0) { + if(s != buf) { + MemFree(s); +Index: src/lib/sswf_lexical.c++ +--- src/sswf/sswf_lexical.c++.orig 2008-06-23 07:51:47.000000000 +0200 ++++ src/sswf/sswf_lexical.c++ 2009-02-25 12:06:36.214881561 +0100 +@@ -2026,7 +2026,7 @@ + out = sizeof(outchar); + output = (char *) &outchar; + b = (int) f_mb_count; +- a = (int) iconv(f_iconvertor, ICONV_INPUT_CAST &input, &f_mb_count, &output, &out); ++ a = (int) iconv(f_iconvertor, ICONV_INPUT_CAST const_cast(&input), &f_mb_count, &output, &out); + // the output buffer will usually be full before the + // input is fully emptied! + if(a < 0 && errno == E2BIG && out == 0 && b != (int) f_mb_count) { diff -r b70af19a3465 -r 7f3c34b6208f sswf/sswf.spec --- a/sswf/sswf.spec Wed Feb 25 12:10:46 2009 +0100 +++ b/sswf/sswf.spec Wed Feb 25 12:13:02 2009 +0100 @@ -32,7 +32,7 @@ Group: Flash License: GPL Version: 1.8.3 -Release: 20080914 +Release: 20090106 # list of sources Source0: http://switch.dl.sourceforge.net/sswf/sswf-%{version}-src.tar.bz2