ICU-62109.0.1.tar.gz

[apple/icu.git] / icuSources / tools / toolutil / swapimpl.cpp

diff --git a/icuSources/tools/toolutil/swapimpl.cpp b/icuSources/tools/toolutil/swapimpl.cpp
index 620a387e2440917ff9c1320832794a5d68e5101a..f3f333a005eb43a895327807e7c22534e6318750 100644 (file)
--- a/icuSources/tools/toolutil/swapimpl.cpp
+++ b/icuSources/tools/toolutil/swapimpl.cpp
@@ -56,6 +56,7 @@
 #include "sprpimpl.h"
 #include "propname.h"
 #include "rbbidata.h"
 #include "sprpimpl.h"
 #include "propname.h"
 #include "rbbidata.h"

+#include "utrie.h"

 #include "utrie2.h"
 #include "dictionarydata.h"
 
 #include "utrie2.h"
 #include "dictionarydata.h"
 


@@ -335,7 +336,7 @@ ucase_swap(const UDataSwapper *ds,
         ((pInfo->formatVersion[0]==1 &&
           pInfo->formatVersion[2]==UTRIE_SHIFT &&
           pInfo->formatVersion[3]==UTRIE_INDEX_SHIFT) ||
         ((pInfo->formatVersion[0]==1 &&
           pInfo->formatVersion[2]==UTRIE_SHIFT &&
           pInfo->formatVersion[3]==UTRIE_INDEX_SHIFT) ||

-         pInfo->formatVersion[0]==2 || pInfo->formatVersion[0]==3)
+         2<=pInfo->formatVersion[0] || pInfo->formatVersion[0]<=4)

     )) {
         udata_printError(ds, "ucase_swap(): data format %02x.%02x.%02x.%02x (format version %02x) is not recognized as case mapping data\n",
                          pInfo->dataFormat[0], pInfo->dataFormat[1],
     )) {
         udata_printError(ds, "ucase_swap(): data format %02x.%02x.%02x.%02x (format version %02x) is not recognized as case mapping data\n",
                          pInfo->dataFormat[0], pInfo->dataFormat[1],