debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Silence lots of warnings in lib/DtHelp.

Browse Source 
* 64bit warnings
* Missing prototypes
* explicit parentheses / brackets

There's still some work to be done, but, as always, it's a start ...
This commit is contained in:
Pascal Stumpf
2013-07-22 18:44:04 +02:00
committed by Jon Trulson
parent 0c165f56f5
commit 7e0a9517e3
65 changed files with 259 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cde/lib/DtHelp/il/ilimage.c
View File

@@ -292,10 +292,11 @@ register int rowBitAlign, nBits, nSamplesPerPixel, i;
while (nSamplesPerPixel-- > 0) {
nBits = *pNBits++;
if (nBits > 8)
if (nBits > 8) {
if (nBits <= 16)
nBits = 16;
else nBits = 32;
}
if (pYCbCr) {
i = width >> _ilSubsampleShift[pYCbCr->subsampleHoriz];
if (i <= 0) i = 1;
@@ -373,9 +374,9 @@ register ilYCbCrSampleInfo *pYCbCr;
else {
pPixels = (ilPtr)IL_MALLOC (nBytesToAlloc);
if (!pPixels) { /* error; free those already created */
while (plane != 0) {
while ((plane != 0)) {
plane--;
if (pPixels = pImage->i.plane[plane].pPixels)
if ((pPixels = pImage->i.plane[plane].pPixels))
IL_FREE (pPixels);
}
pImage->i.clientPixels = TRUE; /* so IL does not deallocate them */
@@ -500,7 +501,7 @@ ilError error;
}
/* Validate pDes: don't allow user-defined types. */
if (context->error = _ilValidateDesFormat (FALSE, pDes, (ilImageFormat *)NULL))
if ((context->error = _ilValidateDesFormat (FALSE, pDes, (ilImageFormat *)NULL)))
return (ilInternalImage)NULL;
/* Create the object and add it to context. */
@@ -564,7 +565,7 @@ ilError error;
pImage->i.pPalette = (unsigned short *)NULL;
pImage->i.clientPalette = TRUE;
if (error = _ilMallocImagePixels (pImage)) {
if ((error = _ilMallocImagePixels (pImage))) {
ilDestroyObject ((ilObject)pImage);
context->error = error;
return (ilInternalImage)NULL;
@@ -665,7 +666,7 @@ int plane, nPlanes;
}
/* Validate pDes and pFormat: do allow user-defined types. */
if (context->error = _ilValidateDesFormat (TRUE, pInfo->pDes, pInfo->pFormat))
if ((context->error = _ilValidateDesFormat (TRUE, pInfo->pDes, pInfo->pFormat)))
return (ilClientImage)NULL;
/* Create the object and add it to context. */
@@ -733,7 +734,7 @@ int plane, nPlanes;
pImage->i.plane[plane] = pInfo->plane[plane];
}
else { /* no pixels from client; allocate them here if uncompressed image */
if (error = _ilMallocImagePixels (pImage)) {
if ((error = _ilMallocImagePixels (pImage))) {
ilDestroyObject ((ilObject)pImage);
context->error = error;
return (ilClientImage)NULL;