From 7cf6ccee8c6b59d8aac17ab6e4673bcb69f5e8d2 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Mon, 4 Apr 2011 23:35:45 +0200 Subject: Le Roi est mort, vive le Roi! The run-together words are dead! Long live the underscores! The postscript inspired naming convention of using all run-together words has served us well, but it is now time for more readable code. In this commit I have also added the sed script, rename.sed, that I used to convert the source. Use it on your patches and application code. --- fitz/filt_faxd.c | 161 +++++++++++++++++++++++++++---------------------------- 1 file changed, 80 insertions(+), 81 deletions(-) (limited to 'fitz/filt_faxd.c') diff --git a/fitz/filt_faxd.c b/fitz/filt_faxd.c index 714629e7..97076f89 100644 --- a/fitz/filt_faxd.c +++ b/fitz/filt_faxd.c @@ -171,7 +171,7 @@ const cfd_node cf_uncompressed_decode[] = { /* bit magic */ static inline void -printbits(FILE *f, int code, int nbits) +print_bits(FILE *f, int code, int nbits) { int n, b; for (n = nbits - 1; n >= 0; n--) @@ -188,7 +188,7 @@ getbit(const unsigned char *buf, int x) } static inline void -printline(FILE *f, unsigned char *line, int w) +print_line(FILE *f, unsigned char *line, int w) { int i; for (i = 0; i < w; i++) @@ -197,7 +197,7 @@ printline(FILE *f, unsigned char *line, int w) } static inline int -findchanging(const unsigned char *line, int x, int w) +find_changing(const unsigned char *line, int x, int w) { int a, b; @@ -227,15 +227,15 @@ findchanging(const unsigned char *line, int x, int w) } static inline int -findchangingcolor(const unsigned char *line, int x, int w, int color) +find_changing_color(const unsigned char *line, int x, int w, int color) { if (!line) return w; - x = findchanging(line, x, w); + x = find_changing(line, x, w); if (x < w && getbit(line, x) != color) - x = findchanging(line, x, w); + x = find_changing(line, x, w); return x; } @@ -278,11 +278,11 @@ typedef struct fz_faxd_s fz_faxd; enum { - SNORMAL, /* neutral state, waiting for any code */ - SMAKEUP, /* got a 1d makeup code, waiting for terminating code */ - SEOL, /* at eol, needs output buffer space */ - SH1, SH2, /* in H part 1 and 2 (both makeup and terminating codes) */ - SDONE /* all done */ + STATE_NORMAL, /* neutral state, waiting for any code */ + STATE_MAKEUP, /* got a 1d makeup code, waiting for terminating code */ + STATE_EOL, /* at eol, needs output buffer space */ + STATE_H1, STATE_H2, /* in H part 1 and 2 (both makeup and terminating codes) */ + STATE_DONE /* all done */ }; struct fz_faxd_s @@ -290,12 +290,12 @@ struct fz_faxd_s fz_stream *chain; int k; - int endofline; - int encodedbytealign; + int end_of_line; + int encoded_byte_align; int columns; int rows; - int endofblock; - int blackis1; + int end_of_block; + int black_is_1; int stride; int ridx; @@ -312,18 +312,18 @@ struct fz_faxd_s }; static inline void -eatbits(fz_faxd *fax, int nbits) +eat_bits(fz_faxd *fax, int nbits) { fax->word <<= nbits; fax->bidx += nbits; } static inline int -fillbits(fz_faxd *fax) +fill_bits(fz_faxd *fax) { while (fax->bidx >= 8) { - int c = fz_readbyte(fax->chain); + int c = fz_read_byte(fax->chain); if (c == EOF) return EOF; fax->bidx -= 8; @@ -348,7 +348,7 @@ getcode(fz_faxd *fax, const cfd_node *table, int initialbits) nbits = initialbits + table[tidx].nbits; } - eatbits(fax, nbits); + eat_bits(fax, nbits); return val; } @@ -384,10 +384,10 @@ dec1d(fz_faxd *fax) if (code < 64) { fax->c = !fax->c; - fax->stage = SNORMAL; + fax->stage = STATE_NORMAL; } else - fax->stage = SMAKEUP; + fax->stage = STATE_MAKEUP; return fz_okay; } @@ -398,7 +398,7 @@ dec2d(fz_faxd *fax) { int code, b1, b2; - if (fax->stage == SH1 || fax->stage == SH2) + if (fax->stage == STATE_H1 || fax->stage == STATE_H2) { if (fax->a == -1) fax->a = 0; @@ -425,10 +425,10 @@ dec2d(fz_faxd *fax) if (code < 64) { fax->c = !fax->c; - if (fax->stage == SH1) - fax->stage = SH2; - else if (fax->stage == SH2) - fax->stage = SNORMAL; + if (fax->stage == STATE_H1) + fax->stage = STATE_H2; + else if (fax->stage == STATE_H2) + fax->stage = STATE_NORMAL; } return fz_okay; @@ -439,28 +439,28 @@ dec2d(fz_faxd *fax) switch (code) { case H: - fax->stage = SH1; + fax->stage = STATE_H1; break; case P: - b1 = findchangingcolor(fax->ref, fax->a, fax->columns, !fax->c); + b1 = find_changing_color(fax->ref, fax->a, fax->columns, !fax->c); if (b1 >= fax->columns) b2 = fax->columns; else - b2 = findchanging(fax->ref, b1, fax->columns); + b2 = find_changing(fax->ref, b1, fax->columns); if (fax->c) setbits(fax->dst, fax->a, b2); fax->a = b2; break; case V0: - b1 = findchangingcolor(fax->ref, fax->a, fax->columns, !fax->c); + b1 = find_changing_color(fax->ref, fax->a, fax->columns, !fax->c); if (fax->c) setbits(fax->dst, fax->a, b1); fax->a = b1; fax->c = !fax->c; break; case VR1: - b1 = 1 + findchangingcolor(fax->ref, fax->a, fax->columns, !fax->c); + b1 = 1 + find_changing_color(fax->ref, fax->a, fax->columns, !fax->c); if (b1 >= fax->columns) b1 = fax->columns; if (fax->c) setbits(fax->dst, fax->a, b1); fax->a = b1; @@ -468,7 +468,7 @@ dec2d(fz_faxd *fax) break; case VR2: - b1 = 2 + findchangingcolor(fax->ref, fax->a, fax->columns, !fax->c); + b1 = 2 + find_changing_color(fax->ref, fax->a, fax->columns, !fax->c); if (b1 >= fax->columns) b1 = fax->columns; if (fax->c) setbits(fax->dst, fax->a, b1); fax->a = b1; @@ -476,7 +476,7 @@ dec2d(fz_faxd *fax) break; case VR3: - b1 = 3 + findchangingcolor(fax->ref, fax->a, fax->columns, !fax->c); + b1 = 3 + find_changing_color(fax->ref, fax->a, fax->columns, !fax->c); if (b1 >= fax->columns) b1 = fax->columns; if (fax->c) setbits(fax->dst, fax->a, b1); fax->a = b1; @@ -484,7 +484,7 @@ dec2d(fz_faxd *fax) break; case VL1: - b1 = -1 + findchangingcolor(fax->ref, fax->a, fax->columns, !fax->c); + b1 = -1 + find_changing_color(fax->ref, fax->a, fax->columns, !fax->c); if (b1 < 0) b1 = 0; if (fax->c) setbits(fax->dst, fax->a, b1); fax->a = b1; @@ -492,7 +492,7 @@ dec2d(fz_faxd *fax) break; case VL2: - b1 = -2 + findchangingcolor(fax->ref, fax->a, fax->columns, !fax->c); + b1 = -2 + find_changing_color(fax->ref, fax->a, fax->columns, !fax->c); if (b1 < 0) b1 = 0; if (fax->c) setbits(fax->dst, fax->a, b1); fax->a = b1; @@ -500,7 +500,7 @@ dec2d(fz_faxd *fax) break; case VL3: - b1 = -3 + findchangingcolor(fax->ref, fax->a, fax->columns, !fax->c); + b1 = -3 + find_changing_color(fax->ref, fax->a, fax->columns, !fax->c); if (b1 < 0) b1 = 0; if (fax->c) setbits(fax->dst, fax->a, b1); fax->a = b1; @@ -521,7 +521,7 @@ dec2d(fz_faxd *fax) } static int -readfaxd(fz_stream *stm, unsigned char *buf, int len) +read_faxd(fz_stream *stm, unsigned char *buf, int len) { fz_faxd *fax = stm->state; unsigned char *p = buf; @@ -529,15 +529,15 @@ readfaxd(fz_stream *stm, unsigned char *buf, int len) unsigned char *tmp; fz_error error; - if (fax->stage == SDONE) + if (fax->stage == STATE_DONE) return 0; - if (fax->stage == SEOL) + if (fax->stage == STATE_EOL) goto eol; loop: - if (fillbits(fax)) + if (fill_bits(fax)) { if (fax->bidx > 31) { @@ -549,13 +549,13 @@ loop: if ((fax->word >> (32 - 12)) == 0) { - eatbits(fax, 1); + eat_bits(fax, 1); goto loop; } if ((fax->word >> (32 - 12)) == 1) { - eatbits(fax, 12); + eat_bits(fax, 12); fax->eolc ++; if (fax->k > 0) @@ -566,7 +566,7 @@ loop: fax->dim = 1; else fax->dim = 2; - eatbits(fax, 1); + eat_bits(fax, 1); } } else if (fax->k > 0 && fax->a == -1) @@ -576,7 +576,7 @@ loop: fax->dim = 1; else fax->dim = 2; - eatbits(fax, 1); + eat_bits(fax, 1); } else if (fax->dim == 1) { @@ -594,7 +594,7 @@ loop: } /* no eol check after makeup codes nor in the middle of an H code */ - if (fax->stage == SMAKEUP || fax->stage == SH1 || fax->stage == SH2) + if (fax->stage == STATE_MAKEUP || fax->stage == STATE_H1 || fax->stage == STATE_H2) goto loop; /* check for eol conditions */ @@ -609,9 +609,9 @@ loop: goto loop; eol: - fax->stage = SEOL; + fax->stage = STATE_EOL; - if (fax->blackis1) + if (fax->black_is_1) { while (fax->rp < fax->wp && p < ep) *p++ = *fax->rp++; @@ -625,7 +625,6 @@ eol: if (fax->rp < fax->wp) return p - buf; - tmp = fax->ref; fax->ref = fax->dst; fax->dst = tmp; @@ -634,12 +633,12 @@ eol: fax->rp = fax->dst; fax->wp = fax->dst + fax->stride; - fax->stage = SNORMAL; + fax->stage = STATE_NORMAL; fax->c = 0; fax->a = -1; fax->ridx ++; - if (!fax->endofblock && fax->rows) + if (!fax->end_of_block && fax->rows) { if (fax->ridx >= fax->rows) goto rtc; @@ -654,13 +653,13 @@ eol: fax->dim = 2; } - /* if endofline & encodedbytealign, EOLs are *not* optional */ - if (fax->encodedbytealign) + /* if end_of_line & encoded_byte_align, EOLs are *not* optional */ + if (fax->encoded_byte_align) { - if (fax->endofline) - eatbits(fax, (12 - fax->bidx) & 7); + if (fax->end_of_line) + eat_bits(fax, (12 - fax->bidx) & 7); else - eatbits(fax, (8 - fax->bidx) & 7); + eat_bits(fax, (8 - fax->bidx) & 7); } /* no more space in output, don't decode the next row yet */ @@ -670,12 +669,12 @@ eol: goto loop; rtc: - fax->stage = SDONE; + fax->stage = STATE_DONE; return p - buf; } static void -closefaxd(fz_stream *stm) +close_faxd(fz_stream *stm) { fz_faxd *fax = stm->state; int i; @@ -683,7 +682,7 @@ closefaxd(fz_stream *stm) /* if we read any extra bytes, try to put them back */ i = (32 - fax->bidx) / 8; while (i--) - fz_unreadbyte(fax->chain); + fz_unread_byte(fax->chain); fz_close(fax->chain); fz_free(fax->ref); @@ -692,7 +691,7 @@ closefaxd(fz_stream *stm) } fz_stream * -fz_openfaxd(fz_stream *chain, fz_obj *params) +fz_open_faxd(fz_stream *chain, fz_obj *params) { fz_faxd *fax; fz_obj *obj; @@ -700,44 +699,44 @@ fz_openfaxd(fz_stream *chain, fz_obj *params) fax = fz_malloc(sizeof(fz_faxd)); fax->chain = chain; - fax->ref = nil; - fax->dst = nil; + fax->ref = NULL; + fax->dst = NULL; fax->k = 0; - fax->endofline = 0; - fax->encodedbytealign = 0; + fax->end_of_line = 0; + fax->encoded_byte_align = 0; fax->columns = 1728; fax->rows = 0; - fax->endofblock = 1; - fax->blackis1 = 0; + fax->end_of_block = 1; + fax->black_is_1 = 0; - obj = fz_dictgets(params, "K"); - if (obj) fax->k = fz_toint(obj); + obj = fz_dict_gets(params, "K"); + if (obj) fax->k = fz_to_int(obj); - obj = fz_dictgets(params, "EndOfLine"); - if (obj) fax->endofline = fz_tobool(obj); + obj = fz_dict_gets(params, "EndOfLine"); + if (obj) fax->end_of_line = fz_to_bool(obj); - obj = fz_dictgets(params, "EncodedByteAlign"); - if (obj) fax->encodedbytealign = fz_tobool(obj); + obj = fz_dict_gets(params, "EncodedByteAlign"); + if (obj) fax->encoded_byte_align = fz_to_bool(obj); - obj = fz_dictgets(params, "Columns"); - if (obj) fax->columns = fz_toint(obj); + obj = fz_dict_gets(params, "Columns"); + if (obj) fax->columns = fz_to_int(obj); - obj = fz_dictgets(params, "Rows"); - if (obj) fax->rows = fz_toint(obj); + obj = fz_dict_gets(params, "Rows"); + if (obj) fax->rows = fz_to_int(obj); - obj = fz_dictgets(params, "EndOfBlock"); - if (obj) fax->endofblock = fz_tobool(obj); + obj = fz_dict_gets(params, "EndOfBlock"); + if (obj) fax->end_of_block = fz_to_bool(obj); - obj = fz_dictgets(params, "BlackIs1"); - if (obj) fax->blackis1 = fz_tobool(obj); + obj = fz_dict_gets(params, "BlackIs1"); + if (obj) fax->black_is_1 = fz_to_bool(obj); fax->stride = ((fax->columns - 1) >> 3) + 1; fax->ridx = 0; fax->bidx = 32; fax->word = 0; - fax->stage = SNORMAL; + fax->stage = STATE_NORMAL; fax->a = -1; fax->c = 0; fax->dim = fax->k < 0 ? 2 : 1; @@ -751,5 +750,5 @@ fz_openfaxd(fz_stream *chain, fz_obj *params) memset(fax->ref, 0, fax->stride); memset(fax->dst, 0, fax->stride); - return fz_newstream(fax, readfaxd, closefaxd); + return fz_new_stream(fax, read_faxd, close_faxd); } -- cgit v1.2.3