diff --git a/.gitmodules b/.gitmodules
index 81e4989edf..c90ba43478 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -43,3 +43,6 @@
 [submodule "thirdparty/zxing-cpp"]
 	path = thirdparty/zxing-cpp
 	url = ../thirdparty-zxing-cpp.git
+[submodule "thirdparty/zint"]
+	path = thirdparty/zint
+	url = ../thirdparty-zint.git
diff --git a/Makelists b/Makelists
index 2aa28734e3..c219d5eb97 100644
--- a/Makelists
+++ b/Makelists
@@ -774,7 +774,7 @@ ZXINGCPP_DEFINES  = -DZXING_USE_ZINT
 ZXINGCPP_DEFINES += -DZXING_EXPERIMENTAL_API
 ZXINGCPP_DEFINES += -DZINT_NO_PNG
 
-ZXINGCPP_BUILD_CFLAGS += -Ithirdparty/zxing-cpp/zint/backend
+ZXINGCPP_BUILD_CFLAGS += -Ithirdparty/zint/backend
 ZXINGCPP_BUILD_CFLAGS += -Iscripts/zxing-cpp
 
 ZXINGCPP_LIBS += -lstdc++
@@ -888,54 +888,54 @@ ZXINGCPP_SRC += thirdparty/zxing-cpp/core/src/WhiteRectDetector.cpp
 ZXINGCPP_SRC += thirdparty/zxing-cpp/core/src/WriteBarcode.cpp
 ZXINGCPP_SRC += thirdparty/zxing-cpp/core/src/ZXingC.cpp
 ZXINGCPP_SRC += thirdparty/zxing-cpp/core/src/ZXingCpp.cpp
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/2of5.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/auspost.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/aztec.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/bc412.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/bmp.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/codablock.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/code.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/code1.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/code128.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/code16k.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/code49.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/common.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/composite.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/dllversion.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/dmatrix.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/dotcode.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/dxfilmedge.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/eci.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/emf.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/filemem.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/general_field.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/gif.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/gridmtx.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/gs1.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/hanxin.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/imail.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/large.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/library.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/mailmark.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/maxicode.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/medical.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/output.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/pcx.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/pdf417.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/plessey.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/png.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/postal.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/ps.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/qr.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/raster.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/reedsol.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/rss.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/svg.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/telepen.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/tif.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/ultra.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/upcean.c
-ZXINGCPP_SRC += thirdparty/zxing-cpp/zint/backend/vector.c
+ZXINGCPP_SRC += thirdparty/zint/backend/2of5.c
+ZXINGCPP_SRC += thirdparty/zint/backend/auspost.c
+ZXINGCPP_SRC += thirdparty/zint/backend/aztec.c
+ZXINGCPP_SRC += thirdparty/zint/backend/bc412.c
+ZXINGCPP_SRC += thirdparty/zint/backend/bmp.c
+ZXINGCPP_SRC += thirdparty/zint/backend/codablock.c
+ZXINGCPP_SRC += thirdparty/zint/backend/code.c
+ZXINGCPP_SRC += thirdparty/zint/backend/code1.c
+ZXINGCPP_SRC += thirdparty/zint/backend/code128.c
+ZXINGCPP_SRC += thirdparty/zint/backend/code16k.c
+ZXINGCPP_SRC += thirdparty/zint/backend/code49.c
+ZXINGCPP_SRC += thirdparty/zint/backend/common.c
+ZXINGCPP_SRC += thirdparty/zint/backend/composite.c
+ZXINGCPP_SRC += thirdparty/zint/backend/dllversion.c
+ZXINGCPP_SRC += thirdparty/zint/backend/dmatrix.c
+ZXINGCPP_SRC += thirdparty/zint/backend/dotcode.c
+ZXINGCPP_SRC += thirdparty/zint/backend/dxfilmedge.c
+ZXINGCPP_SRC += thirdparty/zint/backend/eci.c
+ZXINGCPP_SRC += thirdparty/zint/backend/emf.c
+ZXINGCPP_SRC += thirdparty/zint/backend/filemem.c
+ZXINGCPP_SRC += thirdparty/zint/backend/general_field.c
+ZXINGCPP_SRC += thirdparty/zint/backend/gif.c
+ZXINGCPP_SRC += thirdparty/zint/backend/gridmtx.c
+ZXINGCPP_SRC += thirdparty/zint/backend/gs1.c
+ZXINGCPP_SRC += thirdparty/zint/backend/hanxin.c
+ZXINGCPP_SRC += thirdparty/zint/backend/imail.c
+ZXINGCPP_SRC += thirdparty/zint/backend/large.c
+ZXINGCPP_SRC += thirdparty/zint/backend/library.c
+ZXINGCPP_SRC += thirdparty/zint/backend/mailmark.c
+ZXINGCPP_SRC += thirdparty/zint/backend/maxicode.c
+ZXINGCPP_SRC += thirdparty/zint/backend/medical.c
+ZXINGCPP_SRC += thirdparty/zint/backend/output.c
+ZXINGCPP_SRC += thirdparty/zint/backend/pcx.c
+ZXINGCPP_SRC += thirdparty/zint/backend/pdf417.c
+ZXINGCPP_SRC += thirdparty/zint/backend/plessey.c
+ZXINGCPP_SRC += thirdparty/zint/backend/png.c
+ZXINGCPP_SRC += thirdparty/zint/backend/postal.c
+ZXINGCPP_SRC += thirdparty/zint/backend/ps.c
+ZXINGCPP_SRC += thirdparty/zint/backend/qr.c
+ZXINGCPP_SRC += thirdparty/zint/backend/raster.c
+ZXINGCPP_SRC += thirdparty/zint/backend/reedsol.c
+ZXINGCPP_SRC += thirdparty/zint/backend/rss.c
+ZXINGCPP_SRC += thirdparty/zint/backend/svg.c
+ZXINGCPP_SRC += thirdparty/zint/backend/telepen.c
+ZXINGCPP_SRC += thirdparty/zint/backend/tif.c
+ZXINGCPP_SRC += thirdparty/zint/backend/ultra.c
+ZXINGCPP_SRC += thirdparty/zint/backend/upcean.c
+ZXINGCPP_SRC += thirdparty/zint/backend/vector.c
 ZXINGCPP_SRC += source/fitz/barcode.cpp
 
 ZXINGCPP_BUILD_CFLAGS += $(ZXINGCPP_DEFINES)
