diff options
Diffstat (limited to 'source/common')
| -rw-r--r-- | source/common/ubidi.c | 8 | ||||
| -rw-r--r-- | source/common/ubidiimp.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/common/ubidi.c b/source/common/ubidi.c index 75afd06..edccccf 100644 --- a/source/common/ubidi.c +++ b/source/common/ubidi.c @@ -671,10 +671,10 @@ bracketInit(UBiDi *pBiDi, BracketData *bd) { bd->isoRuns[0].lastStrongPos=bd->isoRuns[0].contextPos=0; if(pBiDi->openingsMemory) { bd->openings=pBiDi->openingsMemory; - bd->openingsSize=pBiDi->openingsSize; + bd->openingsCount=pBiDi->openingsSize / sizeof(Opening); } else { bd->openings=bd->simpleOpenings; - bd->openingsSize=SIMPLE_OPENINGS_SIZE; + bd->openingsCount=SIMPLE_OPENINGS_SIZE; } bd->isNumbersSpecial=bd->pBiDi->reorderingMode==UBIDI_REORDER_NUMBERS_SPECIAL || bd->pBiDi->reorderingMode==UBIDI_REORDER_INVERSE_FOR_NUMBERS_SPECIAL; @@ -732,7 +732,7 @@ static UBool /* return TRUE if success */ bracketAddOpening(BracketData *bd, UChar match, int32_t position) { IsoRun *pLastIsoRun=&bd->isoRuns[bd->isoRunLast]; Opening *pOpening; - if(pLastIsoRun->limit>=bd->openingsSize) { /* no available new entry */ + if(pLastIsoRun->limit>=bd->openingsCount) { /* no available new entry */ UBiDi *pBiDi=bd->pBiDi; if(!getInitialOpeningsMemory(pBiDi, pLastIsoRun->limit * 2)) return FALSE; @@ -740,7 +740,7 @@ bracketAddOpening(BracketData *bd, UChar match, int32_t position) { uprv_memcpy(pBiDi->openingsMemory, bd->simpleOpenings, SIMPLE_OPENINGS_SIZE * sizeof(Opening)); bd->openings=pBiDi->openingsMemory; /* may have changed */ - bd->openingsSize=pBiDi->openingsSize; + bd->openingsCount=pBiDi->openingsSize / sizeof(Opening); } pOpening=&bd->openings[pLastIsoRun->limit]; pOpening->position=position; diff --git a/source/common/ubidiimp.h b/source/common/ubidiimp.h index 58c86f2..068e156 100644 --- a/source/common/ubidiimp.h +++ b/source/common/ubidiimp.h @@ -183,7 +183,7 @@ typedef struct BracketData { /* array of opening entries which should be enough in most cases; no malloc() */ Opening simpleOpenings[SIMPLE_OPENINGS_SIZE]; Opening *openings; /* pointer to current array of entries */ - int32_t openingsSize; /* number of allocated entries */ + int32_t openingsCount; /* number of allocated entries */ int32_t isoRunLast; /* index of last used entry */ /* array of nested isolated sequence entries; can never excess UBIDI_MAX_EXPLICIT_LEVEL + 1 for index 0, + 1 for before the first isolated sequence */ |