From 8667b359eb920a6bc215d266687fe5226029a0b2 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Fri, 30 Dec 2016 10:21:01 +0000 Subject: teckit 2.5.6 git-svn-id: svn://tug.org/texlive/trunk@42807 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/teckit/TECkit-src/INSTALL | 8 +++- Build/source/libs/teckit/TECkit-src/NEWS | 17 ++++++- Build/source/libs/teckit/TECkit-src/README | 12 +++-- .../libs/teckit/TECkit-src/SFconv/SFconv.cpp | 4 +- .../libs/teckit/TECkit-src/SFconv/SFconv_ver.rc | 2 +- Build/source/libs/teckit/TECkit-src/configure.ac | 6 +-- .../libs/teckit/TECkit-src/license/LICENSING.txt | 2 +- .../libs/teckit/TECkit-src/source/Compiler.cpp | 2 +- .../libs/teckit/TECkit-src/source/Compiler.h | 2 +- .../libs/teckit/TECkit-src/source/Compiler_ver.rc | 2 +- .../libs/teckit/TECkit-src/source/Engine.cpp | 2 +- .../source/libs/teckit/TECkit-src/source/Engine.h | 2 +- .../libs/teckit/TECkit-src/source/Engine_ver.rc | 2 +- .../libs/teckit/TECkit-src/source/Perl/TECkit.xs | 1 + .../source/Public-headers/TECkit_Common.h | 2 +- .../source/Public-headers/TECkit_Compiler.h | 2 +- .../source/Public-headers/TECkit_Engine.h | 2 +- .../source/Sample-tools/TECkit_Compile.cpp | 9 ++-- .../source/Sample-tools/TECkit_Compile_ver.rc | 2 +- .../TECkit-src/source/Sample-tools/TxtConv.cpp | 52 ++++++++++++---------- .../TECkit-src/source/Sample-tools/TxtConv_ver.rc | 2 +- .../TECkit-src/source/Sample-tools/version_defs.h | 12 ++--- .../libs/teckit/TECkit-src/source/TECkit_Format.h | 2 +- .../libs/teckit/TECkit-src/source/version_defs.h | 12 ++--- .../source/libs/teckit/TECkit-src/test/GNT-map.xml | 2 +- .../teckit/TECkit-src/test/SILGreek2004-04-27.map | 2 +- .../libs/teckit/TECkit-src/uninstalled-top.pc.in | 6 +-- 27 files changed, 101 insertions(+), 70 deletions(-) (limited to 'Build/source/libs/teckit/TECkit-src') diff --git a/Build/source/libs/teckit/TECkit-src/INSTALL b/Build/source/libs/teckit/TECkit-src/INSTALL index 9611572e9c0..e1ffb020b65 100644 --- a/Build/source/libs/teckit/TECkit-src/INSTALL +++ b/Build/source/libs/teckit/TECkit-src/INSTALL @@ -1,6 +1,6 @@ INSTALL -Note: If you checked out teckit from svn, or for any other reason don't have +Note: If you checked out teckit from a VCS, or for any other reason don't have a file called "configure", you will need to initialize the directory using GNU autotools. Instructions for this are given further down. @@ -63,6 +63,10 @@ Run the following script: The results will be in the teckit-linux subdirectory. +To build just a source package that can be passed to an external package builder +(such as `pbuilder`) add `-S` to the command line. Other `debuild` options can +be given as well. + BUILDING a MAC PACKAGE Run the following script: @@ -92,4 +96,4 @@ Then, on all platforms, run: ./autogen.sh in the teckit source directory. This normally needs to be done only once, but -if you update the directory from svn you may need to run it again. +if you update your directory from the VCS you may need to run it again. diff --git a/Build/source/libs/teckit/TECkit-src/NEWS b/Build/source/libs/teckit/TECkit-src/NEWS index a457bc840d2..a25eed1fa16 100644 --- a/Build/source/libs/teckit/TECkit-src/NEWS +++ b/Build/source/libs/teckit/TECkit-src/NEWS @@ -1,5 +1,20 @@ -2014-06-30 +2016-04-19 + Version 2.5.6 + Added a diversion of /usr/bin/teckit_compile to avoid a conflict with the + texlive-binaries package on Linux + +2016-04-11 + Version 2.5.5 + Split shared libraries into a separate Linux package + Made Linux packages multiarch-compatible + Fixed compiler warnings + +2014-07-09 Version 2.5.4 + Improved building and testing scripts + Enabled tests to be run on Windows without bash + +2014-06-30 Updated Unicode character names and normalization data to 7.0.0 Fixed data normalization bug Updated tests diff --git a/Build/source/libs/teckit/TECkit-src/README b/Build/source/libs/teckit/TECkit-src/README index ccec2ee7ec6..3cb1ef6767b 100644 --- a/Build/source/libs/teckit/TECkit-src/README +++ b/Build/source/libs/teckit/TECkit-src/README @@ -1,16 +1,20 @@ README +====== This is TECkit, a library for encoding conversion, usable through standalone tools or by linking with other software packages. - -See the docs folder for TECkit mapping language and conversion tool usage notes. - +See the Documentation folder for information on the TECkit mapping language +and conversion tool usage notes. The teckit_compile tool now supports a new option, not described in the PDF documentation: - -x generate XML representation rather than compiled table + -x generate XML representation rather than compiled table This is primarily intended for use by the Reprise utility, and the XML format produced is subject to change according to the needs of that tool. + +The TECkit libraries have been updated to support the Unicode 7.0.0 character +repertoire; the documentation and GUI tools (Mapping Editor, DropTEC text file +converter) have not been modified since version 2.5.1 (2006). diff --git a/Build/source/libs/teckit/TECkit-src/SFconv/SFconv.cpp b/Build/source/libs/teckit/TECkit-src/SFconv/SFconv.cpp index 0604a08dd0d..c7e6e68c777 100644 --- a/Build/source/libs/teckit/TECkit-src/SFconv/SFconv.cpp +++ b/Build/source/libs/teckit/TECkit-src/SFconv/SFconv.cpp @@ -313,7 +313,7 @@ makeConverter(const string& mappingName, int direction) fprintf(stderr, "unable to read mapping file for %s (file %s)\n", mappingName.c_str(), mapFileName.c_str()); exit(1); } - fread(buf, 1, fileSize, mapFile); + fileSize = fread(buf, 1, fileSize, mapFile); fclose(mapFile); TECkit_Converter converter; @@ -629,7 +629,7 @@ process(const char* inputFile, const char* outputFile) // *** Unicode to Byte conversion Byte bom[3]; long pos = ftell(inFile); - if (fread(bom, 3, 1, inFile)) { + if (fread(bom, 3, 1, inFile) > 0) { if (bom[0] == 0xef && bom[1] == 0xbb && bom[2] == 0xbf) { inForm = kForm_UTF8; } diff --git a/Build/source/libs/teckit/TECkit-src/SFconv/SFconv_ver.rc b/Build/source/libs/teckit/TECkit-src/SFconv/SFconv_ver.rc index e43f530dc15..c21ca11dd40 100644 --- a/Build/source/libs/teckit/TECkit-src/SFconv/SFconv_ver.rc +++ b/Build/source/libs/teckit/TECkit-src/SFconv/SFconv_ver.rc @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (c) 2008-2014 SIL International. All rights reserved. +Copyright (c) 2008-2016 SIL International. All rights reserved. Distributable under the terms of either the Common Public License or the GNU Lesser General Public License, as specified in the LICENSING.txt file. diff --git a/Build/source/libs/teckit/TECkit-src/configure.ac b/Build/source/libs/teckit/TECkit-src/configure.ac index 10295f6a3d2..d965ccbab82 100644 --- a/Build/source/libs/teckit/TECkit-src/configure.ac +++ b/Build/source/libs/teckit/TECkit-src/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.54) -AC_INIT(teckit, 2.5.4, nrsi@sil.org) +AC_INIT(teckit, 2.5.6, nrsi@sil.org) AM_CONFIG_HEADER([config.h]) AC_CONFIG_SRCDIR([source/UnicodeNames.cpp]) AC_CONFIG_MACRO_DIR([m4]) @@ -84,8 +84,8 @@ AC_ARG_ENABLE(final, AC_HELP_STRING([--enable-final], [build for release. (default=no)])) if test "$enable_final" = yes; then - CFLAGS="-O3 -DNDEBUG" - CXXFLAGS="-O3 -DNDEBUG" + CFLAGS="$CFLAGS -O3 -DNDEBUG" + CXXFLAGS="$CXXFLAGS -O3 -DNDEBUG" fi # Enable profile diff --git a/Build/source/libs/teckit/TECkit-src/license/LICENSING.txt b/Build/source/libs/teckit/TECkit-src/license/LICENSING.txt index 4f3add71197..a5e817a166b 100644 --- a/Build/source/libs/teckit/TECkit-src/license/LICENSING.txt +++ b/Build/source/libs/teckit/TECkit-src/license/LICENSING.txt @@ -1,6 +1,6 @@ TECKit Licensing - Copyright 2002-2014, SIL International + Copyright 2002-2016, SIL International All rights reserved. This library is free software; you can redistribute it and/or modify diff --git a/Build/source/libs/teckit/TECkit-src/source/Compiler.cpp b/Build/source/libs/teckit/TECkit-src/source/Compiler.cpp index a82c5d69c2e..61586453130 100644 --- a/Build/source/libs/teckit/TECkit-src/source/Compiler.cpp +++ b/Build/source/libs/teckit/TECkit-src/source/Compiler.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (C) 2002-2014 SIL International. All rights reserved. +Copyright (C) 2002-2016 SIL International. All rights reserved. Distributable under the terms of either the Common Public License or the GNU Lesser General Public License, as specified in the LICENSING.txt file. diff --git a/Build/source/libs/teckit/TECkit-src/source/Compiler.h b/Build/source/libs/teckit/TECkit-src/source/Compiler.h index 33f0ab98494..00da2824922 100644 --- a/Build/source/libs/teckit/TECkit-src/source/Compiler.h +++ b/Build/source/libs/teckit/TECkit-src/source/Compiler.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (C) 2002-2014 SIL International. All rights reserved. +Copyright (C) 2002-2016 SIL International. All rights reserved. Distributable under the terms of either the Common Public License or the GNU Lesser General Public License, as specified in the LICENSING.txt file. diff --git a/Build/source/libs/teckit/TECkit-src/source/Compiler_ver.rc b/Build/source/libs/teckit/TECkit-src/source/Compiler_ver.rc index 5203e3e430f..ce9a4329261 100644 --- a/Build/source/libs/teckit/TECkit-src/source/Compiler_ver.rc +++ b/Build/source/libs/teckit/TECkit-src/source/Compiler_ver.rc @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (c) 2008-2014 SIL International. All rights reserved. +Copyright (c) 2008-2016 SIL International. All rights reserved. Distributable under the terms of either the Common Public License or the GNU Lesser General Public License, as specified in the LICENSING.txt file. diff --git a/Build/source/libs/teckit/TECkit-src/source/Engine.cpp b/Build/source/libs/teckit/TECkit-src/source/Engine.cpp index 9aef164cc34..e8df9ba391c 100644 --- a/Build/source/libs/teckit/TECkit-src/source/Engine.cpp +++ b/Build/source/libs/teckit/TECkit-src/source/Engine.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (C) 2002-2014 SIL International. All rights reserved. +Copyright (C) 2002-2016 SIL International. All rights reserved. Distributable under the terms of either the Common Public License or the GNU Lesser General Public License, as specified in the LICENSING.txt file. diff --git a/Build/source/libs/teckit/TECkit-src/source/Engine.h b/Build/source/libs/teckit/TECkit-src/source/Engine.h index f40001d3b35..ac8eaa89205 100644 --- a/Build/source/libs/teckit/TECkit-src/source/Engine.h +++ b/Build/source/libs/teckit/TECkit-src/source/Engine.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (C) 2002-2014 SIL International. All rights reserved. +Copyright (C) 2002-2016 SIL International. All rights reserved. Distributable under the terms of either the Common Public License or the GNU Lesser General Public License, as specified in the LICENSING.txt file. diff --git a/Build/source/libs/teckit/TECkit-src/source/Engine_ver.rc b/Build/source/libs/teckit/TECkit-src/source/Engine_ver.rc index 3b380682016..c2aac819564 100644 --- a/Build/source/libs/teckit/TECkit-src/source/Engine_ver.rc +++ b/Build/source/libs/teckit/TECkit-src/source/Engine_ver.rc @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (c) 2008-2014 SIL International. All rights reserved. +Copyright (c) 2008-2016 SIL International. All rights reserved. Distributable under the terms of either the Common Public License or the GNU Lesser General Public License, as specified in the LICENSING.txt file. diff --git a/Build/source/libs/teckit/TECkit-src/source/Perl/TECkit.xs b/Build/source/libs/teckit/TECkit-src/source/Perl/TECkit.xs index a5773e60c85..0e672913fbb 100644 --- a/Build/source/libs/teckit/TECkit-src/source/Perl/TECkit.xs +++ b/Build/source/libs/teckit/TECkit-src/source/Perl/TECkit.xs @@ -168,6 +168,7 @@ flush(converter, style, hr) TECkit_ResetConverter((TECkit_Converter)converter); OUTPUT: RETVAL + hr void DESTROY(converter) diff --git a/Build/source/libs/teckit/TECkit-src/source/Public-headers/TECkit_Common.h b/Build/source/libs/teckit/TECkit-src/source/Public-headers/TECkit_Common.h index 19c3d674c7f..84cdd531b8d 100644 --- a/Build/source/libs/teckit/TECkit-src/source/Public-headers/TECkit_Common.h +++ b/Build/source/libs/teckit/TECkit-src/source/Public-headers/TECkit_Common.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (C) 2002-2014 SIL International. All rights reserved. +Copyright (C) 2002-2016 SIL International. All rights reserved. Distributable under the terms of either the Common Public License or the GNU Lesser General Public License, as specified in the LICENSING.txt file. diff --git a/Build/source/libs/teckit/TECkit-src/source/Public-headers/TECkit_Compiler.h b/Build/source/libs/teckit/TECkit-src/source/Public-headers/TECkit_Compiler.h index 35f8fae32bb..e53cfa6dec5 100644 --- a/Build/source/libs/teckit/TECkit-src/source/Public-headers/TECkit_Compiler.h +++ b/Build/source/libs/teckit/TECkit-src/source/Public-headers/TECkit_Compiler.h @@ -15,7 +15,7 @@ /* TECkit_Compiler.h - Copyright (c) 2002-2014 SIL International. + Copyright (c) 2002-2016 SIL International. */ #ifndef __TECkit_Compiler_H__ diff --git a/Build/source/libs/teckit/TECkit-src/source/Public-headers/TECkit_Engine.h b/Build/source/libs/teckit/TECkit-src/source/Public-headers/TECkit_Engine.h index df68043c9b9..6951f106084 100644 --- a/Build/source/libs/teckit/TECkit-src/source/Public-headers/TECkit_Engine.h +++ b/Build/source/libs/teckit/TECkit-src/source/Public-headers/TECkit_Engine.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (C) 2002-2014 SIL International. All rights reserved. +Copyright (C) 2002-2016 SIL International. All rights reserved. Distributable under the terms of either the Common Public License or the GNU Lesser General Public License, as specified in the LICENSING.txt file. diff --git a/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TECkit_Compile.cpp b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TECkit_Compile.cpp index b60726f9945..795b237a804 100644 --- a/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TECkit_Compile.cpp +++ b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TECkit_Compile.cpp @@ -1,6 +1,6 @@ /* TECkit_Compile.c - Copyright (c) 2002-2014 SIL International. + Copyright (c) 2002-2016 SIL International. 2004-03-12 updated to use v2.1 compiler added -u option to force UTF8 mode @@ -135,7 +135,7 @@ Usage: %s [-u] [-x] [-z] mapping_description [-o compiled_table]\n\ if (mapFileName != 0) { // compile the mapping FILE* inFile = fopen(mapFileName, "rb"); - long len; + size_t len; Byte* compiledTable; UInt32 compiledSize; TECkit_Status status; @@ -165,7 +165,10 @@ Usage: %s [-u] [-x] [-z] mapping_description [-o compiled_table]\n\ return 1; // not enough memory } - fread(txt, len, 1, inFile); + if (fread(txt, len, 1, inFile) != 1) { + fprintf(stderr, "not enough data in mapping file\n"); + return 1; + } fclose(inFile); status = TECkit_CompileOpt(txt, len, &errFunc, 0, &compiledTable, &compiledSize, diff --git a/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TECkit_Compile_ver.rc b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TECkit_Compile_ver.rc index 0583f363639..c9810ac1c6b 100644 --- a/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TECkit_Compile_ver.rc +++ b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TECkit_Compile_ver.rc @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (c) 2008-2014 SIL International. All rights reserved. +Copyright (c) 2008-2016 SIL International. All rights reserved. Distributable under the terms of either the Common Public License or the GNU Lesser General Public License, as specified in the LICENSING.txt file. diff --git a/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TxtConv.cpp b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TxtConv.cpp index 65a6761f769..9e0ae121459 100644 --- a/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TxtConv.cpp +++ b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TxtConv.cpp @@ -1,6 +1,6 @@ /* TxtConv.c - Copyright (c) 2002-2014 SIL International. + Copyright (c) 2002-2016 SIL International. 2008-01-23 jk revised endian-ness stuff to allow Universal build 5-May-2005 jk added include and to keep gcc happy @@ -53,7 +53,7 @@ doConversion(TECkit_Converter cnv, FILE* inFile, FILE* outFile, UInt32 opts) char outBuffer[kOutBufLen]; UInt32 savedLen = 0; UInt32 offset = 0; - TECkit_Status status; + TECkit_Status status = kStatus_NeedMoreInput; inBase = ftell(inFile); fseek(inFile, 0, SEEK_END); @@ -61,19 +61,21 @@ doConversion(TECkit_Converter cnv, FILE* inFile, FILE* outFile, UInt32 opts) fseek(inFile, inBase, SEEK_SET); while (1) { - UInt32 inUsed, outUsed, lookahead; + UInt32 inUsed = 0, outUsed = 0, lookahead = 0; UInt32 amountToRead = kInBufLen - savedLen; char* inPtr = inBuffer; - UInt32 inAvail; + UInt32 inAvail = savedLen; if (offset + amountToRead > inLength) amountToRead = inLength - offset; - inAvail = savedLen + amountToRead; - if (inAvail > 0) { - fread(inBuffer + savedLen, 1, amountToRead, inFile); + if (amountToRead > 0) { + amountToRead = fread(inBuffer + savedLen, 1, amountToRead, inFile); offset += amountToRead; + inAvail += amountToRead; + } + if (inAvail > 0) { status = TECkit_ConvertBufferOpt(cnv, (Byte*)inPtr, inAvail, &inUsed, (Byte*)outBuffer, kOutBufLen, &outUsed, opts, &lookahead); fwrite(outBuffer, 1, outUsed, outFile); @@ -107,6 +109,7 @@ doConversion(TECkit_Converter cnv, FILE* inFile, FILE* outFile, UInt32 opts) fwrite(outBuffer, 1, outUsed, outFile); savedLen -= inUsed; inPtr += inUsed; + inUsed = 0; } while ((status & kStatusMask_Basic) == kStatus_OutputBufferFull); if ((status & kStatusMask_Basic) == kStatus_UnmappedChar) @@ -344,7 +347,7 @@ Usage: %s -i inFile -o outFile [-t tecFile] [-r] [-if inForm] [-of outForm] [-no return 1; } - fread(table, 1, len, tecFile); + len = fread(table, 1, len, tecFile); fclose(tecFile); status = forward @@ -370,6 +373,7 @@ Usage: %s -i inFile -o outFile [-t tecFile] [-r] [-if inForm] [-of outForm] [-no // if the input is supposed to be Unicode, and the inForm is unspecified, try to guess it // or skip over the BOM if one is found that matches the specified inForm unsigned char sig[4]; + size_t sigLen; if (inForm == kForm_Bytes) { fprintf(stderr, "improper input encoding form for this mapping"); return 1; @@ -377,24 +381,24 @@ Usage: %s -i inFile -o outFile [-t tecFile] [-r] [-if inForm] [-of outForm] [-no switch (inForm) { case kForm_Unspecified: - fread(sig, 1, 4, inFile); - if (sig[0] == 0xef && sig[1] == 0xbb && sig[2] == 0xbf) { + sigLen = fread(sig, 1, 4, inFile); + if (sigLen >= 3 && sig[0] == 0xef && sig[1] == 0xbb && sig[2] == 0xbf) { inForm = kForm_UTF8; fseek(inFile, 3, SEEK_SET); } - else if (sig[0] == 0xfe && sig[1] == 0xff) { + else if (sigLen >= 2 && sig[0] == 0xfe && sig[1] == 0xff) { inForm = kForm_UTF16BE; fseek(inFile, 2, SEEK_SET); } - else if (sig[0] == 0xff && sig[1] == 0xfe && sig[2] == 0x00 && sig[3] == 0x00) { + else if (sigLen >= 4 && sig[0] == 0xff && sig[1] == 0xfe && sig[2] == 0x00 && sig[3] == 0x00) { inForm = kForm_UTF32LE; /* fseek(inFile, 4, SEEK_SET); */ } - else if (sig[0] == 0xff && sig[1] == 0xfe) { + else if (sigLen >= 2 && sig[0] == 0xff && sig[1] == 0xfe) { inForm = kForm_UTF16LE; fseek(inFile, 2, SEEK_SET); } - else if (sig[0] == 0x00 && sig[1] == 0x00 && sig[2] == 0xfe && sig[3] == 0xff) { + else if (sigLen >= 4 && sig[0] == 0x00 && sig[1] == 0x00 && sig[2] == 0xfe && sig[3] == 0xff) { inForm = kForm_UTF32BE; /* fseek(inFile, 4, SEEK_SET); */ } @@ -405,32 +409,32 @@ Usage: %s -i inFile -o outFile [-t tecFile] [-r] [-if inForm] [-of outForm] [-no break; case kForm_UTF8: - fread(sig, 1, 3, inFile); - if (!(sig[0] == 0xef && sig[1] == 0xbb && sig[2] == 0xbf)) + sigLen = fread(sig, 1, 3, inFile); + if (sigLen >= 3 && !(sig[0] == 0xef && sig[1] == 0xbb && sig[2] == 0xbf)) fseek(inFile, 0, SEEK_SET); break; case kForm_UTF16BE: - fread(sig, 1, 2, inFile); - if (!(sig[0] == 0xfe && sig[1] == 0xff)) + sigLen = fread(sig, 1, 2, inFile); + if (sigLen >= 2 && !(sig[0] == 0xfe && sig[1] == 0xff)) fseek(inFile, 0, SEEK_SET); break; case kForm_UTF16LE: - fread(sig, 1, 2, inFile); - if (!(sig[0] == 0xff && sig[1] == 0xfe)) + sigLen = fread(sig, 1, 2, inFile); + if (sigLen >= 2 && !(sig[0] == 0xff && sig[1] == 0xfe)) fseek(inFile, 0, SEEK_SET); break; case kForm_UTF32BE: - fread(sig, 1, 4, inFile); - if (!(sig[0] == 0x00 && sig[1] == 0x00 && sig[2] == 0xfe && sig[3] == 0xff)) + sigLen = fread(sig, 1, 4, inFile); + if (sigLen >= 4 && !(sig[0] == 0x00 && sig[1] == 0x00 && sig[2] == 0xfe && sig[3] == 0xff)) fseek(inFile, 0, SEEK_SET); break; case kForm_UTF32LE: - fread(sig, 1, 4, inFile); - if (!(sig[0] == 0xff && sig[1] == 0xfe && sig[2] == 0x00 && sig[3] == 0x00)) + sigLen = fread(sig, 1, 4, inFile); + if (sigLen >= 4 && !(sig[0] == 0xff && sig[1] == 0xfe && sig[2] == 0x00 && sig[3] == 0x00)) fseek(inFile, 0, SEEK_SET); break; } diff --git a/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TxtConv_ver.rc b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TxtConv_ver.rc index 25d1f33abf7..3afab20980c 100644 --- a/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TxtConv_ver.rc +++ b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/TxtConv_ver.rc @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (c) 2008-2014 SIL International. All rights reserved. +Copyright (c) 2008-2016 SIL International. All rights reserved. Distributable under the terms of either the Common Public License or the GNU Lesser General Public License, as specified in the LICENSING.txt file. diff --git a/Build/source/libs/teckit/TECkit-src/source/Sample-tools/version_defs.h b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/version_defs.h index a7676c7bb16..105d7136914 100644 --- a/Build/source/libs/teckit/TECkit-src/source/Sample-tools/version_defs.h +++ b/Build/source/libs/teckit/TECkit-src/source/Sample-tools/version_defs.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (c) 2008-2014 SIL International. All rights reserved. +Copyright (c) 2008-2016 SIL International. All rights reserved. Distributable under the terms of either the Common Public License or the GNU Lesser General Public License, as specified in the LICENSING.txt file. @@ -10,15 +10,15 @@ GNU Lesser General Public License, as specified in the LICENSING.txt file. #include // version numbers that should be updated for each release -#define VER_FILEVERSION 2,5,4,0 -#define VER_FILEVERSION_STR "2.5.4.0\0" +#define VER_FILEVERSION 2,5,6,0 +#define VER_FILEVERSION_STR "2.5.6.0\0" -#define VER_PRODUCTVERSION 2,5,4,0 -#define VER_PRODUCTVERSION_STR "2.5.4\0" +#define VER_PRODUCTVERSION 2,5,6,0 +#define VER_PRODUCTVERSION_STR "2.5.6\0" // constants used in all the binaries, shouldn't need changing (until next year) #define VER_COMPANY_NAME_STR "SIL International\0" -#define VER_COPYRIGHT_STR "Copyright (c) 2002-2014\0" +#define VER_COPYRIGHT_STR "Copyright (c) 2002-2016\0" #define VER_PRODUCT_NAME_STR "TECkit basic tools\0" #ifndef DEBUG diff --git a/Build/source/libs/teckit/TECkit-src/source/TECkit_Format.h b/Build/source/libs/teckit/TECkit-src/source/TECkit_Format.h index 0cce751bd59..0e04a45bb9f 100644 --- a/Build/source/libs/teckit/TECkit-src/source/TECkit_Format.h +++ b/Build/source/libs/teckit/TECkit-src/source/TECkit_Format.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (C) 2002-2014 SIL International. All rights reserved. +Copyright (C) 2002-2016 SIL International. All rights reserved. Distributable under the terms of either the Common Public License or the GNU Lesser General Public License, as specified in the LICENSING.txt file. diff --git a/Build/source/libs/teckit/TECkit-src/source/version_defs.h b/Build/source/libs/teckit/TECkit-src/source/version_defs.h index c7d09b58686..81c3baa09ad 100644 --- a/Build/source/libs/teckit/TECkit-src/source/version_defs.h +++ b/Build/source/libs/teckit/TECkit-src/source/version_defs.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------ -Copyright (c) 2008-2014 SIL International. All rights reserved. +Copyright (c) 2008-2016 SIL International. All rights reserved. Distributable under the terms of either the Common Public License or the GNU Lesser General Public License, as specified in the LICENSING.txt file. @@ -10,15 +10,15 @@ GNU Lesser General Public License, as specified in the LICENSING.txt file. #include // version numbers that should be updated for each release -#define VER_FILEVERSION 2,5,4,0 -#define VER_FILEVERSION_STR "2.5.4.0\0" +#define VER_FILEVERSION 2,5,6,0 +#define VER_FILEVERSION_STR "2.5.6.0\0" -#define VER_PRODUCTVERSION 2,5,4,0 -#define VER_PRODUCTVERSION_STR "2.5.4\0" +#define VER_PRODUCTVERSION 2,5,6,0 +#define VER_PRODUCTVERSION_STR "2.5.6\0" // constants used in all the binaries, shouldn't need changing (until next year) #define VER_COMPANY_NAME_STR "SIL International\0" -#define VER_COPYRIGHT_STR "Copyright (c) 2002-2014\0" +#define VER_COPYRIGHT_STR "Copyright (c) 2002-2016\0" #define VER_PRODUCT_NAME_STR "TECkit core\0" #ifndef DEBUG diff --git a/Build/source/libs/teckit/TECkit-src/test/GNT-map.xml b/Build/source/libs/teckit/TECkit-src/test/GNT-map.xml index 2afecc955f0..9817359fbc7 100644 --- a/Build/source/libs/teckit/TECkit-src/test/GNT-map.xml +++ b/Build/source/libs/teckit/TECkit-src/test/GNT-map.xml @@ -1,5 +1,5 @@ - +