ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use 2-space indentation for the enums, to be consistent with the structs

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/branches/1.3.x@1291 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2014-05-12 00:34:08 +00:00
parent c55d3622c8
commit a72597b837
3 changed files with 50 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
jpegint.h
View File

@@ -14,12 +14,12 @@
/* Declarations for both compression & decompression */ /* Declarations for both compression & decompression */
typedef enum { /* Operating modes for buffer controllers */ typedef enum { /* Operating modes for buffer controllers */
JBUF_PASS_THRU, /* Plain stripwise operation */ JBUF_PASS_THRU, /* Plain stripwise operation */
/* Remaining modes require a full-image buffer to have been created */ /* Remaining modes require a full-image buffer to have been created */
JBUF_SAVE_SOURCE, /* Run source subobject only, save output */ JBUF_SAVE_SOURCE, /* Run source subobject only, save output */
JBUF_CRANK_DEST, /* Run dest subobject only, using saved data */ JBUF_CRANK_DEST, /* Run dest subobject only, using saved data */
JBUF_SAVE_AND_PASS /* Run both subobjects, save output */ JBUF_SAVE_AND_PASS /* Run both subobjects, save output */
} J_BUF_MODE; } J_BUF_MODE;
/* Values of global_state field (jdapi.c has some dependencies on ordering!) */ /* Values of global_state field (jdapi.c has some dependencies on ordering!) */

59
jpeglib.h
View File

