commit 301bfc6b1400fb47d1f8188a6e7c36324ecf41b3
author Lei Zhang <thestig@chromium.org> Sat Nov 17 01:19:27 2018 +0000
committer Chromium commit bot <commit-bot@chromium.org> Sat Nov 17 01:19:27 2018 +0000
tree d180d7d17b6e61fd3d2783491e7757d950eb9ddf
parent fbcc18aa2fb9b9bd60331a156ada37b3e2024be2

Fix some nits in fxbarcode.

Change-Id: If0cb991e76061d1352500efd53c5187f114ff772
Reviewed-on: https://pdfium-review.googlesource.com/c/45757
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

fxbarcode/datamatrix/BC_ASCIIEncoder.cpp

diff --git a/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp b/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp
index b3f653d..95eac09 100644
--- a/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp
+++ b/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp
@@ -43,9 +43,9 @@
 
 }  // namespace
 
-CBC_ASCIIEncoder::CBC_ASCIIEncoder() {}
+CBC_ASCIIEncoder::CBC_ASCIIEncoder() = default;
 
-CBC_ASCIIEncoder::~CBC_ASCIIEncoder() {}
+CBC_ASCIIEncoder::~CBC_ASCIIEncoder() = default;
 
 int32_t CBC_ASCIIEncoder::getEncodingMode() {
   return ASCII_ENCODATION;

fxbarcode/datamatrix/BC_Base256Encoder.cpp

diff --git a/fxbarcode/datamatrix/BC_Base256Encoder.cpp b/fxbarcode/datamatrix/BC_Base256Encoder.cpp
index 1010cfe..23c2bd2 100644
--- a/fxbarcode/datamatrix/BC_Base256Encoder.cpp
+++ b/fxbarcode/datamatrix/BC_Base256Encoder.cpp
@@ -28,11 +28,26 @@
 #include "fxbarcode/datamatrix/BC_SymbolInfo.h"
 #include "fxbarcode/utils.h"
 
-CBC_Base256Encoder::CBC_Base256Encoder() {}
-CBC_Base256Encoder::~CBC_Base256Encoder() {}
+namespace {
+
+wchar_t Randomize255State(wchar_t ch, int32_t position) {
+  int32_t pseudoRandom = ((149 * position) % 255) + 1;
+  int32_t tempVariable = ch + pseudoRandom;
+  if (tempVariable <= 255)
+    return static_cast<wchar_t>(tempVariable);
+  return static_cast<wchar_t>(tempVariable - 256);
+}
+
+}  // namespace
+
+CBC_Base256Encoder::CBC_Base256Encoder() = default;
+
+CBC_Base256Encoder::~CBC_Base256Encoder() = default;
+
 int32_t CBC_Base256Encoder::getEncodingMode() {
   return BASE256_ENCODATION;
 }
+
 void CBC_Base256Encoder::Encode(CBC_EncoderContext& context, int32_t& e) {
   WideString buffer;
   buffer.Reserve(context.getRemainingCharacters() + 1);
@@ -72,16 +87,6 @@
     }
   }
   for (const auto& c : buffer) {
-    context.writeCodeword(randomize255State(c, context.getCodewordCount() + 1));
-  }
-}
-wchar_t CBC_Base256Encoder::randomize255State(wchar_t ch,
-                                              int32_t codewordPosition) {
-  int32_t pseudoRandom = ((149 * codewordPosition) % 255) + 1;
-  int32_t tempVariable = ch + pseudoRandom;
-  if (tempVariable <= 255) {
-    return static_cast<wchar_t>(tempVariable);
-  } else {
-    return static_cast<wchar_t>(tempVariable - 256);
+    context.writeCodeword(Randomize255State(c, context.getCodewordCount() + 1));
   }
 }

fxbarcode/datamatrix/BC_Base256Encoder.h

diff --git a/fxbarcode/datamatrix/BC_Base256Encoder.h b/fxbarcode/datamatrix/BC_Base256Encoder.h
index e8756f9..5ca49b3 100644
--- a/fxbarcode/datamatrix/BC_Base256Encoder.h
+++ b/fxbarcode/datamatrix/BC_Base256Encoder.h
@@ -17,9 +17,6 @@
   // CBC_Encoder
   int32_t getEncodingMode() override;
   void Encode(CBC_EncoderContext& context, int32_t& e) override;
-
- private:
-  static wchar_t randomize255State(wchar_t ch, int32_t codewordPosition);
 };
 
 #endif  // FXBARCODE_DATAMATRIX_BC_BASE256ENCODER_H_

fxbarcode/datamatrix/BC_C40Encoder.cpp

diff --git a/fxbarcode/datamatrix/BC_C40Encoder.cpp b/fxbarcode/datamatrix/BC_C40Encoder.cpp
index 646c8c3..9aae76f 100644
--- a/fxbarcode/datamatrix/BC_C40Encoder.cpp
+++ b/fxbarcode/datamatrix/BC_C40Encoder.cpp
@@ -45,11 +45,14 @@
 
 }  // namespace
 
-CBC_C40Encoder::CBC_C40Encoder() {}
-CBC_C40Encoder::~CBC_C40Encoder() {}
+CBC_C40Encoder::CBC_C40Encoder() = default;
+
+CBC_C40Encoder::~CBC_C40Encoder() = default;
+
 int32_t CBC_C40Encoder::getEncodingMode() {
   return C40_ENCODATION;
 }
+
 void CBC_C40Encoder::Encode(CBC_EncoderContext& context, int32_t& e) {
   WideString buffer;
   while (context.hasMoreCharacters()) {

fxbarcode/datamatrix/BC_EdifactEncoder.cpp

diff --git a/fxbarcode/datamatrix/BC_EdifactEncoder.cpp b/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
index 41180dc..3e814a1 100644
--- a/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
+++ b/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
@@ -117,9 +117,9 @@
 
 }  // namespace
 
-CBC_EdifactEncoder::CBC_EdifactEncoder() {}
+CBC_EdifactEncoder::CBC_EdifactEncoder() = default;
 
-CBC_EdifactEncoder::~CBC_EdifactEncoder() {}
+CBC_EdifactEncoder::~CBC_EdifactEncoder() = default;
 
 int32_t CBC_EdifactEncoder::getEncodingMode() {
   return EDIFACT_ENCODATION;