19c791cdac
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.
110 lines
3.2 KiB
C
110 lines
3.2 KiB
C
/*
|
|
* jcomapi.c
|
|
*
|
|
* This file was part of the Independent JPEG Group's software:
|
|
* Copyright (C) 1994-1997, Thomas G. Lane.
|
|
* It was modified by The libjpeg-turbo Project to include only code relevant
|
|
* to libjpeg-turbo.
|
|
* For conditions of distribution and use, see the accompanying README.ijg
|
|
* file.
|
|
*
|
|
* This file contains application interface routines that are used for both
|
|
* compression and decompression.
|
|
*/
|
|
|
|
#define JPEG_INTERNALS
|
|
#include "jinclude.h"
|
|
#include "jpeglib.h"
|
|
|
|
|
|
/*
|
|
* Abort processing of a JPEG compression or decompression operation,
|
|
* but don't destroy the object itself.
|
|
*
|
|
* For this, we merely clean up all the nonpermanent memory pools.
|
|
* Note that temp files (virtual arrays) are not allowed to belong to
|
|
* the permanent pool, so we will be able to close all temp files here.
|
|
* Closing a data source or destination, if necessary, is the application's
|
|
* responsibility.
|
|
*/
|
|
|
|
GLOBAL(void)
|
|
jpeg_abort(j_common_ptr cinfo)
|
|
{
|
|
int pool;
|
|
|
|
/* Do nothing if called on a not-initialized or destroyed JPEG object. */
|
|
if (cinfo->mem == NULL)
|
|
return;
|
|
|
|
/* Releasing pools in reverse order might help avoid fragmentation
|
|
* with some (brain-damaged) malloc libraries.
|
|
*/
|
|
for (pool = JPOOL_NUMPOOLS - 1; pool > JPOOL_PERMANENT; pool--) {
|
|
(*cinfo->mem->free_pool) (cinfo, pool);
|
|
}
|
|
|
|
/* Reset overall state for possible reuse of object */
|
|
if (cinfo->is_decompressor) {
|
|
cinfo->global_state = DSTATE_START;
|
|
/* Try to keep application from accessing now-deleted marker list.
|
|
* A bit kludgy to do it here, but this is the most central place.
|
|
*/
|
|
((j_decompress_ptr)cinfo)->marker_list = NULL;
|
|
} else {
|
|
cinfo->global_state = CSTATE_START;
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
* Destruction of a JPEG object.
|
|
*
|
|
* Everything gets deallocated except the master jpeg_compress_struct itself
|
|
* and the error manager struct. Both of these are supplied by the application
|
|
* and must be freed, if necessary, by the application. (Often they are on
|
|
* the stack and so don't need to be freed anyway.)
|
|
* Closing a data source or destination, if necessary, is the application's
|
|
* responsibility.
|
|
*/
|
|
|
|
GLOBAL(void)
|
|
jpeg_destroy(j_common_ptr cinfo)
|
|
{
|
|
/* We need only tell the memory manager to release everything. */
|
|
/* NB: mem pointer is NULL if memory mgr failed to initialize. */
|
|
if (cinfo->mem != NULL)
|
|
(*cinfo->mem->self_destruct) (cinfo);
|
|
cinfo->mem = NULL; /* be safe if jpeg_destroy is called twice */
|
|
cinfo->global_state = 0; /* mark it destroyed */
|
|
}
|
|
|
|
|
|
/*
|
|
* Convenience routines for allocating quantization and Huffman tables.
|
|
* (Would jutils.c be a more reasonable place to put these?)
|
|
*/
|
|
|
|
GLOBAL(JQUANT_TBL *)
|
|
jpeg_alloc_quant_table(j_common_ptr cinfo)
|
|
{
|
|
JQUANT_TBL *tbl;
|
|
|
|
tbl = (JQUANT_TBL *)
|
|
(*cinfo->mem->alloc_small) (cinfo, JPOOL_PERMANENT, sizeof(JQUANT_TBL));
|
|
tbl->sent_table = FALSE; /* make sure this is false in any new table */
|
|
return tbl;
|
|
}
|
|
|
|
|
|
GLOBAL(JHUFF_TBL *)
|
|
jpeg_alloc_huff_table(j_common_ptr cinfo)
|
|
{
|
|
JHUFF_TBL *tbl;
|
|
|
|
tbl = (JHUFF_TBL *)
|
|
(*cinfo->mem->alloc_small) (cinfo, JPOOL_PERMANENT, sizeof(JHUFF_TBL));
|
|
tbl->sent_table = FALSE; /* make sure this is false in any new table */
|
|
return tbl;
|
|
}
|