diff --git a/.travis.yml b/.travis.yml index 9bcf173c..f4a35d76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -185,7 +185,7 @@ after_success: - if [[ "$COVERITY_SCAN_BRANCH" != 1 ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "gcc-4.8" ]] && [[ "$HDF5_VERSION_DIR" == "hdf5_1_8_21" ]] && [[ "$ENABLE_MAT73" == "yes" ]] && [[ "$ENABLE_EXTENDED_SPARSE" == "yes" ]] && [[ "$WITH_ZLIB" == "yes" ]] && [[ "$MAX_RANK" == 3 ]]; then make pdf; fi - if [[ "$COVERITY_SCAN_BRANCH" != 1 ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "gcc-4.8" ]] && [[ "$HDF5_VERSION_DIR" == "hdf5_1_8_21" ]] && [[ "$ENABLE_MAT73" == "yes" ]] && [[ "$ENABLE_EXTENDED_SPARSE" == "yes" ]] && [[ "$WITH_ZLIB" == "yes" ]] && [[ "$MAX_RANK" == 3 ]]; then make dist-gzip; fi - if [[ "$COVERITY_SCAN_BRANCH" != 1 ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "gcc-4.8" ]] && [[ "$HDF5_VERSION_DIR" == "hdf5_1_8_21" ]] && [[ "$ENABLE_MAT73" == "yes" ]] && [[ "$ENABLE_EXTENDED_SPARSE" == "yes" ]] && [[ "$WITH_ZLIB" == "yes" ]] && [[ "$MAX_RANK" == 3 ]] && [[ "$TRAVIS_PULL_REQUEST" == "false" ]] && [[ "$TRAVIS_BRANCH" == "master" ]]; then sh ./upload-to-bitbucket.sh tbeu $BBPASS /tbeu/downloads/downloads ./documentation/matio_user_guide.pdf; fi - - if [[ "$COVERITY_SCAN_BRANCH" != 1 ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "gcc-4.8" ]] && [[ "$HDF5_VERSION_DIR" == "hdf5_1_8_21" ]] && [[ "$ENABLE_MAT73" == "yes" ]] && [[ "$ENABLE_EXTENDED_SPARSE" == "yes" ]] && [[ "$WITH_ZLIB" == "yes" ]] && [[ "$MAX_RANK" == 3 ]] && [[ "$TRAVIS_PULL_REQUEST" == "false" ]] && [[ "$TRAVIS_BRANCH" == "master" ]]; then sh ./upload-to-bitbucket.sh tbeu $BBPASS /tbeu/downloads/downloads ./matio-1.5.15.tar.gz; fi + - if [[ "$COVERITY_SCAN_BRANCH" != 1 ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "gcc-4.8" ]] && [[ "$HDF5_VERSION_DIR" == "hdf5_1_8_21" ]] && [[ "$ENABLE_MAT73" == "yes" ]] && [[ "$ENABLE_EXTENDED_SPARSE" == "yes" ]] && [[ "$WITH_ZLIB" == "yes" ]] && [[ "$MAX_RANK" == 3 ]] && [[ "$TRAVIS_PULL_REQUEST" == "false" ]] && [[ "$TRAVIS_BRANCH" == "master" ]]; then sh ./upload-to-bitbucket.sh tbeu $BBPASS /tbeu/downloads/downloads ./matio-1.5.16.tar.gz; fi notifications: email: false diff --git a/NEWS b/NEWS index 4d56e8f3..d47d8fa1 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +Changes in 1.5.16 (25 June 2019) +* Fixed error handling on integer addition/multiplication overflows + Changes in 1.5.15 (29 March 2019) * Added new API function Mat_GetHeader to retrieve header string of a MAT file * Fixed integer multiplication overflows when calculating total number of diff --git a/configure.ac b/configure.ac index 6c39dafd..334deca6 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ dnl CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY dnl OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE dnl OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -AC_INIT([MATIO],[1.5.15],[t-beu@users.sourceforge.net],[], +AC_INIT([MATIO],[1.5.16],[t-beu@users.sourceforge.net],[], [https://sourceforge.net/projects/matio]) AC_CONFIG_SRCDIR([src/matio.h]) AC_CONFIG_AUX_DIR([config]) @@ -39,10 +39,10 @@ AC_CANONICAL_HOST AC_DEFINE_UNQUOTED([MATIO_PLATFORM],"${host}",[Platform]) AC_DEFINE_UNQUOTED([MATIO_MAJOR_VERSION],1,[Matio major version number]) AC_DEFINE_UNQUOTED([MATIO_MINOR_VERSION],5,[Matio minor version number]) -AC_DEFINE_UNQUOTED([MATIO_RELEASE_LEVEL],15,[Matio release level number]) -AC_DEFINE_UNQUOTED([MATIO_VERSION],1515,[Matio version number]) -PACKAGE_RELEASE_DATE="29 March 2019" -AC_DEFINE_UNQUOTED([MATIO_VERSION_STR],"1.5.15",[Matio version number]) +AC_DEFINE_UNQUOTED([MATIO_RELEASE_LEVEL],16,[Matio release level number]) +AC_DEFINE_UNQUOTED([MATIO_VERSION],1516,[Matio version number]) +PACKAGE_RELEASE_DATE="25 June 2019" +AC_DEFINE_UNQUOTED([MATIO_VERSION_STR],"1.5.16",[Matio version number]) AC_SUBST(PACKAGE_RELEASE_DATE) AC_ARG_VAR([FCLDFLAGS],[Fortran compiler-specific flags at link time]) diff --git a/documentation/matio_user_guide.texi b/documentation/matio_user_guide.texi index c7a4c461..282c1f7a 100644 --- a/documentation/matio_user_guide.texi +++ b/documentation/matio_user_guide.texi @@ -35,8 +35,8 @@ @sp 0 @title @subtitle User Manual -@subtitle for version 1.5.15 -@subtitle March 2019 +@subtitle for version 1.5.16 +@subtitle June 2019 @author Christopher C. Hulbert @page @vskip 0pt plus 1filll diff --git a/visual_studio/matio.rc b/visual_studio/matio.rc index 2312fc78..27e7b246 100644 --- a/visual_studio/matio.rc +++ b/visual_studio/matio.rc @@ -5,8 +5,8 @@ VS_VERSION_INFO VERSIONINFO #else VS_VERSION_INFO VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE #endif - FILEVERSION 1,5,15,0 - PRODUCTVERSION 1,5,15,0 + FILEVERSION 1,5,16,0 + PRODUCTVERSION 1,5,16,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS 1 @@ -23,12 +23,12 @@ BEGIN //language ID = U.S. English, char set = Windows, Multilingual BEGIN VALUE "FileDescription", "MATLAB MAT file I/O library\0" - VALUE "FileVersion", "1.5.15\0" + VALUE "FileVersion", "1.5.16\0" VALUE "InternalName", "libmatio.dll\0" VALUE "LegalCopyright", "(C) 2005-2019, Christopher Hulbert\0" VALUE "OriginalFilename", "libmatio.dll\0" VALUE "ProductName", "libmatio\0" - VALUE "ProductVersion", "1.5.15\0" + VALUE "ProductVersion", "1.5.16\0" VALUE "Comments","\0" END END diff --git a/visual_studio/matioConfig.h b/visual_studio/matioConfig.h index ce5c0e31..1958538f 100644 --- a/visual_studio/matioConfig.h +++ b/visual_studio/matioConfig.h @@ -228,7 +228,7 @@ #define PACKAGE_NAME "MATIO" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "MATIO 1.5.15" +#define PACKAGE_STRING "MATIO 1.5.16" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "matio" @@ -237,7 +237,7 @@ #define PACKAGE_URL "https://sourceforge.net/projects/matio" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.5.15" +#define PACKAGE_VERSION "1.5.16" /* The size of `char', as computed by sizeof. */ #define SIZEOF_CHAR 1 @@ -276,7 +276,7 @@ #undef STDC_HEADERS /* Version number of package */ -#define VERSION "1.5.15" +#define VERSION "1.5.16" /* Z prefix */ #undef Z_PREFIX diff --git a/visual_studio/matio_pubconf.h b/visual_studio/matio_pubconf.h index 250be2c5..3824116a 100644 --- a/visual_studio/matio_pubconf.h +++ b/visual_studio/matio_pubconf.h @@ -34,13 +34,13 @@ #define MATIO_MINOR_VERSION 5 /* Matio release level number */ -#define MATIO_RELEASE_LEVEL 15 +#define MATIO_RELEASE_LEVEL 16 /* Matio version number */ -#define MATIO_VERSION 1515 +#define MATIO_VERSION 1516 /* Matio version string */ -#define MATIO_VERSION_STR "1.5.15" +#define MATIO_VERSION_STR "1.5.16" /* Default file format */ #define MAT_FT_DEFAULT MAT_FT_MAT5