walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed compiler warnings

This commit is contained in:
mpetavy 2018-07-19 10:57:54 +02:00
parent a59512e099
commit 2253ec46e1
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/bin/jp2/convertbmp.c
View File

@ -41,6 +41,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <malloc.h>
#include "openjpeg.h" #include "openjpeg.h"
#include "convert.h" #include "convert.h"
@ -862,6 +863,8 @@ int imagetobmp(opj_image_t * image, const char *outfile)
int i, pad; int i, pad;
FILE *fdest = NULL; FILE *fdest = NULL;
int adjustR, adjustG, adjustB; int adjustR, adjustG, adjustB;
OPJ_UINT8 *pBuffer = (OPJ_UINT8 *) calloc(1, 1024*1024);
OPJ_SIZE_T c = 0;
if (image->comps[0].prec < 8) { if (image->comps[0].prec < 8) {
fprintf(stderr, "imagetobmp: Unsupported precision: %d\n", fprintf(stderr, "imagetobmp: Unsupported precision: %d\n",
@ -995,15 +998,35 @@ int imagetobmp(opj_image_t * image, const char *outfile)
} }
bc = (OPJ_UINT8)b; bc = (OPJ_UINT8)b;
fprintf(fdest, "%c%c%c", bc, gc, rc); if(c >= (malloc_usable_size(pBuffer) - 3)) {
fwrite(pBuffer,1,c,fdest);
c = 0;
}
*(pBuffer + c++) = bc;
*(pBuffer + c++) = gc;
*(pBuffer + c++) = rc;
if ((i + 1) % w == 0) { if ((i + 1) % w == 0) {
for (pad = ((3 * w) % 4) ? (4 - (3 * w) % 4) : 0; pad > 0; pad--) { /* ADD */ for (pad = ((3 * w) % 4) ? (4 - (3 * w) % 4) : 0; pad > 0; pad--) { /* ADD */
fprintf(fdest, "%c", 0);
if(c >= (malloc_usable_size(pBuffer) - 1)) {
fwrite(pBuffer,1,c,fdest);
c = 0;
}
*(pBuffer + c++) = 0;
} }
} }
} }
if(c > 0) {
fwrite(pBuffer,1,c,fdest);
}
fclose(fdest); fclose(fdest);
free(pBuffer);
} else { /* Gray-scale */ } else { /* Gray-scale */
/* -->> -->> -->> -->> /* -->> -->> -->> -->>
@ -1103,4 +1126,4 @@ int imagetobmp(opj_image_t * image, const char *outfile)
} }
return 0; return 0;
} }