With rare exceptions ...
- Always separate line continuation characters by one space from
preceding code.
- Always use two-space indentation. Never use tabs.
- Always use K&R-style conditional blocks.
- Always surround operators with spaces, except in raw assembly code.
- Always put a space after, but not before, a comma.
- Never put a space between type casts and variables/function calls.
- Never put a space between the function name and the argument list in
function declarations and prototypes.
- Always surround braces ('{' and '}') with spaces.
- Always surround statements (if, for, else, catch, while, do, switch)
with spaces.
- Always attach pointer symbols ('*' and '**') to the variable or
function name.
- Always precede pointer symbols ('*' and '**') by a space in type
casts.
- Use the MIN() macro from jpegint.h within the libjpeg and TurboJPEG
API libraries (using min() from tjutil.h is still necessary for
TJBench.)
- Where it makes sense (particularly in the TurboJPEG code), put a blank
line after variable declaration blocks.
- Always separate statements in one-liners by two spaces.
The purpose of this was to ease maintenance on my part and also to make
it easier for contributors to figure out how to format patch
submissions. This was admittedly confusing (even to me sometimes) when
we had 3 or 4 different style conventions in the same source tree. The
new convention is more consistent with the formatting of other OSS code
bases.
This commit corrects deviations from the chosen formatting style in the
libjpeg API code and reformats the TurboJPEG API code such that it
conforms to the same standard.
NOTES:
- Although it is no longer necessary for the function name in function
declarations to begin in Column 1 (this was historically necessary
because of the ansi2knr utility, which allowed libjpeg to be built
with non-ANSI compilers), we retain that formatting for the libjpeg
code because it improves readability when using libjpeg's function
attribute macros (GLOBAL(), etc.)
- This reformatting project was accomplished with the help of AStyle and
Uncrustify, although neither was completely up to the task, and thus
a great deal of manual tweaking was required. Note to developers of
code formatting utilities: the libjpeg-turbo code base is an
excellent test bed, because AFAICT, it breaks every single one of the
utilities that are currently available.
- The legacy (MMX, SSE, 3DNow!) assembly code for i386 has been
formatted to match the SSE2 code (refer to
ff5685d5344273df321eb63a005eaae19d2496e3.) I hadn't intended to
bother with this, but the Loongson MMI implementation demonstrated
that there is still academic value to the MMX implementation, as an
algorithmic model for other 64-bit vector implementations. Thus, it
is desirable to improve its readability in the same manner as that of
the SSE2 implementation.
390 lines
11 KiB
C
390 lines
11 KiB
C
/*
|
|
* rdrle.c
|
|
*
|
|
* 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.ijg
|
|
* file.
|
|
*
|
|
* This file contains routines to read input images in Utah RLE format.
|
|
* The Utah Raster Toolkit library is required (version 3.1 or later).
|
|
*
|
|
* These routines may need modification for non-Unix environments or
|
|
* specialized applications. As they stand, they assume input from
|
|
* an ordinary stdio stream. They further assume that reading begins
|
|
* at the start of the file; start_input may need work if the
|
|
* user interface has already read some data (e.g., to determine that
|
|
* the file is indeed RLE format).
|
|
*
|
|
* Based on code contributed by Mike Lijewski,
|
|
* with updates from Robert Hutchinson.
|
|
*/
|
|
|
|
#include "cdjpeg.h" /* Common decls for cjpeg/djpeg applications */
|
|
|
|
#ifdef RLE_SUPPORTED
|
|
|
|
/* rle.h is provided by the Utah Raster Toolkit. */
|
|
|
|
#include <rle.h>
|
|
|
|
/*
|
|
* We assume that JSAMPLE has the same representation as rle_pixel,
|
|
* to wit, "unsigned char". Hence we can't cope with 12- or 16-bit samples.
|
|
*/
|
|
|
|
#if BITS_IN_JSAMPLE != 8
|
|
Sorry, this code only copes with 8-bit JSAMPLEs. /* deliberate syntax err */
|
|
#endif
|
|
|
|
/*
|
|
* We support the following types of RLE files:
|
|
*
|
|
* GRAYSCALE - 8 bits, no colormap
|
|
* MAPPEDGRAY - 8 bits, 1 channel colomap
|
|
* PSEUDOCOLOR - 8 bits, 3 channel colormap
|
|
* TRUECOLOR - 24 bits, 3 channel colormap
|
|
* DIRECTCOLOR - 24 bits, no colormap
|
|
*
|
|
* For now, we ignore any alpha channel in the image.
|
|
*/
|
|
|
|
typedef enum
|
|
{ GRAYSCALE, MAPPEDGRAY, PSEUDOCOLOR, TRUECOLOR, DIRECTCOLOR } rle_kind;
|
|
|
|
|
|
/*
|
|
* Since RLE stores scanlines bottom-to-top, we have to invert the image
|
|
* to conform to JPEG's top-to-bottom order. To do this, we read the
|
|
* incoming image into a virtual array on the first get_pixel_rows call,
|
|
* then fetch the required row from the virtual array on subsequent calls.
|
|
*/
|
|
|
|
typedef struct _rle_source_struct *rle_source_ptr;
|
|
|
|
typedef struct _rle_source_struct {
|
|
struct cjpeg_source_struct pub; /* public fields */
|
|
|
|
rle_kind visual; /* actual type of input file */
|
|
jvirt_sarray_ptr image; /* virtual array to hold the image */
|
|
JDIMENSION row; /* current row # in the virtual array */
|
|
rle_hdr header; /* Input file information */
|
|
rle_pixel **rle_row; /* holds a row returned by rle_getrow() */
|
|
|
|
} rle_source_struct;
|
|
|
|
|
|
/*
|
|
* Read the file header; return image size and component count.
|
|
*/
|
|
|
|
METHODDEF(void)
|
|
start_input_rle(j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
|
|
{
|
|
rle_source_ptr source = (rle_source_ptr)sinfo;
|
|
JDIMENSION width, height;
|
|
#ifdef PROGRESS_REPORT
|
|
cd_progress_ptr progress = (cd_progress_ptr)cinfo->progress;
|
|
#endif
|
|
|
|
/* Use RLE library routine to get the header info */
|
|
source->header = *rle_hdr_init(NULL);
|
|
source->header.rle_file = source->pub.input_file;
|
|
switch (rle_get_setup(&(source->header))) {
|
|
case RLE_SUCCESS:
|
|
/* A-OK */
|
|
break;
|
|
case RLE_NOT_RLE:
|
|
ERREXIT(cinfo, JERR_RLE_NOT);
|
|
break;
|
|
case RLE_NO_SPACE:
|
|
ERREXIT(cinfo, JERR_RLE_MEM);
|
|
break;
|
|
case RLE_EMPTY:
|
|
ERREXIT(cinfo, JERR_RLE_EMPTY);
|
|
break;
|
|
case RLE_EOF:
|
|
ERREXIT(cinfo, JERR_RLE_EOF);
|
|
break;
|
|
default:
|
|
ERREXIT(cinfo, JERR_RLE_BADERROR);
|
|
break;
|
|
}
|
|
|
|
/* Figure out what we have, set private vars and return values accordingly */
|
|
|
|
width = source->header.xmax - source->header.xmin + 1;
|
|
height = source->header.ymax - source->header.ymin + 1;
|
|
source->header.xmin = 0; /* realign horizontally */
|
|
source->header.xmax = width - 1;
|
|
|
|
cinfo->image_width = width;
|
|
cinfo->image_height = height;
|
|
cinfo->data_precision = 8; /* we can only handle 8 bit data */
|
|
|
|
if (source->header.ncolors == 1 && source->header.ncmap == 0) {
|
|
source->visual = GRAYSCALE;
|
|
TRACEMS2(cinfo, 1, JTRC_RLE_GRAY, width, height);
|
|
} else if (source->header.ncolors == 1 && source->header.ncmap == 1) {
|
|
source->visual = MAPPEDGRAY;
|
|
TRACEMS3(cinfo, 1, JTRC_RLE_MAPGRAY, width, height,
|
|
1 << source->header.cmaplen);
|
|
} else if (source->header.ncolors == 1 && source->header.ncmap == 3) {
|
|
source->visual = PSEUDOCOLOR;
|
|
TRACEMS3(cinfo, 1, JTRC_RLE_MAPPED, width, height,
|
|
1 << source->header.cmaplen);
|
|
} else if (source->header.ncolors == 3 && source->header.ncmap == 3) {
|
|
source->visual = TRUECOLOR;
|
|
TRACEMS3(cinfo, 1, JTRC_RLE_FULLMAP, width, height,
|
|
1 << source->header.cmaplen);
|
|
} else if (source->header.ncolors == 3 && source->header.ncmap == 0) {
|
|
source->visual = DIRECTCOLOR;
|
|
TRACEMS2(cinfo, 1, JTRC_RLE, width, height);
|
|
} else
|
|
ERREXIT(cinfo, JERR_RLE_UNSUPPORTED);
|
|
|
|
if (source->visual == GRAYSCALE || source->visual == MAPPEDGRAY) {
|
|
cinfo->in_color_space = JCS_GRAYSCALE;
|
|
cinfo->input_components = 1;
|
|
} else {
|
|
cinfo->in_color_space = JCS_RGB;
|
|
cinfo->input_components = 3;
|
|
}
|
|
|
|
/*
|
|
* A place to hold each scanline while it's converted.
|
|
* (GRAYSCALE scanlines don't need converting)
|
|
*/
|
|
if (source->visual != GRAYSCALE) {
|
|
source->rle_row = (rle_pixel **)(*cinfo->mem->alloc_sarray)
|
|
((j_common_ptr)cinfo, JPOOL_IMAGE,
|
|
(JDIMENSION)width, (JDIMENSION)cinfo->input_components);
|
|
}
|
|
|
|
/* request a virtual array to hold the image */
|
|
source->image = (*cinfo->mem->request_virt_sarray)
|
|
((j_common_ptr)cinfo, JPOOL_IMAGE, FALSE,
|
|
(JDIMENSION)(width * source->header.ncolors),
|
|
(JDIMENSION)height, (JDIMENSION)1);
|
|
|
|
#ifdef PROGRESS_REPORT
|
|
if (progress != NULL) {
|
|
/* count file input as separate pass */
|
|
progress->total_extra_passes++;
|
|
}
|
|
#endif
|
|
|
|
source->pub.buffer_height = 1;
|
|
}
|
|
|
|
|
|
/*
|
|
* Read one row of pixels.
|
|
* Called only after load_image has read the image into the virtual array.
|
|
* Used for GRAYSCALE, MAPPEDGRAY, TRUECOLOR, and DIRECTCOLOR images.
|
|
*/
|
|
|
|
METHODDEF(JDIMENSION)
|
|
get_rle_row(j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
|
|
{
|
|
rle_source_ptr source = (rle_source_ptr)sinfo;
|
|
|
|
source->row--;
|
|
source->pub.buffer = (*cinfo->mem->access_virt_sarray)
|
|
((j_common_ptr)cinfo, source->image, source->row, (JDIMENSION)1, FALSE);
|
|
|
|
return 1;
|
|
}
|
|
|
|
/*
|
|
* Read one row of pixels.
|
|
* Called only after load_image has read the image into the virtual array.
|
|
* Used for PSEUDOCOLOR images.
|
|
*/
|
|
|
|
METHODDEF(JDIMENSION)
|
|
get_pseudocolor_row(j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
|
|
{
|
|
rle_source_ptr source = (rle_source_ptr)sinfo;
|
|
JSAMPROW src_row, dest_row;
|
|
JDIMENSION col;
|
|
rle_map *colormap;
|
|
int val;
|
|
|
|
colormap = source->header.cmap;
|
|
dest_row = source->pub.buffer[0];
|
|
source->row--;
|
|
src_row = *(*cinfo->mem->access_virt_sarray)
|
|
((j_common_ptr)cinfo, source->image, source->row, (JDIMENSION)1, FALSE);
|
|
|
|
for (col = cinfo->image_width; col > 0; col--) {
|
|
val = GETJSAMPLE(*src_row++);
|
|
*dest_row++ = (JSAMPLE)(colormap[val ] >> 8);
|
|
*dest_row++ = (JSAMPLE)(colormap[val + 256] >> 8);
|
|
*dest_row++ = (JSAMPLE)(colormap[val + 512] >> 8);
|
|
}
|
|
|
|
return 1;
|
|
}
|
|
|
|
|
|
/*
|
|
* Load the image into a virtual array. We have to do this because RLE
|
|
* files start at the lower left while the JPEG standard has them starting
|
|
* in the upper left. This is called the first time we want to get a row
|
|
* of input. What we do is load the RLE data into the array and then call
|
|
* the appropriate routine to read one row from the array. Before returning,
|
|
* we set source->pub.get_pixel_rows so that subsequent calls go straight to
|
|
* the appropriate row-reading routine.
|
|
*/
|
|
|
|
METHODDEF(JDIMENSION)
|
|
load_image(j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
|
|
{
|
|
rle_source_ptr source = (rle_source_ptr)sinfo;
|
|
JDIMENSION row, col;
|
|
JSAMPROW scanline, red_ptr, green_ptr, blue_ptr;
|
|
rle_pixel **rle_row;
|
|
rle_map *colormap;
|
|
char channel;
|
|
#ifdef PROGRESS_REPORT
|
|
cd_progress_ptr progress = (cd_progress_ptr)cinfo->progress;
|
|
#endif
|
|
|
|
colormap = source->header.cmap;
|
|
rle_row = source->rle_row;
|
|
|
|
/* Read the RLE data into our virtual array.
|
|
* We assume here that rle_pixel is represented the same as JSAMPLE.
|
|
*/
|
|
RLE_CLR_BIT(source->header, RLE_ALPHA); /* don't read the alpha channel */
|
|
|
|
#ifdef PROGRESS_REPORT
|
|
if (progress != NULL) {
|
|
progress->pub.pass_limit = cinfo->image_height;
|
|
progress->pub.pass_counter = 0;
|
|
(*progress->pub.progress_monitor) ((j_common_ptr)cinfo);
|
|
}
|
|
#endif
|
|
|
|
switch (source->visual) {
|
|
|
|
case GRAYSCALE:
|
|
case PSEUDOCOLOR:
|
|
for (row = 0; row < cinfo->image_height; row++) {
|
|
rle_row = (rle_pixel **)(*cinfo->mem->access_virt_sarray)
|
|
((j_common_ptr)cinfo, source->image, row, (JDIMENSION)1, TRUE);
|
|
rle_getrow(&source->header, rle_row);
|
|
#ifdef PROGRESS_REPORT
|
|
if (progress != NULL) {
|
|
progress->pub.pass_counter++;
|
|
(*progress->pub.progress_monitor) ((j_common_ptr)cinfo);
|
|
}
|
|
#endif
|
|
}
|
|
break;
|
|
|
|
case MAPPEDGRAY:
|
|
case TRUECOLOR:
|
|
for (row = 0; row < cinfo->image_height; row++) {
|
|
scanline = *(*cinfo->mem->access_virt_sarray)
|
|
((j_common_ptr)cinfo, source->image, row, (JDIMENSION)1, TRUE);
|
|
rle_row = source->rle_row;
|
|
rle_getrow(&source->header, rle_row);
|
|
|
|
for (col = 0; col < cinfo->image_width; col++) {
|
|
for (channel = 0; channel < source->header.ncolors; channel++) {
|
|
*scanline++ = (JSAMPLE)
|
|
(colormap[GETJSAMPLE(rle_row[channel][col]) + 256 * channel] >> 8);
|
|
}
|
|
}
|
|
|
|
#ifdef PROGRESS_REPORT
|
|
if (progress != NULL) {
|
|
progress->pub.pass_counter++;
|
|
(*progress->pub.progress_monitor) ((j_common_ptr)cinfo);
|
|
}
|
|
#endif
|
|
}
|
|
break;
|
|
|
|
case DIRECTCOLOR:
|
|
for (row = 0; row < cinfo->image_height; row++) {
|
|
scanline = *(*cinfo->mem->access_virt_sarray)
|
|
((j_common_ptr)cinfo, source->image, row, (JDIMENSION)1, TRUE);
|
|
rle_getrow(&source->header, rle_row);
|
|
|
|
red_ptr = rle_row[0];
|
|
green_ptr = rle_row[1];
|
|
blue_ptr = rle_row[2];
|
|
|
|
for (col = cinfo->image_width; col > 0; col--) {
|
|
*scanline++ = *red_ptr++;
|
|
*scanline++ = *green_ptr++;
|
|
*scanline++ = *blue_ptr++;
|
|
}
|
|
|
|
#ifdef PROGRESS_REPORT
|
|
if (progress != NULL) {
|
|
progress->pub.pass_counter++;
|
|
(*progress->pub.progress_monitor) ((j_common_ptr)cinfo);
|
|
}
|
|
#endif
|
|
}
|
|
}
|
|
|
|
#ifdef PROGRESS_REPORT
|
|
if (progress != NULL)
|
|
progress->completed_extra_passes++;
|
|
#endif
|
|
|
|
/* Set up to call proper row-extraction routine in future */
|
|
if (source->visual == PSEUDOCOLOR) {
|
|
source->pub.buffer = source->rle_row;
|
|
source->pub.get_pixel_rows = get_pseudocolor_row;
|
|
} else {
|
|
source->pub.get_pixel_rows = get_rle_row;
|
|
}
|
|
source->row = cinfo->image_height;
|
|
|
|
/* And fetch the topmost (bottommost) row */
|
|
return (*source->pub.get_pixel_rows) (cinfo, sinfo);
|
|
}
|
|
|
|
|
|
/*
|
|
* Finish up at the end of the file.
|
|
*/
|
|
|
|
METHODDEF(void)
|
|
finish_input_rle(j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
|
|
{
|
|
/* no work */
|
|
}
|
|
|
|
|
|
/*
|
|
* The module selection routine for RLE format input.
|
|
*/
|
|
|
|
GLOBAL(cjpeg_source_ptr)
|
|
jinit_read_rle(j_compress_ptr cinfo)
|
|
{
|
|
rle_source_ptr source;
|
|
|
|
/* Create module interface object */
|
|
source = (rle_source_ptr)
|
|
(*cinfo->mem->alloc_small) ((j_common_ptr)cinfo, JPOOL_IMAGE,
|
|
sizeof(rle_source_struct));
|
|
/* Fill in method ptrs */
|
|
source->pub.start_input = start_input_rle;
|
|
source->pub.finish_input = finish_input_rle;
|
|
source->pub.get_pixel_rows = load_image;
|
|
|
|
return (cjpeg_source_ptr)source;
|
|
}
|
|
|
|
#endif /* RLE_SUPPORTED */
|