[sword-svn] r1867 - in trunk: . src/mgr

[scribe at crosswire.org]

Author: scribe
Date: 2005-11-28 00:14:10 -0700 (Mon, 28 Nov 2005)
New Revision: 1867

Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/mgr/stringmgr.cpp
Log:
Fixed ICUStringMgr toUpper


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-11-23 17:40:10 UTC (rev 1866)
+++ trunk/ChangeLog	2005-11-28 07:14:10 UTC (rev 1867)
@@ -2,6 +2,9 @@
 		app specific changes
 
 19-Nov-2005	Troy A. Griffitts <scribe at crosswire.org>
+	Fixed ICUStringMgr toUpper method
+
+19-Nov-2005	Troy A. Griffitts <scribe at crosswire.org>
 	Cleaned up headers to remove unnecessary includes
 
 26-Oct-2005	Martin Gruner <mgruner at crosswire.org>

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-11-23 17:40:10 UTC (rev 1866)
+++ trunk/configure.ac	2005-11-28 07:14:10 UTC (rev 1867)
@@ -142,8 +142,9 @@
 AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
 
 if test x$enable_debug = xyes; then
+  GCJFLAGS="-g -O0"
   if test x$ac_cv_prog_cc_g = xyes; then
-    AM_CFLAGS="-g3 -O0"
+    SM_CFLAGS="-g3 -O0"
   else
     AM_CFLAGS="-O0"
   fi

Modified: trunk/src/mgr/stringmgr.cpp
===================================================================
--- trunk/src/mgr/stringmgr.cpp	2005-11-23 17:40:10 UTC (rev 1866)
+++ trunk/src/mgr/stringmgr.cpp	2005-11-28 07:14:10 UTC (rev 1867)
@@ -164,14 +164,7 @@
 		UChar *lowerStr = new UChar[max+10];
 		UChar *upperStr = new UChar[max+10];
 		
-		u_strFromUTF8  ( 
-			lowerStr, 
-			max+1,  //including the \0 end
-			0, 
-			buf,
-			max, 
-			&err
-		);
+		u_strFromUTF8(lowerStr, max+9, 0, buf, -1, &err);
 		if (err != U_ZERO_ERROR) {
 //			SWLog::getSystemLog()->logError("from: %s", u_errorName(err));
 			delete [] lowerStr;
@@ -179,14 +172,7 @@
 			return ret;
 		}
 		
-		u_strToUpper(
-			upperStr, 
-			max+1, //for the \0 end
-			lowerStr, 
-			u_strlen(lowerStr),
-			0,
-			&err
-		);
+		u_strToUpper(upperStr, max+9, lowerStr, -1, 0, &err);
 		if (err != U_ZERO_ERROR) {
 //			SWLog::getSystemLog()->logError("upperCase: %s", u_errorName(err));
 			delete [] lowerStr;
@@ -194,14 +180,7 @@
 			return ret;
 		}
 
-		ret = u_strToUTF8  ( 
-			ret, 
-			max+1, //for the \0 end
-			0, 
-			upperStr, 
-			max, 
-			&err
-		);
+		ret = u_strToUTF8(ret, max+9, 0, upperStr, -1, &err);
 		
 		delete [] lowerStr;
 		delete [] upperStr;