Fix compiler warnings

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

diff --git a/jccolor.c b/jccolor.c
index 5c186d42c907aa0fdce12330f253cc3df70d9cad..73969901dcd8e05793f3b940b6f4f0ad8720238a 100644 (file)
--- a/jccolor.c
+++ b/jccolor.c
@@ -258,14 +258,12 @@ rgb_gray_convert (j_compress_ptr cinfo,
                  JSAMPARRAY input_buf, JSAMPIMAGE output_buf,
                  JDIMENSION output_row, int num_rows)
 {
-  my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
   #if BITS_IN_JSAMPLE != 8
   register INT32 * ctab = cconvert->rgb_ycc_tab;
   #endif
   register JSAMPROW inptr;
   register JSAMPROW outptr;
   JSAMPLE *maxoutptr;
-  register JDIMENSION col;
   JDIMENSION num_cols = cinfo->image_width;
   int rindex = rgb_red[cinfo->in_color_space];
   int gindex = rgb_green[cinfo->in_color_space];

diff --git a/jdcolor.c b/jdcolor.c
index e02ea4f9d39aaef0ad5ce9bd6144da470dce199b..bc73b3f4621ed45936b24cdbbf90d1a8d7138d97 100644 (file)
--- a/jdcolor.c
+++ b/jdcolor.c
@@ -223,7 +223,6 @@ gray_rgb_convert (j_decompress_ptr cinfo,
 {
   register JSAMPROW inptr, outptr;
   JSAMPLE *maxinptr;
-  register JDIMENSION col;
   JDIMENSION num_cols = cinfo->output_width;
   int rindex = rgb_red[cinfo->out_color_space];
   int gindex = rgb_green[cinfo->out_color_space];

diff --git a/jpgtest.c b/jpgtest.c
index ef5eaf91797c5dff2bb5e5c390154550c8d625a6..cac5ce3f2bfe8804197aa96ecdf381c7eff364fd 100644 (file)
--- a/jpgtest.c
+++ b/jpgtest.c
@@ -69,7 +69,8 @@ void dotest(unsigned char *srcbuf, int w, int h, int pf, int bu,
        FILE *outfile=NULL;  tjhandle hnd=NULL;
        unsigned char **jpegbuf=NULL, *rgbbuf=NULL;
        double start, elapsed;
-       int jpgbufsize=0, i, j, tilesizex, tilesizey, numtilesx, numtilesy, ITER;
+       int jpgbufsize=0, i, j, tilesizex=w, tilesizey=h, numtilesx=1, numtilesy=1,
+               ITER;
        unsigned long *comptilesize=NULL;
        int flags=(forcemmx?TJ_FORCEMMX:0)|(forcesse?TJ_FORCESSE:0)
                |(forcesse2?TJ_FORCESSE2:0)|(forcesse3?TJ_FORCESSE3:0)

diff --git a/turbojpegl.c b/turbojpegl.c
index 94af6d73479242b94ed52d17d88208e004d372e5..8e3f2b09a158f1fb5379b8c9c7f988c2347610d3 100644 (file)
--- a/turbojpegl.c
+++ b/turbojpegl.c
@@ -531,7 +531,6 @@ DLLEXPORT int DLLCALL tjDecompress(tjhandle h,
                        ptr=_tmpbuf;
                        for(i=0; i<dinfo->num_components; i++)
                        {
-                               jpeg_component_info *compptr=&dinfo->comp_info[i];
                                if((tmpbuf[i]=(JSAMPROW *)malloc(sizeof(JSAMPROW)*th[i]))==NULL)
                                        _throw("Memory allocation failed in tjDecompress()");
                                for(row=0; row<th[i]; row++)
@@ -595,7 +594,6 @@ DLLEXPORT int DLLCALL tjDecompress(tjhandle h,
                                int j;
                                for(i=0; i<dinfo->num_components; i++)
                                {
-                                       jpeg_component_info *compptr=&dinfo->comp_info[i];
                                        for(j=0; j<min(th[i], ch[i]-crow[i]); j++)
                                        {
                                                memcpy(outbuf[i][crow[i]+j], tmpbuf[i][j], cw[i]);