commit c0cf369e0bd58ce5ae910d0b8636f6f23eca1490
author Lei Zhang <thestig@chromium.org> Thu Mar 30 23:34:45 2017 -0700
committer Chromium commit bot <commit-bot@chromium.org> Fri Mar 31 16:11:01 2017 +0000
tree 0d35c949daeee7f475042d7cc3dc5977673b9162
parent d6fa97ba82bc6a19a836119eab904b79961854b2

Fix QR code generation.

Roll DEPS for testing corpus to 2c5a026 to verify.
This regressed in commit c8017b2.

BUG=pdfium:692

Change-Id: Ic09ed53db8b3cc81abb2bdea863b8cf32f614197
Reviewed-on: https://pdfium-review.googlesource.com/3510
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

DEPS

diff --git a/DEPS b/DEPS
index ef2a089..ceb53c7 100644
--- a/DEPS
+++ b/DEPS
@@ -15,7 +15,7 @@
   'gtest_revision': '8245545b6dc9c4703e6496d1efd19e975ad2b038',
   'icu_revision': '73e24736676b4b438270fda44e5b2c83b49fdd80',
   'instrumented_lib_revision': '45f5814b1543e41ea0be54c771e3840ea52cca4a',
-  'pdfium_tests_revision': '146d4c6b67f95ce178d2bd350ea48327486581e0',
+  'pdfium_tests_revision': '2c5a02609900c6cc67341f67ab49d3073a7081c3',
   'skia_revision': '90e3cd78991ef337dbd0023efb30ece864694308',
   'tools_memory_revision': '427f10475e1a8d72424c29d00bf689122b738e5d',
   'trace_event_revision': '06294c8a4a6f744ef284cd63cfe54dbf61eea290',

fxbarcode/qrcode/BC_QRCoderEncoder.cpp

diff --git a/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
index 29dc699..ae9a8eb 100644
--- a/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
+++ b/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
@@ -487,8 +487,9 @@
                                      qrCode->GetVersion(),
                                      qrCode->GetMaskPattern(), matrix.get(), e);
   if (e != BCExceptionNO)
-    return qrCode->SetMatrix(std::move(matrix));
+    return;
 
+  qrCode->SetMatrix(std::move(matrix));
   if (!qrCode->IsValid())
     e = BCExceptionInvalidQRCode;
 }
@@ -523,7 +524,8 @@
     return;
   headerAndDataBits.AppendBitVector(&dataBits, e);
   if (e != BCExceptionNO)
-    return TerminateBits(qrCode->GetNumDataBytes(), &headerAndDataBits, e);
+    return;
+  TerminateBits(qrCode->GetNumDataBytes(), &headerAndDataBits, e);
   if (e != BCExceptionNO)
     return;
   CBC_QRCoderBitVector finalBits;
@@ -547,8 +549,9 @@
                                      qrCode->GetVersion(),
                                      qrCode->GetMaskPattern(), matrix.get(), e);
   if (e != BCExceptionNO)
-    return qrCode->SetMatrix(std::move(matrix));
+    return;
 
+  qrCode->SetMatrix(std::move(matrix));
   if (!qrCode->IsValid())
     e = BCExceptionInvalidQRCode;
 }
@@ -629,9 +632,9 @@
 
 CBC_QRCoderMode* CBC_QRCoderEncoder::ChooseMode(const CFX_ByteString& content,
                                                 CFX_ByteString encoding) {
-  if (encoding.Compare("SHIFT_JIS") == 0) {
+  if (encoding.Compare("SHIFT_JIS") == 0)
     return CBC_QRCoderMode::sKANJI;
-  }
+
   bool hasNumeric = false;
   bool hasAlphaNumeric = false;
   for (int32_t i = 0; i < content.GetLength(); i++) {
@@ -643,11 +646,10 @@
       return CBC_QRCoderMode::sBYTE;
     }
   }
-  if (hasAlphaNumeric) {
+  if (hasAlphaNumeric)
     return CBC_QRCoderMode::sALPHANUMERIC;
-  } else if (hasNumeric) {
+  if (hasNumeric)
     return CBC_QRCoderMode::sNUMERIC;
-  }
   return CBC_QRCoderMode::sBYTE;
 }