ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tjLoadImage(): return TJPF_GRAY for grayscale BMPs

Browse Source 
... if *pixelFormat=TJPF_UNKNOWN is passed to the function.
This commit is contained in:
DRC
2017-11-19 08:43:07 -06:00
parent 479fa1d870
commit e817c07779
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rdbmp.c
View File

@@ -133,6 +133,9 @@ read_colormap (bmp_source_ptr sinfo, int cmaplen, int mapentrysize)
break; break;
} }
if (sinfo->cinfo->in_color_space == JCS_UNKNOWN && gray)
sinfo->cinfo->in_color_space = JCS_GRAYSCALE;
if (sinfo->cinfo->in_color_space == JCS_GRAYSCALE && !gray) if (sinfo->cinfo->in_color_space == JCS_GRAYSCALE && !gray)
ERREXIT(sinfo->cinfo, JERR_BAD_IN_COLORSPACE); ERREXIT(sinfo->cinfo, JERR_BAD_IN_COLORSPACE);
} }

18
tjunittest.c
View File

@@ -792,7 +792,7 @@ int doBmpTest(const char *ext, int width, int align, int height, int pf,
{ {
char filename[80], *md5sum, md5buf[65]; char filename[80], *md5sum, md5buf[65];
int ps=tjPixelSize[pf], pitch=PAD(width*ps, align), int ps=tjPixelSize[pf], pitch=PAD(width*ps, align),
loadWidth=0, loadHeight=0, retval=0; loadWidth=0, loadHeight=0, retval=0, pixelFormat=pf;
unsigned char *buf=NULL; unsigned char *buf=NULL;
char *md5ref; char *md5ref;
@@ -858,6 +858,22 @@ int doBmpTest(const char *ext, int width, int align, int height, int pf,
retval=-1; goto bailout; retval=-1; goto bailout;
} }
} }
/* Verify that tjLoadImage() returns the proper "preferred" pixel format for
the file type. */
tjFree(buf); buf=NULL;
pf=pixelFormat;
pixelFormat=TJPF_UNKNOWN;
if((buf=tjLoadImage(filename, &loadWidth, align, &loadHeight, &pixelFormat,
flags))==NULL)
_throwtj();
if((pf==TJPF_GRAY && pixelFormat!=TJPF_GRAY) ||
(pf!=TJPF_GRAY && !strcasecmp(ext, "bmp") && pixelFormat!=TJPF_BGR) ||
(pf!=TJPF_GRAY && !strcasecmp(ext, "ppm") && pixelFormat!=TJPF_RGB))
{
printf("\n tjLoadImage() returned unexpected pixel format: %s\n",
pixFormatStr[pixelFormat]);
retval=-1;
}
unlink(filename); unlink(filename);
bailout: bailout: