diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/dls.h | 6 | ||||
| -rw-r--r-- | src/sls.cpp | 12 |
3 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index 21c474c..e51392f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ else GITVERSION_FLAGS = endif -odr_padenc_CXXFLAGS = $(GITVERSION_FLAGS) @MAGICKWAND_CFLAGS@ -Icontrib -Wall -Wextra +odr_padenc_CXXFLAGS = $(GITVERSION_FLAGS) @MAGICKWAND_CFLAGS@ -std=c++11 -Wall -Wextra -Wpedantic odr_padenc_LDADD = @MAGICKWAND_LDADD@ odr_padenc_SOURCES = \ src/odr-padenc.cpp \ @@ -40,11 +40,11 @@ // DL/DL+ commands enum { - DLS_CMD_REMOVE_LABEL = 0b0001, - DLS_CMD_DL_PLUS = 0b0010 + DLS_CMD_REMOVE_LABEL = 0x1 /* 0b0001 */, + DLS_CMD_DL_PLUS = 0x2 /* 0b0010 */ }; enum { - DL_PLUS_CMD_TAGS = 0b0000 + DL_PLUS_CMD_TAGS = 0x0 /* 0b0000 */ }; diff --git a/src/sls.cpp b/src/sls.cpp index a36c5da..4d24358 100644 --- a/src/sls.cpp +++ b/src/sls.cpp @@ -207,7 +207,7 @@ void MOTHeader::AddExtensionFixedSize(int pli, int param_id, const uint8_t* data void MOTHeader::AddExtensionVarSize(int param_id, const uint8_t* data_field, size_t data_field_len) { - AddParamHeader(0b11, param_id); + AddParamHeader(0x3, param_id); // longer field lens use 15 instead of 7 bits bool ext = data_field_len > 127; @@ -230,20 +230,20 @@ void MOTHeader::AddExtension(int param_id, const uint8_t* data_field, size_t dat switch(data_field_len) { case 0: - pli = 0b00; + pli = 0x0; // 0b00 break; case 1: - pli = 0b01; + pli = 0x1; // 0b01 break; case 4: - pli = 0b10; + pli = 0x2; // 0b10 break; default: - pli = 0b11; + pli = 0x3; // 0b11 break; } - if (pli == 0b11) + if (pli == 0x3) AddExtensionVarSize(param_id, data_field, data_field_len); else AddExtensionFixedSize(pli, param_id, data_field, data_field_len); |