Split core/include/fpdfapi/fpdf_resource.h

public/fpdf_edit.h

 // 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
 
 #ifndef PUBLIC_FPDF_EDIT_H_
 #define PUBLIC_FPDF_EDIT_H_
 
 #include <stdint.h>
 
 #include "fpdfview.h"
 
 // Define all types used in the SDK. Note they can be simply regarded as opaque
 // pointers
 // or long integer numbers.
 
 #define FPDF_ARGB(a, r, g, b)                                     \
-  ((((uint32_t)(((uint8_t)(b) | ((FX_WORD)((uint8_t)(g)) << 8)) | \
+  ((((uint32_t)(((uint8_t)(b) | ((uint16_t)((uint8_t)(g)) << 8)) | \

[Tom Sepez, 2016/03/22 16:55:53]

Formatting, also this looks wrong.  We want to cast all of these to FX_DWORD or
uint32_t to avoid silent promotion to int for smaller types.

[dsinclair, 2016/03/23 00:00:25]

Done. You may want to verify my bracketing.

                 (((FX_DWORD)(uint8_t)(r)) << 16)))) |             \
    (((FX_DWORD)(uint8_t)(a)) << 24))
 #define FPDF_GetBValue(argb) ((uint8_t)(argb))
 #define FPDF_GetGValue(argb) ((uint8_t)(((uint16_t)(argb)) >> 8))
 #define FPDF_GetRValue(argb) ((uint8_t)((argb) >> 16))
 #define FPDF_GetAValue(argb) ((uint8_t)((argb) >> 24))
 
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ skipping 268 matching lines @@
 DLLEXPORT FPDF_BOOL STDCALL FPDFImageObj_SetBitmap(FPDF_PAGE* pages,
                                                    int nCount,
                                                    FPDF_PAGEOBJECT image_object,
                                                    FPDF_BITMAP bitmap);
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif  // PUBLIC_FPDF_EDIT_H_