Browse Source
Merge pull request #613 from stweil/cov
Fix some issues which were reported by Coverity Scan
pull/615/head
Dan Bloomberg
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with
22 additions and
14 deletions
-
prog/alphaops_reg.c
-
prog/jp2kio_reg.c
-
prog/misctest1.c
-
src/colorcontent.c
-
src/pdfio2.c
-
src/readbarcode.c
|
|
@ -261,12 +261,14 @@ L_REGPARAMS *rp; |
|
|
|
lept_free(data); |
|
|
|
|
|
|
|
/* Test ascii serialization/deserialization of colormap with alpha */ |
|
|
|
fp = fopenWriteStream("/tmp/lept/alpha/cmap.4", "w"); |
|
|
|
pixcmapWriteStream(fp, cmap); |
|
|
|
fclose(fp); |
|
|
|
fp = fopenReadStream("/tmp/lept/alpha/cmap.4"); |
|
|
|
cmap2 = pixcmapReadStream(fp); |
|
|
|
fclose(fp); |
|
|
|
if ((fp = fopenWriteStream("/tmp/lept/alpha/cmap.4", "w")) != NULL) { |
|
|
|
pixcmapWriteStream(fp, cmap); |
|
|
|
fclose(fp); |
|
|
|
} |
|
|
|
if ((fp = fopenReadStream("/tmp/lept/alpha/cmap.4")) != NULL) { |
|
|
|
cmap2 = pixcmapReadStream(fp); |
|
|
|
fclose(fp); |
|
|
|
} |
|
|
|
cmapEqual(cmap, cmap2, 4, &equal); |
|
|
|
regTestCompareValues(rp, TRUE, equal, 0.0); /* 26 */ |
|
|
|
pixcmapDestroy(&cmap2); |
|
|
|
|
|
@ -194,9 +194,10 @@ PIX *pix0, *pix1; |
|
|
|
/* Test write and read using J2K codec */ |
|
|
|
lept_mkdir("lept/jp2k"); |
|
|
|
pix0 = pixRead(fname); |
|
|
|
fp = fopenWriteStream("/tmp/lept/jp2k/wyom.j2k", "wb+"); |
|
|
|
pixWriteStreamJp2k(fp, pix0, 34, 4, L_J2K_CODEC, 0, 0); |
|
|
|
fclose(fp); |
|
|
|
if ((fp = fopenWriteStream("/tmp/lept/jp2k/wyom.j2k", "wb+")) != NULL) { |
|
|
|
pixWriteStreamJp2k(fp, pix0, 34, 4, L_J2K_CODEC, 0, 0); |
|
|
|
fclose(fp); |
|
|
|
} |
|
|
|
pix1 = pixRead("/tmp/lept/jp2k/wyom.j2k"); |
|
|
|
regTestCompareSimilarPix(rp, pix0, pix1, 20, 0.01, 0); /* 16 */ |
|
|
|
pixDisplayWithTitle(pix1, 500, 500, NULL, rp->display); |
|
|
|
|
|
@ -339,8 +339,8 @@ PIXCMAP *cmap, *cmapg; |
|
|
|
pixSetZlibCompression(pixs, 2 * i); |
|
|
|
pixWrite("/tmp/lept/misc/zlibtest.png", pixs, IFF_PNG); |
|
|
|
size = nbytesInFile("/tmp/lept/misc/zlibtest.png"); |
|
|
|
lept_stderr("zlib level = %d, file size = %ld, delta = %d\n", |
|
|
|
2 * i, (unsigned long)size, size - zlibsize[i]); |
|
|
|
lept_stderr("zlib level = %d, file size = %lu, delta = %lu\n", |
|
|
|
2 * i, (unsigned long)size, (unsigned long)(size - zlibsize[i])); |
|
|
|
} |
|
|
|
pixDestroy(&pixs); |
|
|
|
|
|
|
|
|
|
@ -1837,8 +1837,12 @@ l_uint32 *rtab, *gtab, *btab; |
|
|
|
rtab = (l_uint32 *)LEPT_CALLOC(256, sizeof(l_uint32)); |
|
|
|
gtab = (l_uint32 *)LEPT_CALLOC(256, sizeof(l_uint32)); |
|
|
|
btab = (l_uint32 *)LEPT_CALLOC(256, sizeof(l_uint32)); |
|
|
|
if (!rtab || !gtab || !btab) |
|
|
|
if (!rtab || !gtab || !btab) { |
|
|
|
LEPT_FREE(rtab); |
|
|
|
LEPT_FREE(gtab); |
|
|
|
LEPT_FREE(btab); |
|
|
|
return ERROR_INT("calloc fail for tab", procName, 1); |
|
|
|
} |
|
|
|
*prtab = rtab; |
|
|
|
*pgtab = gtab; |
|
|
|
*pbtab = btab; |
|
|
|
|
|
@ -1138,7 +1138,8 @@ FILE *fp; |
|
|
|
} |
|
|
|
|
|
|
|
/* Read the resolution */ |
|
|
|
fp = fopenReadStream(fname); |
|
|
|
if ((fp = fopenReadStream(fname)) == NULL) |
|
|
|
return (L_COMP_DATA *)ERROR_PTR("stream not opened", procName, NULL); |
|
|
|
getTiffResolution(fp, &xres, &yres); |
|
|
|
fclose(fp); |
|
|
|
|
|
|
|
|
|
@ -651,7 +651,7 @@ NUMA *nac, *nad; |
|
|
|
PROCNAME("pixExtractBarcodeWidths1"); |
|
|
|
|
|
|
|
if (pnaehist) *pnaehist = NULL; |
|
|
|
if (pnaohist) *pnaehist = NULL; |
|
|
|
if (pnaohist) *pnaohist = NULL; |
|
|
|
if (!pixs || pixGetDepth(pixs) != 8) |
|
|
|
return (NUMA *)ERROR_PTR("pixs undefined or not 8 bpp", procName, NULL); |
|
|
|
|
|
|
|