zxing-cpp: Update to 1.4.0

* Install BitArray.h manually to fix misc/libreoffice build.

Changelog:
Note: this is an intermediary release on the way to 2.0. This code is (supposed
to be) API compatible (via the ReadBarcode.h interface) with v1.3.0 but
contains quite a few additional deprecations. It still has SO number 1, which
is as wrong as it was for release v1.3.0 and it is not ABI compatible with 1.3
either. 2.0 will be basically 1.4 but with all deprecated API removed and the
final fix for #333.

Main changes

  * Reader support for Micro QRCode by @corbers
  * prepared switch from std::wstring based utf16 to std::string based utf8
    results, use new ZX_USE_UTF8 macro to transition to the upcoming 2.0 API
  * much improved 'binary' data support via new Result::bytes() API, see #334
    for a detailed background discussion.
  * new Result::contentType() API returning information about the type of
    content (like text vs. binary, etc.)
  * better standards conformance with respect to ECI handling, see
    Results::bytesECI()
  * support for proper ECI handling across structured append symbols (see
    MergeStructuredAppendResults())
  * new Result::error() API with improved error handling, see also
    DecodeHints::returnErrors()
  * removed all internal header files from the installed set, so only the
    ReadBarcode.h based APIs are supported from here on out
  * removed all sample images from the 'source' distribution zip/tar balls
    (much reduced size)
  * python read_barcode returns None if no symbol was found (might break
    existing code if not checked for None before)

Minor changes

  * lots of little bug fixes
  * smaller per process runtime memory (thanks to @vkrause)
  * clang-13 and gcc-13 compilation fixes
  * ported Qt example code to Qt6
  * experimental multi-symbol detection support for DataMatrix when compiled
    with c++-20
  * fix error in multi-symbol detection of linear codes (sometimes reported 1
    symbol as 2)
  * new -bytes and -errors options in ZXingReader
  * support tryRotate for PDF417 symbols

3 files changed, 15 insertions, 133 deletions

diff --git a/graphics/zxing-cpp/Makefile b/graphics/zxing-cpp/Makefile
index d2ef4327879..11fedd3722d 100644
--- a/graphics/zxing-cpp/Makefile
+++ b/graphics/zxing-cpp/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2022/07/25 11:12:25 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2022/08/24 12:45:42 ryoon Exp $
 
-DISTNAME=	zxing-cpp-1.3.0
+DISTNAME=	zxing-cpp-1.4.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=nu-book/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -19,4 +19,9 @@ CMAKE_ARGS+=	-DBUILD_BLACKBOX_TESTS=OFF
 
 PKGCONFIG_OVERRIDE+=	zxing.pc.in
 
+# Install private header file to fix build failure of misc/libreoffice-7.3.4.2.
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/core/src/BitArray.h \
+		${DESTDIR}${PREFIX}/include/ZXing
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/zxing-cpp/PLIST b/graphics/zxing-cpp/PLIST
index 87e6d4ec243..cdc13c971dd 100644
--- a/graphics/zxing-cpp/PLIST
+++ b/graphics/zxing-cpp/PLIST
@@ -1,153 +1,30 @@
-@comment $NetBSD: PLIST,v 1.4 2022/07/15 07:26:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2022/08/24 12:45:42 ryoon Exp $
 include/ZXing/BarcodeFormat.h
-include/ZXing/BinaryBitmap.h
 include/ZXing/BitArray.h
 include/ZXing/BitHacks.h
 include/ZXing/BitMatrix.h
-include/ZXing/BitMatrixCursor.h
 include/ZXing/BitMatrixIO.h
-include/ZXing/BitSource.h
 include/ZXing/ByteArray.h
-include/ZXing/ByteMatrix.h
 include/ZXing/CharacterSet.h
 include/ZXing/CharacterSetECI.h
-include/ZXing/ConcentricFinder.h
-include/ZXing/CustomData.h
+include/ZXing/Content.h
 include/ZXing/DecodeHints.h
 include/ZXing/DecodeStatus.h
-include/ZXing/DecoderResult.h
-include/ZXing/DetectorResult.h
+include/ZXing/Error.h
 include/ZXing/Flags.h
 include/ZXing/GTIN.h
-include/ZXing/GenericGF.h
-include/ZXing/GenericGFPoly.h
-include/ZXing/GlobalHistogramBinarizer.h
-include/ZXing/GridSampler.h
-include/ZXing/HybridBinarizer.h
 include/ZXing/ImageView.h
