Remove FX_WORD in favor of uint16_t.

fpdfsdk/fsdk_baseannot.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <algorithm>
 
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_number.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_stream.h"
 #include "core/include/fxcrt/fx_ext.h"
 #include "fpdfsdk/include/fsdk_baseannot.h"
 #include "fpdfsdk/include/fsdk_define.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 
 #ifdef PDF_ENABLE_XFA
 #include "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h"
 #endif  // PDF_ENABLE_XFA
 
 int gAfxGetTimeZoneInSeconds(int8_t tzhour, uint8_t tzminute) {
   return (int)tzhour * 3600 + (int)tzminute * (tzhour >= 0 ? 60 : -60);
 }
 
 FX_BOOL _gAfxIsLeapYear(int16_t year) {
   return ((year % 400 == 0) || ((year % 4 == 0) && (year % 100 != 0)));
 }
 
-FX_WORD _gAfxGetYearDays(int16_t year) {
+uint16_t _gAfxGetYearDays(int16_t year) {
   return (_gAfxIsLeapYear(year) == TRUE ? 366 : 365);
 }
 
 uint8_t _gAfxGetMonthDays(int16_t year, uint8_t month) {
   uint8_t mDays;
   switch (month) {
     case 1:
     case 3:
     case 5:
     case 7:
@@ skipping 325 matching lines @@
                  dt.tzMinute);
   dtStr += CFX_ByteString(tempStr);
   return dtStr;
 }
 
 void CPDFSDK_DateTime::ToSystemTime(FX_SYSTEMTIME& st) {
   CPDFSDK_DateTime dt = *this;
   time_t t = (time_t)dt;
   struct tm* pTime = localtime(&t);
   if (pTime) {
-    st.wYear = (FX_WORD)pTime->tm_year + 1900;
-    st.wMonth = (FX_WORD)pTime->tm_mon + 1;
-    st.wDay = (FX_WORD)pTime->tm_mday;
-    st.wDayOfWeek = (FX_WORD)pTime->tm_wday;
-    st.wHour = (FX_WORD)pTime->tm_hour;
-    st.wMinute = (FX_WORD)pTime->tm_min;
-    st.wSecond = (FX_WORD)pTime->tm_sec;
+    st.wYear = (uint16_t)pTime->tm_year + 1900;
+    st.wMonth = (uint16_t)pTime->tm_mon + 1;
+    st.wDay = (uint16_t)pTime->tm_mday;
+    st.wDayOfWeek = (uint16_t)pTime->tm_wday;
+    st.wHour = (uint16_t)pTime->tm_hour;
+    st.wMinute = (uint16_t)pTime->tm_min;
+    st.wSecond = (uint16_t)pTime->tm_sec;
     st.wMilliseconds = 0;
   }
 }
 
 CPDFSDK_DateTime CPDFSDK_DateTime::ToGMT() const {
   CPDFSDK_DateTime dt = *this;
   dt.AddSeconds(-gAfxGetTimeZoneInSeconds(dt.dt.tzHour, dt.dt.tzMinute));
   dt.dt.tzHour = 0;
   dt.dt.tzMinute = 0;
   return dt;
 }
 
 CPDFSDK_DateTime& CPDFSDK_DateTime::AddDays(short days) {
   if (days == 0)
     return *this;
 
   int16_t y = dt.year, yy;
   uint8_t m = dt.month;
   uint8_t d = dt.day;
   int mdays, ydays, ldays;
 
   ldays = days;
   if (ldays > 0) {
     yy = y;
-    if (((FX_WORD)m * 100 + d) > 300)
+    if (((uint16_t)m * 100 + d) > 300)
       yy++;
     ydays = _gAfxGetYearDays(yy);
     while (ldays >= ydays) {
       y++;
       ldays -= ydays;
       yy++;
       mdays = _gAfxGetMonthDays(y, m);
       if (d > mdays) {
         m++;
         d -= mdays;
       }
       ydays = _gAfxGetYearDays(yy);
     }
     mdays = _gAfxGetMonthDays(y, m) - d + 1;
     while (ldays >= mdays) {
       ldays -= mdays;
       m++;
       d = 1;
       mdays = _gAfxGetMonthDays(y, m);
     }
     d += ldays;
   } else {
     ldays *= -1;
     yy = y;
-    if (((FX_WORD)m * 100 + d) < 300)
+    if (((uint16_t)m * 100 + d) < 300)
       yy--;
     ydays = _gAfxGetYearDays(yy);
     while (ldays >= ydays) {
       y--;
       ldays -= ydays;
       yy--;
       mdays = _gAfxGetMonthDays(y, m);
       if (d > mdays) {
         m++;
         d -= mdays;
@@ skipping 515 matching lines @@
 
 CPDF_Page* CPDFSDK_Annot::GetPDFPage() {
   return m_pPageView ? m_pPageView->GetPDFPage() : nullptr;
 }
 
 #ifdef PDF_ENABLE_XFA
 CPDFXFA_Page* CPDFSDK_Annot::GetPDFXFAPage() {
   return m_pPageView ? m_pPageView->GetPDFXFAPage() : nullptr;
 }
 #endif  // PDF_ENABLE_XFA