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

core/src/fxge/apple/fx_quartz_device.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/fxcrt/fx_ext.h"
 #include "../../../include/fxge/fx_ge.h"
 #include "../agg/include/fxfx_agg_clip_liang_barsky.h"
 #include "../ge/text_int.h"
@@ skipping 63 matching lines @@
                            matrix->c,
                            matrix->d,
                            matrix->e,
                            ty));
 }
 FX_BOOL CQuartz2D::drawGraphicsString(void*                 graphics,
                                       void*                 font,
                                       FX_FLOAT              fontSize,
                                       FX_WORD*              glyphIndices,
                                       CGPoint*           glyphPositions,
-                                      FX_INT32              charsCount,
+                                      int32_t              charsCount,
                                       FX_ARGB               argb,
                                       CFX_AffineMatrix*     matrix )
 {
     if (!graphics) {
         return FALSE;
     }
     CGContextRef context = (CGContextRef) graphics;
     CGContextSetFont(context, (CGFontRef)font);
     CGContextSetFontSize(context, fontSize);
     if (matrix) {
         CGAffineTransform m = CGContextGetTextMatrix(context);
         m = CGAffineTransformConcat(m,
                                     CGAffineTransformMake(matrix->a,
                                             matrix->b,
                                             matrix->c,
                                             matrix->d,
                                             matrix->e,
                                             matrix->f));
         CGContextSetTextMatrix(context, m);
     }
-    FX_INT32 a, r, g, b;
+    int32_t a, r, g, b;
     ArgbDecode(argb, a, r, g, b);
     CGContextSetRGBFillColor(context,
                              r / 255.f,
                              g / 255.f,
                              b / 255.f,
                              a / 255.f);
     CGContextSaveGState(context);
 #if CGFLOAT_IS_DOUBLE
     CGPoint* glyphPositionsCG = new CGPoint[charsCount];
     if (!glyphPositionsCG) {
@@ skipping 43 matching lines @@
     CGContextRef context = CGBitmapContextCreate(pBitmap->GetBuffer(),
                            pBitmap->GetWidth(),
                            pBitmap->GetHeight(),
                            8,
                            pBitmap->GetPitch(),
                            colorSpace,
                            bitmapInfo);
     CGColorSpaceRelease(colorSpace);
     return context;
 }
-CFX_QuartzDeviceDriver::CFX_QuartzDeviceDriver(CGContextRef context, FX_INT32 deviceClass)
+CFX_QuartzDeviceDriver::CFX_QuartzDeviceDriver(CGContextRef context, int32_t deviceClass)
 {
     m_saveCount = 0;
     _context            = context;
     _deviceClass        = deviceClass;
     CGContextRetain(_context);
     CGRect r = CGContextGetClipBoundingBox(context);
     _width      = FXSYS_round(r.size.width);
     _height     = FXSYS_round(r.size.height);
     _renderCaps = FXRC_SOFT_CLIP | FXRC_BLEND_MODE |
                   FXRC_ALPHA_PATH | FXRC_ALPHA_IMAGE |
@@ skipping 251 matching lines @@
         int                       alphaFlag        ,
         void*                     iccTransform ,
         int                                             blend_type )
 {
     CGBlendMode mode = GetCGBlendMode(blend_type);
     if (mode != kCGBlendModeNormal) {
         CGContextSetBlendMode(_context, mode);
     }
     CGRect rect_fx = CGRectMake(rect->left, rect->top, rect->Width(), rect->Height());
     CGRect rect_usr = CGRectApplyAffineTransform(rect_fx, _foxitDevice2User);
-    FX_INT32 a, r, g, b;
+    int32_t a, r, g, b;
     ArgbDecode(fillArgb, a, r, g, b);
     CGContextSetRGBFillColor(_context,
                              r / 255.f,
                              g / 255.f,
                              b / 255.f,
                              a / 255.f);
     CGContextFillRect(_context, rect_usr);
     if (mode != kCGBlendModeNormal) {
         CGContextSetBlendMode(_context, kCGBlendModeNormal);
     }
@@ skipping 11 matching lines @@
     CGBlendMode mode = GetCGBlendMode(blend_type);
     if (mode != kCGBlendModeNormal) {
         CGContextSetBlendMode(_context, mode);
     }
     CGPoint pt = CGPointApplyAffineTransform(CGPointMake(x1, y1), _foxitDevice2User);
     x1 = pt.x;
     y1 = pt.y;
     pt = CGPointApplyAffineTransform(CGPointMake(x2, y2), _foxitDevice2User);
     x2 = pt.x;
     y2 = pt.y;
-    FX_INT32 a, r, g, b;
+    int32_t a, r, g, b;
     ArgbDecode(argb, a, r, g, b);
     CGContextSetRGBStrokeColor(_context,
                                r / 255.f,
                                g / 255.f,
                                b / 255.f,
                                a / 255.f);
     CGContextMoveToPoint(_context, x1, y1);
     CGContextAddLineToPoint(_context, x2, y2);
     CGContextStrokePath(_context);
     if (mode != kCGBlendModeNormal) {
         CGContextSetBlendMode(_context, kCGBlendModeNormal);
     }
     return TRUE;
 }
 FX_BOOL CFX_QuartzDeviceDriver::GetClipBox(FX_RECT* rect)
 {
     CGRect r = CGContextGetClipBoundingBox(_context);
     r = CGRectApplyAffineTransform(r, _user2FoxitDevice);
     rect->left          = FXSYS_floor(r.origin.x);
     rect->top           = FXSYS_floor(r.origin.y);
     rect->right         = FXSYS_ceil(r.origin.x + r.size.width);
     rect->bottom        = FXSYS_ceil(r.origin.y + r.size.height);
     return TRUE;
 }
 FX_BOOL CFX_QuartzDeviceDriver::GetDIBits(CFX_DIBitmap*     bitmap,
-        FX_INT32            left,
-        FX_INT32            top,
+        int32_t            left,
+        int32_t            top,
         void* pIccTransform,
         FX_BOOL bDEdge)
 {
     if (FXDC_PRINTER == _deviceClass) {
         return FALSE;
     }
     if (bitmap->GetBPP() < 32) {
         return FALSE;
     }
     if (!(_renderCaps | FXRC_GET_BITS)) {
@@ skipping 138 matching lines @@
         if (pBitmap1 == pBitmap) {
             pBitmap1 = pBitmap->Clone();
             if (!pBitmap1) {
                 RestoreState(FALSE);
                 return FALSE;
             }
         }
         for (int row = 0; row < pBitmap1->GetHeight(); row ++) {
             FX_LPBYTE pScanline = (FX_LPBYTE)pBitmap1->GetScanline(row);
             for (int col = 0; col < pBitmap1->GetWidth(); col ++) {
-                pScanline[0] = (FX_BYTE)(pScanline[0] * pScanline[3] / 255.f + .5f);
-                pScanline[1] = (FX_BYTE)(pScanline[1] * pScanline[3] / 255.f + .5f);
-                pScanline[2] = (FX_BYTE)(pScanline[2] * pScanline[3] / 255.f + .5f);
+                pScanline[0] = (uint8_t)(pScanline[0] * pScanline[3] / 255.f + .5f);
+                pScanline[1] = (uint8_t)(pScanline[1] * pScanline[3] / 255.f + .5f);
+                pScanline[2] = (uint8_t)(pScanline[2] * pScanline[3] / 255.f + .5f);
                 pScanline += 4;
             }
         }
     }
     CGContextRef ctx = createContextWithBitmap(pBitmap1);
     CGImageRef image = CGBitmapContextCreateImage(ctx);
     int blend_mode = blendType;
     if (FXDIB_BLEND_HARDLIGHT == blendType) {
         blend_mode = kCGBlendModeSoftLight;
     } else if (FXDIB_BLEND_SOFTLIGHT == blendType) {
@@ skipping 102 matching lines @@
         if (pBitmap1 == pBitmap) {
             pBitmap1 = pBitmap->Clone();
             if (!pBitmap1) {
                 RestoreState(FALSE);
                 return FALSE;
             }
         }
         for (int row = 0; row < pBitmap1->GetHeight(); row ++) {
             FX_LPBYTE pScanline = (FX_LPBYTE)pBitmap1->GetScanline(row);
             for (int col = 0; col < pBitmap1->GetWidth(); col ++) {
-                pScanline[0] = (FX_BYTE)(pScanline[0] * pScanline[3] / 255.f + .5f);
-                pScanline[1] = (FX_BYTE)(pScanline[1] * pScanline[3] / 255.f + .5f);
-                pScanline[2] = (FX_BYTE)(pScanline[2] * pScanline[3] / 255.f + .5f);
+                pScanline[0] = (uint8_t)(pScanline[0] * pScanline[3] / 255.f + .5f);
+                pScanline[1] = (uint8_t)(pScanline[1] * pScanline[3] / 255.f + .5f);
+                pScanline[2] = (uint8_t)(pScanline[2] * pScanline[3] / 255.f + .5f);
                 pScanline += 4;
             }
         }
     }
     CGContextRef ctx = createContextWithBitmap(pBitmap1);
     CGImageRef image = CGBitmapContextCreateImage(ctx);
     CGContextDrawImage(_context, rect, image);
     CGImageRelease(image);
     CGContextRelease(ctx);
     if (pBitmap1 != pBitmap) {
@@ skipping 40 matching lines @@
     CGAffineTransform matrix_cg = CGAffineTransformMake(text_matrix.a,
                                   text_matrix.b,
                                   text_matrix.c,
                                   text_matrix.d,
                                   text_matrix.e,
                                   text_matrix.f);
     matrix_cg = CGAffineTransformConcat(matrix_cg, _foxitDevice2User);
     CGContextSetTextMatrix(_context, matrix_cg);
     CGContextSetFont(_context, (CGFontRef)pFont->m_pPlatformFont);
     CGContextSetFontSize(_context, FXSYS_fabs(font_size));
-    FX_INT32 a, r, g, b;
+    int32_t a, r, g, b;
     ArgbDecode(argb, a, r, g, b);
     CGContextSetRGBFillColor(_context,
                              r / 255.f,
                              g / 255.f,
                              b / 255.f,
                              a / 255.f);
     SaveState();
     if (pGlyphMatrix) {
         CGPoint origin = CGPointMake( glyph_positions[0].x,  glyph_positions[0].y);
         origin = CGPointApplyAffineTransform(origin, matrix_cg);
@@ skipping 32 matching lines @@
     }
     FX_BOOL bBold = pFont->IsBold();
     if (!bBold && pFont->GetSubstFont() &&
             pFont->GetSubstFont()->m_Weight >= 500 &&
             pFont->GetSubstFont()->m_Weight <= 600) {
         return FALSE;
     }
     SaveState();
     CGContextSetTextDrawingMode(_context, kCGTextFillClip);
     FX_BOOL ret = FALSE;
-    FX_INT32 i = 0;
+    int32_t i = 0;
     while (i < nChars) {
         if (pCharPos[i].m_bGlyphAdjust || font_size < 0) {
             if (i > 0) {
                 ret = CG_DrawGlypRun(i, pCharPos, pFont, pCache, NULL, pObject2Device, font_size, color, alpha_flag, pIccTransform);
                 if (!ret) {
                     RestoreState(FALSE);
                     return ret;
                 }
             }
             const FXTEXT_CHARPOS* char_pos = pCharPos + i;
@@ skipping 74 matching lines @@
             dashArray[index] = graphState->m_DashArray[index];
         }
 #else
         CGFloat* dashArray = (CGFloat*)graphState->m_DashArray;
 #endif
         CGContextSetLineDash(_context, graphState->m_DashPhase, dashArray, graphState->m_DashCount);
 #if CGFLOAT_IS_DOUBLE
         delete[] dashArray;
 #endif
     }
-    FX_INT32 a, r, g, b;
+    int32_t a, r, g, b;
     ArgbDecode(argb, a, r, g, b);
     CGContextSetRGBStrokeColor(_context,
                                r / 255.f,
                                g / 255.f,
                                b / 255.f,
                                a / 255.f);
 }
 void CFX_QuartzDeviceDriver::setFillInfo(FX_ARGB argb)
 {
-    FX_INT32 a, r, g, b;
+    int32_t a, r, g, b;
     ArgbDecode(argb, a, r, g, b);
     CGContextSetRGBFillColor(_context,
                              r / 255.f,
                              g / 255.f,
                              b / 255.f,
                              a / 255.f);
 }
 void CFX_QuartzDeviceDriver::setPathToContext(const CFX_PathData* pathData)
 {
-    FX_INT32 count = pathData->GetPointCount();
+    int32_t count = pathData->GetPointCount();
     FX_PATHPOINT* points = pathData->GetPoints();
     CGContextBeginPath(_context);
-    for (FX_INT32 i = 0; i < count; i ++) {
+    for (int32_t i = 0; i < count; i ++) {
         switch (points[i].m_Flag & FXPT_TYPE) {
             case FXPT_MOVETO:
                 CGContextMoveToPoint(_context, points[i].m_PointX, points[i].m_PointY);
                 break;
             case FXPT_LINETO:
                 CGContextAddLineToPoint(_context, points[i].m_PointX, points[i].m_PointY);
                 break;
             case FXPT_BEZIERTO: {
                     CGContextAddCurveToPoint(_context,
                                              points[i].m_PointX, points[i].m_PointY,
@@ skipping 54 matching lines @@
         CGContextRelease(m_pContext);
     }
     if (GetBitmap() && m_bOwnedBitmap) {
         delete GetBitmap();
     }
 }
 CGContextRef CFX_QuartzDevice::GetContext()
 {
     return m_pContext;
 }
-FX_BOOL CFX_QuartzDevice::Attach(CGContextRef context, FX_INT32 nDeviceClass)
+FX_BOOL CFX_QuartzDevice::Attach(CGContextRef context, int32_t nDeviceClass)
 {
     if (m_pContext) {
         CGContextRelease(m_pContext);
     }
     m_pContext = context;
     CGContextRetain(m_pContext);
     IFX_RenderDeviceDriver* pDriver = FX_NEW CFX_QuartzDeviceDriver(m_pContext, nDeviceClass);
     if (!pDriver) {
         return FALSE;
     }
     SetDeviceDriver(pDriver);
     return TRUE;
 }
 FX_BOOL CFX_QuartzDevice::Attach(CFX_DIBitmap* pBitmap)
 {
     SetBitmap(pBitmap);
     m_pContext = createContextWithBitmap(pBitmap);
     if (NULL == m_pContext) {
         return FALSE;
     }
     IFX_RenderDeviceDriver* pDriver = FX_NEW CFX_QuartzDeviceDriver(m_pContext, FXDC_DISPLAY);
     if (!pDriver) {
         return FALSE;
     }
     SetDeviceDriver(pDriver);
     return TRUE;
 }
-FX_BOOL CFX_QuartzDevice::Create(FX_INT32 width, FX_INT32 height, FXDIB_Format format)
+FX_BOOL CFX_QuartzDevice::Create(int32_t width, int32_t height, FXDIB_Format format)
 {
-    if ((FX_BYTE)format < 32) {
+    if ((uint8_t)format < 32) {
         return FALSE;
     }
     CFX_DIBitmap* pBitmap = FX_NEW CFX_DIBitmap;
     if (!pBitmap) {
         return FALSE;
     }
     if (!pBitmap->Create(width, height, format)) {
         delete pBitmap;
         return FALSE;
     }
     m_bOwnedBitmap = TRUE;
     return Attach(pBitmap);
 }
 #endif