@@ -215,38 +215,37 @@ struct jpeg_marker_struct {
#define JCS_ALPHA_EXTENSIONS 1 #define JCS_ALPHA_EXTENSIONS 1
typedef enum { typedef enum {
JCS_UNKNOWN, /* error/unspecified */ JCS_UNKNOWN, /* error/unspecified */
JCS_GRAYSCALE, /* monochrome */ JCS_GRAYSCALE, /* monochrome */
JCS_RGB, /* red/green/blue as specified by the RGB_RED, RGB_GREEN, JCS_RGB, /* red/green/blue as specified by the RGB_RED,
RGB_BLUE, and RGB_PIXELSIZE macros */ RGB_GREEN, RGB_BLUE, and RGB_PIXELSIZE macros */
JCS_YCbCr, /* Y/Cb/Cr (also known as YUV) */ JCS_YCbCr, /* Y/Cb/Cr (also known as YUV) */
JCS_CMYK, /* C/M/Y/K */ JCS_CMYK, /* C/M/Y/K */
JCS_YCCK, /* Y/Cb/Cr/K */ JCS_YCCK, /* Y/Cb/Cr/K */
JCS_EXT_RGB, /* red/green/blue */ JCS_EXT_RGB, /* red/green/blue */
JCS_EXT_RGBX, /* red/green/blue/x */ JCS_EXT_RGBX, /* red/green/blue/x */
JCS_EXT_BGR, /* blue/green/red */ JCS_EXT_BGR, /* blue/green/red */
JCS_EXT_BGRX, /* blue/green/red/x */ JCS_EXT_BGRX, /* blue/green/red/x */
JCS_EXT_XBGR, /* x/blue/green/red */ JCS_EXT_XBGR, /* x/blue/green/red */
JCS_EXT_XRGB, /* x/red/green/blue */ JCS_EXT_XRGB, /* x/red/green/blue */
/* When out_color_space it set to JCS_EXT_RGBX, JCS_EXT_BGRX, /* When out_color_space it set to JCS_EXT_RGBX, JCS_EXT_BGRX, JCS_EXT_XBGR,
JCS_EXT_XBGR, or JCS_EXT_XRGB during decompression, the X byte is or JCS_EXT_XRGB during decompression, the X byte is undefined, and in
undefined, and in order to ensure the best performance, order to ensure the best performance, libjpeg-turbo can set that byte to
libjpeg-turbo can set that byte to whatever value it wishes. Use whatever value it wishes. Use the following colorspace constants to
the following colorspace constants to ensure that the X byte is set ensure that the X byte is set to 0xFF, so that it can be interpreted as an
to 0xFF, so that it can be interpreted as an opaque alpha opaque alpha channel. */
channel. */ JCS_EXT_RGBA, /* red/green/blue/alpha */
JCS_EXT_RGBA, /* red/green/blue/alpha */ JCS_EXT_BGRA, /* blue/green/red/alpha */
JCS_EXT_BGRA, /* blue/green/red/alpha */ JCS_EXT_ABGR, /* alpha/blue/green/red */
JCS_EXT_ABGR, /* alpha/blue/green/red */ JCS_EXT_ARGB /* alpha/red/green/blue */
JCS_EXT_ARGB /* alpha/red/green/blue */
} J_COLOR_SPACE; } J_COLOR_SPACE;
/* DCT/IDCT algorithm options. */ /* DCT/IDCT algorithm options. */
typedef enum { typedef enum {
JDCT_ISLOW, /* slow but accurate integer algorithm */ JDCT_ISLOW, /* slow but accurate integer algorithm */
JDCT_IFAST, /* faster, less accurate integer method */ JDCT_IFAST, /* faster, less accurate integer method */
JDCT_FLOAT /* floating-point: accurate, fast on fast HW */ JDCT_FLOAT /* floating-point: accurate, fast on fast HW */
} J_DCT_METHOD; } J_DCT_METHOD;
#ifndef JDCT_DEFAULT /* may be overridden in jconfig.h */ #ifndef JDCT_DEFAULT /* may be overridden in jconfig.h */
@@ -259,9 +258,9 @@ typedef enum {
/* Dithering options for decompression. */ /* Dithering options for decompression. */
typedef enum { typedef enum {
JDITHER_NONE, /* no dithering */ JDITHER_NONE, /* no dithering */
JDITHER_ORDERED, /* simple ordered dither */ JDITHER_ORDERED, /* simple ordered dither */
JDITHER_FS /* Floyd-Steinberg error diffusion dither */ JDITHER_FS /* Floyd-Steinberg error diffusion dither */
} J_DITHER_MODE; } J_DITHER_MODE;

30
transupp.h
View File

@@ -95,14 +95,14 @@
*/ */
typedef enum { typedef enum {
JXFORM_NONE, /* no transformation */ JXFORM_NONE, /* no transformation */
JXFORM_FLIP_H, /* horizontal flip */ JXFORM_FLIP_H, /* horizontal flip */
JXFORM_FLIP_V, /* vertical flip */ JXFORM_FLIP_V, /* vertical flip */
JXFORM_TRANSPOSE, /* transpose across UL-to-LR axis */ JXFORM_TRANSPOSE, /* transpose across UL-to-LR axis */
JXFORM_TRANSVERSE, /* transpose across UR-to-LL axis */ JXFORM_TRANSVERSE, /* transpose across UR-to-LL axis */
JXFORM_ROT_90, /* 90-degree clockwise rotation */ JXFORM_ROT_90, /* 90-degree clockwise rotation */
JXFORM_ROT_180, /* 180-degree rotation */ JXFORM_ROT_180, /* 180-degree rotation */
JXFORM_ROT_270 /* 270-degree clockwise (or 90 ccw) */ JXFORM_ROT_270 /* 270-degree clockwise (or 90 ccw) */
} JXFORM_CODE; } JXFORM_CODE;
/* /*
@@ -112,10 +112,10 @@ typedef enum {
*/ */
typedef enum { typedef enum {
JCROP_UNSET, JCROP_UNSET,
JCROP_POS, JCROP_POS,
JCROP_NEG, JCROP_NEG,
JCROP_FORCE JCROP_FORCE
} JCROP_CODE; } JCROP_CODE;
/* /*
@@ -204,9 +204,9 @@ EXTERN(boolean) jtransform_perfect_transform
*/ */
typedef enum { typedef enum {
JCOPYOPT_NONE, /* copy no optional markers */ JCOPYOPT_NONE, /* copy no optional markers */
JCOPYOPT_COMMENTS, /* copy only comment (COM) markers */ JCOPYOPT_COMMENTS, /* copy only comment (COM) markers */
JCOPYOPT_ALL /* copy all optional markers */ JCOPYOPT_ALL /* copy all optional markers */
} JCOPY_OPTION; } JCOPY_OPTION;
#define JCOPYOPT_DEFAULT JCOPYOPT_COMMENTS /* recommended default */ #define JCOPYOPT_DEFAULT JCOPYOPT_COMMENTS /* recommended default */