Use int32_t in TimeValue

main
Kevin Backhouse 3 years ago committed by Rosen Penev
parent 3db7598e29
commit 1958e70a71

@ -932,16 +932,16 @@ class EXIV2API DateValue : public Value {
//! Default constructor. //! Default constructor.
DateValue(); DateValue();
//! Constructor //! Constructor
DateValue(int year, int month, int day); DateValue(int32_t year, int32_t month, int32_t day);
//! Virtual destructor. //! Virtual destructor.
~DateValue() override = default; ~DateValue() override = default;
//@} //@}
//! Simple Date helper structure //! Simple Date helper structure
struct EXIV2API Date { struct EXIV2API Date {
int year{0}; //!< Year int32_t year{0}; //!< Year
int month{0}; //!< Month int32_t month{0}; //!< Month
int day{0}; //!< Day int32_t day{0}; //!< Day
}; };
//! @name Manipulators //! @name Manipulators
@ -1025,7 +1025,7 @@ class EXIV2API TimeValue : public Value {
//! Default constructor. //! Default constructor.
TimeValue(); TimeValue();
//! Constructor //! Constructor
TimeValue(int hour, int minute, int second = 0, int tzHour = 0, int tzMinute = 0); TimeValue(int32_t hour, int32_t minute, int32_t second = 0, int32_t tzHour = 0, int32_t tzMinute = 0);
//! Virtual destructor. //! Virtual destructor.
~TimeValue() override = default; ~TimeValue() override = default;
@ -1035,11 +1035,11 @@ class EXIV2API TimeValue : public Value {
struct Time { struct Time {
Time() = default; Time() = default;
int hour{0}; //!< Hour int32_t hour{0}; //!< Hour
int minute{0}; //!< Minute int32_t minute{0}; //!< Minute
int second{0}; //!< Second int32_t second{0}; //!< Second
int tzHour{0}; //!< Hours ahead or behind UTC int32_t tzHour{0}; //!< Hours ahead or behind UTC
int tzMinute{0}; //!< Minutes ahead or behind UTC int32_t tzMinute{0}; //!< Minutes ahead or behind UTC
}; };
//! @name Manipulators //! @name Manipulators

@ -764,7 +764,7 @@ LangAltValue* LangAltValue::clone_() const {
DateValue::DateValue() : Value(date) { DateValue::DateValue() : Value(date) {
} }
DateValue::DateValue(int year, int month, int day) : Value(date) { DateValue::DateValue(int32_t year, int32_t month, int32_t day) : Value(date) {
date_.year = year; date_.year = year;
date_.month = month; date_.month = month;
date_.day = day; date_.day = day;
@ -883,7 +883,7 @@ Rational DateValue::toRational(size_t n) const {
TimeValue::TimeValue() : Value(time) { TimeValue::TimeValue() : Value(time) {
} }
TimeValue::TimeValue(int hour, int minute, int second, int tzHour, int tzMinute) : Value(date) { TimeValue::TimeValue(int32_t hour, int32_t minute, int32_t second, int32_t tzHour, int32_t tzMinute) : Value(date) {
time_.hour = hour; time_.hour = hour;
time_.minute = minute; time_.minute = minute;
time_.second = second; time_.second = second;

Loading…
Cancel
Save