organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-21 04:29:31 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-5371 Visual Studio 6 fixes.

Browse source 
X-SVN-Rev: 20277
This commit is contained in:
George Rhoten 2006-09-08 16:48:31 +00:00
parent 7f89a07ea2
commit 8cb0256a8d
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
icu4c/source/common/triedict.cpp
View file

@ -1070,6 +1070,7 @@ CompactTrieDictionary::compactMutableTrieDictionary( const MutableTrieDictionary
int32_t count = nodes.size();
int32_t nodeCount = 1; // The sentinel node we already have
BuildCompactTrieNode *node;
int32_t i;
UVector32 translate(count, status); // Should be no growth needed after this
translate.push(0, status); // The sentinel node
@ -1077,7 +1078,7 @@ CompactTrieDictionary::compactMutableTrieDictionary( const MutableTrieDictionary
return NULL;
}
for (int32_t i = 1; i < count; ++i) {
for (i = 1; i < count; ++i) {
node = (BuildCompactTrieNode *)nodes[i];
if (node->fNodeID == i) {
// Only one node out of each duplicate set is used
@ -1125,7 +1126,7 @@ CompactTrieDictionary::compactMutableTrieDictionary( const MutableTrieDictionary
uint32_t offset = offsetof(CompactTrieHeader,offsets)+(nodeCount*sizeof(uint32_t));
nodeCount = 1;
// Now write the data
for (int32_t i = 1; i < count; ++i) {
for (i = 1; i < count; ++i) {
node = (BuildCompactTrieNode *)nodes[i];
if (node->fNodeID == i) {
header->offsets[nodeCount++] = offset;
@ -1148,19 +1149,19 @@ CompactTrieDictionary::compactMutableTrieDictionary( const MutableTrieDictionary
size_t hItemCount = 0;
size_t vItemCount = 0;
uint32_t previousOff = offset;
for (uint16_t i = nodeCount-1; i >= 2; --i) {
const CompactTrieNode *node = getCompactNode(header, i);
for (uint16_t nodeIdx = nodeCount-1; nodeIdx >= 2; --nodeIdx) {
const CompactTrieNode *node = getCompactNode(header, nodeIdx);
if (node->flagscount & kVerticalNode) {
vCount += 1;
vItemCount += (node->flagscount & kCountMask);
vSize += previousOff-header->offsets[i];
vSize += previousOff-header->offsets[nodeIdx];
}
else {
hCount += 1;
hItemCount += (node->flagscount & kCountMask);
hSize += previousOff-header->offsets[i];
hSize += previousOff-header->offsets[nodeIdx];
}
previousOff = header->offsets[i];
previousOff = header->offsets[nodeIdx];
}
fprintf(stderr, "Horizontal nodes: %d total, average %f bytes with %f items\n", hCount,
(double)hSize/hCount, (double)hItemCount/hCount);

5
icu4c/source/i18n/csdetect.cpp
View file

@ -260,13 +260,14 @@ const CharsetMatch * const *CharsetDetector::detectAll(int32_t &maxMatchesFound,
CharsetRecognizer *csr;
int32_t detectResults;
int32_t confidence;
int32_t i;
textIn->MungeInput(fStripTags);
// Iterate over all possible charsets, remember all that
// give a match quality > 0.
resultCount = 0;
for (int32_t i = 0; i < fCSRecognizers_size; i += 1) {
for (i = 0; i < fCSRecognizers_size; i += 1) {
csr = fCSRecognizers[i];
detectResults = csr->match(textIn);
confidence = detectResults;
@ -276,7 +277,7 @@ const CharsetMatch * const *CharsetDetector::detectAll(int32_t &maxMatchesFound,
}
}
for(int32_t i = resultCount; i < fCSRecognizers_size; i += 1) {
for(i = resultCount; i < fCSRecognizers_size; i += 1) {
resultArray[i]->set(textIn, 0, 0);
}