diff --git a/Makethird b/Makethird
index d4d4696b3e..8f37c57b62 100644
--- a/Makethird
+++ b/Makethird
@@ -286,7 +286,7 @@ $(OUT)/thirdparty/zxing-cpp/core/src/pdf147/%.o: thirdparty/zxing-cpp/core/src/p
 	$(CXX_CMD) $(LIB_CFLAGS) $(ZXINGCPP_CFLAGS) $(ZXINGCPP_BUILD_CFLAGS) $(ZXINGCPP_LANGFLAGS)
 $(OUT)/thirdparty/zxing-cpp/core/src/qrcode/%.o: thirdparty/zxing-cpp/core/src/qrcode/%.cpp
 	$(CXX_CMD) $(LIB_CFLAGS) $(ZXINGCPP_CFLAGS) $(ZXINGCPP_BUILD_CFLAGS) $(ZXINGCPP_LANGFLAGS)
-$(OUT)/thirdparty/zxing-cpp/zint/backend/%.o: thirdparty/zxing-cpp/zint/backend/%.c
+$(OUT)/thirdparty/zint/backend/%.o: thirdparty/zint/backend/%.c
 	$(CC_CMD) $(LIB_CFLAGS) $(ZXINGCPP_CFLAGS) $(ZXINGCPP_BUILD_CFLAGS)
 endif
 endif
