diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:17:11 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:17:11 +0100 |
| commit | 9839bdba39d7f96de11071b9c6ab4c9c6635a976 (patch) | |
| tree | 582412b12a05ff394979e011d13fd09c05c0856a /src/3rdparty/libtiff/libtiff/tif_win32.c | |
| parent | c7f2abe551c027a8eddb01dd7445dcf1fb829171 (diff) | |
| parent | 4d4de2e070178510afb7f160c2594ae7af34f782 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: If0c8e712f7521483df688ae9d33adea8b5fdaae5
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_win32.c')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_win32.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_win32.c b/src/3rdparty/libtiff/libtiff/tif_win32.c index fdc2ee6..ea40163 100644 --- a/src/3rdparty/libtiff/libtiff/tif_win32.c +++ b/src/3rdparty/libtiff/libtiff/tif_win32.c @@ -1,4 +1,4 @@ -/* $Id: tif_win32.c,v 1.41 2015-08-23 20:12:44 bfriesen Exp $ */ +/* $Id: tif_win32.c,v 1.42 2017-01-11 19:02:49 erouault Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -360,6 +360,14 @@ _TIFFmalloc(tmsize_t s) return (malloc((size_t) s)); } +void* _TIFFcalloc(tmsize_t nmemb, tmsize_t siz) +{ + if( nmemb == 0 || siz == 0 ) + return ((void *) NULL); + + return calloc((size_t) nmemb, (size_t)siz); +} + void _TIFFfree(void* p) { |