Fix invalid use of fpos_t

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@293 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/jpgtest.cxx b/jpgtest.cxx
index e5160d321d652e2c50161611a41a8d3efd26a66d..79de5cf9aca38be998ac2ffdb96e4305800449f3 100644 (file)
--- a/jpgtest.cxx
+++ b/jpgtest.cxx
@@ -276,27 +276,26 @@ void dodecomptest(char *filename, BMPPIXELFORMAT pf, int bu, int useppm,
                |(forcesse2?TJ_FORCESSE2:0)|(forcesse3?TJ_FORCESSE3:0)
                |(fastupsample?TJ_FASTUPSAMPLE:0);
        int ps=_ps[pf], pitch;
-       fpos_t size=0;  char *temp=NULL;
+       char *temp=NULL;
 
        flags |= _flags[pf];
        if(bu) flags |= TJ_BOTTOMUP;
 
        if((file=fopen(filename, "rb"))==NULL)
                _throwunix("opening file");
-       if(fseek(file, 0, SEEK_END)<0 || fgetpos(file, &size)<0)
+       if(fseek(file, 0, SEEK_END)<0 || (jpgbufsize=ftell(file))<0)
                _throwunix("determining file size");
-       if((jpegbuf=(unsigned char *)malloc(size))==NULL)
+       if((jpegbuf=(unsigned char *)malloc(jpgbufsize))==NULL)
                _throwunix("allocating memory");
        if(fseek(file, 0, SEEK_SET)<0)
                _throwunix("setting file position");
-       if(fread(jpegbuf, size, 1, file)<1)
+       if(fread(jpegbuf, jpgbufsize, 1, file)<1)
                _throwunix("reading JPEG data");
 
        temp=strrchr(filename, '.');
        if(temp!=NULL) *temp='\0';
 
        if((hnd=tjInitDecompress())==NULL) _throwtj("executing tjInitDecompress()");
-       jpgbufsize=(unsigned long)size;
        if(tjDecompressHeader(hnd, jpegbuf, jpgbufsize, &w, &h)==-1)
                _throwtj("executing tjDecompressHeader()");