diff --git a/platform/win32/libzxing.vcxproj b/platform/win32/libzxing.vcxproj
index 716d7c701a..1a73cf0a50 100644
--- a/platform/win32/libzxing.vcxproj
+++ b/platform/win32/libzxing.vcxproj
@@ -136,54 +136,54 @@
     <ClCompile Include="..\..\thirdparty\zxing-cpp\core\src\WriteBarcode.cpp" />
     <ClCompile Include="..\..\thirdparty\zxing-cpp\core\src\ZXingC.cpp" />
     <ClCompile Include="..\..\thirdparty\zxing-cpp\core\src\ZXingCpp.cpp" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\2of5.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\auspost.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\aztec.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\bc412.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\bmp.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\codablock.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\code.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\code1.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\code128.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\code16k.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\code49.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\common.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\composite.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\dllversion.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\dmatrix.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\dotcode.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\dxfilmedge.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\eci.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\emf.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\filemem.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\general_field.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\gif.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\gridmtx.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\gs1.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\hanxin.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\imail.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\large.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\library.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\mailmark.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\maxicode.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\medical.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\output.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\pcx.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\pdf417.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\plessey.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\png.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\postal.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\ps.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\qr.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\raster.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\reedsol.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\rss.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\svg.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\telepen.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\tif.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\ultra.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\upcean.c" />
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\vector.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\2of5.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\auspost.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\aztec.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\bc412.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\bmp.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\codablock.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\code.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\code1.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\code128.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\code16k.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\code49.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\common.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\composite.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\dllversion.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\dmatrix.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\dotcode.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\dxfilmedge.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\eci.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\emf.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\filemem.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\general_field.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\gif.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\gridmtx.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\gs1.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\hanxin.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\imail.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\large.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\library.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\mailmark.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\maxicode.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\medical.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\output.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\pcx.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\pdf417.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\plessey.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\png.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\postal.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\ps.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\qr.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\raster.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\reedsol.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\rss.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\svg.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\telepen.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\tif.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\ultra.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\upcean.c" />
+    <ClCompile Include="..\..\thirdparty\zint\backend\vector.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\thirdparty\zxing-cpp\core\src\aztec\AZDecoder.h" />
@@ -344,50 +344,50 @@
     <ClInclude Include="..\..\thirdparty\zxing-cpp\core\src\ZXingCpp.h" />
     <ClInclude Include="..\..\thirdparty\zxing-cpp\core\src\ZXTestSupport.h" />
     <ClInclude Include="..\..\thirdparty\zxing-cpp\core\src\ZXVersion.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\aztec.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\big5.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\bmp.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\channel_precalcs.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\code1.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\code128.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\code49.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\common.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\composite.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\dmatrix.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\dmatrix_trace.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\eci.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\eci_sb.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\emf.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\filemem.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\gb18030.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\gb2312.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\gbk.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\general_field.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\gridmtx.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\gs1.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\gs1_lint.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\hanxin.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\iso3166.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\iso4217.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\ksx1001.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\large.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\maxicode.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\output.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\pcx.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\pdf417.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\pdf417_tabs.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\pdf417_trace.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\qr.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\raster_font.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\reedsol.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\reedsol_logs.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\rss.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\sjis.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\tif.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\tif_lzw.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\zfiletypes.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\zint.h" />
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\zintconfig.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\aztec.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\big5.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\bmp.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\channel_precalcs.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\code1.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\code128.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\code49.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\common.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\composite.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\dmatrix.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\dmatrix_trace.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\eci.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\eci_sb.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\emf.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\filemem.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\gb18030.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\gb2312.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\gbk.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\general_field.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\gridmtx.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\gs1.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\gs1_lint.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\hanxin.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\iso3166.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\iso4217.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\ksx1001.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\large.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\maxicode.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\output.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\pcx.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\pdf417.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\pdf417_tabs.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\pdf417_trace.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\qr.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\raster_font.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\reedsol.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\reedsol_logs.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\rss.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\sjis.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\tif.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\tif_lzw.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\zfiletypes.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\zint.h" />
+    <ClInclude Include="..\..\thirdparty\zint\backend\zintconfig.h" />
   </ItemGroup>
   <ItemGroup>
   </ItemGroup>
@@ -494,7 +494,7 @@
       </ConformanceMode>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..\..\thirdparty\zxing-cpp\core\src;..\..\scripts\zxing-cpp\;..\..\thirdparty\zxing-cpp\zint\backend</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\thirdparty\zxing-cpp\core\src;..\..\scripts\zxing-cpp\;..\..\thirdparty\zint\backend</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp20</LanguageStandard>
       <UndefinePreprocessorDefinitions>
       </UndefinePreprocessorDefinitions>
@@ -524,7 +524,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..\..\thirdparty\zxing-cpp\core\src;..\..\scripts\zxing-cpp\;..\..\thirdparty\zxing-cpp\zint\backend</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\thirdparty\zxing-cpp\core\src;..\..\scripts\zxing-cpp\;..\..\thirdparty\zint\backend</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp20</LanguageStandard>
       <UndefinePreprocessorDefinitions>
       </UndefinePreprocessorDefinitions>
@@ -547,7 +547,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..\..\thirdparty\zxing-cpp\core\src;..\..\scripts\zxing-cpp\;..\..\thirdparty\zxing-cpp\zint\backend</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\thirdparty\zxing-cpp\core\src;..\..\scripts\zxing-cpp\;..\..\thirdparty\zint\backend</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp20</LanguageStandard>
       <UndefinePreprocessorDefinitions>
       </UndefinePreprocessorDefinitions>
@@ -571,7 +571,7 @@
       </ConformanceMode>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..\..\thirdparty\zxing-cpp\core\src;..\..\scripts\zxing-cpp\;..\..\thirdparty\zxing-cpp\zint\backend</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\thirdparty\zxing-cpp\core\src;..\..\scripts\zxing-cpp\;..\..\thirdparty\zint\backend</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp20</LanguageStandard>
       <UndefinePreprocessorDefinitions>
       </UndefinePreprocessorDefinitions>
