You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ca...@apache.org on 2005/04/21 11:05:57 UTC
cvs commit: xml-xerces/c/src/xercesc/internal XMLReader.cpp
cargilld 2005/04/21 02:05:57
Modified: c/src/xercesc/dom/impl DOMWriterImpl.cpp
c/src/xercesc/util TransService.cpp XMLUni.cpp XMLUni.hpp
c/src/xercesc/util/Transcoders/Uniconv390
Uniconv390TransService.cpp
c/src/xercesc/internal XMLReader.cpp
Log:
Add detection for UCS-2 and treat as another UTF16 alias.
Revision Changes Path
1.58 +7 -2 xml-xerces/c/src/xercesc/dom/impl/DOMWriterImpl.cpp
Index: DOMWriterImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMWriterImpl.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- DOMWriterImpl.cpp 20 Mar 2005 19:02:45 -0000 1.57
+++ DOMWriterImpl.cpp 21 Apr 2005 09:05:57 -0000 1.58
@@ -17,6 +17,9 @@
/*
* $Id$
* $Log$
+ * Revision 1.58 2005/04/21 09:05:57 cargilld
+ * Add detection for UCS-2 and treat as another UTF16 alias.
+ *
* Revision 1.57 2005/03/20 19:02:45 cargilld
* Implement versions of uppercase and compareIstring that only check a to z, instead of all characters, and don't rely on functionality provided in the transcoders.
*
@@ -1824,7 +1827,9 @@
(XMLString::compareIStringASCII(fEncoding, XMLUni::fgUTF16EncodingString2) == 0) ||
(XMLString::compareIStringASCII(fEncoding, XMLUni::fgUTF16EncodingString3) == 0) ||
(XMLString::compareIStringASCII(fEncoding, XMLUni::fgUTF16EncodingString4) == 0) ||
- (XMLString::compareIStringASCII(fEncoding, XMLUni::fgUTF16EncodingString5) == 0) )
+ (XMLString::compareIStringASCII(fEncoding, XMLUni::fgUTF16EncodingString5) == 0) ||
+ (XMLString::compareIStringASCII(fEncoding, XMLUni::fgUTF16EncodingString6) == 0) ||
+ (XMLString::compareIStringASCII(fEncoding, XMLUni::fgUTF16EncodingString7) == 0) )
{
#if defined(ENDIANMODE_LITTLE)
fFormatter->writeBOM(BOM_utf16le, 2);
1.21 +19 -1 xml-xerces/c/src/xercesc/util/TransService.cpp
Index: TransService.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/TransService.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TransService.cpp 20 Mar 2005 19:02:45 -0000 1.20
+++ TransService.cpp 21 Apr 2005 09:05:57 -0000 1.21
@@ -425,6 +425,24 @@
);
gMappings->put
(
+ (void*)XMLUni::fgUTF16EncodingString6,
+ new EEndianNameMapFor<XMLUTF16Transcoder>
+ (
+ XMLUni::fgUTF16EncodingString6
+ , false
+ )
+ );
+ gMappings->put
+ (
+ (void*)XMLUni::fgUTF16EncodingString7,
+ new EEndianNameMapFor<XMLUTF16Transcoder>
+ (
+ XMLUni::fgUTF16EncodingString7
+ , false
+ )
+ );
+ gMappings->put
+ (
(void*)XMLUni::fgUCS4EncodingString,
new EEndianNameMapFor<XMLUCS4Transcoder>
(
1.50 +12 -1 xml-xerces/c/src/xercesc/util/XMLUni.cpp
Index: XMLUni.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUni.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- XMLUni.cpp 30 Mar 2005 00:55:14 -0000 1.49
+++ XMLUni.cpp 21 Apr 2005 09:05:57 -0000 1.50
@@ -430,6 +430,17 @@
chLatin_U, chLatin_T, chLatin_F, chDigit_1, chDigit_6, chNull
};
+const XMLCh XMLUni::fgUTF16EncodingString6[] =
+{
+ chLatin_U, chLatin_C, chLatin_S, chDash, chDigit_2, chNull
+};
+
+const XMLCh XMLUni::fgUTF16EncodingString7[] =
+{
+ chLatin_I, chLatin_S, chLatin_O, chDash, chDigit_1, chDigit_0, chDigit_6, chDigit_4
+ , chDigit_6, chDash, chLatin_U, chLatin_C, chLatin_S, chDash, chDigit_2, chNull
+};
+
const XMLCh XMLUni::fgUTF16BEncodingString[] =
{
chLatin_U, chLatin_T, chLatin_F, chDash, chDigit_1, chDigit_6, chSpace, chOpenParen, chLatin_B, chLatin_E, chCloseParen, chNull
1.44 +3 -1 xml-xerces/c/src/xercesc/util/XMLUni.hpp
Index: XMLUni.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/XMLUni.hpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- XMLUni.hpp 30 Mar 2005 00:55:14 -0000 1.43
+++ XMLUni.hpp 21 Apr 2005 09:05:57 -0000 1.44
@@ -119,6 +119,8 @@
static const XMLCh fgUTF16EncodingString3[];
static const XMLCh fgUTF16EncodingString4[];
static const XMLCh fgUTF16EncodingString5[];
+ static const XMLCh fgUTF16EncodingString6[];
+ static const XMLCh fgUTF16EncodingString7[];
static const XMLCh fgUTF16BEncodingString[];
static const XMLCh fgUTF16BEncodingString2[];
static const XMLCh fgUTF16LEncodingString[];
1.10 +55 -1 xml-xerces/c/src/xercesc/util/Transcoders/Uniconv390/Uniconv390TransService.cpp
Index: Uniconv390TransService.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Uniconv390/Uniconv390TransService.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Uniconv390TransService.cpp 23 Feb 2005 15:59:11 -0000 1.9
+++ Uniconv390TransService.cpp 21 Apr 2005 09:05:57 -0000 1.10
@@ -699,6 +699,33 @@
);
gMappings->put
(
+ (void*)XMLUni::fgUTF16EncodingString5,
+ new EEndianNameMapFor<XMLUTF16Transcoder>
+ (
+ XMLUni::fgUTF16EncodingString5
+ , false
+ )
+ );
+ gMappings->put
+ (
+ (void*)XMLUni::fgUTF16EncodingString6,
+ new EEndianNameMapFor<XMLUTF16Transcoder>
+ (
+ XMLUni::fgUTF16EncodingString6
+ , false
+ )
+ );
+ gMappings->put
+ (
+ (void*)XMLUni::fgUTF16EncodingString7,
+ new EEndianNameMapFor<XMLUTF16Transcoder>
+ (
+ XMLUni::fgUTF16EncodingString7
+ , false
+ )
+ );
+ gMappings->put
+ (
(void*)XMLUni::fgUCS4EncodingString,
new EEndianNameMapFor<XMLUCS4Transcoder>
(
@@ -943,6 +970,33 @@
);
gMappings->put
(
+ (void*)XMLUni::fgUTF16EncodingString5,
+ new EEndianNameMapFor<XMLUTF16Transcoder>
+ (
+ XMLUni::fgUTF16EncodingString5
+ , false
+ )
+ );
+ gMappings->put
+ (
+ (void*)XMLUni::fgUTF16EncodingString6,
+ new EEndianNameMapFor<XMLUTF16Transcoder>
+ (
+ XMLUni::fgUTF16EncodingString6
+ , false
+ )
+ );
+ gMappings->put
+ (
+ (void*)XMLUni::fgUTF16EncodingString7,
+ new EEndianNameMapFor<XMLUTF16Transcoder>
+ (
+ XMLUni::fgUTF16EncodingString7
+ , false
+ )
+ );
+ gMappings->put
+ (
(void*)XMLUni::fgUCS4EncodingString,
new EEndianNameMapFor<XMLUCS4Transcoder>
(
1.32 +4 -2 xml-xerces/c/src/xercesc/internal/XMLReader.cpp
Index: XMLReader.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLReader.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- XMLReader.cpp 7 Apr 2005 15:30:56 -0000 1.31
+++ XMLReader.cpp 21 Apr 2005 09:05:57 -0000 1.32
@@ -1219,7 +1219,9 @@
|| !XMLString::compareString(inputEncoding, XMLUni::fgUTF16EncodingString2)
|| !XMLString::compareString(inputEncoding, XMLUni::fgUTF16EncodingString3)
|| !XMLString::compareString(inputEncoding, XMLUni::fgUTF16EncodingString4)
- || !XMLString::compareString(inputEncoding, XMLUni::fgUTF16EncodingString5))
+ || !XMLString::compareString(inputEncoding, XMLUni::fgUTF16EncodingString5)
+ || !XMLString::compareString(inputEncoding, XMLUni::fgUTF16EncodingString6)
+ || !XMLString::compareString(inputEncoding, XMLUni::fgUTF16EncodingString7))
{
fMemoryManager->deallocate(inputEncoding);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org