[fdo-commits] r812 - in branches/3.2.x/Fdo/Unmanaged/Src: Common Fdo/Parse Fdo/Xml

[svn_fdo at osgeo.org]

Author: warmerdam
Date: 2007-02-23 13:07:29 -0500 (Fri, 23 Feb 2007)
New Revision: 812

Modified:
   branches/3.2.x/Fdo/Unmanaged/Src/Common/ConvertUTF.h
   branches/3.2.x/Fdo/Unmanaged/Src/Fdo/Parse/Lex.cpp
   branches/3.2.x/Fdo/Unmanaged/Src/Fdo/Xml/FeaturePropertyReaderImpl.cpp
Log:
64bit fixes - mainly using int instead of long for 32bit type.  (ticket #6)


Modified: branches/3.2.x/Fdo/Unmanaged/Src/Common/ConvertUTF.h
===================================================================
--- branches/3.2.x/Fdo/Unmanaged/Src/Common/ConvertUTF.h	2007-02-23 17:03:39 UTC (rev 811)
+++ branches/3.2.x/Fdo/Unmanaged/Src/Common/ConvertUTF.h	2007-02-23 18:07:29 UTC (rev 812)
@@ -85,7 +85,7 @@
     bit mask & shift operations.
 ------------------------------------------------------------------------ */
 
-typedef unsigned long	UTF32;	/* at least 32 bits */
+typedef unsigned int	UTF32;	/* at least 32 bits */
 typedef unsigned short	UTF16;	/* at least 16 bits */
 typedef unsigned char	UTF8;	/* typically 8 bits */
 typedef unsigned char	Boolean; /* 0 or 1 */

Modified: branches/3.2.x/Fdo/Unmanaged/Src/Fdo/Parse/Lex.cpp
===================================================================
--- branches/3.2.x/Fdo/Unmanaged/Src/Fdo/Parse/Lex.cpp	2007-02-23 17:03:39 UTC (rev 811)
+++ branches/3.2.x/Fdo/Unmanaged/Src/Fdo/Parse/Lex.cpp	2007-02-23 18:07:29 UTC (rev 812)
@@ -877,7 +877,7 @@
         if ( checkStr == str ) {
             // String converted to in64 ok.
 
-            if (i64num <= LONG_MAX && i64num >= LONG_MIN) 
+            if (i64num <= INT_MAX && i64num >= INT_MIN) 
 		    {
                 // In Int32 range so wrap in int32
 			    try  

Modified: branches/3.2.x/Fdo/Unmanaged/Src/Fdo/Xml/FeaturePropertyReaderImpl.cpp
===================================================================
--- branches/3.2.x/Fdo/Unmanaged/Src/Fdo/Xml/FeaturePropertyReaderImpl.cpp	2007-02-23 17:03:39 UTC (rev 811)
+++ branches/3.2.x/Fdo/Unmanaged/Src/Fdo/Xml/FeaturePropertyReaderImpl.cpp	2007-02-23 18:07:29 UTC (rev 812)
@@ -498,7 +498,7 @@
         break;
     case ParsingState_base64Binary:
         {
-            FdoSize len;
+            unsigned int len;
             XMLByte* decoded = XERCES_CPP_NAMESPACE::Base64::decode((const XMLByte*)(const char*)m_dataProperty, &len);
             if (decoded != NULL) {
                 curFeatureHandler->FeatureBinaryData(m_featureContext, decoded, len);