-include/ZXing/LogMatrix.h
 include/ZXing/Matrix.h
-include/ZXing/MultiFormatReader.h
 include/ZXing/MultiFormatWriter.h
-include/ZXing/Pattern.h
-include/ZXing/PerspectiveTransform.h
 include/ZXing/Point.h
 include/ZXing/Quadrilateral.h
 include/ZXing/ReadBarcode.h
-include/ZXing/Reader.h
-include/ZXing/ReedSolomonDecoder.h
-include/ZXing/ReedSolomonEncoder.h
-include/ZXing/RegressionLine.h
 include/ZXing/Result.h
-include/ZXing/ResultPoint.h
-include/ZXing/Scope.h
 include/ZXing/StructuredAppend.h
-include/ZXing/TextDecoder.h
-include/ZXing/TextEncoder.h
 include/ZXing/TextUtfEncoding.h
-include/ZXing/ThresholdBinarizer.h
-include/ZXing/TritMatrix.h
-include/ZXing/WhiteRectDetector.h
-include/ZXing/ZXBigInteger.h
+include/ZXing/ZXAlgorithms.h
 include/ZXing/ZXConfig.h
-include/ZXing/ZXContainerAlgorithms.h
-include/ZXing/ZXNullable.h
-include/ZXing/ZXTestSupport.h
 include/ZXing/ZXVersion.h
-include/ZXing/aztec/AZDecoder.h
-include/ZXing/aztec/AZDetector.h
-include/ZXing/aztec/AZDetectorResult.h
-include/ZXing/aztec/AZEncoder.h
-include/ZXing/aztec/AZEncodingState.h
-include/ZXing/aztec/AZHighLevelEncoder.h
-include/ZXing/aztec/AZReader.h
-include/ZXing/aztec/AZToken.h
-include/ZXing/aztec/AZWriter.h
-include/ZXing/datamatrix/DMBitLayout.h
-include/ZXing/datamatrix/DMDataBlock.h
-include/ZXing/datamatrix/DMDecoder.h
-include/ZXing/datamatrix/DMDetector.h
-include/ZXing/datamatrix/DMECEncoder.h
-include/ZXing/datamatrix/DMEncoderContext.h
-include/ZXing/datamatrix/DMHighLevelEncoder.h
-include/ZXing/datamatrix/DMReader.h
-include/ZXing/datamatrix/DMSymbolInfo.h
-include/ZXing/datamatrix/DMSymbolShape.h
-include/ZXing/datamatrix/DMVersion.h
-include/ZXing/datamatrix/DMWriter.h
-include/ZXing/maxicode/MCBitMatrixParser.h
-include/ZXing/maxicode/MCDecoder.h
-include/ZXing/maxicode/MCReader.h
-include/ZXing/oned/ODCodabarReader.h
-include/ZXing/oned/ODCodabarWriter.h
-include/ZXing/oned/ODCode128Patterns.h
-include/ZXing/oned/ODCode128Reader.h
-include/ZXing/oned/ODCode128Writer.h
-include/ZXing/oned/ODCode39Reader.h
-include/ZXing/oned/ODCode39Writer.h
-include/ZXing/oned/ODCode93Reader.h
-include/ZXing/oned/ODCode93Writer.h
-include/ZXing/oned/ODDataBarCommon.h
-include/ZXing/oned/ODDataBarExpandedReader.h
-include/ZXing/oned/ODDataBarReader.h
-include/ZXing/oned/ODEAN13Writer.h
-include/ZXing/oned/ODEAN8Writer.h
-include/ZXing/oned/ODITFReader.h
-include/ZXing/oned/ODITFWriter.h
-include/ZXing/oned/ODMultiUPCEANReader.h
-include/ZXing/oned/ODReader.h
-include/ZXing/oned/ODRowReader.h
-include/ZXing/oned/ODUPCAWriter.h
-include/ZXing/oned/ODUPCEANCommon.h
-include/ZXing/oned/ODUPCEWriter.h
-include/ZXing/oned/ODWriterHelper.h
-include/ZXing/oned/rss/ODRSSExpandedBinaryDecoder.h
-include/ZXing/oned/rss/ODRSSFieldParser.h
-include/ZXing/oned/rss/ODRSSGenericAppIdDecoder.h
-include/ZXing/pdf417/PDFBarcodeMetadata.h
-include/ZXing/pdf417/PDFBarcodeValue.h
-include/ZXing/pdf417/PDFBoundingBox.h
-include/ZXing/pdf417/PDFCodeword.h
-include/ZXing/pdf417/PDFCodewordDecoder.h
-include/ZXing/pdf417/PDFCompaction.h
-include/ZXing/pdf417/PDFDecodedBitStreamParser.h
-include/ZXing/pdf417/PDFDecoderResultExtra.h
-include/ZXing/pdf417/PDFDetectionResult.h
-include/ZXing/pdf417/PDFDetectionResultColumn.h
-include/ZXing/pdf417/PDFDetector.h
-include/ZXing/pdf417/PDFEncoder.h
-include/ZXing/pdf417/PDFHighLevelEncoder.h
-include/ZXing/pdf417/PDFModulusGF.h
-include/ZXing/pdf417/PDFModulusPoly.h
-include/ZXing/pdf417/PDFReader.h
-include/ZXing/pdf417/PDFScanningDecoder.h
-include/ZXing/pdf417/PDFWriter.h
-include/ZXing/qrcode/QRBitMatrixParser.h
-include/ZXing/qrcode/QRCodecMode.h
-include/ZXing/qrcode/QRDataBlock.h
-include/ZXing/qrcode/QRDataMask.h
-include/ZXing/qrcode/QRDecoder.h
-include/ZXing/qrcode/QRDetector.h
-include/ZXing/qrcode/QRECB.h
-include/ZXing/qrcode/QREncodeResult.h
-include/ZXing/qrcode/QREncoder.h
-include/ZXing/qrcode/QRErrorCorrectionLevel.h
-include/ZXing/qrcode/QRFormatInformation.h
-include/ZXing/qrcode/QRMaskUtil.h
-include/ZXing/qrcode/QRMatrixUtil.h
-include/ZXing/qrcode/QRReader.h
-include/ZXing/qrcode/QRVersion.h
-include/ZXing/qrcode/QRWriter.h
-include/ZXing/textcodec/Big5MapTable.h
-include/ZXing/textcodec/Big5TextDecoder.h
-include/ZXing/textcodec/Big5TextEncoder.h
-include/ZXing/textcodec/GBTextDecoder.h
-include/ZXing/textcodec/GBTextEncoder.h
-include/ZXing/textcodec/JPTextDecoder.h
-include/ZXing/textcodec/JPTextEncoder.h
-include/ZXing/textcodec/KRHangulMapping.h
-include/ZXing/textcodec/KRTextDecoder.h
-include/ZXing/textcodec/KRTextEncoder.h
 lib/cmake/ZXing/ZXingConfig.cmake
 lib/cmake/ZXing/ZXingConfigVersion.cmake
 lib/cmake/ZXing/ZXingTargets-release.cmake
