From 92cb5e580cecf0412b74d51e8863ed557e2bd47a Mon Sep 17 00:00:00 2001 From: dsinclair Date: Mon, 16 May 2016 11:38:28 -0700 Subject: Convert border style defines to an enum class. There were two defines, BBS_ and PBS_ for the various border styles in the system. They were the same, except PBS_ had an extra SHADOW define which was never used. This CL combines both of those into a single BorderStyle enum class and updates the code as needed. Also, removes ADDBIT, GETBIT unused defines. Updates barcode code to use the util.h defines instead of redefinition. fsdk_baseannot names starting with _ were cleaned up and some #defines moved to constants. Review-Url: https://codereview.chromium.org/1980973002 --- core/fxcodec/codec/fx_codec_fax.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'core/fxcodec') diff --git a/core/fxcodec/codec/fx_codec_fax.cpp b/core/fxcodec/codec/fx_codec_fax.cpp index 91f9eb2eb8..97b7ee2ad6 100644 --- a/core/fxcodec/codec/fx_codec_fax.cpp +++ b/core/fxcodec/codec/fx_codec_fax.cpp @@ -132,11 +132,6 @@ void FaxFillBits(uint8_t* dest_buf, int columns, int startpos, int endpos) { #define NEXTBIT \ src_buf[bitpos / 8] & (1 << (7 - bitpos % 8)); \ bitpos++; -#define ADDBIT(code, bit) \ - code = code << 1; \ - if (bit) \ - code++; -#define GETBIT(bitpos) src_buf[bitpos / 8] & (1 << (7 - bitpos % 8)) const uint8_t FaxBlackRunIns[] = { 0, 2, 0x02, 3, 0, 0x03, -- cgit v1.2.3