Skip to content

Commit

Permalink
MSVC: Fix build flag mismatch with barcode lib.
Browse files Browse the repository at this point in the history 
We were building libzxing with ZXING_EXPERIMENTAL_API and
libmubarcode without it, causing crashes in the decoding code.

The fix, implemented here, is just to define it for both.
  • Loading branch information
@robinwatts
robinwatts committed Mar 3, 2025
1 parent b1a07b4 commit 08e5b7f
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions platform/win32/libmubarcode.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
<ClCompile>
<WarningLevel>Level2</WarningLevel>
<SDLCheck>false</SDLCheck>
<PreprocessorDefinitions>HAVE_ZXINGCPP=1;FZ_ENABLE_BARCODE=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB</PreprocessorDefinitions>
<PreprocessorDefinitions>ZXING_EXPERIMENTAL_API;HAVE_ZXINGCPP=1;FZ_ENABLE_BARCODE=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB</PreprocessorDefinitions>
<ConformanceMode>
</ConformanceMode>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
Expand Down Expand Up @@ -162,7 +162,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>false</SDLCheck>
<PreprocessorDefinitions>HAVE_ZXINGCPP=1;FZ_ENABLE_BARCODE=1;_CRT_SECURE_NO_WARNINGS;MEMENTO;WIN32;_DEBUG;_LIB</PreprocessorDefinitions>
<PreprocessorDefinitions>ZXING_EXPERIMENTAL_API;HAVE_ZXINGCPP=1;FZ_ENABLE_BARCODE=1;_CRT_SECURE_NO_WARNINGS;MEMENTO;WIN32;_DEBUG;_LIB</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
Expand All @@ -185,7 +185,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>false</SDLCheck>
<PreprocessorDefinitions>HAVE_ZXINGCPP=1;FZ_ENABLE_BARCODE=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB</PreprocessorDefinitions>
<PreprocessorDefinitions>ZXING_EXPERIMENTAL_API;HAVE_ZXINGCPP=1;FZ_ENABLE_BARCODE=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
Expand All @@ -208,7 +208,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>false</SDLCheck>
<PreprocessorDefinitions>HAVE_ZXINGCPP=1;FZ_ENABLE_BARCODE=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB</PreprocessorDefinitions>
<PreprocessorDefinitions>ZXING_EXPERIMENTAL_API;HAVE_ZXINGCPP=1;FZ_ENABLE_BARCODE=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB</PreprocessorDefinitions>
<ConformanceMode>
</ConformanceMode>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
Expand All @@ -231,7 +231,7 @@
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<SDLCheck>false</SDLCheck>
<PreprocessorDefinitions>HAVE_ZXINGCPP=1;FZ_ENABLE_BARCODE=1;MEMENTO;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB</PreprocessorDefinitions>
<PreprocessorDefinitions>ZXING_EXPERIMENTAL_API;HAVE_ZXINGCPP=1;FZ_ENABLE_BARCODE=1;MEMENTO;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
Expand All @@ -254,7 +254,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>false</SDLCheck>
<PreprocessorDefinitions>HAVE_ZXINGCPP=1;FZ_ENABLE_BARCODE=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB</PreprocessorDefinitions>
<PreprocessorDefinitions>ZXING_EXPERIMENTAL_API;HAVE_ZXINGCPP=1;FZ_ENABLE_BARCODE=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
Expand Down

0 comments on commit 08e5b7f

Please sign in to comment.