From 16e777b69bf335e97bd8d6d48077ef4cba14772a Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 26 Aug 2005 08:48:54 +0000 Subject: [PATCH] From Farshid Lashkari, fixed warnings. --- src/osgPlugins/tiff/ReaderWriterTIFF.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/osgPlugins/tiff/ReaderWriterTIFF.cpp b/src/osgPlugins/tiff/ReaderWriterTIFF.cpp index 4d2d053dd..9681b9da5 100644 --- a/src/osgPlugins/tiff/ReaderWriterTIFF.cpp +++ b/src/osgPlugins/tiff/ReaderWriterTIFF.cpp @@ -67,12 +67,12 @@ tsize_t libtiffStreamReadProc(thandle_t fd, tdata_t buf, tsize_t size) return -1; if(fin->gcount() < size) - return 0; + return 0; return size; } -tsize_t libtiffStreamWriteProc(thandle_t fd, tdata_t buf, tsize_t size) +tsize_t libtiffStreamWriteProc(thandle_t, tdata_t, tsize_t) { return 0; } @@ -88,30 +88,30 @@ toff_t libtiffStreamSeekProc(thandle_t fd, toff_t off, int i) fin->seekg(off,std::ios::beg); ret = fin->tellg(); if(fin->bad()) - ret = -1; + ret = 0; break; case SEEK_CUR: fin->seekg(off,std::ios::cur); ret = fin->tellg(); if(fin->bad()) - ret = -1; + ret = 0; break; case SEEK_END: fin->seekg(off,std::ios::end); ret = fin->tellg(); if(fin->bad()) - ret = -1; + ret = 0; break; default: - ret = -1; + ret = 0; break; } return ret; } -int libtiffStreamCloseProc(thandle_t fd) +int libtiffStreamCloseProc(thandle_t) { return 0; } @@ -129,7 +129,7 @@ toff_t libtiffStreamSizeProc(thandle_t fd) return size; } -int libtiffStreamMapProc(thandle_t fd, tdata_t*addr, toff_t*len) +int libtiffStreamMapProc(thandle_t, tdata_t*, toff_t*) { return 0; } @@ -162,6 +162,10 @@ simage_tiff_error(char * buffer, int buflen) } + + + + static void tiff_error(const char*, const char*, va_list) {