50 lines
1.7 KiB
Diff
50 lines
1.7 KiB
Diff
diff -rupN openjpeg-2.3.0/src/bin/jp2/convertbmp.c openjpeg-2.3.0-new/src/bin/jp2/convertbmp.c
|
|
--- openjpeg-2.3.0/src/bin/jp2/convertbmp.c 2018-12-20 10:51:16.451336040 +0100
|
|
+++ openjpeg-2.3.0-new/src/bin/jp2/convertbmp.c 2018-12-20 10:51:16.491335949 +0100
|
|
@@ -534,14 +534,14 @@ static OPJ_BOOL bmp_read_raw_data(FILE*
|
|
static OPJ_BOOL bmp_read_rle8_data(FILE* IN, OPJ_UINT8* pData,
|
|
OPJ_UINT32 stride, OPJ_UINT32 width, OPJ_UINT32 height)
|
|
{
|
|
- OPJ_UINT32 x, y;
|
|
+ OPJ_UINT32 x, y, written;
|
|
OPJ_UINT8 *pix;
|
|
const OPJ_UINT8 *beyond;
|
|
|
|
beyond = pData + stride * height;
|
|
pix = pData;
|
|
|
|
- x = y = 0U;
|
|
+ x = y = written = 0U;
|
|
while (y < height) {
|
|
int c = getc(IN);
|
|
if (c == EOF) {
|
|
@@ -561,6 +561,7 @@ static OPJ_BOOL bmp_read_rle8_data(FILE*
|
|
for (j = 0; (j < c) && (x < width) &&
|
|
((OPJ_SIZE_T)pix < (OPJ_SIZE_T)beyond); j++, x++, pix++) {
|
|
*pix = c1;
|
|
+ written++;
|
|
}
|
|
} else {
|
|
c = getc(IN);
|
|
@@ -598,6 +599,7 @@ static OPJ_BOOL bmp_read_rle8_data(FILE*
|
|
}
|
|
c1 = (OPJ_UINT8)c1_int;
|
|
*pix = c1;
|
|
+ written++;
|
|
}
|
|
if ((OPJ_UINT32)c & 1U) { /* skip padding byte */
|
|
c = getc(IN);
|
|
@@ -608,6 +610,12 @@ static OPJ_BOOL bmp_read_rle8_data(FILE*
|
|
}
|
|
}
|
|
}/* while() */
|
|
+
|
|
+ if (written != width * height) {
|
|
+ fprintf(stderr, "warning, image's actual size does not match advertized one\n");
|
|
+ return OPJ_FALSE;
|
|
+ }
|
|
+
|
|
return OPJ_TRUE;
|
|
}
|
|
|