[sword-svn] r3096 - trunk/src/modules/filters

scribe at crosswire.org scribe at crosswire.org
Tue Mar 11 04:39:41 MST 2014


Author: scribe
Date: 2014-03-11 04:39:41 -0700 (Tue, 11 Mar 2014)
New Revision: 3096

Modified:
   trunk/src/modules/filters/scsuutf8.cpp
   trunk/src/modules/filters/utf8scsu.cpp
Log:
fixed warning messages in new encoding filters when --enable-debug is turned on

Modified: trunk/src/modules/filters/scsuutf8.cpp
===================================================================
--- trunk/src/modules/filters/scsuutf8.cpp	2014-03-11 09:39:49 UTC (rev 3095)
+++ trunk/src/modules/filters/scsuutf8.cpp	2014-03-11 11:39:41 UTC (rev 3096)
@@ -139,9 +139,10 @@
 	UnicodeString utf16Text(text.getRawData(), text.length(), scsuConv, err);
 	err = U_ZERO_ERROR;
 	int32_t len = utf16Text.extract(text.getRawData(), text.size(), utf8Conv, err);
-	if (len > text.size()+1) {
+	if (len > (int32_t)text.size()+1) {
 		text.setSize(len+1);
 		int32_t len = utf16Text.extract(text.getRawData(), text.size(), scsuConv, err);
+		(void) len;	// avoid unused warning
 	}
 #else
 	// If ICU is unavailable, decode using Czyborra's decoder

Modified: trunk/src/modules/filters/utf8scsu.cpp
===================================================================
--- trunk/src/modules/filters/utf8scsu.cpp	2014-03-11 09:39:49 UTC (rev 3095)
+++ trunk/src/modules/filters/utf8scsu.cpp	2014-03-11 11:39:41 UTC (rev 3096)
@@ -49,9 +49,10 @@
 	UnicodeString utf16Text(text.getRawData(), text.length(), utf8Conv, err);
 	err = U_ZERO_ERROR;
 	int32_t len = utf16Text.extract(text.getRawData(), text.size(), scsuConv, err);
-	if (len > text.size()+1) {
+	if (len > (int32_t)text.size()+1) {
 		text.setSize(len+1);
 		int32_t len = utf16Text.extract(text.getRawData(), text.size(), scsuConv, err);
+		(void) len;
 	}
 
 	return 0;




More information about the sword-cvs mailing list