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

ICU-7089 Recalculate time stamp array if stamp value is going to exceed limit in ICU4C calendar class.

Browse source 
X-SVN-Rev: 29162
This commit is contained in:
Michael Ow 2010-12-07 17:27:42 +00:00
parent 54c4dc59ca
commit 734b84401f
2 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
icu4c/source/i18n/calendar.cpp
View file

@ -138,6 +138,9 @@ U_CFUNC void ucal_dump(UCalendar* cal) {
#endif
/* Max value for stamp allowable */
#define STAMP_MAX INT32_MAX
static const char * const gCalTypes[] = {
"gregorian",
"japanese",
@ -1055,7 +1058,10 @@ Calendar::set(UCalendarDateFields field, int32_t value)
}
fFields[field] = value;
/* Ensure that the fNextStamp value doesn't go pass max value for int32_t */
fStamp[field] = fNextStamp == INT32_MAX ? fNextStamp : fNextStamp++;
if (fNextStamp == STAMP_MAX) {
recalculateStamp();
}
fStamp[field] = fNextStamp++;
fIsSet[field] = TRUE; // Remove later
fIsTimeSet = fAreFieldsSet = fAreFieldsVirtuallySet = FALSE;
}
@ -3360,6 +3366,33 @@ Calendar::getLocaleID(ULocDataLocaleType type, UErrorCode& status) const {
return locBased.getLocaleID(type, status);
}
void
Calendar::recalculateStamp() {
int32_t index;
int32_t currentValue;
int32_t j, i;
fNextStamp = 1;
for (j = 0; j < UCAL_FIELD_COUNT; j++) {
currentValue = STAMP_MAX;
index = -1;
for (i = 0; i < UCAL_FIELD_COUNT; i++) {
if (fStamp[i] > fNextStamp && fStamp[i] < currentValue) {
currentValue = fStamp[i];
index = i;
}
}
if (index >= 0) {
fStamp[index] = ++fNextStamp;
} else {
break;
}
}
fNextStamp++;
}
// Deprecated function. This doesn't need to be inline.
void
Calendar::internalSet(EDateFields field, int32_t value)

6
icu4c/source/i18n/unicode/calendar.h
View file

@ -1936,6 +1936,12 @@ private:
*/
int32_t fNextStamp;// = MINIMUM_USER_STAMP;
/**
* Recalculates the time stamp array (fStamp).
* Resets fNextStamp to lowest next stamp value.
*/
void recalculateStamp();
/**
* The current time set for the calendar.
*/