generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated 3rd party libs: CLapack 3.1.1.1 => 3.2.1, zlib 1.2.3 => 1.2.5, libpng 1.2.x => 1.4.3, libtiff 3.7.x => 3.9.4. fixed many 64-bit related VS2010 warnings

Browse Source
This commit is contained in:
Vadim Pisarevsky
2010-07-16 12:54:53 +00:00
parent 0c9eca7922
commit f78a3b4cc1
465 changed files with 51856 additions and 41344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
3rdparty/libtiff/tif_unix.c vendored
View File

@@ -1,4 +1,4 @@
/* $Id: tif_unix.c,v 1.1 2005-06-17 13:54:52 vp153 Exp $ */
/* $Id: tif_unix.c,v 1.12.2.1 2010-06-08 18:50:43 bfriesen Exp $ */
/*
* Copyright (c) 1988-1997 Sam Leffler
@@ -30,6 +30,11 @@
*/
#include "tif_config.h"
#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#include <stdarg.h>
#include <stdlib.h>
#include <sys/stat.h>
@@ -37,15 +42,11 @@
# include <unistd.h>
#endif
#if HAVE_FCNTL_H
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif
#if HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
#if HAVE_IO_H
#ifdef HAVE_IO_H
# include <io.h>
#endif
@@ -170,7 +171,7 @@ TIFFOpen(const char* name, const char* mode)
fd = open(name, m, 0666);
#endif
if (fd < 0) {
TIFFError(module, "%s: Cannot open", name);
TIFFErrorExt(0, module, "%s: Cannot open", name);
return ((TIFF *)0);
}
@@ -181,6 +182,7 @@ TIFFOpen(const char* name, const char* mode)
}
#ifdef __WIN32__
#include <windows.h>
/*
* Open a TIFF file with a Unicode filename, for read/writing.
*/
@@ -204,7 +206,7 @@ TIFFOpenW(const wchar_t* name, const char* mode)
fd = _wopen(name, m, 0666);
if (fd < 0) {
TIFFError(module, "%s: Cannot open", name);
TIFFErrorExt(0, module, "%s: Cannot open", name);
return ((TIFF *)0);
}
@@ -213,7 +215,7 @@ TIFFOpenW(const wchar_t* name, const char* mode)
if (mbsize > 0) {
mbname = _TIFFmalloc(mbsize);
if (!mbname) {
TIFFError(module,
TIFFErrorExt(0, module,
"Can't allocate space for filename conversion buffer");
return ((TIFF*)0);
}
@@ -289,3 +291,10 @@ unixErrorHandler(const char* module, const char* fmt, va_list ap)
fprintf(stderr, ".\n");
}
TIFFErrorHandler _TIFFerrorHandler = unixErrorHandler;
/*
* Local Variables:
* mode: c
* c-basic-offset: 8
* fill-column: 78
* End:
*/