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.
89 lines
2.9 KiB
C
89 lines
2.9 KiB
C
/*
|
|
* jinclude.h
|
|
*
|
|
* This file was part of the Independent JPEG Group's software:
|
|
* Copyright (C) 1991-1994, 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 exists to provide a single place to fix any problems with
|
|
* including the wrong system include files. (Common problems are taken
|
|
* care of by the standard jconfig symbols, but on really weird systems
|
|
* you may have to edit this file.)
|
|
*
|
|
* NOTE: this file is NOT intended to be included by applications using the
|
|
* JPEG library. Most applications need only include jpeglib.h.
|
|
*/
|
|
|
|
|
|
/* Include auto-config file to find out which system include files we need. */
|
|
|
|
#include "jconfig.h" /* auto configuration options */
|
|
#define JCONFIG_INCLUDED /* so that jpeglib.h doesn't do it again */
|
|
|
|
/*
|
|
* We need the NULL macro and size_t typedef.
|
|
* On an ANSI-conforming system it is sufficient to include <stddef.h>.
|
|
* Otherwise, we get them from <stdlib.h> or <stdio.h>; we may have to
|
|
* pull in <sys/types.h> as well.
|
|
* Note that the core JPEG library does not require <stdio.h>;
|
|
* only the default error handler and data source/destination modules do.
|
|
* But we must pull it in because of the references to FILE in jpeglib.h.
|
|
* You can remove those references if you want to compile without <stdio.h>.
|
|
*/
|
|
|
|
#ifdef HAVE_STDDEF_H
|
|
#include <stddef.h>
|
|
#endif
|
|
|
|
#ifdef HAVE_STDLIB_H
|
|
#include <stdlib.h>
|
|
#endif
|
|
|
|
#ifdef NEED_SYS_TYPES_H
|
|
#include <sys/types.h>
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
|
|
/*
|
|
* We need memory copying and zeroing functions, plus strncpy().
|
|
* ANSI and System V implementations declare these in <string.h>.
|
|
* BSD doesn't have the mem() functions, but it does have bcopy()/bzero().
|
|
* Some systems may declare memset and memcpy in <memory.h>.
|
|
*
|
|
* NOTE: we assume the size parameters to these functions are of type size_t.
|
|
* Change the casts in these macros if not!
|
|
*/
|
|
|
|
#ifdef NEED_BSD_STRINGS
|
|
|
|
#include <strings.h>
|
|
#define MEMZERO(target, size) \
|
|
bzero((void *)(target), (size_t)(size))
|
|
#define MEMCOPY(dest, src, size) \
|
|
bcopy((const void *)(src), (void *)(dest), (size_t)(size))
|
|
|
|
#else /* not BSD, assume ANSI/SysV string lib */
|
|
|
|
#include <string.h>
|
|
#define MEMZERO(target, size) \
|
|
memset((void *)(target), 0, (size_t)(size))
|
|
#define MEMCOPY(dest, src, size) \
|
|
memcpy((void *)(dest), (const void *)(src), (size_t)(size))
|
|
|
|
#endif
|
|
|
|
/*
|
|
* The modules that use fread() and fwrite() always invoke them through
|
|
* these macros. On some systems you may need to twiddle the argument casts.
|
|
* CAUTION: argument order is different from underlying functions!
|
|
*/
|
|
|
|
#define JFREAD(file, buf, sizeofbuf) \
|
|
((size_t)fread((void *)(buf), (size_t)1, (size_t)(sizeofbuf), (file)))
|
|
#define JFWRITE(file, buf, sizeofbuf) \
|
|
((size_t)fwrite((const void *)(buf), (size_t)1, (size_t)(sizeofbuf), (file)))
|