Update libjpeg-turbo to v2.0.1
In order to apply some performance updates from ARM, we need to update
libjpeg-turbo. These performance updates have yielded a 50% speedup on
some devices.
This CL updates our copy of libjpeg-turbo to v2.0.1 and re-applies our
local patches. This patch also deletes some extra files which were not
being used locally.
Update our local patch that was applied to fix http://crbug.com/398235
(https://codereview.appspot.com/229430043/). The original patch
incorrectly removed "& 0xFF" which limited an array index to within
that array's bounds (effectively reverting
https://github.com/libjpeg-turbo/libjpeg-turbo/commit/fa1d18385d904d530b4aec83ab7757a33397de6e).
Restore the mask, making the array access safe and fixing a graphical
glitch which would otherwise be introduced by this change.
Bug:922430
Change-Id: I3860fdb424deecf7a17818ed09a640e632e71f8d
diff --git a/wrtarga.c b/wrtarga.c
index c02b332..9dfa920 100644
--- a/wrtarga.c
+++ b/wrtarga.c
@@ -3,8 +3,8 @@
*
* 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.
+ * libjpeg-turbo Modifications:
+ * Copyright (C) 2017, D. R. Commander.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
*
@@ -45,7 +45,7 @@
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];
@@ -55,15 +55,15 @@
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) {
@@ -79,7 +79,7 @@
}
}
- if (JFWRITE(dinfo->output_file, targaheader, 18) != (size_t) 18)
+ if (JFWRITE(dinfo->output_file, targaheader, 18) != (size_t)18)
ERREXIT(cinfo, JERR_FILE_WRITE);
}
@@ -90,11 +90,11 @@
*/
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 JDIMENSION col;
@@ -102,20 +102,20 @@
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] = (char)GETJSAMPLE(inptr[2]); /* RGB to BGR order */
+ outptr[1] = (char)GETJSAMPLE(inptr[1]);
+ outptr[2] = (char)GETJSAMPLE(inptr[0]);
inptr += 3, outptr += 3;
}
- (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
+ (void)JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
}
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;
@@ -123,9 +123,9 @@
inptr = dest->pub.buffer[0];
outptr = dest->iobuffer;
for (col = cinfo->output_width; col > 0; col--) {
- *outptr++ = (char) GETJSAMPLE(*inptr++);
+ *outptr++ = (char)GETJSAMPLE(*inptr++);
}
- (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
+ (void)JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
}
@@ -135,10 +135,10 @@
*/
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 JSAMPROW color_map0 = cinfo->colormap[0];
@@ -147,9 +147,9 @@
inptr = dest->pub.buffer[0];
outptr = dest->iobuffer;
for (col = cinfo->output_width; col > 0; col--) {
- *outptr++ = (char) GETJSAMPLE(color_map0[GETJSAMPLE(*inptr++)]);
+ *outptr++ = (char)GETJSAMPLE(color_map0[GETJSAMPLE(*inptr++)]);
}
- (void) JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
+ (void)JFWRITE(dest->pub.output_file, dest->iobuffer, dest->buffer_width);
}
@@ -158,9 +158,9 @@
*/
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;
@@ -202,7 +202,7 @@
*/
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);
@@ -212,36 +212,50 @@
/*
+ * 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;
/* 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 */