Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix format strings and unneeded assignment #638

Merged
merged 1 commit into from
Oct 21, 2015
Merged

Fix format strings and unneeded assignment #638

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/bin/jp2/convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,7 +1255,7 @@ int imagetopgx(opj_image_t * image, const char *outfile)
}
}
strncpy(name, outfile, dotpos);
sprintf(name+dotpos, "_%d.pgx", compno);
sprintf(name+dotpos, "_%u.pgx", compno);
fdest = fopen(name, "wb");
/* don't need name anymore */

Expand Down Expand Up @@ -1339,7 +1339,7 @@ static char *skip_int(char *start, int *out_n)
char *s;
char c;

*out_n = 0; s = start;
*out_n = 0;

s = skip_white(start);
if(s == NULL) return NULL;
Expand Down Expand Up @@ -1812,7 +1812,7 @@ int imagetopnm(opj_image_t * image, const char *outfile, int force_split)
{
const char *tt = (triple?"RGB_ALPHA":"GRAYSCALE_ALPHA");

fprintf(fdest, "P7\n# OpenJPEG-%s\nWIDTH %d\nHEIGHT %d\nDEPTH %d\n"
fprintf(fdest, "P7\n# OpenJPEG-%s\nWIDTH %d\nHEIGHT %d\nDEPTH %u\n"
"MAXVAL %d\nTUPLTYPE %s\nENDHDR\n", opj_version(),
wr, hr, ncomp, max, tt);
alpha = image->comps[ncomp - 1].data;
Expand Down Expand Up @@ -1918,7 +1918,7 @@ if(v > 65535) v = 65535; else if(v < 0) v = 0;
const size_t dotpos = olen - 4;

strncpy(destname, outfile, dotpos);
sprintf(destname+dotpos, "_%d.pgm", compno);
sprintf(destname+dotpos, "_%u.pgm", compno);
}
else
sprintf(destname, "%s", outfile);
Expand Down Expand Up @@ -2155,7 +2155,7 @@ static int imagetoraw_common(opj_image_t * image, const char *outfile, OPJ_BOOL

for(compno = 0; compno < image->numcomps; compno++)
{
fprintf(stdout,"Component %d characteristics: %dx%dx%d %s\n", compno, image->comps[compno].w,
fprintf(stdout,"Component %u characteristics: %dx%dx%d %s\n", compno, image->comps[compno].w,
image->comps[compno].h, image->comps[compno].prec, image->comps[compno].sgnd==1 ? "signed": "unsigned");

w = (int)image->comps[compno].w;
Expand Down