cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

C++ stream interface updated to be compliant with the latest standard.

Browse Source 
Appropriate additions in makefiles now completed.
This commit is contained in:
Andrey Kiselev 2004-11-13 11:19:15 +00:00
parent 57e10aa76e
commit 000bacdc15
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libtiff/tif_stream.cxx
View File

@ -1,4 +1,4 @@
/* $Id: tif_stream.cxx,v 1.1 2004-11-07 18:20:05 dron Exp $ */ /* $Id: tif_stream.cxx,v 1.2 2004-11-13 11:19:15 dron Exp $ */
/* /*
* Copyright (c) 1988-1996 Sam Leffler * Copyright (c) 1988-1996 Sam Leffler
@ -27,15 +27,17 @@
/* /*
* TIFF Library UNIX-specific Routines. * TIFF Library UNIX-specific Routines.
*/ */
#include <iostream.h> #include <iostream>
#include "tiffiop.h" #include "tiffiop.h"
using namespace std;
class tiffis_data class tiffis_data
{ {
public: public:
istream *myIS; istream *myIS;
long myStreamStartPos; long myStreamStartPos;
}; };
static tsize_t static tsize_t
@ -49,7 +51,7 @@ _tiffisReadProc(thandle_t fd, tdata_t buf, tsize_t size)
{ {
tiffis_data *data = (tiffis_data *)fd; tiffis_data *data = (tiffis_data *)fd;
data->myIS->read((char *)buf, size); data->myIS->read((char *)buf, (int)size);
return data->myIS->gcount(); return data->myIS->gcount();
} }
@ -129,8 +131,8 @@ static toff_t
_tiffisSizeProc(thandle_t fd) _tiffisSizeProc(thandle_t fd)
{ {
tiffis_data *data = (tiffis_data *)fd; tiffis_data *data = (tiffis_data *)fd;
int pos = data->myIS->tellg(); int pos = data->myIS->tellg();
int len; int len;
data->myIS->seekg(0, ios::end); data->myIS->seekg(0, ios::end);
len = data->myIS->tellg(); len = data->myIS->tellg();

8
libtiff/tiffio.h
View File

@ -1,4 +1,4 @@
/* $Id: tiffio.h,v 1.38 2004-11-07 18:20:05 dron Exp $ */ /* $Id: tiffio.h,v 1.39 2004-11-13 11:19:15 dron Exp $ */
/* /*
* Copyright (c) 1988-1997 Sam Leffler * Copyright (c) 1988-1997 Sam Leffler
@ -495,9 +495,9 @@ extern void TIFFSetClientInfo( TIFF *, void *, const char * );
#endif #endif
#if defined(c_plusplus) || defined(__cplusplus) #if defined(c_plusplus) || defined(__cplusplus)
# include <iostream.h> # include <iostream>
extern TIFF* TIFFStreamOpen(const char*, ostream *); extern TIFF* TIFFStreamOpen(const char*, std::ostream *);
extern TIFF* TIFFStreamOpen(const char*, istream *); extern TIFF* TIFFStreamOpen(const char*, std::istream *);
#endif #endif
#endif /* _TIFFIO_ */ #endif /* _TIFFIO_ */