Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.10 grimoire by Eric Sandall (c29d924d14a80d12e056f392f4893a9396d55280)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.10 grimoire by Eric Sandall (c29d924d14a80d12e056f392f4893a9396d55280)
  • Date: Mon, 7 May 2007 19:32:26 -0500

GIT changes to stable-rc-0.10 grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

gnome2-libs/intltool/HISTORY | 3
gnome2-libs/intltool/PRE_BUILD | 3
libs/fftw/CONFIGURE | 3
libs/fftw/HISTORY | 3
php-pear/php/DETAILS | 10 +-
php-pear/php/HISTORY | 4
php-pear/php4/DETAILS | 6 -
php-pear/php4/HISTORY | 4
x11-toolkits/qt-x11/DETAILS | 2
x11-toolkits/qt-x11/HISTORY | 6 +
x11-toolkits/qt-x11/PRE_BUILD | 3
x11-toolkits/qt-x11/Qt-3.3.8-UTF-8-fix.diff | 106 ++++++++++++++++++++++
x11-toolkits/qt4/DETAILS | 1
x11-toolkits/qt4/HISTORY | 9 +
x11-toolkits/qt4/PRE_BUILD | 9 +
x11-toolkits/qt4/Qt-4.2.3-UTF-8-fix.diff | 133
++++++++++++++++++++++++++++
16 files changed, 294 insertions(+), 11 deletions(-)

New commits:
commit c29d924d14a80d12e056f392f4893a9396d55280
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qt4 - fix typo

Conflicts:

x11-toolkits/qt4/PRE_BUILD

commit d4c3793f035ebc739df67b00c2a88d6ea30d681f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qt4 - fix bug #13762
(cherry picked from commit 7b8dfb93b3af367207f65c75bf404e2065729467)

Conflicts:

x11-toolkits/qt4/DETAILS
x11-toolkits/qt4/HISTORY
x11-toolkits/qt4/PRE_BUILD

commit 926a6dc23ab1fe415de176291fcf46a6ff0f2b46
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

qt-x11 - fix bug #13762
(cherry picked from commit 88d98d6cecb40444660f4b91cf9072f69be6555c)

commit 113fc2a6f95aa84e7569951f5cc79a4d62a1ff1d
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

fftw: fix #13572
(cherry picked from commit b16d5f3bb2fe1479b3ddd726904b214bc481c031)

Conflicts:

libs/fftw/HISTORY

commit 344fb42f5b2ffcf27b6d2aaa4a572dc15a7dd4b7
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

intltool: fix #13760
(cherry picked from commit 35defcc18c0cc148e422a82fc136ca8fe3d60e3f)

commit 3fb8fb90b493ffd1286182a1864e6c3112ef785c
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

php4: Updated to version 4.4.7. SECURITY_PATCH++ Bug #13758
(cherry picked from commit 2ae465e32e46138cd5171a06aca22874e216cb7e)

commit b2337a3b39f4003bdc3be873240e9722e3dd0392
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

php: Updated to version 5.2.2. SECURITY_PATCH++. Bug #13759
(cherry picked from commit 670d07f3b43beaccfff3b882e0505905fb8fb1c7)

diff --git a/gnome2-libs/intltool/HISTORY b/gnome2-libs/intltool/HISTORY
index 4381792..acf18aa 100644
--- a/gnome2-libs/intltool/HISTORY
+++ b/gnome2-libs/intltool/HISTORY
@@ -1,3 +1,6 @@
+2007-05-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * PRE_BUILD: added to fix #13760
+
2007-03-03 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.35.5

