Split core/include/fpdfapi/fpdf_resource.h

public/fpdf_edit.h

Index: public/fpdf_edit.h
diff --git a/public/fpdf_edit.h b/public/fpdf_edit.h
index 64eef263a551dc8443d78beb377fd8e9a4c34012..179e7fb88321a66d56bb44257a4238b4674ed8ac 100644
--- a/public/fpdf_edit.h
+++ b/public/fpdf_edit.h
@@ -15,10 +15,9 @@
 // pointers
 // or long integer numbers.
 
-#define FPDF_ARGB(a, r, g, b)                                     \
-  ((((uint32_t)(((uint8_t)(b) | ((FX_WORD)((uint8_t)(g)) << 8)) | \
-                (((FX_DWORD)(uint8_t)(r)) << 16)))) |             \
-   (((FX_DWORD)(uint8_t)(a)) << 24))
+#define FPDF_ARGB(a, r, g, b)                                                \
+  ((uint32_t)((uint32_t)(b) | ((uint32_t)(g) << 8) | ((uint32_t)(r) << 16) | \

[Tom Sepez, 2016/03/23 19:57:01]

not quite.  They are counting on the cast to uint8_t to truncate values above
256 to occupy bottom byte only.  I'd prefer an explicit (b & 0xff) rather than
the cast, so
(static_cast<uint32_t>(b) & 0xFF) |
((static_cast<uint32_t>(g) & 0xFF) << 8) | ...
 

[dsinclair, 2016/03/23 20:09:11]

Can't static_cast as this is public/ but made the other changes.

+              ((uint32_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))