rdppm.c - Issue 1934113002: Update libjpeg_turbo to 1.4.90 from https://github.com/libjpeg-turbo/

Unified Diff: rdppm.c

Issue 1934113002: Update libjpeg_turbo to 1.4.90 from https://github.com/libjpeg-turbo/ (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@master

Patch Set: Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: rdppm.c

diff --git a/rdppm.c b/rdppm.c

index a7570227ce90a716058e9f1b8a0a3cbcf82fdf7d..aef49239384f48e2d9499dbf6e49f5c39a653681 100644

--- a/rdppm.c

+++ b/rdppm.c

@@ -1,10 +1,13 @@

* rdppm.c

+ * This file was part of the Independent JPEG Group's software:

* Modified 2009 by Bill Allombert, Guido Vollbeding.

- * This file is part of the Independent JPEG Group's software.

- * For conditions of distribution and use, see the accompanying README file.

+ * libjpeg-turbo Modifications:

+ * For conditions of distribution and use, see the accompanying README.ijg

+ * file.

* This file contains routines to read input images in PPM/PGM format.

* The extended 2-byte-per-sample raw PPM/PGM formats are supported.

@@ -19,7 +22,7 @@

* the file is indeed PPM format).

-#include "cdjpeg.h" /* Common decls for cjpeg/djpeg applications */

+#include "cdjpeg.h" /* Common decls for cjpeg/djpeg applications */

#ifdef PPM_SUPPORTED

@@ -41,30 +44,19 @@

#ifdef HAVE_UNSIGNED_CHAR

typedef unsigned char U_CHAR;

-#define UCH(x) ((int) (x))

+#define UCH(x) ((int) (x))

#else /* !HAVE_UNSIGNED_CHAR */

-#ifdef CHAR_IS_UNSIGNED

+#ifdef __CHAR_UNSIGNED__

typedef char U_CHAR;

-#define UCH(x) ((int) (x))

+#define UCH(x) ((int) (x))

#else

typedef char U_CHAR;

-#define UCH(x) ((int) (x) & 0xFF)

+#define UCH(x) ((int) (x) & 0xFF)

#endif

#endif /* HAVE_UNSIGNED_CHAR */

-#define ReadOK(file,buffer,len) (JFREAD(file,buffer,len) == ((size_t) (len)))

-/*

- * On most systems, reading individual bytes with getc() is drastically less

- * efficient than buffering a row at a time with fread(). On PCs, we must

- * allocate the buffer in near data space, because we are assuming small-data

- * memory model, wherein fread() can't reach far memory. If you need to

- * process very wide images on a PC, you might have to compile in large-memory

- * model, or else replace fread() with a getc() loop --- which will be much

- * slower.

- */

+#define ReadOK(file,buffer,len) (JFREAD(file,buffer,len) == ((size_t) (len)))

/* Private version of data source object */

@@ -72,17 +64,19 @@ typedef char U_CHAR;

typedef struct {

struct cjpeg_source_struct pub; /* public fields */

- U_CHAR *iobuffer; /* non-FAR pointer to I/O buffer */

- JSAMPROW pixrow; /* FAR pointer to same */

- size_t buffer_width; /* width of I/O buffer */

- JSAMPLE *rescale; /* => maxval-remapping array, or NULL */

+ /* Usually these two pointers point to the same place: */

+ U_CHAR *iobuffer; /* fread's I/O buffer */

+ JSAMPROW pixrow; /* compressor input buffer */

+ size_t buffer_width; /* width of I/O buffer */

+ JSAMPLE *rescale; /* => maxval-remapping array, or NULL */

+ int maxval;

} ppm_source_struct;

-typedef ppm_source_struct * ppm_source_ptr;

+typedef ppm_source_struct *ppm_source_ptr;

LOCAL(int)

-pbm_getc (FILE * infile)

+pbm_getc (FILE *infile)

/* Read next char, skipping over any comments */

/* A comment/newline sequence is returned as a newline */

{

@@ -99,7 +93,7 @@ pbm_getc (FILE * infile)

LOCAL(unsigned int)

-read_pbm_integer (j_compress_ptr cinfo, FILE * infile)

+read_pbm_integer (j_compress_ptr cinfo, FILE *infile, unsigned int maxval)

/* Read an unsigned decimal integer from the PPM file */

/* Swallows one trailing character after the integer */

/* Note that on a 16-bit-int machine, only values up to 64k can be read. */

@@ -123,6 +117,10 @@ read_pbm_integer (j_compress_ptr cinfo, FILE * infile)

val *= 10;

val += ch - '0';

}

+ if (val > maxval)

