diff options
Diffstat (limited to 'fxbarcode/datamatrix')
-rw-r--r-- | fxbarcode/datamatrix/BC_DefaultPlacement.cpp | 12 | ||||
-rw-r--r-- | fxbarcode/datamatrix/BC_EncoderContext.cpp | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/fxbarcode/datamatrix/BC_DefaultPlacement.cpp b/fxbarcode/datamatrix/BC_DefaultPlacement.cpp index 3f1b35864f..24d81f1bb3 100644 --- a/fxbarcode/datamatrix/BC_DefaultPlacement.cpp +++ b/fxbarcode/datamatrix/BC_DefaultPlacement.cpp @@ -21,19 +21,23 @@ */ #include "fxbarcode/datamatrix/BC_DefaultPlacement.h" + +#include <utility> + #include "fxbarcode/datamatrix/BC_Encoder.h" CBC_DefaultPlacement::CBC_DefaultPlacement(WideString codewords, int32_t numcols, - int32_t numrows) { - m_codewords = codewords; - m_numcols = numcols; - m_numrows = numrows; + int32_t numrows) + : m_codewords(std::move(codewords)), + m_numrows(numrows), + m_numcols(numcols) { m_bits.resize(numcols * numrows); for (int32_t i = 0; i < numcols * numrows; i++) { m_bits[i] = (uint8_t)2; } } + CBC_DefaultPlacement::~CBC_DefaultPlacement() {} int32_t CBC_DefaultPlacement::getNumrows() { diff --git a/fxbarcode/datamatrix/BC_EncoderContext.cpp b/fxbarcode/datamatrix/BC_EncoderContext.cpp index f5c2f4c1fc..e72d1e4640 100644 --- a/fxbarcode/datamatrix/BC_EncoderContext.cpp +++ b/fxbarcode/datamatrix/BC_EncoderContext.cpp @@ -22,6 +22,8 @@ #include "fxbarcode/datamatrix/BC_EncoderContext.h" +#include <utility> + #include "fxbarcode/BC_UtilCodingConvert.h" #include "fxbarcode/common/BC_CommonBitMatrix.h" #include "fxbarcode/datamatrix/BC_Encoder.h" @@ -43,7 +45,7 @@ CBC_EncoderContext::CBC_EncoderContext(const WideString& msg, } sb += ch; } - m_msg = sb; + m_msg = std::move(sb); m_codewords.Reserve(m_msg.GetLength()); m_allowRectangular = true; m_newEncoding = -1; |