diff -ur leptonlib-1.52/src/boxfunc.c leptonlib-1.52.my/src/boxfunc.c --- leptonlib-1.52/src/boxfunc.c 2007-11-25 01:15:24.000000000 +0300 +++ leptonlib-1.52.my/src/boxfunc.c 2007-12-11 13:57:41.000000000 +0300 @@ -1750,7 +1750,7 @@ l_int32 width, l_uint32 val) { -l_int32 n, rval, gval, bval, newindex; +l_int32 rval, gval, bval, newindex; l_int32 mapvacancy; /* true only if cmap and not full */ PIX *pixd; PIXCMAP *cmap; diff -ur leptonlib-1.52/src/colorcontent.c leptonlib-1.52.my/src/colorcontent.c --- leptonlib-1.52/src/colorcontent.c 2007-11-25 01:15:24.000000000 +0300 +++ leptonlib-1.52.my/src/colorcontent.c 2007-12-11 13:57:59.000000000 +0300 @@ -308,7 +308,7 @@ l_int32 type) { l_int32 w, h, d, i, j, wplc, wpld; -l_int32 rval, gval, bval, rdist, gdist, bdist, maxval, colorval; +l_int32 rval, gval, bval, rdist, gdist, bdist, colorval; l_int32 rgdist, rbdist, gbdist, mindist, maxdist; l_int32 *rtab, *gtab, *btab; l_uint32 pixel; diff -ur leptonlib-1.52/src/gplot.c leptonlib-1.52.my/src/gplot.c --- leptonlib-1.52/src/gplot.c 2007-11-25 01:15:24.000000000 +0300 +++ leptonlib-1.52.my/src/gplot.c 2007-12-11 13:59:51.000000000 +0300 @@ -169,7 +169,7 @@ else if (outformat == GPLOT_LATEX) snprintf(buf, L_BUF_SIZE, "%s.tex", rootname); else /* outformat == GPLOT_X11 */ - sprintf(buf, ""); + buf[0] = '\0'; gplot->outname = stringNew(buf); if (title) gplot->title = stringNew(title); if (xlabel) gplot->xlabel = stringNew(xlabel); diff -ur leptonlib-1.52/src/morph.c leptonlib-1.52.my/src/morph.c --- leptonlib-1.52/src/morph.c 2007-11-25 01:15:24.000000000 +0300 +++ leptonlib-1.52.my/src/morph.c 2007-12-11 14:01:51.000000000 +0300 @@ -1692,6 +1692,9 @@ return ((1 << depth) - 1); if (depth == 32) return 0xffffff00; + + /* not reachable */ + return 0; } diff -ur leptonlib-1.52/src/morphseq.c leptonlib-1.52.my/src/morphseq.c --- leptonlib-1.52/src/morphseq.c 2007-11-25 01:15:24.000000000 +0300 +++ leptonlib-1.52.my/src/morphseq.c 2007-12-11 14:02:43.000000000 +0300 @@ -885,7 +885,7 @@ } if (border != 0 && netred != 0) { - fprintf(stderr, "*** border added but net reduction not 0\n", op); + fprintf(stderr, "*** op = %s; border added but net reduction not 0\n", op); valid = FALSE; } return valid; diff -ur leptonlib-1.52/src/parseprotos.c leptonlib-1.52.my/src/parseprotos.c --- leptonlib-1.52/src/parseprotos.c 2007-11-25 01:15:24.000000000 +0300 +++ leptonlib-1.52.my/src/parseprotos.c 2007-12-11 14:03:21.000000000 +0300 @@ -423,7 +423,7 @@ /* Check if a semicolon occurs before a left brace or * a left parenthesis; if so, skip it */ if ((soffsetsc != -1) - && (toffsetsc < toffsetlb) || (toffsetsc < toffsetlp)) { + && ((toffsetsc < toffsetlb) || (toffsetsc < toffsetlp))) { skipToSemicolon(sa, next, 0, &scline); begin = scline + 1; continue; diff -ur leptonlib-1.52/src/pix2.c leptonlib-1.52.my/src/pix2.c --- leptonlib-1.52/src/pix2.c 2007-11-25 01:15:24.000000000 +0300 +++ leptonlib-1.52.my/src/pix2.c 2007-12-11 14:03:57.000000000 +0300 @@ -685,11 +685,11 @@ return 0; } if (d == 1 || - d == 2 && val == 3 || - d == 4 && val == 0xf || - d == 8 && val == 0xff || - d == 16 && val == 0xffff || - d == 32 && ((val ^ 0xffffff00) >> 8 == 0)) { + (d == 2 && val == 3) || + (d == 4 && val == 0xf) || + (d == 8 && val == 0xff) || + (d == 16 && val == 0xffff) || + (d == 32 && ((val ^ 0xffffff00) >> 8 == 0))) { pixSetInRect(pix, box); return 0; } diff -ur leptonlib-1.52/src/pixabasic.c leptonlib-1.52.my/src/pixabasic.c --- leptonlib-1.52/src/pixabasic.c 2007-11-25 01:15:24.000000000 +0300 +++ leptonlib-1.52.my/src/pixabasic.c 2007-12-11 14:04:41.000000000 +0300 @@ -221,7 +221,8 @@ for (i = 0; i < n; i++) { box = boxaGetBox(boxa, i, L_COPY); if (cropwarn) { /* if box is outside pixs, pixd is NULL */ - if (pixd = pixClipRectangle(pixs, box, &boxc)) { /* may be NULL */ + pixd = pixClipRectangle(pixs, box, &boxc); /* may be NULL */ + if (pixd) { pixaAddPix(pixad, pixd, L_INSERT); pixaAddBox(pixad, boxc, L_INSERT); } diff -ur leptonlib-1.52/src/sarray.c leptonlib-1.52.my/src/sarray.c --- leptonlib-1.52/src/sarray.c 2007-11-25 01:15:24.000000000 +0300 +++ leptonlib-1.52.my/src/sarray.c 2007-12-11 14:05:56.000000000 +0300 @@ -470,12 +470,13 @@ PROCNAME("sarrayClear"); if (!sa) - return ERROR_INT("sa not defined", procName, 0); + return ERROR_INT("sa not defined", procName, 1); for (i = 0; i < sa->n; i++) { /* free strings and null ptrs */ FREE(sa->array[i]); sa->array[i] = NULL; } sa->n = 0; + return 0; } diff -ur leptonlib-1.52/src/scalelow.c leptonlib-1.52.my/src/scalelow.c --- leptonlib-1.52/src/scalelow.c 2007-11-25 01:15:25.000000000 +0300 +++ leptonlib-1.52.my/src/scalelow.c 2007-12-11 14:07:38.000000000 +0300 @@ -409,17 +409,17 @@ /* save dest values */ pixel = (rval1 << 24 | gval1 << 16 | bval1 << 8); *(lined + jd) = pixel; /* pix 1 */ - pixel = (((rval1 + rval2) << 23) & 0xff000000 | - ((gval1 + gval2) << 15) & 0x00ff0000 | - ((bval1 + bval2) << 7) & 0x0000ff00); + pixel = ((((rval1 + rval2) << 23) & 0xff000000) | + (((gval1 + gval2) << 15) & 0x00ff0000) | + (((bval1 + bval2) << 7) & 0x0000ff00)); *(lined + jd + 1) = pixel; /* pix 2 */ - pixel = (((rval1 + rval3) << 23) & 0xff000000 | - ((gval1 + gval3) << 15) & 0x00ff0000 | - ((bval1 + bval3) << 7) & 0x0000ff00); + pixel = ((((rval1 + rval3) << 23) & 0xff000000) | + (((gval1 + gval3) << 15) & 0x00ff0000) | + (((bval1 + bval3) << 7) & 0x0000ff00)); *(linedp + jd) = pixel; /* pix 3 */ - pixel = (((rval1 + rval2 + rval3 + rval4) << 22) & 0xff000000 | - ((gval1 + gval2 + gval3 + gval4) << 14) & 0x00ff0000 | - ((bval1 + bval2 + bval3 + bval4) << 6) & 0x0000ff00); + pixel = ((((rval1 + rval2 + rval3 + rval4) << 22) & 0xff000000) | + (((gval1 + gval2 + gval3 + gval4) << 14) & 0x00ff0000) | + (((bval1 + bval2 + bval3 + bval4) << 6) & 0x0000ff00)); *(linedp + jd + 1) = pixel; /* pix 4 */ } /* last src pixel on line */ @@ -432,9 +432,9 @@ pixel = (rval1 << 24 | gval1 << 16 | bval1 << 8); *(lined + 2 * wsm) = pixel; /* pix 1 */ *(lined + 2 * wsm + 1) = pixel; /* pix 2 */ - pixel = (((rval1 + rval3) << 23) & 0xff000000 | - ((gval1 + gval3) << 15) & 0x00ff0000 | - ((bval1 + bval3) << 7) & 0x0000ff00); + pixel = ((((rval1 + rval3) << 23) & 0xff000000) | + (((gval1 + gval3) << 15) & 0x00ff0000) | + (((bval1 + bval3) << 7) & 0x0000ff00)); *(linedp + 2 * wsm) = pixel; /* pix 3 */ *(linedp + 2 * wsm + 1) = pixel; /* pix 4 */ } @@ -455,9 +455,9 @@ pixel = (rval1 << 24 | gval1 << 16 | bval1 << 8); *(lined + jd) = pixel; /* pix 1 */ *(linedp + jd) = pixel; /* pix 2 */ - pixel = (((rval1 + rval2) << 23) & 0xff000000 | - ((gval1 + gval2) << 15) & 0x00ff0000 | - ((bval1 + bval2) << 7) & 0x0000ff00); + pixel = ((((rval1 + rval2) << 23) & 0xff000000) | + (((gval1 + gval2) << 15) & 0x00ff0000) | + (((bval1 + bval2) << 7) & 0x0000ff00)); *(lined + jd + 1) = pixel; /* pix 3 */ *(linedp + jd + 1) = pixel; /* pix 4 */ }