+ ERREXIT(cinfo, JERR_PPM_TOOLARGE);

return val;

}

@@ -143,14 +141,15 @@ get_text_gray_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

/* This version is for reading text-format PGM files with any maxval */

{

ppm_source_ptr source = (ppm_source_ptr) sinfo;

- FILE * infile = source->pub.input_file;

+ FILE *infile = source->pub.input_file;

JDIMENSION col;

+ unsigned int maxval = source->maxval;

ptr = source->pub.buffer[0];

for (col = cinfo->image_width; col > 0; col--) {

- *ptr++ = rescale[read_pbm_integer(cinfo, infile)];

+ *ptr++ = rescale[read_pbm_integer(cinfo, infile, maxval)];

}

return 1;

}

@@ -161,16 +160,17 @@ get_text_rgb_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

/* This version is for reading text-format PPM files with any maxval */

{

ppm_source_ptr source = (ppm_source_ptr) sinfo;

- FILE * infile = source->pub.input_file;

+ FILE *infile = source->pub.input_file;

JDIMENSION col;

+ unsigned int maxval = source->maxval;

ptr = source->pub.buffer[0];

for (col = cinfo->image_width; col > 0; col--) {

- *ptr++ = rescale[read_pbm_integer(cinfo, infile)];

+ *ptr++ = rescale[read_pbm_integer(cinfo, infile, maxval)];

}

return 1;

}

@@ -182,7 +182,7 @@ get_scaled_gray_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

