Merge to XFA: Use stdint.h types throughout PDFium.

fpdfsdk/src/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 "../include/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fsdk_mgr.h"
 #include "../include/fsdk_baseannot.h"
 
 
 //---------------------------------------------------------------------------
 //                                                              CPDFSDK_DateTime        
 //---------------------------------------------------------------------------
-int _gAfxGetTimeZoneInSeconds(FX_CHAR tzhour, FX_BYTE tzminute)
+int _gAfxGetTimeZoneInSeconds(FX_CHAR tzhour, uint8_t tzminute)
 {
         return (int)tzhour * 3600 + (int)tzminute * (tzhour >= 0 ? 60 : -60);
 }
 
-FX_BOOL _gAfxIsLeapYear(FX_SHORT year)
+FX_BOOL _gAfxIsLeapYear(int16_t year)
 {
         return ((year % 400 == 0) || ((year % 4 == 0) && (year % 100 != 0)));
 }
 
-FX_WORD _gAfxGetYearDays(FX_SHORT year)
+FX_WORD _gAfxGetYearDays(int16_t year)
 {
         return (_gAfxIsLeapYear(year) == TRUE ? 366 : 365);
 }
 
-FX_BYTE _gAfxGetMonthDays(FX_SHORT year, FX_BYTE month)
+uint8_t _gAfxGetMonthDays(int16_t year, uint8_t month)
 {
-        FX_BYTE mDays;
+        uint8_t mDays;
         switch (month)
         {
         case 1:
         case 3:
         case 5:
         case 7:
         case 8:
         case 10:
         case 12:
                 mDays = 31;
@@ skipping 67 matching lines @@
 CPDFSDK_DateTime& CPDFSDK_DateTime::operator = (const CPDFSDK_DateTime& datetime)
 {
         FXSYS_memcpy(&dt, &datetime.dt, sizeof(FX_DATETIME));
         return *this;
 }
 
 CPDFSDK_DateTime& CPDFSDK_DateTime::operator = (const FX_SYSTEMTIME& st)
 {
         tzset();
 
-        dt.year = (FX_SHORT)st.wYear;
-        dt.month = (FX_BYTE)st.wMonth;
-        dt.day = (FX_BYTE)st.wDay;
-        dt.hour = (FX_BYTE)st.wHour;
-        dt.minute = (FX_BYTE)st.wMinute;
-        dt.second = (FX_BYTE)st.wSecond;
+        dt.year = (int16_t)st.wYear;
+        dt.month = (uint8_t)st.wMonth;
+        dt.day = (uint8_t)st.wDay;
+        dt.hour = (uint8_t)st.wHour;
+        dt.minute = (uint8_t)st.wMinute;
+        dt.second = (uint8_t)st.wSecond;
 //      dt.tzHour = _timezone / 3600 * -1;
 //      dt.tzMinute = (abs(_timezone) % 3600) / 60;
         return *this;
 }
 
 FX_BOOL CPDFSDK_DateTime::operator == (CPDFSDK_DateTime& datetime)
 {
         return (FXSYS_memcmp(&dt, &datetime.dt, sizeof(FX_DATETIME)) == 0);
 }
 
@@ skipping 91 matching lines @@
                 j = 0;
                 k = 0;
                 while (i < strLength && j < 4)
                 {
                         ch = dtStr[i];
                         k = k * 10 + ch - '0';
                         j ++;
                         if (ch < '0' || ch > '9') break;
                         i ++;
                 }
-                dt.year = (FX_SHORT)k;
+                dt.year = (int16_t)k;
                 if (i >= strLength || j < 4) return *this;
 
                 j = 0;
                 k = 0;
                 while (i < strLength && j < 2)
                 {
                         ch = dtStr[i];
                         k = k * 10 + ch - '0';
                         j ++;
                         if (ch < '0' || ch > '9') break;
                         i ++;
                 }
-                dt.month = (FX_BYTE)k;
+                dt.month = (uint8_t)k;
                 if (i >= strLength || j < 2) return *this;
 
                 j = 0;
                 k = 0;
                 while (i < strLength && j < 2)
                 {
                         ch = dtStr[i];
                         k = k * 10 + ch - '0';
                         j ++;
                         if (ch < '0' || ch > '9') break;
                         i ++;
                 }
-                dt.day = (FX_BYTE)k;
+                dt.day = (uint8_t)k;
                 if (i >= strLength || j < 2) return *this;
 
                 j = 0;
                 k = 0;
                 while (i < strLength && j < 2)
                 {
                         ch = dtStr[i];
                         k = k * 10 + ch - '0';
                         j ++;
                         if (ch < '0' || ch > '9') break;
                         i ++;
                 }
-                dt.hour = (FX_BYTE)k;
+                dt.hour = (uint8_t)k;
                 if (i >= strLength || j < 2) return *this;
 
                 j = 0;
                 k = 0;
                 while (i < strLength && j < 2)
                 {
                         ch = dtStr[i];
                         k = k * 10 + ch - '0';
                         j ++;
                         if (ch < '0' || ch > '9') break;
                         i ++;
                 }
-                dt.minute = (FX_BYTE)k;
+                dt.minute = (uint8_t)k;
                 if (i >= strLength || j < 2) return *this;
 
                 j = 0;
                 k = 0;
                 while (i < strLength && j < 2)
                 {
                         ch = dtStr[i];
                         k = k * 10 + ch - '0';
                         j ++;
                         if (ch < '0' || ch > '9') break;
                         i ++;
                 }
-                dt.second = (FX_BYTE)k;
+                dt.second = (uint8_t)k;
                 if (i >= strLength || j < 2) return *this;
 
                 ch = dtStr[i ++];
                 if (ch != '-' && ch != '+') return *this;
                 if (ch == '-')
                         dt.tzHour = -1;
                 else
                         dt.tzHour = 1;
                 j = 0;
                 k = 0;
@@ skipping 13 matching lines @@
                 j = 0;
                 k = 0;
                 while (i < strLength && j < 2)
                 {
                         ch = dtStr[i];
                         k = k * 10 + ch - '0';
                         j ++;
                         if (ch < '0' || ch > '9') break;
                         i ++;
                 }
-                dt.tzMinute = (FX_BYTE)k;
+                dt.tzMinute = (uint8_t)k;
                 if (i >= strLength || j < 2) return *this;
         }
 
         return  *this;
 }
 
 CFX_ByteString CPDFSDK_DateTime::ToCommonDateTimeString()
 {
         CFX_ByteString str1;
         str1.Format("%04d-%02d-%02d %02d:%02d:%02d ", dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second);
@@ skipping 47 matching lines @@
         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;
 
-        FX_SHORT        y = dt.year, yy;
-        FX_BYTE         m = dt.month;
-        FX_BYTE         d = dt.day;
+        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) yy ++;
                 ydays = _gAfxGetYearDays(yy);
                 while (ldays >= ydays)
                 {
@@ skipping 65 matching lines @@
         if (n < 0)
         {
                 days = (n - 86399) / 86400;
                 n -= days * 86400;
         }
         else
         {
                 days = n / 86400;
                 n %= 86400;
         }
-        dt.hour = (FX_BYTE)(n / 3600);
+        dt.hour = (uint8_t)(n / 3600);
         dt.hour %= 24;
         n %= 3600;
-        dt.minute = (FX_BYTE)(n / 60);
-        dt.second = (FX_BYTE)(n % 60);
+        dt.minute = (uint8_t)(n / 60);
+        dt.second = (uint8_t)(n % 60);
         if (days != 0) AddDays(days);
 
         return *this;
 }
 
 
 //---------------------------------------------------------------------------
 //                                                              CPDFSDK_Annot   
 //---------------------------------------------------------------------------
 CPDFSDK_Annot::CPDFSDK_Annot(CPDFSDK_PageView* pPageView) :
