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

13
3rdparty/libtiff/tif_stream.cxx vendored
View File

@@ -1,4 +1,4 @@
/* $Id: tif_stream.cxx,v 1.1 2005-06-17 13:54:52 vp153 Exp $ */
/* $Id: tif_stream.cxx,v 1.6.2.1 2009-01-01 00:10:43 bfriesen Exp $ */
/*
* Copyright (c) 1988-1996 Sam Leffler
@@ -27,11 +27,12 @@
/*
* TIFF Library UNIX-specific Routines.
*/
#include <iostream>
#include <cstring>
#include "tiffiop.h"
#include <iostream>
#ifndef __VMS
using namespace std;
#endif
class tiffis_data
{
@@ -110,8 +111,12 @@ _tiffosSeekProc(thandle_t fd, toff_t off, int whence)
// ostrstream/ostringstream does. In that situation, add intermediate
// '\0' characters.
if( os->fail() ) {
#ifdef __VMS
int old_state;
#else
ios::iostate old_state;
toff_t origin;
#endif
toff_t origin=0;
old_state = os->rdstate();
// reset the fail bit or else tellp() won't work below