diff options
Diffstat (limited to 'fxbarcode')
-rw-r--r-- | fxbarcode/BC_TwoDimWriter.h | 2 | ||||
-rw-r--r-- | fxbarcode/cfx_barcode.cpp | 5 | ||||
-rw-r--r-- | fxbarcode/common/BC_CommonByteMatrix.h | 2 | ||||
-rw-r--r-- | fxbarcode/datamatrix/BC_SymbolInfo.cpp | 6 | ||||
-rw-r--r-- | fxbarcode/oned/BC_OneDimWriter.h | 2 | ||||
-rw-r--r-- | fxbarcode/pdf417/BC_PDF417BarcodeRow.h | 2 | ||||
-rw-r--r-- | fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h | 2 | ||||
-rw-r--r-- | fxbarcode/qrcode/BC_QRCoderBitVector.h | 2 | ||||
-rw-r--r-- | fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp | 3 |
9 files changed, 11 insertions, 15 deletions
diff --git a/fxbarcode/BC_TwoDimWriter.h b/fxbarcode/BC_TwoDimWriter.h index 3f9e4a7db..cab1f45cb 100644 --- a/fxbarcode/BC_TwoDimWriter.h +++ b/fxbarcode/BC_TwoDimWriter.h @@ -11,7 +11,7 @@ #include "core/fxcrt/fx_coordinates.h" #include "fxbarcode/BC_Writer.h" -#include "third_party/base/span.h" +#include "third_party/base/containers/span.h" class CBC_CommonBitMatrix; class CFX_RenderDevice; diff --git a/fxbarcode/cfx_barcode.cpp b/fxbarcode/cfx_barcode.cpp index f7cd5f60d..5b2c1346c 100644 --- a/fxbarcode/cfx_barcode.cpp +++ b/fxbarcode/cfx_barcode.cpp @@ -18,8 +18,8 @@ #include "fxbarcode/cbc_pdf417i.h" #include "fxbarcode/cbc_qrcode.h" #include "fxbarcode/cbc_upca.h" +#include "third_party/base/memory/ptr_util.h" #include "third_party/base/notreached.h" -#include "third_party/base/ptr_util.h" namespace { @@ -50,8 +50,7 @@ std::unique_ptr<CBC_CodeBase> CreateBarCodeEngineObject(BC_TYPE type) { case BC_TYPE::kUnknown: return nullptr; } - NOTREACHED(); - return nullptr; + NOTREACHED_NORETURN(); } } // namespace diff --git a/fxbarcode/common/BC_CommonByteMatrix.h b/fxbarcode/common/BC_CommonByteMatrix.h index 6ce611998..fa97f6904 100644 --- a/fxbarcode/common/BC_CommonByteMatrix.h +++ b/fxbarcode/common/BC_CommonByteMatrix.h @@ -10,7 +10,7 @@ #include <stdint.h> #include "core/fxcrt/data_vector.h" -#include "third_party/base/span.h" +#include "third_party/base/containers/span.h" class CBC_CommonByteMatrix final { public: diff --git a/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/fxbarcode/datamatrix/BC_SymbolInfo.cpp index 05efd5654..59d40d023 100644 --- a/fxbarcode/datamatrix/BC_SymbolInfo.cpp +++ b/fxbarcode/datamatrix/BC_SymbolInfo.cpp @@ -106,8 +106,7 @@ int32_t CBC_SymbolInfo::GetHorizontalDataRegions() const { case 36: return 6; default: - NOTREACHED(); - return 0; + NOTREACHED_NORETURN(); } } @@ -124,8 +123,7 @@ int32_t CBC_SymbolInfo::GetVerticalDataRegions() const { case 36: return 6; default: - NOTREACHED(); - return 0; + NOTREACHED_NORETURN(); } } diff --git a/fxbarcode/oned/BC_OneDimWriter.h b/fxbarcode/oned/BC_OneDimWriter.h index 49957b5c2..3abcce488 100644 --- a/fxbarcode/oned/BC_OneDimWriter.h +++ b/fxbarcode/oned/BC_OneDimWriter.h @@ -18,7 +18,7 @@ #include "core/fxge/cfx_textrenderoptions.h" #include "fxbarcode/BC_Library.h" #include "fxbarcode/BC_Writer.h" -#include "third_party/base/span.h" +#include "third_party/base/containers/span.h" class CFX_Font; class CFX_Matrix; diff --git a/fxbarcode/pdf417/BC_PDF417BarcodeRow.h b/fxbarcode/pdf417/BC_PDF417BarcodeRow.h index 160275eea..fc40701f3 100644 --- a/fxbarcode/pdf417/BC_PDF417BarcodeRow.h +++ b/fxbarcode/pdf417/BC_PDF417BarcodeRow.h @@ -10,7 +10,7 @@ #include <stdint.h> #include "core/fxcrt/fixed_zeroed_data_vector.h" -#include "third_party/base/span.h" +#include "third_party/base/containers/span.h" class CBC_BarcodeRow final { public: diff --git a/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h index 16b80daa4..6e8f034ee 100644 --- a/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h +++ b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h @@ -10,7 +10,7 @@ #include "core/fxcrt/widestring.h" #include "fxbarcode/pdf417/BC_PDF417.h" #include "third_party/abseil-cpp/absl/types/optional.h" -#include "third_party/base/span.h" +#include "third_party/base/containers/span.h" class CBC_PDF417HighLevelEncoder { public: diff --git a/fxbarcode/qrcode/BC_QRCoderBitVector.h b/fxbarcode/qrcode/BC_QRCoderBitVector.h index 1bfa24bb6..51bbe7c37 100644 --- a/fxbarcode/qrcode/BC_QRCoderBitVector.h +++ b/fxbarcode/qrcode/BC_QRCoderBitVector.h @@ -11,7 +11,7 @@ #include <stdint.h> #include "core/fxcrt/data_vector.h" -#include "third_party/base/span.h" +#include "third_party/base/containers/span.h" class CBC_QRCoderBitVector { public: diff --git a/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp b/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp index f518c8b01..10fac61ca 100644 --- a/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp +++ b/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp @@ -196,8 +196,7 @@ bool CBC_QRCoderMaskUtil::GetDataMaskBit(int32_t maskPattern, intermediate = (((temp % 3) + ((y + x) & 0x1)) & 0x1); break; default: - NOTREACHED(); - return false; + NOTREACHED_NORETURN(); } return intermediate == 0; } |