diff --git a/gnome2-libs/intltool/PRE_BUILD b/gnome2-libs/intltool/PRE_BUILD
new file mode 100755
index 0000000..e7a0ce2
--- /dev/null
+++ b/gnome2-libs/intltool/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+# fix intltool-extract invocation path #13760
+sed -i '/"intltool-extract"/ s,","/usr/bin/,3'
$SOURCE_DIRECTORY/intltool-update.in.in
diff --git a/libs/fftw/CONFIGURE b/libs/fftw/CONFIGURE
index 3fb99fc..da719c3 100755
--- a/libs/fftw/CONFIGURE
+++ b/libs/fftw/CONFIGURE
@@ -5,8 +5,7 @@ config_query_option FFTW_THREADS "Compile FFTW SMP threads
library?" n \
config_query FORTRAN "Compile in fortran bindings?" n &&
if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]; then
config_query_option FFTW_DOUBLEOPTS "x86: enable SSE2 for doubles?" n
--enable-sse2 --enable-sse2 &&
- config_query_option FFTW_FLOATOPTS "x86: enable SSE for floats?" n
--enable-sse --disable-sse &&
- config_query_option FFTW_FLOATOPTS "x86: enable K7 opts (incl. 3DNow) for
floats?" n --enable-k7 --disable-k7
+ config_query_option FFTW_FLOATOPTS "x86: enable SSE for floats?" n
--enable-sse --disable-sse
fi &&
if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ppc" ]]; then
config_query_option FFTW_FLOATOPTS "ppc: enable AltiVec for floats?" n
--enable-altivec --disable-altivec
diff --git a/libs/fftw/HISTORY b/libs/fftw/HISTORY
index f0b4941..acb4770 100644
--- a/libs/fftw/HISTORY
+++ b/libs/fftw/HISTORY
@@ -1,3 +1,6 @@
+2007-05-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * CONFIGURE: remove the bad k7 option #13572
+
2007-02-16 Thomas Orgis <sobukus AT sourcemage.org>
* CONFIGURE,BUILD: turn grepping of CFLAGS into queries for
special optimizations, accompanying --enable with --disable
diff --git a/php-pear/php/DETAILS b/php-pear/php/DETAILS
index 36726c5..e51bc78 100755
--- a/php-pear/php/DETAILS
+++ b/php-pear/php/DETAILS
@@ -1,12 +1,12 @@
SPELL=php
if [[ "$PHP_RC" == y ]]; then
- VERSION=5.2.1 # last was 5.1.0RC6
-
SOURCE_HASH=sha512:5cf13ea4d610ca1c1f05f56433aa86e90b0833a715d40d1f4bbb199d941bf27ae7e0cc43fabc69d1f31576083ed381467db8bfb1788ecb3b42818bf6d3d71bbd
+ VERSION=5.2.2 # last was 5.1.0RC6
+
SOURCE_HASH=sha512:19b50467ce363fdaed9ec3ce69e560de969a9edd1b4ba6c55cfacd1b5bbc9ff83627f3c54d4f74846f583646bb593dccb02d04c26a6ed9a90da1d02a4dd8d907
else
- VERSION=5.2.1
-
SOURCE_HASH=sha512:5cf13ea4d610ca1c1f05f56433aa86e90b0833a715d40d1f4bbb199d941bf27ae7e0cc43fabc69d1f31576083ed381467db8bfb1788ecb3b42818bf6d3d71bbd
+ VERSION=5.2.2
+
SOURCE_HASH=sha512:19b50467ce363fdaed9ec3ce69e560de969a9edd1b4ba6c55cfacd1b5bbc9ff83627f3c54d4f74846f583646bb593dccb02d04c26a6ed9a90da1d02a4dd8d907
fi
- SECURITY_PATCH=2
+ SECURITY_PATCH=3
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://static.php.net/www.php.net/distributions/$SOURCE
diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY
index 75ecadd..25c78a3 100644
--- a/php-pear/php/HISTORY
+++ b/php-pear/php/HISTORY
@@ -1,3 +1,7 @@
+2007-05-05 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated to version 5.2.2
+ SECURITY_PATCH++. Bug #13759
+
2007-02-09 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to version 5.2.1. SECURITY_PATCH++
* PRE_BUILD: Removed.
diff --git a/php-pear/php4/DETAILS b/php-pear/php4/DETAILS
index aa8c8c2..f9d1cd2 100755
--- a/php-pear/php4/DETAILS
+++ b/php-pear/php4/DETAILS
@@ -1,6 +1,6 @@
SPELL=php4
- VERSION=4.4.6
-
SOURCE_HASH=sha512:952c1ec18edade5719c4608df69d0f3e73da8fb46eb0e04a47e7800def2cae417c97594a3b6cbde63ba839ab9f5f45aaafa630e703c74df852c7759b1bd03050
+ VERSION=4.4.7
+
SOURCE_HASH=sha512:0702884fd398dbbcef466fe4cdf83b0c63356c45403e410570bc3a748cdd900141087dc318e958dbf5982d72e80b8a3f6570a462b96883b37873cc2cea066e88
SOURCE=php-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/php-$VERSION
if [ "${VERSION//RC/}" == "$VERSION" ]; then
@@ -10,7 +10,7 @@ else
fi
WEB_SITE=http://www.php.net/
ENTERED=20011024
- SECURITY_PATCH=3
+ SECURITY_PATCH=4
LICENSE[0]=http://www.php.net/license/3_0.txt
KEYWORDS="php"
SHORT="Hypertext Preprocessor (PHP) scripting language"
diff --git a/php-pear/php4/HISTORY b/php-pear/php4/HISTORY
index f524446..a45a460 100644
--- a/php-pear/php4/HISTORY
+++ b/php-pear/php4/HISTORY
@@ -1,3 +1,7 @@
+2007-05-05 George Sherwood <george AT beernabeer.com>
+ * DETAILS: updated spell to 4.4.7
+ SECURITY_PATCH++. Bug #13758
+
2007-03-21 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 4.4.6. SECURITY_PATCH++ Bug 13639.

