commit 69dc21c1e17c55e527f6778ebd316eaf68712a16
author Lei Zhang <thestig@chromium.org> Tue Mar 22 18:44:41 2022 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Mar 22 18:44:41 2022 +0000
tree 80422246b80db39a1ba371abfee860b4953f8c79
parent 4a142f68911f9d8b0273b556fab579b707c710d8

Remove more useless CBC_QRCoderMode code.

Delete various modes that are never used.

Change-Id: I0c8a1c4140a4ebc864fae7402547a55f5ac163a0
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/91712
Reviewed-by: Nigi <nigi@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>

fxbarcode/qrcode/BC_QRCoderEncoder.cpp

diff --git a/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
index 21b3c2b..03d4ff1 100644
--- a/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
+++ b/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
@@ -117,24 +117,6 @@
   return true;
 }
 
-bool AppendGBKBytes(const ByteString& content, CBC_QRCoderBitVector* bits) {
-  size_t length = content.GetLength();
-  uint32_t value = 0;
-  for (size_t i = 0; i < length; i += 2) {
-    value = (uint32_t)(content[i] << 8 | content[i + 1]);
-    if (value <= 0xAAFE && value >= 0xA1A1)
-      value -= 0xA1A1;
-    else if (value <= 0xFAFE && value >= 0xB0A1)
-      value -= 0xA6A1;
-    else
-      return false;
-
-    value = (uint32_t)((value >> 8) * 0x60) + (uint32_t)(value & 0xff);
-    bits->AppendBits(value, 13);
-  }
-  return true;
-}
-
 bool Append8BitBytes(const ByteString& content, CBC_QRCoderBitVector* bits) {
   for (char c : content)
     bits->AppendBits(c, 8);
@@ -143,8 +125,6 @@
 
 void AppendModeInfo(CBC_QRCoderMode* mode, CBC_QRCoderBitVector* bits) {
   bits->AppendBits(mode->GetBits(), 4);
-  if (mode == CBC_QRCoderMode::sGBK)
-    bits->AppendBits(1, 4);
 }
 
 bool AppendLengthInfo(int32_t numLetters,
@@ -160,8 +140,6 @@
   if (numBits > ((1 << numBits) - 1))
     return true;
 
-  if (mode == CBC_QRCoderMode::sGBK)
-    bits->AppendBits(numLetters / 2, numBits);
   bits->AppendBits(numLetters, numBits);
   return true;
 }
@@ -175,8 +153,6 @@
     return AppendAlphaNumericBytes(content, bits);
   if (mode == CBC_QRCoderMode::sBYTE)
     return Append8BitBytes(content, bits);
-  if (mode == CBC_QRCoderMode::sGBK)
-    return AppendGBKBytes(content, bits);
   return false;
 }
 

fxbarcode/qrcode/BC_QRCoderMode.cpp

diff --git a/fxbarcode/qrcode/BC_QRCoderMode.cpp b/fxbarcode/qrcode/BC_QRCoderMode.cpp
index 14e556e..7a65029 100644
--- a/fxbarcode/qrcode/BC_QRCoderMode.cpp
+++ b/fxbarcode/qrcode/BC_QRCoderMode.cpp
@@ -30,12 +30,6 @@
 CBC_QRCoderMode* CBC_QRCoderMode::sBYTE = nullptr;
 CBC_QRCoderMode* CBC_QRCoderMode::sNUMERIC = nullptr;
 CBC_QRCoderMode* CBC_QRCoderMode::sALPHANUMERIC = nullptr;
-CBC_QRCoderMode* CBC_QRCoderMode::sECI = nullptr;
-CBC_QRCoderMode* CBC_QRCoderMode::sGBK = nullptr;
-CBC_QRCoderMode* CBC_QRCoderMode::sTERMINATOR = nullptr;
-CBC_QRCoderMode* CBC_QRCoderMode::sFNC1_FIRST_POSITION = nullptr;
-CBC_QRCoderMode* CBC_QRCoderMode::sFNC1_SECOND_POSITION = nullptr;
-CBC_QRCoderMode* CBC_QRCoderMode::sSTRUCTURED_APPEND = nullptr;
 
 CBC_QRCoderMode::CBC_QRCoderMode(std::vector<int32_t> charCountBits,
                                  int32_t bits)
@@ -46,13 +40,7 @@
 void CBC_QRCoderMode::Initialize() {
   sBYTE = new CBC_QRCoderMode({8, 16, 16}, 0x4);
   sALPHANUMERIC = new CBC_QRCoderMode({9, 11, 13}, 0x2);
-  sECI = new CBC_QRCoderMode(std::vector<int32_t>(), 0x7);
   sNUMERIC = new CBC_QRCoderMode({10, 12, 14}, 0x1);
-  sGBK = new CBC_QRCoderMode({8, 10, 12}, 0x0D);
-  sTERMINATOR = new CBC_QRCoderMode(std::vector<int32_t>(), 0x00);
-  sFNC1_FIRST_POSITION = new CBC_QRCoderMode(std::vector<int32_t>(), 0x05);
-  sFNC1_SECOND_POSITION = new CBC_QRCoderMode(std::vector<int32_t>(), 0x09);
-  sSTRUCTURED_APPEND = new CBC_QRCoderMode(std::vector<int32_t>(), 0x03);
 }
 
 void CBC_QRCoderMode::Finalize() {
@@ -60,20 +48,8 @@
   sBYTE = nullptr;
   delete sALPHANUMERIC;
   sALPHANUMERIC = nullptr;
-  delete sECI;
-  sECI = nullptr;
   delete sNUMERIC;
   sNUMERIC = nullptr;
-  delete sGBK;
-  sGBK = nullptr;
-  delete sTERMINATOR;
-  sTERMINATOR = nullptr;
-  delete sFNC1_FIRST_POSITION;
-  sFNC1_FIRST_POSITION = nullptr;
-  delete sFNC1_SECOND_POSITION;
-  sFNC1_SECOND_POSITION = nullptr;
-  delete sSTRUCTURED_APPEND;
-  sSTRUCTURED_APPEND = nullptr;
 }
 
 int32_t CBC_QRCoderMode::GetBits() const {

fxbarcode/qrcode/BC_QRCoderMode.h

diff --git a/fxbarcode/qrcode/BC_QRCoderMode.h b/fxbarcode/qrcode/BC_QRCoderMode.h
index 8759614c..b8d39a7 100644
--- a/fxbarcode/qrcode/BC_QRCoderMode.h
+++ b/fxbarcode/qrcode/BC_QRCoderMode.h
@@ -24,12 +24,6 @@
   static CBC_QRCoderMode* sBYTE;
   static CBC_QRCoderMode* sNUMERIC;
   static CBC_QRCoderMode* sALPHANUMERIC;
-  static CBC_QRCoderMode* sECI;
-  static CBC_QRCoderMode* sGBK;
-  static CBC_QRCoderMode* sTERMINATOR;
-  static CBC_QRCoderMode* sFNC1_FIRST_POSITION;
-  static CBC_QRCoderMode* sFNC1_SECOND_POSITION;
-  static CBC_QRCoderMode* sSTRUCTURED_APPEND;
 
  private:
   CBC_QRCoderMode(std::vector<int32_t> charCountBits, int32_t bits);