*
* This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-1996, Thomas G. Lane.
- * It was modified by The libjpeg-turbo Project to include only code and
- * information relevant to libjpeg-turbo.
- * For conditions of distribution and use, see the accompanying README file.
+ * libjpeg-turbo Modifications:
+ * Copyright (C) 2017, 2019, 2022, D. R. Commander.
+ * For conditions of distribution and use, see the accompanying README.ijg
+ * file.
*
* This file contains routines to write output images in Targa format.
*
JDIMENSION buffer_width; /* width of one row */
} tga_dest_struct;
-typedef tga_dest_struct * tga_dest_ptr;
+typedef tga_dest_struct *tga_dest_ptr;
LOCAL(void)
-write_header (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo, int num_colors)
+write_header(j_decompress_ptr cinfo, djpeg_dest_ptr dinfo, int num_colors)
/* Create and write a Targa header */
{
char targaheader[18];
/* Set unused fields of header to 0 */
- MEMZERO(targaheader, sizeof(targaheader));
+ memset(targaheader, 0, sizeof(targaheader));
if (num_colors > 0) {
targaheader[1] = 1; /* color map type 1 */
- targaheader[5] = (char) (num_colors & 0xFF);
- targaheader[6] = (char) (num_colors >> 8);
+ targaheader[5] = (char)(num_colors & 0xFF);
+ targaheader[6] = (char)(num_colors >> 8);
targaheader[7] = 24; /* 24 bits per cmap entry */
}
- targaheader[12] = (char) (cinfo->output_width & 0xFF);
- targaheader[13] = (char) (cinfo->output_width >> 8);
- targaheader[14] = (char) (cinfo->output_height & 0xFF);
- targaheader[15] = (char) (cinfo->output_height >> 8);
+ targaheader[12] = (char)(cinfo->output_width & 0xFF);
+ targaheader[13] = (char)(cinfo->output_width >> 8);
+ targaheader[14] = (char)(cinfo->output_height & 0xFF);
+ targaheader[15] = (char)(cinfo->output_height >> 8);
targaheader[17] = 0x20; /* Top-down, non-interlaced */
if (cinfo->out_color_space == JCS_GRAYSCALE) {
}
}
- if (JFWRITE(dinfo->output_file, targaheader, 18) != (size_t) 18)
+ if (fwrite(targaheader, 1, 18, dinfo->output_file) != (size_t)18)
ERREXIT(cinfo, JERR_FILE_WRITE);
}
*/
METHODDEF(void)
-put_pixel_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
- JDIMENSION rows_supplied)
+put_pixel_rows(j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+ JDIMENSION rows_supplied)
/* used for unquantized full-color output */
{
- tga_dest_ptr dest = (tga_dest_ptr) dinfo;
+ tga_dest_ptr dest = (tga_dest_ptr)dinfo;
register JSAMPROW inptr;
- register char * outptr;
+ register char *outptr;
register JDIMENSION col;
inptr = dest->pub.buffer[0];
outptr = dest->iobuffer;
for (col = cinfo->output_width; col > 0; col--) {
- outptr[0] = (char) GETJSAMPLE(inptr[2]); /* RGB to BGR order */
- outptr[1] = (char) GETJSAMPLE(inptr[1]);
- outptr[2] = (char) GETJSAMPLE(inptr[0]);
+ outptr[0] = inptr[2]; /* RGB to BGR order */
+ outptr[1] = inptr[1];
+ outptr[2] = inptr[0];
inptr += 3, outptr += 3;
}
- (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
+ fwrite(dest->iobuffer, 1, dest->buffer_width, dest->pub.output_file);
}
METHODDEF(void)
-put_gray_rows (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
- JDIMENSION rows_supplied)
+put_gray_rows(j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+ JDIMENSION rows_supplied)
/* used for grayscale OR quantized color output */
{
- tga_dest_ptr dest = (tga_dest_ptr) dinfo;
+ tga_dest_ptr dest = (tga_dest_ptr)dinfo;
register JSAMPROW inptr;
- register char * outptr;
- register JDIMENSION col;
+ register char *outptr;
inptr = dest->pub.buffer[0];
outptr = dest->iobuffer;
- for (col = cinfo->output_width; col > 0; col--) {
- *outptr++ = (char) GETJSAMPLE(*inptr++);
- }
- (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
+ memcpy(outptr, inptr, cinfo->output_width);
+ fwrite(dest->iobuffer, 1, dest->buffer_width, dest->pub.output_file);
}
*/
METHODDEF(void)
-put_demapped_gray (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
- JDIMENSION rows_supplied)
+put_demapped_gray(j_decompress_ptr cinfo, djpeg_dest_ptr dinfo,
+ JDIMENSION rows_supplied)
{
- tga_dest_ptr dest = (tga_dest_ptr) dinfo;
+ tga_dest_ptr dest = (tga_dest_ptr)dinfo;
register JSAMPROW inptr;
- register char * outptr;
+ register char *outptr;
register JSAMPROW color_map0 = cinfo->colormap[0];
register JDIMENSION col;
inptr = dest->pub.buffer[0];
outptr = dest->iobuffer;
for (col = cinfo->output_width; col > 0; col--) {
- *outptr++ = (char) GETJSAMPLE(color_map0[GETJSAMPLE(*inptr++)]);
+ *outptr++ = color_map0[*inptr++];
}
- (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
+ fwrite(dest->iobuffer, 1, dest->buffer_width, dest->pub.output_file);
}
*/
METHODDEF(void)
-start_output_tga (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
+start_output_tga(j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
{
- tga_dest_ptr dest = (tga_dest_ptr) dinfo;
+ tga_dest_ptr dest = (tga_dest_ptr)dinfo;
int num_colors, i;
FILE *outfile;
/* Write the colormap. Note Targa uses BGR byte order */
outfile = dest->pub.output_file;
for (i = 0; i < num_colors; i++) {
- putc(GETJSAMPLE(cinfo->colormap[2][i]), outfile);
- putc(GETJSAMPLE(cinfo->colormap[1][i]), outfile);
- putc(GETJSAMPLE(cinfo->colormap[0][i]), outfile);
+ putc(cinfo->colormap[2][i], outfile);
+ putc(cinfo->colormap[1][i], outfile);
+ putc(cinfo->colormap[0][i], outfile);
}
dest->pub.put_pixel_rows = put_gray_rows;
} else {
*/
METHODDEF(void)
-finish_output_tga (j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
+finish_output_tga(j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
{
/* Make sure we wrote the output file OK */
fflush(dinfo->output_file);
/*
+ * Re-calculate buffer dimensions based on output dimensions.
+ */
+
+METHODDEF(void)
+calc_buffer_dimensions_tga(j_decompress_ptr cinfo, djpeg_dest_ptr dinfo)
+{
+ tga_dest_ptr dest = (tga_dest_ptr)dinfo;
+
+ dest->buffer_width = cinfo->output_width * cinfo->output_components;
+}
+
+
+/*
* The module selection routine for Targa format output.
*/
GLOBAL(djpeg_dest_ptr)
-jinit_write_targa (j_decompress_ptr cinfo)
+jinit_write_targa(j_decompress_ptr cinfo)
{
tga_dest_ptr dest;
+ if (cinfo->data_precision != 8)
+ ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision);
+
/* Create module interface object, fill in method pointers */
dest = (tga_dest_ptr)
- (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
- sizeof(tga_dest_struct));
+ (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE,
+ sizeof(tga_dest_struct));
dest->pub.start_output = start_output_tga;
dest->pub.finish_output = finish_output_tga;
+ dest->pub.calc_buffer_dimensions = calc_buffer_dimensions_tga;
/* Calculate output image dimensions so we can allocate space */
jpeg_calc_output_dimensions(cinfo);
/* Create I/O buffer. */
- dest->buffer_width = cinfo->output_width * cinfo->output_components;
+ dest->pub.calc_buffer_dimensions(cinfo, (djpeg_dest_ptr)dest);
dest->iobuffer = (char *)
- (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
- (size_t) (dest->buffer_width * sizeof(char)));
+ (*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE,
+ (size_t)(dest->buffer_width * sizeof(char)));
/* Create decompressor output buffer. */
dest->pub.buffer = (*cinfo->mem->alloc_sarray)
- ((j_common_ptr) cinfo, JPOOL_IMAGE, dest->buffer_width, (JDIMENSION) 1);
+ ((j_common_ptr)cinfo, JPOOL_IMAGE, dest->buffer_width, (JDIMENSION)1);
dest->pub.buffer_height = 1;
- return (djpeg_dest_ptr) dest;
+ return (djpeg_dest_ptr)dest;
}
#endif /* TARGA_SUPPORTED */
projects / platform / upstream / libjpeg-turbo.git / blobdiff