From f1f6d4ffc68fe121fba10b27d7b6a2724174a1c2 Mon Sep 17 00:00:00 2001
From: Harald Oehlmann <oehhar@sourceforge.net>
Date: Fri, 16 Oct 2015 14:26:13 +0200
Subject: [PATCH] Remove unreachable statements. From
 https://github.com/UniQP/zint/commit/8d2ab1bfcfa32704cceaa5f0e6eed9cad84c5290

---
 backend/auspost.c           |  1 -
 backend/library.c           |  2 --
 backend/upcean.c            |  5 ++---
 win32/vsx/libzintMD.vcxproj | 13 +++++++------
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/backend/auspost.c b/backend/auspost.c
index fbdd07b6..18399b85 100644
--- a/backend/auspost.c
+++ b/backend/auspost.c
@@ -141,7 +141,6 @@ int australia_post(struct zint_symbol *symbol, unsigned char source[], int lengt
 			default:
 				strcpy(symbol->errtxt, "Auspost input is wrong length");
 				return ERROR_TOO_LONG;
-				break;
 		}
 		if(error_number == ERROR_INVALID_DATA) {
 			strcpy(symbol->errtxt, "Invalid characters in data");
diff --git a/backend/library.c b/backend/library.c
index 467e471d..6889de40 100755
--- a/backend/library.c
+++ b/backend/library.c
@@ -730,7 +730,6 @@ int ZBarcode_Print(struct zint_symbol *symbol, int rotate_angle)
 		default:
 			strcpy(symbol->errtxt, "Invalid rotation angle");
 			return ERROR_INVALID_OPTION;
-			break;
 	}
 
 	if(strlen(symbol->outfile) > 3) {
@@ -783,7 +782,6 @@ int ZBarcode_Buffer(struct zint_symbol *symbol, int rotate_angle)
 		default:
 			strcpy(symbol->errtxt, "Invalid rotation angle");
 			return ERROR_INVALID_OPTION;
-			break;
 	}
 
 	error_number = bmp_handle(symbol, rotate_angle);
diff --git a/backend/upcean.c b/backend/upcean.c
index 8dfff204..154cb1a6 100644
--- a/backend/upcean.c
+++ b/backend/upcean.c
@@ -668,7 +668,7 @@ int eanx(struct zint_symbol *symbol, unsigned char source[], int src_len)
 				case 5: add_on(first_part, (char*)dest, 0); ustrcpy(symbol->text, first_part); break;
 				case 7: ean8(symbol, first_part, (char*)dest); break;
 				case 12: ean13(symbol, first_part, (char*)dest); break;
-				default: strcpy(symbol->errtxt, "Invalid length input"); return ERROR_TOO_LONG; break;
+				default: strcpy(symbol->errtxt, "Invalid length input"); return ERROR_TOO_LONG;
 			}
 			break;
 		case BARCODE_EANX_CC:
@@ -696,7 +696,7 @@ int eanx(struct zint_symbol *symbol, unsigned char source[], int src_len)
 					symbol->row_height[symbol->rows + 2] = 2;
 					symbol->rows += 3;
 					ean13(symbol, first_part, (char*)dest); break;
-					default: strcpy(symbol->errtxt, "Invalid length EAN input"); return ERROR_TOO_LONG; break;
+					default: strcpy(symbol->errtxt, "Invalid length EAN input"); return ERROR_TOO_LONG;
 			}
 			break;
 		case BARCODE_UPCA:
@@ -774,7 +774,6 @@ int eanx(struct zint_symbol *symbol, unsigned char source[], int src_len)
 		default:
 			strcpy(symbol->errtxt, "Invalid length input");
 			return ERROR_TOO_LONG;
-			break;
 	}
 	
 	expand(symbol, (char*)dest);
diff --git a/win32/vsx/libzintMD.vcxproj b/win32/vsx/libzintMD.vcxproj
index e69dae17..65db59f1 100644
--- a/win32/vsx/libzintMD.vcxproj
+++ b/win32/vsx/libzintMD.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release_LIB|Win32">
       <Configuration>Release_LIB</Configuration>
@@ -16,6 +16,7 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>NotSet</CharacterSet>
     <WholeProgramOptimization>false</WholeProgramOptimization>
+    <PlatformToolset>v140</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -38,7 +39,7 @@
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <AdditionalIncludeDirectories>d:\opt1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.0";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.4.0";NO_PNG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -100,8 +101,8 @@
     <ClCompile Include="..\..\backend\svg.c" />
     <ClCompile Include="..\..\backend\telepen.c" />
     <ClCompile Include="..\..\backend\upcean.c" />
-  </ItemGroup>          
-  <ItemGroup>           
+  </ItemGroup>
+  <ItemGroup>
     <ClInclude Include="..\..\backend\aztec.h" />
     <ClInclude Include="..\..\backend\code1.h" />
     <ClInclude Include="..\..\backend\code49.h" />
@@ -123,8 +124,8 @@
     <ClInclude Include="..\..\backend\rss.h" />
     <ClInclude Include="..\..\backend\sjis.h" />
     <ClInclude Include="..\..\backend\zint.h" />
-  </ItemGroup>          
-  <ItemGroup>           
+  </ItemGroup>
+  <ItemGroup>
     <ResourceCompile Include="..\..\backend\libzint.rc">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_LIB|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>