summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-10-20 14:32:51 -0700
committerTom Sepez <tsepez@chromium.org>2015-10-20 14:32:51 -0700
commitb95fc6d9f2f591ba26da38d97adf840762ce049e (patch)
tree76308da65daa55c122cab8b5da8e7a3db68825a3
parent05d9e934b74c2d4e4f2983cb8d31e995a18cbe6a (diff)
downloadpdfium-b95fc6d9f2f591ba26da38d97adf840762ce049e.tar.xz
Merge to XFA: Cosmetic changes in fsdk_define.h
Review URL: https://codereview.chromium.org/1412123004 . (cherry picked from commit b5dd65f31408dc8c15d202cbb3e8d9ec2afd4520) TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1415433006 .
-rw-r--r--fpdfsdk/include/fsdk_define.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h
index cc8c12d50f..e001e751de 100644
--- a/fpdfsdk/include/fsdk_define.h
+++ b/fpdfsdk/include/fsdk_define.h
@@ -29,19 +29,15 @@
#include <math.h>
#endif
-#ifndef FX_ARGBTOCOLORREF
-/** @brief Convert a #FX_ARGB to a #FX_COLORREF. */
+// Convert a #FX_ARGB to a #FX_COLORREF.
#define FX_ARGBTOCOLORREF(argb) \
((((FX_DWORD)argb & 0x00FF0000) >> 16) | ((FX_DWORD)argb & 0x0000FF00) | \
(((FX_DWORD)argb & 0x000000FF) << 16))
-#endif
-#ifndef FX_COLORREFTOARGB
-/** @brief Convert a #FX_COLORREF to a #FX_ARGB. */
+// Convert a #FX_COLORREF to a #FX_ARGB.
#define FX_COLORREFTOARGB(rgb) \
((FX_DWORD)0xFF000000 | (((FX_DWORD)rgb & 0x000000FF) << 16) | \
((FX_DWORD)rgb & 0x0000FF00) | (((FX_DWORD)rgb & 0x00FF0000) >> 16))
-#endif
typedef unsigned int FX_UINT;
class CRenderContext;