@@ skipping 447 matching lines @@
                 
                 pParentDict = pAPTypeDict;
                 pStream = pAPTypeDict->GetStream(sAPState);
         }
         
         if (!pStream) 
         {
                 ASSERT(m_pPageView != NULL);
                 CPDF_Document* pDoc = m_pPageView->GetPDFDocument();
                 ASSERT(pDoc != NULL);
-                
+
                 pStream = FX_NEW CPDF_Stream(NULL, 0, NULL);
-                FX_INT32 objnum = pDoc->AddIndirectObject(pStream);
+                int32_t objnum = pDoc->AddIndirectObject(pStream);
                 //pAPDict->SetAtReference(sAPType, pDoc, objnum);
                 ASSERT(pParentDict != NULL);
                 pParentDict->SetAtReference(sAPType, pDoc, objnum);
         }
-        
+
         CPDF_Dictionary * pStreamDict = pStream->GetDict();
         
         if (!pStreamDict)
         {
                 pStreamDict = FX_NEW CPDF_Dictionary;
                 pStreamDict->SetAtName("Type", "XObject");
                 pStreamDict->SetAtName("Subtype", "Form");
                 pStreamDict->SetAtInteger("FormType", 1);
                 pStream->InitStream(NULL,0,pStreamDict);
         }
         
         if (pStreamDict)
         {
                 pStreamDict->SetAtMatrix("Matrix",matrix);      
                 pStreamDict->SetAtRect("BBox", rcBBox);         
         }
         
-        pStream->SetData((FX_BYTE*)sContents.c_str(), sContents.GetLength(), FALSE, FALSE);
+        pStream->SetData((uint8_t*)sContents.c_str(), sContents.GetLength(), FALSE, FALSE);
 }
 
 #define BA_ANNOT_MINWIDTH                       1
 #define BA_ANNOT_MINHEIGHT                      1
 
 FX_FLOAT CPDFSDK_Annot::GetMinWidth() const
 {
         return BA_ANNOT_MINWIDTH;
 }
 
@@ skipping 88 matching lines @@
         return NULL;
 }
 
 CPDFXFA_Page* CPDFSDK_Annot::GetPDFXFAPage()
 {
         if (m_pPageView)
                 return m_pPageView->GetPDFXFAPage();
         return NULL;
 }