Skip to content

Commit

Permalink
Fix compiler warnings
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.1.x@461 632fc199-4ca6-4c93-a231-07263d6284db
  • Loading branch information
dcommander committed Feb 26, 2011
1 parent b4a50ce commit 0769f50
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 6 deletions.
2 changes: 0 additions & 2 deletions jccolor.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
1 change: 0 additions & 1 deletion jdcolor.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
3 changes: 2 additions & 1 deletion jpgtest.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions turbojpegl.c
Original file line number Diff line number Diff line change
Expand Up @@ -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++)
Expand Down Expand Up @@ -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]);
Expand Down

0 comments on commit 0769f50

Please sign in to comment.