FreeBSD 10 clang port

This commit is contained in:
Ulrich Wilkens
2014-07-27 16:48:57 +02:00
committed by Jon Trulson
parent 8d0551bfda
commit c3f74eec17
99 changed files with 510 additions and 366 deletions

View File

@@ -914,12 +914,12 @@ int scaledX, scaledY ;
nSrcLines = *pNLines;
if (nSrcLines <= 0)
return; /* no lines, EXIT */
return 0; /* no lines, EXIT */
pPriv = (ilXPrivPtr)pData->pPrivate;
pSrcImage = pData->pSrcImage;
width = pSrcImage->width;
if (width <= 0)
return; /* no width, EXIT */
return 0; /* no width, EXIT */
srcRowBytes = pSrcImage->plane[0].nBytesPerRow;
pSrcLine = (ilPtr)(pSrcImage->plane[0].pPixels +
pData->srcLine * srcRowBytes);

View File

@@ -242,7 +242,7 @@ register int shift, bitNumber;
nLines = *pNLines;
if (nLines <= 0)
return; /* no lines, EXIT */
return 0; /* no lines, EXIT */
if (pPriv->srcBufferHeight)
bottomLine = pPriv->srcBufferHeight - 1;
else bottomLine = pData->srcLine + nLines - 1;

View File

@@ -619,11 +619,11 @@ register ilImagePtr pImage;
pImage = (ilImagePtr)image;
if (mustBeZero != 0) {
pImage->o.p.context->error = IL_ERROR_PAR_NOT_ZERO;
return; /* EXIT */
return 0; /* EXIT */
}
if (pImage->o.p.objectType != IL_INTERNAL_IMAGE) {
pImage->o.p.context->error = IL_ERROR_OBJECT_TYPE;
return; /* EXIT */
return 0; /* EXIT */
}
pImage->o.p.context->error = IL_OK;

View File

@@ -106,10 +106,10 @@ register long nLines, nPixels;
dstnbytes = pPriv->dstRowBytes;
pdstline = pPriv->pDstPixels + dstLine * dstnbytes;
if (pPriv->nPixels < 0) return;
if (pPriv->nPixels < 0) return 0;
nLines = *pNLines;
if (nLines <= 0) return;
if (nLines <= 0) return 0;
while ( nLines-- > 0 ) {
psrc = psrcline;

View File

@@ -86,11 +86,11 @@ register ilPtr pSrc, pDst, pTranslate;
pPriv = (ilMapPrivPtr)pData->pPrivate;
nRowsM1 = pPriv->width;
if (nRowsM1 <= 0)
return;
return 0;
nRowsM1--;
nLinesM1 = *pNLines;
if (nLinesM1 <= 0)
return;
return 0;
nLinesM1--;
srcRowBytes = pPriv->srcRowBytes;
@@ -135,11 +135,11 @@ register ilPtr pSrc, pDst, pTranslate;
pPriv = (ilMapPrivPtr)pData->pPrivate;
nRowsM1 = pPriv->width;
if (nRowsM1 <= 0)
return;
return 0;
nRowsM1--;
nLinesM1 = *pNLines;
if (nLinesM1 <= 0)
return;
return 0;
nLinesM1--;
srcRowBytes = pPriv->srcRowBytes;

View File

@@ -159,10 +159,10 @@ register long nLinesM1, nPixelsM1Temp;
nPixelsM1 = pPriv->nPixelsM1;
if (nPixelsM1 < 0)
return;
return 0;
nLinesM1 = *pNLines;
if (nLinesM1 <= 0)
return;
return 0;
nLinesM1--;
/* For each src byte: get a long from the cvt'd palette table, then take

View File

@@ -141,10 +141,10 @@ register INT32 i;
dstnbytes = pPriv->dstRowBytes;
pdstline = pPriv->pDstPixels + dstLine * dstnbytes;
if (pPriv->nPixels < 0) return;
if (pPriv->nPixels < 0) return 0;
nLines = *pNLines;
if (nLines <= 0) return;
if (nLines <= 0) return 0;
while ( nLines-- > 0 ) {

View File

@@ -327,11 +327,11 @@ ilImagePlaneInfo *pPlane;
/* Set nPixels/LinesM1 to # pixels / lines - 1; exit if either 0. */
nPixelsM1Init = pData->pSrcImage->width;
if (nPixelsM1Init <= 0)
return;
return 0;
nPixelsM1Init--;
nLinesM1 = *pNLines;
if (nLinesM1 <= 0)
return;
return 0;
nLinesM1--;
/* Point pY/Cb/CrLine to 1st line in src planes; pDstLine to 1st line in dst.
@@ -420,11 +420,11 @@ ilImagePlaneInfo *pPlane;
/* Set nPixels/LinesM1 to # pixels / lines - 1; exit if either 0. */
nPixelsM1Init = pData->pSrcImage->width;
if (nPixelsM1Init <= 0)
return;
return 0;
nPixelsM1Init--;
nLinesM1 = *pNLines;
if (nLinesM1 <= 0)
return;
return 0;
nLinesM1--;
/* Point pY/Cb/CrLine to 1st line in src planes; pDstLine to 1st line in dst.
@@ -1161,11 +1161,11 @@ register long R, G, B, pixel;
pPriv = (ilRGBToYCbCrPrivPtr)pData->pPrivate;
nPixelsM1Init = pData->pSrcImage->width;
if (nPixelsM1Init <= 0)
return;
return 0;
nPixelsM1Init--;
nLinesM1 = *pNLines;
if (nLinesM1 <= 0)
return;
return 0;
nLinesM1--;
/* Point pSrcLine to first line of src RGB (pixel-order) data; point