mirror of
https://github.com/zint/zint
synced 2024-11-16 20:57:25 +13:00
parent
96974d2cd1
commit
f1f6d4ffc6
@ -141,7 +141,6 @@ int australia_post(struct zint_symbol *symbol, unsigned char source[], int lengt
|
|||||||
default:
|
default:
|
||||||
strcpy(symbol->errtxt, "Auspost input is wrong length");
|
strcpy(symbol->errtxt, "Auspost input is wrong length");
|
||||||
return ERROR_TOO_LONG;
|
return ERROR_TOO_LONG;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
if(error_number == ERROR_INVALID_DATA) {
|
if(error_number == ERROR_INVALID_DATA) {
|
||||||
strcpy(symbol->errtxt, "Invalid characters in data");
|
strcpy(symbol->errtxt, "Invalid characters in data");
|
||||||
|
@ -730,7 +730,6 @@ int ZBarcode_Print(struct zint_symbol *symbol, int rotate_angle)
|
|||||||
default:
|
default:
|
||||||
strcpy(symbol->errtxt, "Invalid rotation angle");
|
strcpy(symbol->errtxt, "Invalid rotation angle");
|
||||||
return ERROR_INVALID_OPTION;
|
return ERROR_INVALID_OPTION;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(strlen(symbol->outfile) > 3) {
|
if(strlen(symbol->outfile) > 3) {
|
||||||
@ -783,7 +782,6 @@ int ZBarcode_Buffer(struct zint_symbol *symbol, int rotate_angle)
|
|||||||
default:
|
default:
|
||||||
strcpy(symbol->errtxt, "Invalid rotation angle");
|
strcpy(symbol->errtxt, "Invalid rotation angle");
|
||||||
return ERROR_INVALID_OPTION;
|
return ERROR_INVALID_OPTION;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
error_number = bmp_handle(symbol, rotate_angle);
|
error_number = bmp_handle(symbol, rotate_angle);
|
||||||
|
@ -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 5: add_on(first_part, (char*)dest, 0); ustrcpy(symbol->text, first_part); break;
|
||||||
case 7: ean8(symbol, first_part, (char*)dest); break;
|
case 7: ean8(symbol, first_part, (char*)dest); break;
|
||||||
case 12: ean13(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;
|
break;
|
||||||
case BARCODE_EANX_CC:
|
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->row_height[symbol->rows + 2] = 2;
|
||||||
symbol->rows += 3;
|
symbol->rows += 3;
|
||||||
ean13(symbol, first_part, (char*)dest); break;
|
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;
|
break;
|
||||||
case BARCODE_UPCA:
|
case BARCODE_UPCA:
|
||||||
@ -774,7 +774,6 @@ int eanx(struct zint_symbol *symbol, unsigned char source[], int src_len)
|
|||||||
default:
|
default:
|
||||||
strcpy(symbol->errtxt, "Invalid length input");
|
strcpy(symbol->errtxt, "Invalid length input");
|
||||||
return ERROR_TOO_LONG;
|
return ERROR_TOO_LONG;
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
expand(symbol, (char*)dest);
|
expand(symbol, (char*)dest);
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?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">
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
<ProjectConfiguration Include="Release_LIB|Win32">
|
<ProjectConfiguration Include="Release_LIB|Win32">
|
||||||
<Configuration>Release_LIB</Configuration>
|
<Configuration>Release_LIB</Configuration>
|
||||||
@ -16,6 +16,7 @@
|
|||||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||||
<CharacterSet>NotSet</CharacterSet>
|
<CharacterSet>NotSet</CharacterSet>
|
||||||
<WholeProgramOptimization>false</WholeProgramOptimization>
|
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||||
|
<PlatformToolset>v140</PlatformToolset>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
<ImportGroup Label="ExtensionSettings">
|
<ImportGroup Label="ExtensionSettings">
|
||||||
@ -38,7 +39,7 @@
|
|||||||
<Optimization>MaxSpeed</Optimization>
|
<Optimization>MaxSpeed</Optimization>
|
||||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
<AdditionalIncludeDirectories>d:\opt1\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
<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>
|
<StringPooling>true</StringPooling>
|
||||||
<ExceptionHandling>
|
<ExceptionHandling>
|
||||||
</ExceptionHandling>
|
</ExceptionHandling>
|
||||||
|
Loading…
Reference in New Issue
Block a user