@@ -593,7 +593,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..\..\thirdparty\zxing-cpp\core\src;..\..\scripts\zxing-cpp\;..\..\thirdparty\zxing-cpp\zint\backend</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\thirdparty\zxing-cpp\core\src;..\..\scripts\zxing-cpp\;..\..\thirdparty\zint\backend</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp20</LanguageStandard>
       <UndefinePreprocessorDefinitions>
       </UndefinePreprocessorDefinitions>
@@ -616,7 +616,7 @@
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>..\..\thirdparty\zxing-cpp\core\src;..\..\scripts\zxing-cpp\;..\..\thirdparty\zxing-cpp\zint\backend</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\thirdparty\zxing-cpp\core\src;..\..\scripts\zxing-cpp\;..\..\thirdparty\zint\backend</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp20</LanguageStandard>
       <UndefinePreprocessorDefinitions>
       </UndefinePreprocessorDefinitions>
diff --git a/platform/win32/libzxing.vcxproj.filters b/platform/win32/libzxing.vcxproj.filters
index fa9c6e05fb..064cfd5002 100644
--- a/platform/win32/libzxing.vcxproj.filters
+++ b/platform/win32/libzxing.vcxproj.filters
@@ -378,133 +378,133 @@
     <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\bmp.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\codablock.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\codablock.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\code.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\code.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\code1.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\code1.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\code16k.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\code16k.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\code49.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\code49.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\code128.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\code128.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\common.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\common.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\composite.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\composite.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\dllversion.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\dllversion.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\dmatrix.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\dmatrix.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\dotcode.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\dotcode.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\dxfilmedge.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\dxfilmedge.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\eci.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\eci.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\emf.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\emf.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\filemem.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\filemem.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\general_field.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\general_field.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\gif.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\gif.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\gridmtx.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\gridmtx.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\gs1.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\gs1.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\hanxin.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\hanxin.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\imail.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\imail.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\large.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\large.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\library.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\library.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\mailmark.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\mailmark.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\maxicode.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\maxicode.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\medical.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\medical.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\output.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\output.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\pcx.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\pcx.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\pdf417.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\pdf417.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\plessey.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\plessey.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\png.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\png.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\postal.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\postal.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\ps.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\ps.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\qr.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\qr.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\raster.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\raster.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\reedsol.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\reedsol.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\rss.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\rss.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\svg.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\svg.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\telepen.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\telepen.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\tif.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\tif.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\ultra.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\ultra.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\upcean.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\upcean.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\zxing-cpp\zint\backend\vector.c">
+    <ClCompile Include="..\..\thirdparty\zint\backend\vector.c">
       <Filter>Source Files\libzint</Filter>
     </ClCompile>
     <ClCompile Include="..\..\scripts\zxing-cpp\eci_dedup.cpp">
@@ -986,137 +986,137 @@
     <ClInclude Include="..\..\thirdparty\zxing-cpp\core\src\oned\ODWriterHelper.h">
       <Filter>Source Files\oned</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\aztec.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\aztec.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\big5.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\big5.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\bmp.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\bmp.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\channel_precalcs.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\channel_precalcs.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\code1.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\code1.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\code49.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\code49.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\code128.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\code128.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\common.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\common.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\composite.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\composite.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\dmatrix.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\dmatrix.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\dmatrix_trace.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\dmatrix_trace.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\eci.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\eci.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\eci_sb.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\eci_sb.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\emf.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\emf.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\filemem.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\filemem.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\gb2312.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\gb2312.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\gb18030.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\gb18030.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\gbk.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\gbk.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\general_field.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\general_field.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\gridmtx.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\gridmtx.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\gs1.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\gs1.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\gs1_lint.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\gs1_lint.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\hanxin.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\hanxin.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\iso3166.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\iso3166.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\iso4217.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\iso4217.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\ksx1001.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\ksx1001.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\large.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\large.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\maxicode.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\maxicode.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\output.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\output.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\pcx.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\pcx.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\pdf417.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\pdf417.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\pdf417_tabs.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\pdf417_tabs.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\pdf417_trace.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\pdf417_trace.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\qr.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\qr.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\raster_font.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\raster_font.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\reedsol.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\reedsol.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\reedsol_logs.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\reedsol_logs.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\rss.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\rss.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\sjis.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\sjis.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\tif.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\tif.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\tif_lzw.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\tif_lzw.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\zfiletypes.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\zfiletypes.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\zint.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\zint.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\zxing-cpp\zint\backend\zintconfig.h">
+    <ClInclude Include="..\..\thirdparty\zint\backend\zintconfig.h">
       <Filter>Source Files\libzint</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/thirdparty/zint b/thirdparty/zint
new file mode 160000
index 0000000000..7a9fdd6cd0
--- /dev/null
+++ b/thirdparty/zint
@@ -0,0 +1 @@
+Subproject commit 7a9fdd6cd00cd5bfd0082705d934c13ef84f25e1