diff --git a/graphics/zxing-cpp/distinfo b/graphics/zxing-cpp/distinfo
index d8cd3c0029e..426119ba384 100644
--- a/graphics/zxing-cpp/distinfo
+++ b/graphics/zxing-cpp/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2022/07/15 07:26:22 wiz Exp $
+$NetBSD: distinfo,v 1.5 2022/08/24 12:45:42 ryoon Exp $
 
-BLAKE2s (zxing-cpp-1.3.0.tar.gz) = 15124d59cb561371425a4e567d971a368621a8404a6ad570f2937072ace9bf43
-SHA512 (zxing-cpp-1.3.0.tar.gz) = 27821667dea3d09b91bf9825ff25483ed658d850fd238009f1c7e43b1b09e62d24b3a2cd78d4e39d29725931b32bfce3e21e7ec871830b3ad69a5a69c72d8de8
-Size (zxing-cpp-1.3.0.tar.gz) = 97938087 bytes
+BLAKE2s (zxing-cpp-1.4.0.tar.gz) = e7719a2668dcc79935667eb28bf9b5abfc9eff4612034f11f69045352fad2bc3
+SHA512 (zxing-cpp-1.4.0.tar.gz) = 05c5b9282f13b76fa0897b21e5b73cb7df0c52e62f1a2d9760fe774aa0378fde97f5f9896690b65b28b4b96ba6ad2703bed53ffaf9d3784636d29cbe860d4bad
+Size (zxing-cpp-1.4.0.tar.gz) = 1018225 bytes