diff --git a/x11-toolkits/qt-x11/DETAILS b/x11-toolkits/qt-x11/DETAILS
index 46fe283..bf0b814 100755
--- a/x11-toolkits/qt-x11/DETAILS
+++ b/x11-toolkits/qt-x11/DETAILS
@@ -10,7 +10,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-free-$VERSION
WEB_SITE=http://www.trolltech.com/qt/x11.html
KEYWORDS="qt x11 libs"
ENTERED=20020410
- SECURITY_PATCH=1
+ SECURITY_PATCH=2
DOCS="FAQ README README-QT.TXT"
SHORT="Qt simplifies writing and maintaining GUI applications"
cat << EOF
diff --git a/x11-toolkits/qt-x11/HISTORY b/x11-toolkits/qt-x11/HISTORY
index f94363b..463e901 100644
--- a/x11-toolkits/qt-x11/HISTORY
+++ b/x11-toolkits/qt-x11/HISTORY
@@ -1,3 +1,9 @@
+2007-05-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * PRE_BUILD:apply patch
+ * Qt-3.3.8-UTF-8-fix.diff: added
+ fixes bug #13762
+
2007-02-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: Updated to 3.3.8

diff --git a/x11-toolkits/qt-x11/PRE_BUILD b/x11-toolkits/qt-x11/PRE_BUILD
index 00b7869..d6a04ec 100755
--- a/x11-toolkits/qt-x11/PRE_BUILD
+++ b/x11-toolkits/qt-x11/PRE_BUILD
@@ -1,5 +1,8 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+# apply patches
+patch -p0 < $SPELL_DIRECTORY/Qt-3.3.8-UTF-8-fix.diff &&
+
# fix detecction of firebird
sedit "s/-lgds//" configure &&
sedit "/gds/D;/\t}/D" plugins/src/sqldrivers/ibase/ibase.pro &&
diff --git a/x11-toolkits/qt-x11/Qt-3.3.8-UTF-8-fix.diff
b/x11-toolkits/qt-x11/Qt-3.3.8-UTF-8-fix.diff
new file mode 100644
index 0000000..3cb3753
--- /dev/null
+++ b/x11-toolkits/qt-x11/Qt-3.3.8-UTF-8-fix.diff
@@ -0,0 +1,106 @@
+--- src/codecs/qutfcodec.cpp Fri Mar 30 06:08:57 2007
++++ src/codecs/qutfcodec.cpp Fri Mar 30 06:08:57 2007
+@@ -154,6 +154,7 @@
+
+ class QUtf8Decoder : public QTextDecoder {
+ uint uc;
++ uint min_uc;
+ int need;
+ bool headerDone;
+ public:
+@@ -167,8 +168,9 @@
+ result.setLength( len ); // worst case
+ QChar *qch = (QChar *)result.unicode();
+ uchar ch;
++ int error = -1;
+ for (int i=0; i<len; i++) {
+- ch = *chars++;
++ ch = chars[i];
+ if (need) {
+ if ( (ch&0xc0) == 0x80 ) {
+ uc = (uc << 6) | (ch & 0x3f);
+@@ -182,6 +184,8 @@
+ *qch++ = QChar(high);
+ *qch++ = QChar(low);
+ headerDone = TRUE;
++ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <=
0xdfff) || (uc >= 0xfffe)) {
++ *qch++ = QChar::replacement;
+ } else {
+ if (headerDone || QChar(uc) !=
QChar::byteOrderMark)
+ *qch++ = uc;
+@@ -190,6 +194,7 @@
+ }
+ } else {
+ // error
++ i = error;
+ *qch++ = QChar::replacement;
+ need = 0;
+ }
+@@ -200,13 +205,22 @@
+ } else if ((ch & 0xe0) == 0xc0) {
+ uc = ch & 0x1f;
+ need = 1;
++ error = i;
++ min_uc = 0x80;
+ } else if ((ch & 0xf0) == 0xe0) {
+ uc = ch & 0x0f;
+ need = 2;
++ error = i;
++ min_uc = 0x800;
+ } else if ((ch&0xf8) == 0xf0) {
+ uc = ch & 0x07;
+ need = 3;
+- }
++ error = i;
++ min_uc = 0x10000;
++ } else {
++ // error
++ *qch++ = QChar::replacement;
++ }
+ }
+ }
+ result.truncate( qch - result.unicode() );
+
+--- src/tools/qstring.cpp Fri Mar 30 06:08:57 2007
++++ src/tools/qstring.cpp Fri Mar 30 06:08:57 2007
+@@ -5805,6 +5805,7 @@
+ result.setLength( len ); // worst case
+ QChar *qch = (QChar *)result.unicode();
+ uint uc = 0;
++ uint min_uc = 0;
+ int need = 0;
+ int error = -1;
+ uchar ch;
+@@ -5822,7 +5823,13 @@
+ unsigned short low = uc%0x400 + 0xdc00;
+ *qch++ = QChar(high);
+ *qch++ = QChar(low);
+- } else {
++ } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff)
|| (uc >= 0xfffe)) {
++ // overlong seqence, UTF16 surrogate or BOM
++ i = error;
++ qch = addOne(qch, result);
++ *qch++ = QChar(0xdbff);
++ *qch++ = QChar(0xde00+((uchar)utf8[i]));
++ } else {
+ *qch++ = uc;
+ }
+ }
+@@ -5844,14 +5851,17 @@
+ uc = ch & 0x1f;
+ need = 1;
+ error = i;
++ min_uc = 0x80;
+ } else if ((ch & 0xf0) == 0xe0) {
+ uc = ch & 0x0f;
+ need = 2;
+ error = i;
++ min_uc = 0x800;
+ } else if ((ch&0xf8) == 0xf0) {
+ uc = ch & 0x07;
+ need = 3;
+ error = i;
++ min_uc = 0x10000;
+ } else {
+ // Error
+ qch = addOne(qch, result);
diff --git a/x11-toolkits/qt4/DETAILS b/x11-toolkits/qt4/DETAILS
index 10af8de..64c6013 100755
--- a/x11-toolkits/qt4/DETAILS
+++ b/x11-toolkits/qt4/DETAILS
@@ -6,6 +6,7 @@
SOURCE_DIRECTORY=$BUILD_DIRECTORY/qt-x11-opensource-src-$VERSION
SOURCE_URL[0]=ftp://ftp.trolltech.com/qt/source/$SOURCE
SOURCE_URL[1]=ftp://ftp.silug.org/pub/qt/source/$SOURCE

SOURCE_URL[2]=ftp://ftp.planetmirror.com.au/pub/trolltech/qt/source/$SOURCE
+ SECURITY_PATCH=1
WEB_SITE=http://www.trolltech.com/qt/x11.html
ENTERED=20020410
LICENSE[0]=GPL
diff --git a/x11-toolkits/qt4/HISTORY b/x11-toolkits/qt4/HISTORY
index 4d03409..e47f483 100644
--- a/x11-toolkits/qt4/HISTORY
+++ b/x11-toolkits/qt4/HISTORY
@@ -1,3 +1,12 @@
+2007-05-06 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: fix typo
+
+2007-05-05 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++
+ * Qt-4.2.3-UTF-8-fix.diff: added
+ * PRE_BUILD: apply patch
+ fixes bug #13762
+
2007-03-28 Treeve Jelbert <treeve AT sourcemage.org>
* TRIGGERS: add check on postgresql
fixes bug #13662
diff --git a/x11-toolkits/qt4/PRE_BUILD b/x11-toolkits/qt4/PRE_BUILD
index ff35dad..67051cf 100755
--- a/x11-toolkits/qt4/PRE_BUILD
+++ b/x11-toolkits/qt4/PRE_BUILD
@@ -1,5 +1,14 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+
+# apply patches
+patch -p0 < $SPELL_DIRECTORY/Qt-4.2.3-UTF-8-fix.diff &&
+
+# add better optimisation flags
+# -O2 gives segmentation fault in moc when building tools
+sed -i "s|-O2|${CFLAGS/-O3/-O2}|" mkspecs/common/g++.conf \
+ mkspecs/linux-cxx/qmake.conf &&
+
# remove big direcotries
if [ $QT_DOC = n ];then
rm -r doc demos examples &&
diff --git a/x11-toolkits/qt4/Qt-4.2.3-UTF-8-fix.diff
b/x11-toolkits/qt4/Qt-4.2.3-UTF-8-fix.diff
new file mode 100644
index 0000000..098f4d6
--- /dev/null
+++ b/x11-toolkits/qt4/Qt-4.2.3-UTF-8-fix.diff
@@ -0,0 +1,133 @@
+--- src/corelib/codecs/qutfcodec.cpp Fri Mar 30 06:06:30 2007
++++ src/corelib/codecs/qutfcodec.cpp Fri Mar 30 06:06:30 2007
+@@ -117,15 +117,19 @@
+ bool headerdone = false;
+ QChar replacement = QChar::ReplacementCharacter;
+ int need = 0;
++ int error = -1;
+ uint uc = 0;
++ uint min_uc = 0;
+ if (state) {
+ if (state->flags & IgnoreHeader)
+ headerdone = true;
+ if (state->flags & ConvertInvalidToNull)
+ replacement = QChar::Null;
+ need = state->remainingChars;
+- if (need)
++ if (need) {
+ uc = state->state_data[0];
++ min_uc = state->state_data[1];
++ }
+ }
+ if (!headerdone && len > 3
+ && (uchar)chars[0] == 0xef && (uchar)chars[1] == 0xbb &&
(uchar)chars[2] == 0xbf) {
+@@ -142,7 +146,7 @@
+ int invalid = 0;
+
+ for (int i=0; i<len; i++) {
+- ch = *chars++;
++ ch = chars[i];
+ if (need) {
+ if ((ch&0xc0) == 0x80) {
+ uc = (uc << 6) | (ch & 0x3f);
+@@ -153,14 +157,27 @@
+ uc -= 0x10000;
+ unsigned short high = uc/0x400 + 0xd800;
+ unsigned short low = uc%0x400 + 0xdc00;
++
++ // resize if necessary
++ long where = qch - result.unicode();
++ if (where + 2 >= result.size()) {
++ result.resize(where + 2);
++ qch = result.data() + where;
++ }
++
+ *qch++ = QChar(high);
+ *qch++ = QChar(low);
++ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <=
0xdfff) || (uc >= 0xfffe)) {
++ // error
++ *qch++ = QChar::ReplacementCharacter;
++ ++invalid;
+ } else {
+ *qch++ = uc;
+ }
+ }
+ } else {
+ // error
++ i = error;
+ *qch++ = QChar::ReplacementCharacter;
+ ++invalid;
+ need = 0;
+@@ -171,12 +188,22 @@
+ } else if ((ch & 0xe0) == 0xc0) {
+ uc = ch & 0x1f;
+ need = 1;
++ error = i;
++ min_uc = 0x80;
+ } else if ((ch & 0xf0) == 0xe0) {
+ uc = ch & 0x0f;
+ need = 2;
++ error = i;
++ min_uc = 0x800;
+ } else if ((ch&0xf8) == 0xf0) {
+ uc = ch & 0x07;
+ need = 3;
++ error = i;
++ min_uc = 0x10000;
++ } else {
++ // error
++ *qch++ = QChar::ReplacementCharacter;
++ ++invalid;
+ }
+ }
+ }
+@@ -187,6 +214,7 @@
+ if (headerdone)
+ state->flags |= IgnoreHeader;
+ state->state_data[0] = need ? uc : 0;
++ state->state_data[1] = need ? min_uc : 0;
+ }
+ return result;
+ }
+
+--- src/corelib/tools/qstring.cpp Fri Mar 30 06:06:30 2007
++++ src/corelib/tools/qstring.cpp Fri Mar 30 06:06:30 2007
+@@ -3342,6 +3342,7 @@
+ result.resize(size); // worst case
+ ushort *qch = result.d->data;
+ uint uc = 0;
++ uint min_uc = 0;
+ int need = 0;
+ int error = -1;
+ uchar ch;
+@@ -3359,6 +3360,12 @@
+ ushort low = uc%0x400 + 0xdc00;
+ *qch++ = high;
+ *qch++ = low;
++ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <=
0xdfff) || (uc >= 0xfffe)) {
++ // overlong seqence, UTF16 surrogate or BOM
++ i = error;
++ qch = addOne(qch, result);
++ *qch++ = 0xdbff;
++ *qch++ = 0xde00 + ((uchar)str[i]);
+ } else {
+ *qch++ = uc;
+ }
+@@ -3381,14 +3388,17 @@
+ uc = ch & 0x1f;
+ need = 1;
+ error = i;
++ min_uc = 0x80;
+ } else if ((ch & 0xf0) == 0xe0) {
+ uc = ch & 0x0f;
+ need = 2;
+ error = i;
++ min_uc = 0x800;
+ } else if ((ch&0xf8) == 0xf0) {
+ uc = ch & 0x07;
+ need = 3;
+ error = i;
++ min_uc = 0x10000;
+ } else {
+ // Error
+ qch = addOne(qch, result);



  • [SM-Commit] GIT changes to stable-rc-0.10 grimoire by Eric Sandall (c29d924d14a80d12e056f392f4893a9396d55280), Eric Sandall, 05/07/2007

Archive powered by MHonArc 2.6.24.

Top of Page