diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2012-11-20 13:44:27 +0100 |
---|---|---|
committer | Robin Watts <robin.watts@artifex.com> | 2012-11-20 14:25:21 +0000 |
commit | 6108f235c54fb039e92f7aebce75a774c9255e24 (patch) | |
tree | e33f1343b776d17448b8ec5f6a76c7f3819225d1 /fitz | |
parent | 7dd02831cf0e1c6e59b548079b92d91312e3fa1c (diff) | |
download | mupdf-6108f235c54fb039e92f7aebce75a774c9255e24.tar.xz |
Obsess about whitespace.
Diffstat (limited to 'fitz')
-rw-r--r-- | fitz/crypt_sha2.c | 14 | ||||
-rw-r--r-- | fitz/filt_faxd.c | 2 | ||||
-rw-r--r-- | fitz/fitz.h | 12 | ||||
-rw-r--r-- | fitz/image_tiff.c | 2 | ||||
-rw-r--r-- | fitz/res_colorspace.c | 70 | ||||
-rw-r--r-- | fitz/res_font.c | 4 |
6 files changed, 52 insertions, 52 deletions
diff --git a/fitz/crypt_sha2.c b/fitz/crypt_sha2.c index 1a91fdda..dee0ccf7 100644 --- a/fitz/crypt_sha2.c +++ b/fitz/crypt_sha2.c @@ -34,13 +34,13 @@ static inline uint64_t bswap64(uint64_t num) if (!isbigendian()) { return ( (((num) << 56)) - | (((num) << 40) & 0x00FF000000000000ULL) - | (((num) << 24) & 0x0000FF0000000000ULL) - | (((num) << 8) & 0x000000FF00000000ULL) - | (((num) >> 8) & 0x00000000FF000000ULL) - | (((num) >> 24) & 0x0000000000FF0000ULL) - | (((num) >> 40) & 0x000000000000FF00ULL) - | (((num) >> 56)) ); + | (((num) << 40) & 0x00FF000000000000ULL) + | (((num) << 24) & 0x0000FF0000000000ULL) + | (((num) << 8) & 0x000000FF00000000ULL) + | (((num) >> 8) & 0x00000000FF000000ULL) + | (((num) >> 24) & 0x0000000000FF0000ULL) + | (((num) >> 40) & 0x000000000000FF00ULL) + | (((num) >> 56)) ); } return num; } diff --git a/fitz/filt_faxd.c b/fitz/filt_faxd.c index a23e6319..1de6b970 100644 --- a/fitz/filt_faxd.c +++ b/fitz/filt_faxd.c @@ -31,7 +31,7 @@ enum cfd_white_initial_bits = 8, cfd_black_initial_bits = 7, cfd_2d_initial_bits = 7, - cfd_uncompressed_initial_bits = 6 /* must be 6 */ + cfd_uncompressed_initial_bits = 6 /* must be 6 */ }; /* non-run codes in tables */ diff --git a/fitz/fitz.h b/fitz/fitz.h index f058df50..77e690e7 100644 --- a/fitz/fitz.h +++ b/fitz/fitz.h @@ -2549,7 +2549,7 @@ typedef struct fz_ui_event_s { struct { - int ptype; + int ptype; fz_point pt; } pointer; } event; @@ -2881,14 +2881,14 @@ typedef struct fz_write_options_s fz_write_options; */ struct fz_write_options_s { - int do_ascii; /* If non-zero then attempt (where possible) to - make the output ascii. */ - int do_expand; /* Bitflags; each non zero bit indicates an aspect + int do_ascii; /* If non-zero then attempt (where possible) to make + the output ascii. */ + int do_expand; /* Bitflags; each non zero bit indicates an aspect of the file that should be 'expanded' on writing. */ - int do_garbage; /* If non-zero then attempt (where possible) to + int do_garbage; /* If non-zero then attempt (where possible) to garbage collect the file before writing. */ - int do_linear; /* If non-zero then write linearised. */ + int do_linear; /* If non-zero then write linearised. */ }; /* An enumeration of bitflags to use in the above 'do_expand' field of diff --git a/fitz/image_tiff.c b/fitz/image_tiff.c index f79e8672..2176062c 100644 --- a/fitz/image_tiff.c +++ b/fitz/image_tiff.c @@ -47,7 +47,7 @@ struct tiff unsigned ycbcrsubsamp[2]; - unsigned char *jpegtables; /* point into "file" buffer */ + unsigned char *jpegtables; /* point into "file" buffer */ unsigned jpegtableslen; unsigned char *profile; diff --git a/fitz/res_colorspace.c b/fitz/res_colorspace.c index edda776d..50c0a8f7 100644 --- a/fitz/res_colorspace.c +++ b/fitz/res_colorspace.c @@ -86,13 +86,13 @@ static void cmyk_to_rgb(fz_context *ctx, fz_colorspace *cs, float *cmyk, float * float c1m = m - cm; float cm1 = c - cm; float c1m1 = 1 - m - cm1; - float c1m1y = c1m1 * y; + float c1m1y = c1m1 * y; float c1m1y1 = c1m1 - c1m1y; - float c1my = c1m * y; + float c1my = c1m * y; float c1my1 = c1m - c1my; - float cm1y = cm1 * y; + float cm1y = cm1 * y; float cm1y1 = cm1 - cm1y; - float cmy = cm * y; + float cmy = cm * y; float cmy1 = cm - cmy; /* this is a matrix multiplication, unrolled for performance */ @@ -389,13 +389,13 @@ static void fast_cmyk_to_rgb(fz_context *ctx, fz_pixmap *dst, fz_pixmap *src) c1m = (m<<8) - cm; cm1 = (c<<8) - cm; c1m1 = ((256 - m)<<8) - cm1; - c1m1y = c1m1 * y; + c1m1y = c1m1 * y; c1m1y1 = (c1m1<<7) - c1m1y; - c1my = c1m * y; + c1my = c1m * y; c1my1 = (c1m<<7) - c1my; - cm1y = cm1 * y; + cm1y = cm1 * y; cm1y1 = (cm1<<7) - cm1y; - cmy = cm * y; + cmy = cm * y; cmy1 = (cm<<7) - cmy; /* this is a matrix multiplication, unrolled for performance */ @@ -403,67 +403,67 @@ static void fast_cmyk_to_rgb(fz_context *ctx, fz_pixmap *dst, fz_pixmap *src) x0 = (c1m1y1<<8) - x1; /* 0 0 0 0 */ x1 = x1>>8; /* From 23 fractional bits to 15 */ r = g = b = x0; - r += 35 * x1; /* 0.1373 */ - g += 31 * x1; /* 0.1216 */ - b += 32 * x1; /* 0.1255 */ + r += 35 * x1; /* 0.1373 */ + g += 31 * x1; /* 0.1216 */ + b += 32 * x1; /* 0.1255 */ x1 = c1m1y * k; /* 0 0 1 1 */ x0 = (c1m1y<<8) - x1; /* 0 0 1 0 */ x1 >>= 8; /* From 23 fractional bits to 15 */ - r += 28 * x1; /* 0.1098 */ - g += 26 * x1; /* 0.1020 */ + r += 28 * x1; /* 0.1098 */ + g += 26 * x1; /* 0.1020 */ r += x0; x0 >>= 8; /* From 23 fractional bits to 15 */ - g += 243 * x0; /* 0.9490 */ + g += 243 * x0; /* 0.9490 */ x1 = c1my1 * k; /* 0 1 0 1 */ x0 = (c1my1<<8) - x1; /* 0 1 0 0 */ x1 >>= 8; /* From 23 fractional bits to 15 */ x0 >>= 8; /* From 23 fractional bits to 15 */ - r += 36 * x1; /* 0.1412 */ - r += 237 * x0; /* 0.9255 */ - b += 141 * x0; /* 0.5490 */ + r += 36 * x1; /* 0.1412 */ + r += 237 * x0; /* 0.9255 */ + b += 141 * x0; /* 0.5490 */ x1 = c1my * k; /* 0 1 1 1 */ x0 = (c1my<<8) - x1; /* 0 1 1 0 */ x1 >>= 8; /* From 23 fractional bits to 15 */ x0 >>= 8; /* From 23 fractional bits to 15 */ - r += 34 * x1; /* 0.1333 */ - r += 238 * x0; /* 0.9294 */ - g += 28 * x0; /* 0.1098 */ - b += 36 * x0; /* 0.1412 */ + r += 34 * x1; /* 0.1333 */ + r += 238 * x0; /* 0.9294 */ + g += 28 * x0; /* 0.1098 */ + b += 36 * x0; /* 0.1412 */ x1 = cm1y1 * k; /* 1 0 0 1 */ x0 = (cm1y1<<8) - x1; /* 1 0 0 0 */ x1 >>= 8; /* From 23 fractional bits to 15 */ x0 >>= 8; /* From 23 fractional bits to 15 */ - g += 15 * x1; /* 0.0588 */ - b += 36 * x1; /* 0.1412 */ - g += 174 * x0; /* 0.6784 */ - b += 240 * x0; /* 0.9373 */ + g += 15 * x1; /* 0.0588 */ + b += 36 * x1; /* 0.1412 */ + g += 174 * x0; /* 0.6784 */ + b += 240 * x0; /* 0.9373 */ x1 = cm1y * k; /* 1 0 1 1 */ x0 = (cm1y<<8) - x1; /* 1 0 1 0 */ x1 >>= 8; /* From 23 fractional bits to 15 */ x0 >>= 8; /* From 23 fractional bits to 15 */ - g += 19 * x1; /* 0.0745 */ - g += 167 * x0; /* 0.6510 */ - b += 80 * x0; /* 0.3137 */ + g += 19 * x1; /* 0.0745 */ + g += 167 * x0; /* 0.6510 */ + b += 80 * x0; /* 0.3137 */ x1 = cmy1 * k; /* 1 1 0 1 */ x0 = (cmy1<<8) - x1; /* 1 1 0 0 */ x1 >>= 8; /* From 23 fractional bits to 15 */ x0 >>= 8; /* From 23 fractional bits to 15 */ - b += 2 * x1; /* 0.0078 */ - r += 46 * x0; /* 0.1804 */ - g += 49 * x0; /* 0.1922 */ - b += 147 * x0; /* 0.5725 */ + b += 2 * x1; /* 0.0078 */ + r += 46 * x0; /* 0.1804 */ + g += 49 * x0; /* 0.1922 */ + b += 147 * x0; /* 0.5725 */ x0 = cmy * (256-k); /* 1 1 1 0 */ x0 >>= 8; /* From 23 fractional bits to 15 */ - r += 54 * x0; /* 0.2118 */ - g += 54 * x0; /* 0.2119 */ - b += 57 * x0; /* 0.2235 */ + r += 54 * x0; /* 0.2118 */ + g += 54 * x0; /* 0.2119 */ + b += 57 * x0; /* 0.2235 */ r -= (r>>8); g -= (g>>8); diff --git a/fitz/res_font.c b/fitz/res_font.c index 77cae676..b7304e55 100644 --- a/fitz/res_font.c +++ b/fitz/res_font.c @@ -142,9 +142,9 @@ struct fz_font_context_s { }; #undef __FTERRORS_H__ -#define FT_ERRORDEF(e, v, s) { (e), (s) }, +#define FT_ERRORDEF(e, v, s) { (e), (s) }, #define FT_ERROR_START_LIST -#define FT_ERROR_END_LIST { 0, NULL } +#define FT_ERROR_END_LIST { 0, NULL } struct ft_error { |