{

ppm_source_ptr source = (ppm_source_ptr) sinfo;

- register U_CHAR * bufferptr;

+ register U_CHAR *bufferptr;

JDIMENSION col;

@@ -203,7 +203,7 @@ get_scaled_rgb_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

{

ppm_source_ptr source = (ppm_source_ptr) sinfo;

- register U_CHAR * bufferptr;

+ register U_CHAR *bufferptr;

JDIMENSION col;

@@ -241,7 +241,7 @@ get_word_gray_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

{

ppm_source_ptr source = (ppm_source_ptr) sinfo;

- register U_CHAR * bufferptr;

+ register U_CHAR *bufferptr;

JDIMENSION col;

@@ -265,7 +265,7 @@ get_word_rgb_row (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

{

ppm_source_ptr source = (ppm_source_ptr) sinfo;

- register U_CHAR * bufferptr;

+ register U_CHAR *bufferptr;

JDIMENSION col;

@@ -308,10 +308,10 @@ start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

/* detect unsupported variants (ie, PBM) before trying to read header */

switch (c) {

- case '2': /* it's a text-format PGM file */

- case '3': /* it's a text-format PPM file */

- case '5': /* it's a raw-format PGM file */

- case '6': /* it's a raw-format PPM file */

+ case '2': /* it's a text-format PGM file */

+ case '3': /* it's a text-format PPM file */

+ case '5': /* it's a raw-format PGM file */

+ case '6': /* it's a raw-format PPM file */

break;

default:

ERREXIT(cinfo, JERR_PPM_NOT);

@@ -319,9 +319,9 @@ start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

}

/* fetch the remaining header info */

- w = read_pbm_integer(cinfo, source->pub.input_file);

- h = read_pbm_integer(cinfo, source->pub.input_file);

- maxval = read_pbm_integer(cinfo, source->pub.input_file);

+ w = read_pbm_integer(cinfo, source->pub.input_file, 65535);

+ h = read_pbm_integer(cinfo, source->pub.input_file, 65535);

+ maxval = read_pbm_integer(cinfo, source->pub.input_file, 65535);

if (w <= 0 || h <= 0 || maxval <= 0) /* error check */

ERREXIT(cinfo, JERR_PPM_NOT);

@@ -329,14 +329,15 @@ start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

cinfo->data_precision = BITS_IN_JSAMPLE; /* we always rescale data to this */

cinfo->image_width = (JDIMENSION) w;

cinfo->image_height = (JDIMENSION) h;

+ source->maxval = maxval;

/* initialize flags to most common settings */

- need_iobuffer = TRUE; /* do we need an I/O buffer? */

- use_raw_buffer = FALSE; /* do we map input buffer onto I/O buffer? */

- need_rescale = TRUE; /* do we need a rescale array? */

+ need_iobuffer = TRUE; /* do we need an I/O buffer? */

+ use_raw_buffer = FALSE; /* do we map input buffer onto I/O buffer? */

+ need_rescale = TRUE; /* do we need a rescale array? */

switch (c) {

- case '2': /* it's a text-format PGM file */

+ case '2': /* it's a text-format PGM file */

cinfo->input_components = 1;

cinfo->in_color_space = JCS_GRAYSCALE;

TRACEMS2(cinfo, 1, JTRC_PGM_TEXT, w, h);

@@ -344,7 +345,7 @@ start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

need_iobuffer = FALSE;

break;

- case '3': /* it's a text-format PPM file */

+ case '3': /* it's a text-format PPM file */

cinfo->input_components = 3;

cinfo->in_color_space = JCS_RGB;

TRACEMS2(cinfo, 1, JTRC_PPM_TEXT, w, h);

@@ -352,13 +353,13 @@ start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

need_iobuffer = FALSE;

break;

- case '5': /* it's a raw-format PGM file */

+ case '5': /* it's a raw-format PGM file */

cinfo->input_components = 1;

cinfo->in_color_space = JCS_GRAYSCALE;

TRACEMS2(cinfo, 1, JTRC_PGM, w, h);

if (maxval > 255) {

source->pub.get_pixel_rows = get_word_gray_row;

- } else if (maxval == MAXJSAMPLE && SIZEOF(JSAMPLE) == SIZEOF(U_CHAR)) {

+ } else if (maxval == MAXJSAMPLE && sizeof(JSAMPLE) == sizeof(U_CHAR)) {

source->pub.get_pixel_rows = get_raw_row;

use_raw_buffer = TRUE;

need_rescale = FALSE;

@@ -367,13 +368,13 @@ start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

}

break;

- case '6': /* it's a raw-format PPM file */

+ case '6': /* it's a raw-format PPM file */

cinfo->input_components = 3;

cinfo->in_color_space = JCS_RGB;

TRACEMS2(cinfo, 1, JTRC_PPM, w, h);

if (maxval > 255) {

source->pub.get_pixel_rows = get_word_rgb_row;

- } else if (maxval == MAXJSAMPLE && SIZEOF(JSAMPLE) == SIZEOF(U_CHAR)) {

+ } else if (maxval == MAXJSAMPLE && sizeof(JSAMPLE) == sizeof(U_CHAR)) {

source->pub.get_pixel_rows = get_raw_row;

use_raw_buffer = TRUE;

need_rescale = FALSE;

@@ -386,17 +387,16 @@ start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

/* Allocate space for I/O buffer: 1 or 3 bytes or words/pixel. */

if (need_iobuffer) {

source->buffer_width = (size_t) w * cinfo->input_components *

- ((maxval<=255) ? SIZEOF(U_CHAR) : (2*SIZEOF(U_CHAR)));

+ ((maxval <= 255) ? sizeof(U_CHAR) : (2 * sizeof(U_CHAR)));

source->iobuffer = (U_CHAR *)

(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

- source->buffer_width);

+ source->buffer_width);

}

/* Create compressor input buffer. */

if (use_raw_buffer) {

/* For unscaled raw-input case, we can just map it onto the I/O buffer. */

/* Synthesize a JSAMPARRAY pointer structure */

- /* Cast here implies near->far pointer conversion on PCs */

source->pixrow = (JSAMPROW) source->iobuffer;

source->pub.buffer = & source->pixrow;

source->pub.buffer_height = 1;

@@ -410,16 +410,18 @@ start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo)

/* Compute the rescaling array if required. */

if (need_rescale) {

- INT32 val, half_maxval;

+ long val, half_maxval;

/* On 16-bit-int machines we have to be careful of maxval = 65535 */

source->rescale = (JSAMPLE *)

(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

- (size_t) (((long) maxval + 1L) * SIZEOF(JSAMPLE)));

+ (size_t) (((long) maxval + 1L) *

+ sizeof(JSAMPLE)));

half_maxval = maxval / 2;

- for (val = 0; val <= (INT32) maxval; val++) {

+ for (val = 0; val <= (long) maxval; val++) {

/* The multiplication here must be done in 32 bits to avoid overflow */

- source->rescale[val] = (JSAMPLE) ((val*MAXJSAMPLE + half_maxval)/maxval);

+ source->rescale[val] = (JSAMPLE) ((val * MAXJSAMPLE + half_maxval) /

+ maxval);

}

@@ -448,7 +450,7 @@ jinit_read_ppm (j_compress_ptr cinfo)

/* Create module interface object */

source = (ppm_source_ptr)

(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,

- SIZEOF(ppm_source_struct));

+ sizeof(ppm_source_struct));

/* Fill in method ptrs, except get_pixel_rows which start_input sets */

source->pub.start_input = start_input_ppm;

source->pub.finish_input = finish_input_ppm;

« jconfigint.h ('K') | « rdjpgcom.c ('k') | rdrle.c » ('j') | simd/jccolext-sse2-64.asm » ('J')