diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2023-10-08 17:45:23 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2023-10-08 17:45:23 +0000 |
| commit | bb4ba2586d4cfe9302278a427ee4cf7a89aef53b (patch) | |
| tree | e48d17b2acafd26e2367c33d96d56cf58eb1f858 | |
| parent | 4b091760fddc73ffc877563b445599db21557e78 (diff) | |
| download | netpbm-mirror-bb4ba2586d4cfe9302278a427ee4cf7a89aef53b.tar.gz netpbm-mirror-bb4ba2586d4cfe9302278a427ee4cf7a89aef53b.tar.xz netpbm-mirror-bb4ba2586d4cfe9302278a427ee4cf7a89aef53b.zip | |
cleanup
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4736 9d0c8265-081b-0410-96cb-a4ca84ce46f8
110 files changed, 1551 insertions, 1128 deletions
diff --git a/converter/other/avstopam.c b/converter/other/avstopam.c index 322f387d..5b2be683 100644 --- a/converter/other/avstopam.c +++ b/converter/other/avstopam.c @@ -101,3 +101,6 @@ main(int argc, const char *argv[]) { return 0; } + + + diff --git a/converter/other/bmptopnm.c b/converter/other/bmptopnm.c index 3f66634b..eed428de 100644 --- a/converter/other/bmptopnm.c +++ b/converter/other/bmptopnm.c @@ -196,6 +196,8 @@ GetShort(FILE * const fp) { return v; } + + static short GetBigShort(FILE * const fp) { @@ -938,6 +940,7 @@ convertRow32(unsigned char const bmprow[], } + static void validateIndex(unsigned int const index, unsigned int const cmapSize ) { @@ -1718,3 +1721,4 @@ main(int argc, const char ** argv) { } + diff --git a/converter/other/cameratopam/camera.c b/converter/other/cameratopam/camera.c index 4610462c..62b58ad5 100644 --- a/converter/other/cameratopam/camera.c +++ b/converter/other/cameratopam/camera.c @@ -56,7 +56,6 @@ merror (const void *ptr, const char *where) - static void adobeCopyPixel(Image const image, unsigned int const row, @@ -87,6 +86,8 @@ adobeCopyPixel(Image const image, --(*rp); } + + void adobe_dng_load_raw_lj(Image const image) { @@ -187,6 +188,8 @@ nikon_compressed_load_raw(Image const image) { free (curve); } + + void nikon_load_raw(Image const image) { @@ -213,6 +216,8 @@ nikon_load_raw(Image const image) { } } + + /* Figure out if a NEF file is compressed. These fancy heuristics are only needed for the D100, thanks to a bug in some cameras @@ -235,6 +240,8 @@ nikon_is_compressed() return 0; } + + /* Returns 1 for a Coolpix 990, 0 for a Coolpix 995. */ @@ -254,6 +261,8 @@ nikon_e990() return 0; } + + /* Returns 1 for a Coolpix 2100, 0 for anything else. */ @@ -273,6 +282,8 @@ nikon_e2100() return 1; } + + /* Separates a Pentax Optio 33WR from a Nikon E3700. */ @@ -289,6 +300,8 @@ pentax_optio33() return sum[0] < sum[1]*4; } + + /* Separates a Minolta DiMAGE Z2 from a Nikon E4300. */ @@ -305,6 +318,8 @@ minolta_z2() return 0; } + + void nikon_e2100_load_raw(Image const image) { @@ -333,6 +348,8 @@ nikon_e2100_load_raw(Image const image) { } } + + void nikon_e950_load_raw(Image const image) { @@ -349,6 +366,8 @@ nikon_e950_load_raw(Image const image) { maximum = 0x3dd; } + + /* The Fuji Super CCD is just a Bayer grid rotated 45 degrees. */ @@ -368,6 +387,8 @@ fuji_s2_load_raw(Image const image) { } } + + void fuji_s3_load_raw(Image const image) { unsigned short pixel[4352]; @@ -384,6 +405,8 @@ fuji_s3_load_raw(Image const image) { } } + + static void fuji_common_load_raw(Image const image, unsigned int const ncol, @@ -444,6 +467,8 @@ fuji_f700_load_raw(Image const image) { } } + + void rollei_load_raw(Image const image) { unsigned char pixel[10]; @@ -470,6 +495,8 @@ rollei_load_raw(Image const image) { maximum = 0x3ff; } + + void phase_one_load_raw(Image const image) { int row, col, a, b; @@ -496,6 +523,8 @@ phase_one_load_raw(Image const image) { free (pixel); } + + void ixpress_load_raw(Image const image) { unsigned short pixel[4090]; @@ -510,6 +539,8 @@ ixpress_load_raw(Image const image) { } } + + void leaf_load_raw(Image const image) { unsigned short *pixel; @@ -526,6 +557,8 @@ leaf_load_raw(Image const image) { free (pixel); } + + /* For this function only, raw_width is in bytes, not pixels! */ @@ -542,6 +575,8 @@ packed_12_load_raw(Image const image) { } } + + void unpacked_load_raw(Image const image) { unsigned short *pixel; @@ -557,6 +592,8 @@ unpacked_load_raw(Image const image) { free (pixel); } + + void olympus_e300_load_raw(Image const image) { unsigned char *data, *dp; @@ -580,6 +617,8 @@ olympus_e300_load_raw(Image const image) { free (data); } + + void olympus_cseries_load_raw(Image const image) { int irow, row, col; @@ -595,6 +634,8 @@ olympus_cseries_load_raw(Image const image) { } } + + void eight_bit_load_raw(Image const image) { unsigned char *pixel; @@ -611,6 +652,8 @@ eight_bit_load_raw(Image const image) { maximum = 0xff; } + + void casio_qv5700_load_raw(Image const image) { unsigned char data[3232], *dp; @@ -631,6 +674,8 @@ casio_qv5700_load_raw(Image const image) { maximum = 0x3fc; } + + void nucore_load_raw(Image const image) { unsigned short *pixel; @@ -647,6 +692,8 @@ nucore_load_raw(Image const image) { free (pixel); } + + static int radc_token (int tree) { int t; @@ -688,6 +735,8 @@ static int radc_token (int tree) return dindex->leaf; } + + #define FORYX for (y=1; y < 3; y++) for (x=col+1; x >= col; x--) #define PREDICTOR (c ? (buf[c][y-1][x] + buf[c][y][x+1]) / 2 \ @@ -770,6 +819,8 @@ kodak_radc_load_raw(Image const image) { maximum = 0x1fff; /* wild guess */ } + + #undef FORYX #undef PREDICTOR @@ -791,6 +842,8 @@ fill_input_buffer (j_decompress_ptr cinfo) return TRUE; } + + void kodak_jpeg_load_raw(Image const image) { @@ -830,6 +883,8 @@ kodak_jpeg_load_raw(Image const image) maximum = 0xff << 1; } + + #endif void @@ -849,6 +904,8 @@ kodak_dc120_load_raw(Image const image) maximum = 0xff; } + + void kodak_dc20_coeff (float const juice) { @@ -868,6 +925,8 @@ kodak_dc20_coeff (float const juice) use_coeff = 1; } + + void kodak_easy_load_raw(Image const image) { @@ -896,6 +955,8 @@ kodak_easy_load_raw(Image const image) maximum = curve[0xff]; } + + void kodak_compressed_load_raw(Image const image) { @@ -960,6 +1021,8 @@ kodak_compressed_load_raw(Image const image) } } + + void kodak_yuv_load_raw(Image const image) { @@ -1019,6 +1082,8 @@ kodak_yuv_load_raw(Image const image) maximum = 0xe74; } + + static void sony_decrypt (unsigned *data, int len, int start, int key) { static uint32_t pad[128]; @@ -1053,6 +1118,8 @@ static void sony_decrypt (unsigned *data, int len, int start, int key) } } + + void sony_load_raw(Image const image) { @@ -1091,6 +1158,8 @@ sony_load_raw(Image const image) maximum = 0x3ff0; } + + void parse_minolta(FILE * const ifp) { @@ -1124,6 +1193,8 @@ parse_minolta(FILE * const ifp) data_offset = offset; } + + /* CIFF block 0x1030 contains an 8x8 white sample. Load this into white[][] for use in scale_colors(). @@ -1151,6 +1222,8 @@ static void ciff_block_1030() } } + + /* Parse a CIFF file, better known as Canon CRW format. */ @@ -1266,6 +1339,8 @@ common: camera_red = -1; /* Use my auto WB for this photo */ } + + void parse_rollei(FILE * const ifp) { @@ -1333,6 +1408,8 @@ parse_mos(FILE * const ifp, } } + + void nikon_e950_coeff() { @@ -1504,6 +1581,8 @@ get_timestamp(FILE * const ifp) timestamp = ts; } + + static void parse_exif(FILE * const ifp, int base) { @@ -1529,6 +1608,8 @@ parse_exif(FILE * const ifp, int base) } } + + static int parse_tiff_ifd(FILE * const ifp, int base, int level) { @@ -1725,6 +1806,8 @@ guess_cfa_pc: return done; } + + void parse_tiff(FILE * const ifp, int base) { @@ -1797,3 +1880,5 @@ parse_external_jpeg(const char * const ifname) free (jname); } + + diff --git a/converter/other/cameratopam/camera.h b/converter/other/cameratopam/camera.h index 02c3f2af..172bc46e 100644 --- a/converter/other/cameratopam/camera.h +++ b/converter/other/cameratopam/camera.h @@ -5,7 +5,7 @@ #include "cameratopam.h" -void +void parse_ciff(FILE * const ifp, int const offset, int const length); diff --git a/converter/other/cameratopam/cameratopam.c b/converter/other/cameratopam/cameratopam.c index 78eb6854..693d280c 100644 --- a/converter/other/cameratopam/cameratopam.c +++ b/converter/other/cameratopam/cameratopam.c @@ -88,6 +88,8 @@ static void CLASS merror (const void *ptr, const char *where) pm_error ("Out of memory in %s", where); } + + struct CmdlineInfo { /* All the information the user supplied in the command line, in a form easy for the program to use. @@ -136,37 +138,37 @@ parseCommandLine(int argc, char ** argv, opt.allowNegNum = FALSE; option_def_index = 0; /* incremented by OPTENT3 */ - OPTENT3(0, "bright", + OPTENT3(0, "bright", OPT_FLOAT, &cmdlineP->bright, &brightSpec, 0); - OPTENT3(0, "red_scale", + OPTENT3(0, "red_scale", OPT_FLOAT, &cmdlineP->red_scale, &red_scaleSpec, 0); - OPTENT3(0, "blue_scale", + OPTENT3(0, "blue_scale", OPT_FLOAT, &cmdlineP->blue_scale, &blue_scaleSpec, 0); - OPTENT3(0, "profile", + OPTENT3(0, "profile", OPT_STRING, &cmdlineP->profile, &profileSpec, 0); - OPTENT3(0, "identify_only", + OPTENT3(0, "identify_only", OPT_FLAG, NULL, &cmdlineP->identify_only, 0); - OPTENT3(0, "verbose", + OPTENT3(0, "verbose", OPT_FLAG, NULL, &cmdlineP->verbose, 0); - OPTENT3(0, "half_size", + OPTENT3(0, "half_size", OPT_FLAG, NULL, &cmdlineP->half_size, 0); - OPTENT3(0, "four_color_rgb", + OPTENT3(0, "four_color_rgb", OPT_FLAG, NULL, &cmdlineP->four_color_rgb, 0); - OPTENT3(0, "document_mode", + OPTENT3(0, "document_mode", OPT_FLAG, NULL, &cmdlineP->document_mode, 0); - OPTENT3(0, "quick_interpolate", + OPTENT3(0, "quick_interpolate", OPT_FLAG, NULL, &cmdlineP->quick_interpolate, 0); - OPTENT3(0, "balance_auto", + OPTENT3(0, "balance_auto", OPT_FLAG, NULL, &cmdlineP->use_auto_wb, 0); - OPTENT3(0, "balance_camera", + OPTENT3(0, "balance_camera", OPT_FLAG, NULL, &cmdlineP->use_camera_wb, 0); - OPTENT3(0, "use_secondary", + OPTENT3(0, "use_secondary", OPT_FLAG, NULL, &cmdlineP->use_secondary, 0); - OPTENT3(0, "no_clip_color", + OPTENT3(0, "no_clip_color", OPT_FLAG, NULL, &cmdlineP->no_clip_color, 0); - OPTENT3(0, "rgb", + OPTENT3(0, "rgb", OPT_FLAG, NULL, &cmdlineP->use_camera_rgb, 0); - OPTENT3(0, "linear", + OPTENT3(0, "linear", OPT_FLAG, NULL, &cmdlineP->linear, 0); pm_optParseOptions3(&argc, argv, opt, sizeof(opt), 0); @@ -185,12 +187,12 @@ parseCommandLine(int argc, char ** argv, cmdlineP->inputFileName = strdup("-"); /* he wants stdin */ else if (argc - 1 == 1) cmdlineP->inputFileName = strdup(argv[1]); - else + else pm_error("Too many arguments. The only argument accepted " "is the input file name"); } - + static void CLASS fixBadPixels(Image const image) { @@ -658,9 +660,9 @@ fujiRotate(Image * const imageP) { newImage[row*wide+col][i] = (pix[ 0][i]*(1-fc) + pix[ 1][i]*fc) * (1-fr) + (pix[width][i]*(1-fc) + pix[width+1][i]*fc) * fr; - } + } } - } + } free(*imageP); width = wide; height = high; @@ -920,7 +922,7 @@ convertIt(FILE * const ifP, if (flip) { if (cmdline.verbose) pm_message ("Flipping image %c:%c:%c...", - flip & 1 ? 'H':'0', flip & 2 ? 'V':'0', + flip & 1 ? 'H':'0', flip & 2 ? 'V':'0', flip & 4 ? 'T':'0'); flipImage(image); } @@ -931,7 +933,7 @@ convertIt(FILE * const ifP, -int +int main (int argc, char **argv) { FILE * const ofP = stdout; diff --git a/converter/other/cameratopam/canon.c b/converter/other/cameratopam/canon.c index cbf5ece0..f86f43d8 100644 --- a/converter/other/cameratopam/canon.c +++ b/converter/other/cameratopam/canon.c @@ -170,3 +170,6 @@ canon_compressed_load_raw(Image const image) { if (raw_width > width) black /= (raw_width - width) * height; } + + + diff --git a/converter/other/cameratopam/decode.c b/converter/other/cameratopam/decode.c index e3a62fab..d42f8619 100644 --- a/converter/other/cameratopam/decode.c +++ b/converter/other/cameratopam/decode.c @@ -44,15 +44,15 @@ void init_decoder() { */ -unsigned char * -make_decoder(const unsigned char * const source, +unsigned char * +make_decoder(const unsigned char * const source, int const level) { struct decode *cur; static int leaf; int i, next; - if (level==0) + if (level==0) leaf=0; cur = free_decode++; if (free_decode > first_decode+2048) { @@ -74,7 +74,7 @@ make_decoder(const unsigned char * const source, -const int * +const int * make_decoder_int(const int * const source, int const level) { @@ -98,7 +98,7 @@ make_decoder_int(const int * const source, -void +void crw_init_tables(unsigned int const table) { unsigned int const clippedTableNum = MIN(2, table); @@ -170,3 +170,5 @@ crw_init_tables(unsigned int const table) { make_decoder (second_tree[clippedTableNum], 0); } + + diff --git a/converter/other/cameratopam/decode.h b/converter/other/cameratopam/decode.h index b0addc82..e79a6989 100644 --- a/converter/other/cameratopam/decode.h +++ b/converter/other/cameratopam/decode.h @@ -1,22 +1,22 @@ struct decode { struct decode *branch[2]; int leaf; -}; +}; extern struct decode * free_decode; extern struct decode first_decode[2048]; extern struct decode * second_decode; -void +void init_decoder(void); -void +void crw_init_tables(unsigned int const table); -const int * -make_decoder_int (const int * const source, +const int * +make_decoder_int (const int * const source, int const level); -unsigned char * -make_decoder(const unsigned char * const source, +unsigned char * +make_decoder(const unsigned char * const source, int const level); diff --git a/converter/other/cameratopam/dng.c b/converter/other/cameratopam/dng.c index bddfd9f4..fbd2028f 100644 --- a/converter/other/cameratopam/dng.c +++ b/converter/other/cameratopam/dng.c @@ -3,7 +3,7 @@ #include "dng.h" -void +void dng_coeff (double cc[4][4], double cm[4][3], double xyz[3]) { diff --git a/converter/other/cameratopam/dng.h b/converter/other/cameratopam/dng.h index 56293563..2b7c96df 100644 --- a/converter/other/cameratopam/dng.h +++ b/converter/other/cameratopam/dng.h @@ -1,4 +1,4 @@ -void +void dng_coeff(double cc[4][4], double cm[4][3], double xyz[3]); diff --git a/converter/other/cameratopam/foveon.c b/converter/other/cameratopam/foveon.c index 5a26777b..23cffe67 100644 --- a/converter/other/cameratopam/foveon.c +++ b/converter/other/cameratopam/foveon.c @@ -339,6 +339,8 @@ foveon_fixed (void * const ptr, return 1; } + + static float foveon_avg (unsigned short *pix, int range[2], float cfilt) { int i; @@ -353,6 +355,8 @@ static float foveon_avg (unsigned short *pix, int range[2], float cfilt) return (sum - min - max) / (range[1] - range[0] - 1); } + + static short *foveon_make_curve (double max, double mul, double filt) { short *curve; @@ -373,6 +377,8 @@ static short *foveon_make_curve (double max, double mul, double filt) return curve; } + + static void foveon_make_curves (short **curvep, float dq[3], float div[3], float filt) { @@ -384,12 +390,16 @@ static void foveon_make_curves FORC3 curvep[c] = foveon_make_curve (max, mul[c], filt); } + + static int foveon_apply_curve (short *curve, int i) { if (abs(i) >= (unsigned short)curve[0]) return 0; return i < 0 ? -(unsigned short)curve[1-i] : (unsigned short)curve[1+i]; } + + void foveon_interpolate(Image const image, float coeff[3][4]) { @@ -797,3 +807,6 @@ foveon_interpolate(Image const image, width = i; height = row; } + + + diff --git a/converter/other/cameratopam/foveon.h b/converter/other/cameratopam/foveon.h index c9bf48a8..584a38f6 100644 --- a/converter/other/cameratopam/foveon.h +++ b/converter/other/cameratopam/foveon.h @@ -3,15 +3,15 @@ #include "cameratopam.h" #include "camera.h" -void +void parse_foveon(FILE * const ifp); -void +void foveon_interpolate(Image const image, float coeff[3][4]); LoadRawFn foveon_load_raw; -void +void foveon_coeff(int * const useCoeffP, float coeff[3][4]); diff --git a/converter/other/cameratopam/identify.c b/converter/other/cameratopam/identify.c index e5df6b22..c1eb8a25 100644 --- a/converter/other/cameratopam/identify.c +++ b/converter/other/cameratopam/identify.c @@ -263,7 +263,6 @@ adobeCoeff(const char * const make, - int identify(FILE * const ifp, bool const use_secondary, @@ -1206,3 +1205,6 @@ dng_skip: return 0; } + + + diff --git a/converter/other/cameratopam/ljpeg.c b/converter/other/cameratopam/ljpeg.c index 35f50f4b..d1ede87c 100644 --- a/converter/other/cameratopam/ljpeg.c +++ b/converter/other/cameratopam/ljpeg.c @@ -161,3 +161,6 @@ lossless_jpeg_load_raw(Image const image) { if (!strcasecmp(make,"KODAK")) black = min; } + + + diff --git a/converter/other/cameratopam/ljpeg.h b/converter/other/cameratopam/ljpeg.h index 9d9d8ee9..7b1cf364 100644 --- a/converter/other/cameratopam/ljpeg.h +++ b/converter/other/cameratopam/ljpeg.h @@ -8,11 +8,11 @@ struct jhead { LoadRawFn lossless_jpeg_load_raw; -int +int ljpeg_start (FILE * const ifP, struct jhead * const jhP); -int +int ljpeg_diff (FILE * const ifP, struct decode * const dindexP); diff --git a/converter/other/cameratopam/util.c b/converter/other/cameratopam/util.c index ede5ef69..d489b23e 100644 --- a/converter/other/cameratopam/util.c +++ b/converter/other/cameratopam/util.c @@ -28,6 +28,8 @@ get2(FILE * const ifp) return a << 8 | b; } + + /* Same for a 4-byte integer. */ @@ -45,6 +47,8 @@ get4(FILE * const ifp) return a << 24 | b << 16 | c << 8 | d; } + + /* Faster than calling get2() multiple times. */ @@ -68,11 +72,13 @@ read_shorts (FILE * const ifp, unsigned short *pixel, int count) } } + + /* getbits(-1) initializes the buffer getbits(n) where 0 <= n <= 25 returns an n-bit integer */ -unsigned +unsigned getbits (FILE * const ifp, int nbits) { static unsigned long bitbuf=0; @@ -95,3 +101,6 @@ getbits (FILE * const ifp, int nbits) } return ret; } + + + diff --git a/converter/other/exif.c b/converter/other/exif.c index d1eb517f..b2a7bd5d 100644 --- a/converter/other/exif.c +++ b/converter/other/exif.c @@ -613,6 +613,7 @@ commentValue(const unsigned char * const valuePtr, } + /* Forward declaration for recursion */ static void diff --git a/converter/other/fitstopnm.c b/converter/other/fitstopnm.c index 804d4ae9..ca621164 100644 --- a/converter/other/fitstopnm.c +++ b/converter/other/fitstopnm.c @@ -361,7 +361,6 @@ readCard(FILE * const ifP, - static void processNaxisN(unsigned int const n, int const value, @@ -397,7 +396,7 @@ readFitsHeader(FILE * const ifP, bool gotEmpty, gotSimple, gotNaxis, gotN1, gotN2, gotN3, gotBitpix, gotEnd; - gotEmpty = false; /* initial value */ + gotEmpty = false; /* initial value */ gotSimple = false; /* initial value */ gotNaxis = false; /* initial value */ gotN1 = false; /* initial value */ @@ -463,7 +462,7 @@ readFitsHeader(FILE * const ifP, gotEnd = true; if (gotEmpty == true) pm_message("Blank card(s) were encountered before " - "END in header"); + "END in header"); } } } diff --git a/converter/other/gemtopnm.c b/converter/other/gemtopnm.c index 6bbfcc05..c7d3433b 100644 --- a/converter/other/gemtopnm.c +++ b/converter/other/gemtopnm.c @@ -255,6 +255,7 @@ main(argc, argv) } + static void getinit (file, colsP, rowsP, padrightP, patlenP, planesP) FILE *file; diff --git a/converter/other/giftopnm.c b/converter/other/giftopnm.c index 470c85b7..bc1d545a 100644 --- a/converter/other/giftopnm.c +++ b/converter/other/giftopnm.c @@ -291,6 +291,7 @@ initGif89(struct Gif89 * const gif89P) { } + static bool verbose; static bool showComment; @@ -1237,7 +1238,6 @@ lzwReadByteFresh(struct GetCodeState * const getCodeStateP, - static void lzwReadByte(Decompressor * const decompP, unsigned char * const dataReadP, @@ -1357,6 +1357,7 @@ bumpRowInterlace(unsigned int const rows, } + static void renderRow(unsigned char * const cmapIndexRow, unsigned int const cols, @@ -2198,3 +2199,4 @@ main(int argc, const char **argv) { } + diff --git a/converter/other/hdifftopam.c b/converter/other/hdifftopam.c index c9363040..7464bb1a 100644 --- a/converter/other/hdifftopam.c +++ b/converter/other/hdifftopam.c @@ -1,7 +1,7 @@ /****************************************************************************** hdifftopam ******************************************************************************* - This program recovers a PAM image from a horizontal difference images + This program recovers a PAM image from a horizontal difference images such as created by Pamtohdiff. By Bryan Henderson, San Jose, CA 2002.04.15. @@ -64,7 +64,7 @@ static void makePnm(struct pam * const pamP) { switch (pamP->depth) { - case 1: + case 1: pamP->format = PGM_FORMAT; break; case 3: @@ -87,7 +87,7 @@ static void -int +int main(int argc, char *argv[]) { FILE *ifP; struct cmdlineInfo cmdline; @@ -105,9 +105,9 @@ main(int argc, char *argv[]) { pnm_readpaminit(ifP, &diffpam, PAM_STRUCT_SIZE(tuple_type)); - if (diffpam.format != PAM_FORMAT) + if (diffpam.format != PAM_FORMAT) pm_error("Input must be a PAM file, not PNM"); - else if (!streq(diffpam.tuple_type, "hdiff")) + else if (!streq(diffpam.tuple_type, "hdiff")) pm_error("Input tuple type is '%s'. Must be 'hdiff'", diffpam.tuple_type); @@ -130,7 +130,7 @@ main(int argc, char *argv[]) { { unsigned int const bias = diffpam.maxval/2; - + for (row = 0; row < diffpam.height; ++row) { unsigned int col; pnm_readpamrow(&diffpam, diffrow); @@ -139,8 +139,8 @@ main(int argc, char *argv[]) { for (plane = 0; plane < diffpam.depth; ++plane) { sample const prevSample = prevrow[col][plane]; sample const diffSample = diffrow[col][plane]; - - outrow[col][plane] = + + outrow[col][plane] = (-bias + prevSample + diffSample) % (outpam.maxval+1); prevrow[col][plane] = outrow[col][plane]; } @@ -155,3 +155,5 @@ main(int argc, char *argv[]) { exit(0); } + + diff --git a/converter/other/jbig/jbigtopnm.c b/converter/other/jbig/jbigtopnm.c index 0d55ccc1..69767e11 100644 --- a/converter/other/jbig/jbigtopnm.c +++ b/converter/other/jbig/jbigtopnm.c @@ -198,6 +198,7 @@ diagnose_bie(FILE *f) } + int main (int argc, const char **argv) { CmdlineInfo cmdline; diff --git a/converter/other/jbig/libjbig/jbig.c b/converter/other/jbig/libjbig/jbig.c index 42932ca7..fcb39f5c 100644 --- a/converter/other/jbig/libjbig/jbig.c +++ b/converter/other/jbig/libjbig/jbig.c @@ -150,6 +150,7 @@ static void *checked_malloc(size_t nmemb, size_t size) } + static void *checked_realloc(void *ptr, size_t nmemb, size_t size) { void *p; @@ -176,6 +177,7 @@ static void *checked_realloc(void *ptr, size_t nmemb, size_t size) } + static void checked_free(void *ptr) { free(ptr); @@ -188,7 +190,6 @@ static void checked_free(void *ptr) - /* * Memory management for buffers which are used for temporarily * storing SDEs by the encoder. @@ -229,6 +230,7 @@ static struct jbg_buf *jbg_buf_init(struct jbg_buf **free_list) } + /* * Return an entire free_list to the memory management of stdlib. * This is only done by jbg_enc_free(). @@ -247,6 +249,7 @@ static void jbg_buf_free(struct jbg_buf **free_list) } + /* * Append a single byte to a single list that starts with the block * *(struct jbg_buf *) head. The type of *head is void here in order to @@ -272,6 +275,7 @@ static void jbg_buf_write(int b, void *head) } + /* * Remove any trailing zero bytes from the end of a linked jbg_buf list, * however make sure that no zero byte is removed which directly @@ -311,6 +315,7 @@ static void jbg_buf_remove_zeros(struct jbg_buf *head) } + /* * The jbg_buf list which starts with block *new_prefix is concatenated * with the list which starts with block **start and *start will then point @@ -327,6 +332,7 @@ static void jbg_buf_prefix(struct jbg_buf *new_prefix, struct jbg_buf **start) } + /* * Send the contents of a jbg_buf list that starts with block **head to * the call back function data_out and return the blocks of the jbg_buf @@ -352,6 +358,7 @@ static void jbg_buf_output(struct jbg_buf **head, } + /* * Calculate y = ceil(x/2) applied n times, which is equivalent to * y = ceil(x/(2^n)). This function is used to @@ -369,6 +376,7 @@ unsigned long jbg_ceil_half(unsigned long x, int n) } + /* * Set L0 (the number of lines in a stripe at lowest resolution) * to a default value, such that there are about 35 stripes, as @@ -384,6 +392,7 @@ static void jbg_set_default_l0(struct jbg_enc_state *s) } + /* * Calculate the number of stripes, as defined in clause 6.2.3 of T.82. */ @@ -396,6 +405,7 @@ static unsigned long jbg_stripes(unsigned long l0, unsigned long yd, } + /* * Resolution reduction table given by ITU-T T.82 Table 17 */ @@ -818,6 +828,7 @@ void jbg_enc_init(struct jbg_enc_state *s, unsigned long x, unsigned long y, } + /* * This function selects the number of differential layers based on * the maximum size requested for the lowest resolution layer. If @@ -843,6 +854,7 @@ int jbg_enc_lrlmax(struct jbg_enc_state *s, unsigned long x, } + /* * As an alternative to jbg_enc_lrlmax(), the following function allows the * user to specify the number of layers directly. The stripe height and layer @@ -860,6 +872,7 @@ void jbg_enc_layers(struct jbg_enc_state *s, int d) } + /* * Specify the highest and lowest resolution layers which will be * written to the output file. Call this function not before @@ -876,6 +889,7 @@ int jbg_enc_lrange(struct jbg_enc_state *s, int dl, int dh) } + /* * The following function allows the user to specify the bits describing the * options of the format as well as the maximum AT movement window and the @@ -894,6 +908,7 @@ void jbg_enc_options(struct jbg_enc_state *s, int order, int options, } + /* * This function actually does all the tricky work involved in producing * a SDE, which is stored in the appropriate s->sde[][][] element @@ -1507,6 +1522,7 @@ static void encode_sde(struct jbg_enc_state *s, } + /* * Create the next lower resolution version of an image */ @@ -1619,6 +1635,7 @@ static void resolution_reduction(struct jbg_enc_state *s, int plane, } + /* * This function is called inside the three loops of jbg_enc_out() in * order to write the next SDE. It has first to generate the required @@ -1697,6 +1714,7 @@ static void output_sde(struct jbg_enc_state *s, } + /* * Convert the table which controls the deterministic prediction * process from the internal format into the representation required @@ -1748,6 +1766,7 @@ void jbg_int2dppriv(unsigned char *dptable, const char *internal) } + /* * Convert the table which controls the deterministic prediction * process from the 1728 byte long DPTABLE format into the 6912 byte long @@ -1779,6 +1798,7 @@ void jbg_dppriv2int(char *internal, const unsigned char *dptable) } + /* * Encode one full BIE and pass the generated data to the specified * call-back function @@ -1973,6 +1993,7 @@ void jbg_enc_out(struct jbg_enc_state *s) } + void jbg_enc_free(struct jbg_enc_state *s) { unsigned long stripe; @@ -2023,6 +2044,7 @@ void jbg_enc_free(struct jbg_enc_state *s) } + /* * Convert the error codes used by jbg_dec_in() into an English ASCII string */ @@ -2036,6 +2058,7 @@ const char *jbg_strerror(int errnum) } + /* * The constructor for a decoder */ @@ -2055,6 +2078,7 @@ void jbg_dec_init(struct jbg_dec_state *s) } + /* * Specify a maximum image size for the decoder. If the JBIG file has * the order bit ILEAVE, but not the bit SEQ set, then the decoder @@ -2072,6 +2096,7 @@ void jbg_dec_maxsize(struct jbg_dec_state *s, unsigned long xmax, } + /* * Decode the new len PSDC bytes to which data points and add them to * the current stripe. Return the number of bytes which have actually @@ -2528,6 +2553,7 @@ static size_t decode_pscd(struct jbg_dec_state *s, unsigned char *data, } + /* * Provide to the decoder a new BIE fragment of len bytes starting at data. * @@ -2893,6 +2919,7 @@ int jbg_dec_in(struct jbg_dec_state *s, unsigned char *data, size_t len, } + /* * After jbg_dec_in() returned JBG_EOK or JBG_EOK_INTR, you can call this * function in order to find out the width of the image. Returns 0 if @@ -2913,6 +2940,7 @@ unsigned long jbg_dec_getwidth(const struct jbg_dec_state *s) } + /* * After jbg_dec_in() returned JBG_EOK or JBG_EOK_INTR, you can call this * function in order to find out the height of the image. Returns 0 if @@ -2933,6 +2961,7 @@ unsigned long jbg_dec_getheight(const struct jbg_dec_state *s) } + /* * After jbg_dec_in() returned JBG_EOK or JBG_EOK_INTR, you can call this * function in order to get a pointer to the image. Returns NULL if @@ -2953,6 +2982,7 @@ unsigned char *jbg_dec_getimage(const struct jbg_dec_state *s, int plane) } + /* * After jbg_dec_in() returned JBG_EOK or JBG_EOK_INTR, you can call * this function in order to find out the size in bytes of one @@ -2975,6 +3005,7 @@ unsigned long jbg_dec_getsize(const struct jbg_dec_state *s) } + /* * After jbg_dec_in() returned JBG_EOK or JBG_EOK_INTR, you can call * this function in order to find out the size of the image that you @@ -2998,6 +3029,7 @@ unsigned long jbg_dec_getsize_merged(const struct jbg_dec_state *s) } + /* * The destructor function which releases any resources obtained by the * other decoder functions. @@ -3036,6 +3068,7 @@ void jbg_dec_free(struct jbg_dec_state *s) } + /* * Split bigendian integer pixel field into separate bit planes. In the * src array, every pixel is represented by a ((has_planes + 7) / 8) byte @@ -3100,6 +3133,8 @@ void jbg_split_planes(unsigned long x, unsigned long y, int has_planes, return; } + + /* * Merge the separate bit planes decoded by the JBIG decoder into an * integer pixel field. This is essentially the counterpart to @@ -3163,6 +3198,7 @@ void jbg_dec_merge_planes(const struct jbg_dec_state *s, int use_graycode, } + /* * Given a pointer p to the first byte of either a marker segment or a * PSCD, as well as the length len of the remaining data, return @@ -3232,6 +3268,7 @@ static unsigned char *jbg_next_pscdms(unsigned char *p, size_t len) } + /* * Scan a complete BIE for a NEWLEN marker segment, then read the new * YD value found in it and use it to overwrite the one in the BIE @@ -3281,3 +3318,6 @@ int jbg_newlen(unsigned char *bie, size_t len) } return JBG_EINVAL | 0; } + + + diff --git a/converter/other/jbig/libjbig/jbig_ar.c b/converter/other/jbig/libjbig/jbig_ar.c index 194e13eb..aad293f2 100644 --- a/converter/other/jbig/libjbig/jbig_ar.c +++ b/converter/other/jbig/libjbig/jbig_ar.c @@ -119,6 +119,7 @@ void arith_encode_init(struct jbg_arenc_state *s, int reuse_st) } + void arith_encode_flush(struct jbg_arenc_state *s) { unsigned long temp; @@ -167,6 +168,7 @@ void arith_encode_flush(struct jbg_arenc_state *s) } + void arith_encode(struct jbg_arenc_state *s, int cx, int pix) { register unsigned lsz, ss; @@ -259,6 +261,7 @@ void arith_encode(struct jbg_arenc_state *s, int cx, int pix) } + void arith_decode_init(struct jbg_ardec_state *s, int reuse_st) { int i; @@ -273,6 +276,8 @@ void arith_decode_init(struct jbg_ardec_state *s, int reuse_st) return; } + + /* * Decode and return one symbol from the provided PSCD byte stream * that starts in s->pscd_ptr and ends in the byte before s->pscd_end. @@ -415,3 +420,6 @@ int arith_decode(struct jbg_ardec_state *s, int cx) return pix; } + + + diff --git a/converter/other/jbig/pnmtojbig.c b/converter/other/jbig/pnmtojbig.c index 5757680e..ebdb4993 100644 --- a/converter/other/jbig/pnmtojbig.c +++ b/converter/other/jbig/pnmtojbig.c @@ -64,6 +64,7 @@ static void } + /* * Callback procedure which is used by JBIG encoder to deliver the * encoded data. It simply sends the bytes to the output file. @@ -461,3 +462,6 @@ main(int argc, char **argv) { return 0; } + + + diff --git a/converter/other/jpegdatasource.c b/converter/other/jpegdatasource.c index 1f53c2a4..34393a7b 100644 --- a/converter/other/jpegdatasource.c +++ b/converter/other/jpegdatasource.c @@ -7,18 +7,18 @@ This data source manager is the same as the Jpeg library's built in "stdio" one, except that it looks ahead and one can query it to see if there is any data in the stream that the Jpeg library hasn't seen - yet. Thus, you can use it in a program that reads multiple JPEG + yet. Thus, you can use it in a program that reads multiple JPEG images and know when to stop. You can also nicely handle completely empty input files more gracefully than just crying input error. - This data source manager does 4K fread() reads and passes 4K buffers + This data source manager does 4K fread() reads and passes 4K buffers to the Jpeg library. It reads one 4K block ahead, so there is up to 8K of image buffered at any time. By Bryan Henderson, San Jose CA 2002.10.13 *****************************************************************************/ -#include <ctype.h> +#include <ctype.h> #include <stdlib.h> #include <stdio.h> #include <errno.h> @@ -92,7 +92,7 @@ dsFillInputBuffer(j_decompress_ptr const cinfoP) { truncation and pad out the image with gray. */ srcP->prematureEof = TRUE; - + srcP->jpegSourceMgr.next_input_byte = jfifEoiMarker; srcP->jpegSourceMgr.bytes_in_buffer = sizeof(jfifEoiMarker); } else { @@ -107,7 +107,7 @@ dsFillInputBuffer(j_decompress_ptr const cinfoP) { } /* Fill the new "next" buffer */ - srcP->bytesInNextBuffer = + srcP->bytesInNextBuffer = fread(srcP->nextBuffer, 1, BUFFER_SIZE, srcP->ifP); } return TRUE; @@ -166,7 +166,7 @@ dsPrematureEof(struct sourceManager * const srcP) { -struct sourceManager * +struct sourceManager * dsCreateSource(const char * const fileName) { struct sourceManager * srcP; @@ -182,22 +182,24 @@ dsCreateSource(const char * const fileName) { srcP->jpegSourceMgr.skip_input_data = dsSkipInputData; srcP->jpegSourceMgr.resync_to_restart = jpeg_resync_to_restart; srcP->jpegSourceMgr.term_source = dsTermSource; - + srcP->prematureEof = FALSE; srcP->currentBuffer = srcP->buffer1; srcP->nextBuffer = srcP->buffer2; - srcP->jpegSourceMgr.bytes_in_buffer = + srcP->jpegSourceMgr.bytes_in_buffer = fread(srcP->currentBuffer, 1, BUFFER_SIZE, srcP->ifP); srcP->jpegSourceMgr.next_input_byte = srcP->currentBuffer; - srcP->bytesInNextBuffer = + srcP->bytesInNextBuffer = fread(srcP->nextBuffer, 1, BUFFER_SIZE, srcP->ifP); return srcP; } + + void dsDestroySource(struct sourceManager * const srcP) { - + pm_close(srcP->ifP); free(srcP); @@ -209,3 +211,6 @@ struct jpeg_source_mgr * dsJpegSourceMgr(struct sourceManager * const srcP) { return &srcP->jpegSourceMgr; } + + + diff --git a/converter/other/jpegdatasource.h b/converter/other/jpegdatasource.h index 58648fe4..70d55d11 100644 --- a/converter/other/jpegdatasource.h +++ b/converter/other/jpegdatasource.h @@ -3,7 +3,7 @@ #include "pm_c_util.h" -struct sourceManager * +struct sourceManager * dsCreateSource(const char * const fileName); void diff --git a/converter/other/jpegtopnm.c b/converter/other/jpegtopnm.c index 518d80ac..33baf6f0 100644 --- a/converter/other/jpegtopnm.c +++ b/converter/other/jpegtopnm.c @@ -53,7 +53,7 @@ #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ #include <stdbool.h> -#include <ctype.h> /* to declare isprint() */ +#include <ctype.h> /* to declare isprint() */ #include <string.h> #include <stdlib.h> #include <stdio.h> @@ -142,6 +142,7 @@ interpretMaxmemory(bool const maxmemorySpec, } + static void interpretAdobe(int const adobe, int const notadobe, @@ -265,6 +266,7 @@ parseCommandLine(int const argc, } + /* * Marker processor for COM and interesting APPn markers. * This replaces the library's built-in processor, which just skips the marker. @@ -288,6 +290,7 @@ jpegGetc (j_decompress_ptr const cinfoP) { } + static bool printTextMarker(j_decompress_ptr const cinfoP) { /*---------------------------------------------------------------------------- @@ -320,12 +323,12 @@ printTextMarker(j_decompress_ptr const cinfoP) { length = jpeg_getc(cinfoP) << 8; length += jpeg_getc(cinfoP); - length -= 2; /* discount the length word itself */ + length -= 2; /* discount the length word itself */ if (traceit) { if (cinfoP->unread_marker == JPEG_COM) fprintf(stderr, "Comment, length %ld:\n", (long) length); - else /* assume it is an APPn otherwise */ + else /* assume it is an APPn otherwise */ fprintf(stderr, "APP%d, length %ld:\n", cinfoP->unread_marker - JPEG_APP0, (long) length); } @@ -409,6 +412,7 @@ printMarker(struct jpeg_marker_struct const marker) { } + typedef struct rgb {unsigned int r; unsigned int g; unsigned int b;} rgb_type; @@ -916,7 +920,6 @@ convertImage(FILE * const ofP, - static void saveMarkers(struct jpeg_decompress_struct * const cinfoP) { diff --git a/converter/other/pamtoavs.c b/converter/other/pamtoavs.c index 4764c9e8..2e2bf254 100644 --- a/converter/other/pamtoavs.c +++ b/converter/other/pamtoavs.c @@ -39,6 +39,7 @@ sample2char(sample const s, } + #define THIS_SAMPLE_CHAR(PLANE) \ sample2char(tuplerow[col][PLANE], pamP->maxval) @@ -148,3 +149,5 @@ main(int argc, const char *argv[]) { return 0; } + + diff --git a/converter/other/pamtodjvurle.c b/converter/other/pamtodjvurle.c index cae9e026..cc3a119c 100644 --- a/converter/other/pamtodjvurle.c +++ b/converter/other/pamtodjvurle.c @@ -2,7 +2,7 @@ pamtodjvurle ****************************************************************************** This program converts a PAM image to DjVu Color RLE format. - + By Bryan Henderson, San Jose, CA April 2004. Contributed to the public domain by its author. @@ -30,13 +30,13 @@ struct cmdlineInfo { -static void -parseCommandLine(int argc, - char ** argv, +static void +parseCommandLine(int argc, + char ** argv, struct cmdlineInfo * const cmdlineP) { /* -------------------------------------------------------------------------- Parse program command line described in Unix standard form by argc - and argv. Return the information in the options as *cmdlineP. + and argv. Return the information in the options as *cmdlineP. If command line is internally inconsistent (invalid options, etc.), issue error message to stderr and abort program. @@ -47,16 +47,16 @@ parseCommandLine(int argc, optEntry *option_def = malloc( 100*sizeof( optEntry ) ); /* Instructions to pm_optParseOptions3 on how to parse our options. */ optStruct3 opt; - + unsigned int option_def_index; unsigned int transparentSpec; option_def_index = 0; /* incremented by OPTENTRY */ - OPTENT3(0, "transparent", OPT_STRING, &cmdlineP->transparent, + OPTENT3(0, "transparent", OPT_STRING, &cmdlineP->transparent, &transparentSpec, 0); OPTENT3(0, "showcolormap", OPT_FLAG, NULL, &cmdlineP->showcolormap, 0); - + opt.opt_table = option_def; opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */ opt.allowNegNum = FALSE; /* We have no parms that are negative numbers */ @@ -73,7 +73,7 @@ parseCommandLine(int argc, cmdlineP->inputFilespec = argv[1]; else cmdlineP->inputFilespec = "-"; - + if (argc-1 > 1) pm_error("Program takes at most one argument: the file name. " "You specified %d", argc-1); @@ -96,7 +96,7 @@ computeColorMap(struct pam * const pamP, if (numColors > 0xFF0) pm_error("too many colors; " "use pnmquant to reduce to no more than %u colors", 0xFF0); - + if (show) { unsigned int colorIndex; fprintf(stderr, "Color map:\n"); @@ -123,7 +123,7 @@ makeDjvurleHeader(FILE * const ofP, struct pam * const pamP, unsigned int const numColors, tupletable const colormap) { - + unsigned int colorIndex; fprintf(ofP, "R6\n"); @@ -138,7 +138,7 @@ makeDjvurleHeader(FILE * const ofP, blu = colormap[colorIndex]->tuple[PAM_BLU_PLANE]; } else red = grn = blu = colormap[colorIndex]->tuple[0]; - + fputc(pnm_scalesample(red, pamP->maxval, 255), ofP); fputc(pnm_scalesample(grn, pamP->maxval, 255), ofP); fputc(pnm_scalesample(blu, pamP->maxval, 255), ofP); @@ -166,18 +166,18 @@ colorEqual(tuple comparand, -static void -writeRleRun(FILE * const ofP, +static void +writeRleRun(FILE * const ofP, struct pam * const pamP, - tuple const color, + tuple const color, int const count, tuplehash const colorhash, tuple const transcolor) { /*---------------------------------------------------------------------------- - Write one DjVu Color RLE run to the file 'ofP'. The run is + Write one DjVu Color RLE run to the file 'ofP'. The run is 'count' pixels of color 'color', using the color index given by 'colorhash' and assuming 'transcolor' is the transparent color. - + 'transcolor' is a 3-deep tuple with the same maxval as the image. -----------------------------------------------------------------------------*/ uint32_t rlevalue; /* RLE-encoded color/valuex */ @@ -192,7 +192,7 @@ writeRleRun(FILE * const ofP, assert(found); } rlevalue = (index << 20) | count; - + pm_writebiglong(ofP, rlevalue); } } @@ -212,10 +212,10 @@ writeDjvurleRow(FILE * const ofP, prevpixel = tupleRow[0]; runlength = 0; - + for (col = 0; col < pamP->width; ++col) { tuple const newpixel = tupleRow[col]; /* Current pixel color */ - + if (pnm_tupleequal(pamP, newpixel, prevpixel)) /* This is a continuation of the current run */ ++runlength; @@ -223,7 +223,7 @@ writeDjvurleRow(FILE * const ofP, /* The run is over. Write it out and start a run of the next color. */ - writeRleRun(ofP, pamP, prevpixel, runlength, + writeRleRun(ofP, pamP, prevpixel, runlength, colorhash, transcolor); runlength = 1; prevpixel = newpixel; @@ -232,7 +232,7 @@ writeDjvurleRow(FILE * const ofP, /* Can't make the run any longer. Write it out and start a new run. */ - writeRleRun(ofP, pamP, prevpixel, runlength, + writeRleRun(ofP, pamP, prevpixel, runlength, colorhash, transcolor); runlength = 1; } @@ -243,7 +243,7 @@ writeDjvurleRow(FILE * const ofP, -int +int main(int argc, char *argv[]) { FILE * const rlefile = stdout; @@ -254,7 +254,7 @@ main(int argc, char *argv[]) { tuple ** tupleArray; /* The image raster */ tupletable colormap; /* List of all of the colors used */ unsigned int numColors; /* Number of unique colors in the color map */ - tuplehash colorhash; + tuplehash colorhash; /* Mapping from color to index into colormap[] */ tuple transcolor; /* Color that should be considered transparent */ @@ -268,10 +268,10 @@ main(int argc, char *argv[]) { tupleArray = pnm_readpam(ifP, &pam, PAM_STRUCT_SIZE(tuple_type)); transcolor = pnm_parsecolor(cmdline.transparent, pam.maxval); - + computeColorMap(&pam, tupleArray, &numColors, &colormap, &colorhash, cmdline.showcolormap); - + makeDjvurleHeader(rlefile, &pam, numColors, colormap); /* Write the raster */ @@ -279,11 +279,11 @@ main(int argc, char *argv[]) { { unsigned int row; for (row = 0; row < pam.height; ++row) - writeDjvurleRow(rlefile, &pam, tupleArray[row], colorhash, + writeDjvurleRow(rlefile, &pam, tupleArray[row], colorhash, transcolor); } /* Clean up */ - + pnm_freepamarray(tupleArray, &pam); pnm_freetupletable(&pam, colormap); pnm_destroytuplehash(colorhash); @@ -292,3 +292,6 @@ main(int argc, char *argv[]) { return 0; } + + + diff --git a/converter/other/pamtogif.c b/converter/other/pamtogif.c index 341c9c03..11e9bdcd 100644 --- a/converter/other/pamtogif.c +++ b/converter/other/pamtogif.c @@ -406,7 +406,6 @@ rowReaderGotoNextInterlaceRow(RowReader * const rdrP) { - static void rowReaderGotoNextStraightRow(RowReader * const rdrP) { /*---------------------------------------------------------------------------- @@ -1269,6 +1268,7 @@ writePixelUncompressed(LzwCompressor * const lzwP, } + static void writeRaster(struct pam * const pamP, RowReader * const rowReaderP, diff --git a/converter/other/pamtohdiff.c b/converter/other/pamtohdiff.c index 8d785f5b..d28cdb14 100644 --- a/converter/other/pamtohdiff.c +++ b/converter/other/pamtohdiff.c @@ -64,7 +64,7 @@ parseCommandLine(int argc, char ** argv, -int +int main(int argc, char *argv[]) { FILE *ifP; struct cmdlineInfo cmdline; @@ -106,7 +106,7 @@ main(int argc, char *argv[]) { knows the "20" can't be +20, because that would create the sample 90 + 20 = 110, and violate maxval. So it must be -80. Modulus arithmetic by the interpreter effectively makes that - decision. + decision. */ @@ -115,7 +115,7 @@ main(int argc, char *argv[]) { all +/- half of maxval, you can see positive transitions as bright spots and negative transitions as dark spots. */ - + { unsigned int const bias = outpam.maxval/2; for (row = 0; row < inpam.height; ++row) { @@ -124,7 +124,7 @@ main(int argc, char *argv[]) { for (col = 0; col < inpam.width; ++col) { unsigned int plane; for (plane = 0; plane < inpam.depth; ++plane) { - + sample const sampleValue = inrow[col][plane]; int const difference = sampleValue - prevrow[col][plane]; outrow[col][plane] = (difference + bias) % (outpam.maxval+1); @@ -141,3 +141,5 @@ main(int argc, char *argv[]) { exit(0); } + + diff --git a/converter/other/pamtohtmltbl.c b/converter/other/pamtohtmltbl.c index d1482073..960d26b8 100644 --- a/converter/other/pamtohtmltbl.c +++ b/converter/other/pamtohtmltbl.c @@ -24,7 +24,7 @@ parseCommandLine(int argc, char ** argv, struct cmdlineInfo * const cmdlineP) { /*---------------------------------------------------------------------------- parse program command line described in Unix standard form by argc - and argv. Return the information in the options as *cmdlineP. + and argv. Return the information in the options as *cmdlineP. If command line is internally inconsistent (invalid options, etc.), issue error message to stderr and abort program. @@ -44,7 +44,7 @@ parseCommandLine(int argc, char ** argv, MALLOCARRAY_NOFAIL(option_def, 100); option_def_index = 0; /* incremented by OPTENT3 */ - OPTENT3(0, "verbose", OPT_FLAG, NULL, + OPTENT3(0, "verbose", OPT_FLAG, NULL, &cmdlineP->verbose, 0 ); OPTENT3(0, "transparent", OPT_STRING, &cmdlineP->transparent, &transparentSpec, 0 ); @@ -71,23 +71,22 @@ parseCommandLine(int argc, char ** argv, - static void pripix(struct pam * const pamP, - tuple const color, - unsigned int const rectWidth, - unsigned int const rectHeight, + tuple const color, + unsigned int const rectWidth, + unsigned int const rectHeight, tuple const transparentColor) { if (rectWidth > 0 && rectHeight > 0) { printf("<TD VALIGN=CENTER ALIGN=CENTER"); - if (rectWidth != 1) + if (rectWidth != 1) printf(" COLSPAN=%d", rectWidth); - if (rectHeight != 1) + if (rectHeight != 1) printf(" ROWSPAN=%d", rectHeight); - if (transparentColor && + if (transparentColor && !pnm_tupleequal(pamP, color,transparentColor)) { /* No BGCOLOR attribute */ } else { @@ -123,7 +122,7 @@ findSameColorRectangle(struct pam * const pamP, unsigned int * const rectWidthP, unsigned int * const rectHeightP) { /*---------------------------------------------------------------------------- - Find the largest rectangle, in the image described by 'pam' and + Find the largest rectangle, in the image described by 'pam' and 'tuples', of uniform color, whose upper left corner is at (row, col). Return the width and height of that rectangle as *rectWidthP @@ -142,23 +141,23 @@ findSameColorRectangle(struct pam * const pamP, int j; for (j = 0; j <= i; ++j) { if (!my) { - if (i >= cny) + if (i >= cny) my = cny; else { if ((!mx || j < mx) && (j < cnx)) { if (!pnm_tupleequal(pamP, tuples[row+i][col+j], - rectangleColor)) + rectangleColor)) my = i; } } } if (!mx) { - if (i >= cnx) + if (i >= cnx) mx = cnx; else { if ((!my || (j < my)) && (j < cny)) { if (!pnm_tupleequal(pamP, tuples[row+j][col+i], - rectangleColor)) + rectangleColor)) mx = i; } } @@ -204,7 +203,6 @@ freeOutputtedArray(bool ** const outputted, - static void markNotOutputted(bool ** const outputted, unsigned int const upperLeftCol, @@ -218,10 +216,10 @@ markNotOutputted(bool ** const outputted, unsigned int const lowerRightCol = upperLeftCol + width; unsigned int const lowerRightRow = upperLeftRow + height; unsigned int row; - + for (row = upperLeftRow; row < lowerRightRow; ++row) { unsigned int col; - for (col = upperLeftCol; col < lowerRightCol; ++col) + for (col = upperLeftCol; col < lowerRightCol; ++col) outputted[row][col] = FALSE; } } @@ -241,10 +239,10 @@ markOutputted(bool ** const outputted, unsigned int const lowerRightCol = upperLeftCol + width; unsigned int const lowerRightRow = upperLeftRow + height; unsigned int row; - + for (row = upperLeftRow; row < lowerRightRow; ++row) { unsigned int col; - for (col = upperLeftCol; col < lowerRightCol; ++col) + for (col = upperLeftCol; col < lowerRightCol; ++col) outputted[row][col] = TRUE; } } @@ -294,17 +292,17 @@ main(int argc, char **argv) { for (row = 0; row < inpam.height; ++row) { unsigned int col; printf("<TR>\n"); - pripix(&inpam, tuples[row][0], 1, 1, transparentColor); + pripix(&inpam, tuples[row][0], 1, 1, transparentColor); markOutputted(outputted, 0, row, 1, 1); for (col = 1; col < inpam.width; ++col) { if (!outputted[row][col]) { - findSameColorRectangle(&inpam, tuples, row, col, + findSameColorRectangle(&inpam, tuples, row, col, &rectWidth, &rectHeight); if (cmdline.verbose) pm_message("[%u/%u] [%u/%u]", col, row, rectWidth, rectHeight); - pripix(&inpam, tuples[row][col], rectWidth, rectHeight, + pripix(&inpam, tuples[row][col], rectWidth, rectHeight, transparentColor); markOutputted(outputted, col, row, rectWidth, rectHeight); } @@ -320,3 +318,6 @@ main(int argc, char **argv) { return 0; } + + + diff --git a/converter/other/pamtompfont.c b/converter/other/pamtompfont.c index 92f8de29..dd92fc7c 100644 --- a/converter/other/pamtompfont.c +++ b/converter/other/pamtompfont.c @@ -62,7 +62,7 @@ parseCommandLine(int argc, char ** argv, pm_optParseOptions3(&argc, argv, opt, sizeof(opt), 0); /* Uses and sets argc, argv, and some of *cmdlineP and others. */ - if (argc-1 == 0) + if (argc-1 == 0) cmdlineP->inputFilename = "-"; else if (argc-1 != 1) pm_error("Program takes zero or one argument (filename). You " @@ -126,7 +126,7 @@ writeMpFontHeader(FILE * const ofP, static void convertRaster(struct pam * const inpamP, FILE * const ofP) { - + tuple * tuplerow; unsigned char * outrow; unsigned int row; @@ -150,7 +150,7 @@ convertRaster(struct pam * const inpamP, outrow[col] = pnm_scalesample(tuplerow[col][0], inpamP->maxval, 255); } - + fwrite(outrow, 1, inpamP->width, ofP); } free(outrow); @@ -182,3 +182,6 @@ main(int argc, char *argv[]) { return 0; } + + + diff --git a/converter/other/pamtooctaveimg.c b/converter/other/pamtooctaveimg.c index 28bc4cd4..b89b8229 100644 --- a/converter/other/pamtooctaveimg.c +++ b/converter/other/pamtooctaveimg.c @@ -144,7 +144,7 @@ convertToOctave(FILE * const ifP, pnm_readpaminit(ifP, &inpam, PAM_STRUCT_SIZE(allocation_depth)); pnm_setminallocationdepth(&inpam, 3); - + /* Output the image as a GNU Octave matrix. For each row of the * input file we immediately output indexes into the colormap then, * when we're finished, we output the colormap as a second @@ -191,14 +191,14 @@ main(int argc, char *argv[]) { inputName = argc-1 > 0 ? argv[1] : "-"; ifP = pm_openr(inputName); - + if (streq(inputName, "-")) fprintf(stdout, "# Created by pamtooctave\n"); else fprintf(stdout, "# Created from '%s' by pamtooctave\n", inputName); convertToOctave(ifP, stdout); - + pm_close(ifP); return 0; diff --git a/converter/other/pamtopam.c b/converter/other/pamtopam.c index 9cb82f7a..45f67d98 100644 --- a/converter/other/pamtopam.c +++ b/converter/other/pamtopam.c @@ -55,3 +55,6 @@ main(int argc, const char * argv[]) { return 0; } + + + diff --git a/converter/other/pamtopfm.c b/converter/other/pamtopfm.c index 25a8a0af..7991e0dd 100644 --- a/converter/other/pamtopfm.c +++ b/converter/other/pamtopfm.c @@ -2,7 +2,7 @@ pamtopfm ****************************************************************************** This program converts a PAM image to PFM (Portable Float Map). - + By Bryan Henderson, San Jose, CA April 2004. Contributed to the public domain by its author. @@ -37,13 +37,13 @@ static enum endian machineEndianness; -static void -parseCommandLine(int argc, - char ** argv, +static void +parseCommandLine(int argc, + char ** argv, struct cmdlineInfo * const cmdlineP) { /* -------------------------------------------------------------------------- Parse program command line described in Unix standard form by argc - and argv. Return the information in the options as *cmdlineP. + and argv. Return the information in the options as *cmdlineP. If command line is internally inconsistent (invalid options, etc.), issue error message to stderr and abort program. @@ -54,7 +54,7 @@ parseCommandLine(int argc, optEntry *option_def = malloc( 100*sizeof( optEntry ) ); /* Instructions to pm_optParseOptions3 on how to parse our options. */ optStruct3 opt; - + unsigned int option_def_index; char * endianOpt; unsigned int endianSpec, scaleSpec; @@ -62,7 +62,7 @@ parseCommandLine(int argc, option_def_index = 0; /* incremented by OPTENTRY */ OPTENT3(0, "endian", OPT_STRING, &endianOpt, &endianSpec, 0); OPTENT3(0, "scale", OPT_FLOAT, &cmdlineP->scale, &scaleSpec, 0); - + opt.opt_table = option_def; opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */ opt.allowNegNum = FALSE; /* We have no parms that are negative numbers */ @@ -93,7 +93,7 @@ parseCommandLine(int argc, cmdlineP->inputFilespec = argv[1]; else cmdlineP->inputFilespec = "-"; - + if (argc-1 > 1) pm_error("Program takes at most one argument: the file name. " "You specified %d", argc-1); @@ -109,7 +109,7 @@ thisMachineEndianness(void) { that varies among typical machines. Big endianness is the natural format. In this format, if an integer is - 4 bytes, to be stored at memory address 100-103, the most significant + 4 bytes, to be stored at memory address 100-103, the most significant byte goes at 100, the next most significant at 101, and the least significant byte at 103. This is natural because it matches the way humans read and write numbers. I.e. 258 is stored as 0x00000102. @@ -125,7 +125,7 @@ thisMachineEndianness(void) { unsigned char * const storedNumber = (unsigned char *)&testNumber; enum endian endianness; - + if (storedNumber[0] == 0x01) endianness = ENDIAN_LITTLE; else @@ -156,11 +156,11 @@ floatToPfmSample(float const input, unsigned int i, j; MEMSCPY(&reversed, &input); - - for (i = 0, j = sizeof(pfmSample)-1; - i < sizeof(pfmSample); + + for (i = 0, j = sizeof(pfmSample)-1; + i < sizeof(pfmSample); ++i, --j) - + outputP->bytes[i] = reversed[j]; } } @@ -181,8 +181,8 @@ writePfmHeader(FILE * const ofP, struct pfmHeader const pfmHeader) { const char * const magic = pfmHeader.color ? "PF" : "Pf"; - float const scaleFactorEndian = - pfmHeader.endian == ENDIAN_BIG ? + float const scaleFactorEndian = + pfmHeader.endian == ENDIAN_BIG ? pfmHeader.scaleFactor : - pfmHeader.scaleFactor; @@ -217,7 +217,7 @@ writePfmRow(struct pam * const pamP, unsigned int plane; for (plane = 0; plane < pamP->depth; ++plane) { pfmSample val; - floatToPfmSample(tuplenRow[col][plane] * scaleFactor, + floatToPfmSample(tuplenRow[col][plane] * scaleFactor, &val, endian); pfmRowBuffer[pfmCursor++] = val; } @@ -226,7 +226,7 @@ writePfmRow(struct pam * const pamP, rc = fwrite(pfmRowBuffer, sizeof(pfmSample), pfmSamplesPerRow, ofP); if (rc != pfmSamplesPerRow) - pm_error("Unable to write to output file in the middle of row %d", + pm_error("Unable to write to output file in the middle of row %d", pfmRow); @@ -238,9 +238,9 @@ static struct pfmHeader makePfmHeader(const struct pam * const pamP, float const scaleFactor, enum endian const endian) { - + struct pfmHeader pfmHeader; - + pfmHeader.width = pamP->width; pfmHeader.height = pamP->height; @@ -256,11 +256,12 @@ makePfmHeader(const struct pam * const pamP, pfmHeader.scaleFactor = scaleFactor; pfmHeader.endian = endian; - + return pfmHeader; } + int main(int argc, char **argv ) { @@ -282,11 +283,11 @@ main(int argc, char **argv ) { tuplenArray = pnm_readpamn(ifP, &pam, PAM_STRUCT_SIZE(tuple_type)); - writePfmHeader(stdout, + writePfmHeader(stdout, makePfmHeader(&pam, cmdline.scale, cmdline.endian)); pfmSamplesPerRow = pam.width * pam.depth; - + MALLOCARRAY_NOFAIL(pfmRowBuffer, pfmSamplesPerRow); /* PFMs are upside down like BMPs */ @@ -297,9 +298,12 @@ main(int argc, char **argv ) { pnm_freepamarrayn(tuplenArray, &pam); free(pfmRowBuffer); - + pm_close(stdout); pm_close(pam.file); return 0; } + + + diff --git a/converter/other/pamtopng.c b/converter/other/pamtopng.c index 831c3242..24eb1ca2 100644 --- a/converter/other/pamtopng.c +++ b/converter/other/pamtopng.c @@ -527,7 +527,6 @@ doZtxtChunkSet(struct pngx * const pngxP, - static void doItxtChunkSet(struct pngx * const pngxP, const char * const textFileName) { diff --git a/converter/other/pamtopnm.c b/converter/other/pamtopnm.c index f0ad451a..11e34b45 100644 --- a/converter/other/pamtopnm.c +++ b/converter/other/pamtopnm.c @@ -52,7 +52,7 @@ parseCommandLine(int argc, const char ** argv, pm_optParseOptions3(&argc, (char **)argv, opt, sizeof(opt), 0); /* Uses and sets argc, argv, and some of *cmdlineP and others. */ - if (argc-1 == 0) + if (argc-1 == 0) cmdlineP->inputFileName = "-"; else if (argc-1 != 1) pm_error("Program takes zero or one argument (filename). You " @@ -66,7 +66,7 @@ parseCommandLine(int argc, const char ** argv, static void -validateTupleType(struct pam const inpam, +validateTupleType(struct pam const inpam, int const assumeTupleType) { /*---------------------------------------------------------------------------- Make sure the image has a tuple type we know how to convert to PNM. @@ -83,18 +83,18 @@ validateTupleType(struct pam const inpam, if (assumeTupleType) { /* User says tuple type is appropriate regardless of tuple_type. */ } else { - if (inpam.depth >= 1 && - strncmp(inpam.tuple_type, "BLACKANDWHITE", + if (inpam.depth >= 1 && + strncmp(inpam.tuple_type, "BLACKANDWHITE", sizeof("BLACKANDWHITE")-1) == 0) { /* It's a PBMable image */ - } else if (inpam.depth >= 1 && + } else if (inpam.depth >= 1 && strncmp(inpam.tuple_type, "GRAYSCALE", sizeof("GRAYSCALE")-1) == 0) { /* It's a PGMable image */ } else if (inpam.depth >= 3 && strncmp(inpam.tuple_type, "RGB", sizeof("RGB")-1) == 0) { /* It's a PPMable image */ - } else + } else pm_error("PAM image does not have a depth and tuple_type " "consistent with a PNM image. " "According to its " @@ -129,12 +129,12 @@ main(int argc, const char **argv) { outpam = inpam; outpam.file = stdout; - + if (inpam.depth < 3) { outpam.depth = 1; if (inpam.maxval == 1) outpam.format = PBM_FORMAT; - else + else outpam.format = PGM_FORMAT; } else { outpam.depth = 3; @@ -145,17 +145,17 @@ main(int argc, const char **argv) { { tuple *tuplerow; - - tuplerow = pnm_allocpamrow(&inpam); - { + + tuplerow = pnm_allocpamrow(&inpam); + { int row; - + for (row = 0; row < inpam.height; row++) { pnm_readpamrow(&inpam, tuplerow); pnm_writepamrow(&outpam, tuplerow); } } - pnm_freepamrow(tuplerow); + pnm_freepamrow(tuplerow); } pnm_nextimage(ifP, &eof); @@ -163,3 +163,6 @@ main(int argc, const char **argv) { return 0; } + + + diff --git a/converter/other/pamtoqoi.c b/converter/other/pamtoqoi.c index 638efa3a..e3f87ae0 100644 --- a/converter/other/pamtoqoi.c +++ b/converter/other/pamtoqoi.c @@ -113,6 +113,8 @@ encodeQoiHeader(qoi_Desc const qoiDesc) { } + + enum Tupletype {BW, BWAlpha, GRAY, GRAYAlpha, RGB, RGBAlpha, GRAY255, GRAY255Alpha, RGB255, RGB255Alpha}; @@ -437,3 +439,4 @@ main(int argc, const char **argv) { } + diff --git a/converter/other/pamtosrf.c b/converter/other/pamtosrf.c index 3800d77c..b62b19df 100644 --- a/converter/other/pamtosrf.c +++ b/converter/other/pamtosrf.c @@ -206,7 +206,7 @@ main(int argc, const char * argv[]) { } srf_write(stdout, &srf); - + srf_term(&srf); pm_closer(ifP); diff --git a/converter/other/pamtosvg/autotrace.c b/converter/other/pamtosvg/autotrace.c index fa5b7e15..37f5d5ec 100644 --- a/converter/other/pamtosvg/autotrace.c +++ b/converter/other/pamtosvg/autotrace.c @@ -42,6 +42,8 @@ at_fitting_opts_new(void) return opts; } + + at_fitting_opts_type * at_fitting_opts_copy (at_fitting_opts_type * original) { @@ -56,12 +58,16 @@ at_fitting_opts_copy (at_fitting_opts_type * original) return new_opts; } + + void at_fitting_opts_free(at_fitting_opts_type * opts) { free(opts); } + + at_output_opts_type * at_output_opts_new(void) { @@ -71,6 +77,8 @@ at_output_opts_new(void) return opts; } + + at_output_opts_type * at_output_opts_copy(at_output_opts_type * original) { @@ -79,12 +87,16 @@ at_output_opts_copy(at_output_opts_type * original) return opts; } + + void at_output_opts_free(at_output_opts_type * opts) { free(opts); } + + /* at_splines_new_full modifies its 'bitmap' argument when it does the thin_image thing. */ diff --git a/converter/other/pamtosvg/bitmap.c b/converter/other/pamtosvg/bitmap.c index 84a8a8ae..8b8ce092 100644 --- a/converter/other/pamtosvg/bitmap.c +++ b/converter/other/pamtosvg/bitmap.c @@ -13,7 +13,7 @@ at_bitmap_new(unsigned short width, at_bitmap_type * bitmap; - MALLOCVAR_NOFAIL(bitmap); + MALLOCVAR_NOFAIL(bitmap); *bitmap = at_bitmap_init(NULL, width, height, planes); @@ -31,10 +31,10 @@ at_bitmap_copy(at_bitmap_type * src) width = at_bitmap_get_width(src); height = at_bitmap_get_height(src); planes = at_bitmap_get_planes(src); - + dist = at_bitmap_new(width, height, planes); - memcpy(dist->bitmap, - src->bitmap, + memcpy(dist->bitmap, + src->bitmap, width * height * planes * sizeof(unsigned char)); return dist; } @@ -48,7 +48,7 @@ at_bitmap_init(unsigned char * area, unsigned int planes) { at_bitmap_type bitmap; - + if (area) bitmap.bitmap = area; else { @@ -63,33 +63,41 @@ at_bitmap_init(unsigned char * area, 0, width * height * planes * sizeof(unsigned char)); } } - + bitmap.width = width; bitmap.height = height; bitmap.np = planes; - return bitmap; + return bitmap; } -void + + +void at_bitmap_free (at_bitmap_type * bitmap) { free_bitmap (bitmap); free(bitmap); } + + unsigned short at_bitmap_get_width (at_bitmap_type * bitmap) { return bitmap->width; } + + unsigned short at_bitmap_get_height (at_bitmap_type * bitmap) { return bitmap->height; } + + unsigned short at_bitmap_get_planes (at_bitmap_type * bitmap) { @@ -104,6 +112,8 @@ new_bitmap (unsigned short width, unsigned short height) return at_bitmap_init(NULL,width,height,1); } + + /* Free the storage that is allocated for a bitmap. On the other hand, the bitmap might not have any storage allocated for it if it is zero in either dimension; in that case, don't free it. */ @@ -114,3 +124,6 @@ free_bitmap (bitmap_type *b) if (b->bitmap != NULL) free (b->bitmap); } + + + diff --git a/converter/other/pamtosvg/bitmap.h b/converter/other/pamtosvg/bitmap.h index b979e0c0..ae5da2a8 100644 --- a/converter/other/pamtosvg/bitmap.h +++ b/converter/other/pamtosvg/bitmap.h @@ -12,16 +12,16 @@ /* at_ prefix removed version */ typedef at_bitmap_type bitmap_type; #define BITMAP_PLANES(b) AT_BITMAP_PLANES(b) -#define BITMAP_BITS(b) AT_BITMAP_BITS(b) -#define BITMAP_WIDTH(b) AT_BITMAP_WIDTH(b) -#define BITMAP_HEIGHT(b) AT_BITMAP_HEIGHT(b) +#define BITMAP_BITS(b) AT_BITMAP_BITS(b) +#define BITMAP_WIDTH(b) AT_BITMAP_WIDTH(b) +#define BITMAP_HEIGHT(b) AT_BITMAP_HEIGHT(b) /* This is the pixel at [ROW,COL]. */ -#define BITMAP_PIXEL(b, row, col) \ +#define BITMAP_PIXEL(b, row, col) \ ((b).bitmap + ((row) * (b).width + (col)) * (b).np) -#define BITMAP_VALID_PIXEL(b, row, col) \ - ((row) < (b).height && (col) < (b).width) +#define BITMAP_VALID_PIXEL(b, row, col) \ + ((row) < (b).height && (col) < (b).width) /* Allocate storage for the bits, set them all to white, and return an initialized structure. */ @@ -32,12 +32,12 @@ extern void free_bitmap (bitmap_type *); at_bitmap_type * at_bitmap_new(unsigned short width, - unsigned short height, - unsigned int planes); + unsigned short height, + unsigned int planes); at_bitmap_type * at_bitmap_copy(at_bitmap_type * src); -/* We have to export functions that allows internal datum - access. Such functions might be useful for +/* We have to export functions that allows internal datum + access. Such functions might be useful for at_bitmap_new user. */ unsigned short at_bitmap_get_width (at_bitmap_type * bitmap); unsigned short at_bitmap_get_height (at_bitmap_type * bitmap); @@ -46,8 +46,8 @@ void at_bitmap_free (at_bitmap_type * bitmap); at_bitmap_type at_bitmap_init(unsigned char * area, - unsigned short width, - unsigned short height, - unsigned int planes); + unsigned short width, + unsigned short height, + unsigned int planes); #endif /* not BITMAP_H */ diff --git a/converter/other/pamtosvg/curve.c b/converter/other/pamtosvg/curve.c index d7fff87d..bd0ca70b 100644 --- a/converter/other/pamtosvg/curve.c +++ b/converter/other/pamtosvg/curve.c @@ -61,6 +61,7 @@ curve_new(void) { } + Curve * curve_copyMost(Curve * const oldCurveP) { /*---------------------------------------------------------------------------- @@ -77,6 +78,8 @@ curve_copyMost(Curve * const oldCurveP) { return curveP; } + + void curve_move(Curve * const dstP, Curve * const srcP) { @@ -285,7 +288,6 @@ curve_logEntire(Curve * const curveP) { - CurveList curve_newList(void) { /*---------------------------------------------------------------------------- diff --git a/converter/other/pamtosvg/curve.h b/converter/other/pamtosvg/curve.h index 65d4e26b..946bb2f3 100644 --- a/converter/other/pamtosvg/curve.h +++ b/converter/other/pamtosvg/curve.h @@ -64,12 +64,12 @@ typedef struct Curve { /* If the curve is cyclic, the next and previous points should wrap around; otherwise, if we get to the end, we return CURVE_LENGTH and -1, respectively. */ -#define CURVE_NEXT(c, n) \ - ((n) + 1 >= CURVE_LENGTH (c) \ - ? CURVE_CYCLIC (c) ? ((n) + 1) % CURVE_LENGTH (c) : CURVE_LENGTH (c) \ +#define CURVE_NEXT(c, n) \ + ((n) + 1 >= CURVE_LENGTH (c) \ + ? CURVE_CYCLIC (c) ? ((n) + 1) % CURVE_LENGTH (c) : CURVE_LENGTH (c) \ : (n) + 1) -#define CURVE_PREV(c, n) \ - ((signed int) (n) - 1 < 0 \ +#define CURVE_PREV(c, n) \ + ((signed int) (n) - 1 < 0 \ ? CURVE_CYCLIC (c) ? (signed int) CURVE_LENGTH (c) + (signed int) (n) - 1 : -1\ : (signed int) (n) - 1) diff --git a/converter/other/pamtosvg/epsilon.c b/converter/other/pamtosvg/epsilon.c index 0c914dae..f5370475 100644 --- a/converter/other/pamtosvg/epsilon.c +++ b/converter/other/pamtosvg/epsilon.c @@ -11,7 +11,9 @@ epsilon_equal(float const v1, float const v2) { return - v1 == v2 /* Usually they'll be exactly equal, anyway. */ + v1 == v2 /* Usually they'll be exactly equal, anyway. */ || fabs(v1 - v2) <= REAL_EPSILON; } + + diff --git a/converter/other/pamtosvg/exception.c b/converter/other/pamtosvg/exception.c index 43761936..bf8228ae 100644 --- a/converter/other/pamtosvg/exception.c +++ b/converter/other/pamtosvg/exception.c @@ -1,4 +1,3 @@ - #include "exception.h" at_exception_type @@ -10,7 +9,7 @@ at_exception_new(at_msg_func client_func, e.msg_type = 0; e.client_func = client_func; e.client_data = client_data; - + return e; } @@ -31,7 +30,7 @@ at_exception_fatal(at_exception_type * const exception, if (exception) { exception->msg_type = AT_MSG_FATAL; if (exception->client_func) { - exception->client_func(message, + exception->client_func(message, AT_MSG_FATAL, exception->client_data); } @@ -47,9 +46,12 @@ at_exception_warning(at_exception_type * const exception, if (exception) { exception->msg_type = AT_MSG_WARNING; if (exception->client_func) { - exception->client_func(message, + exception->client_func(message, AT_MSG_WARNING, exception->client_data); } } } + + + diff --git a/converter/other/pamtosvg/exception.h b/converter/other/pamtosvg/exception.h index 113f65e6..06de7182 100644 --- a/converter/other/pamtosvg/exception.h +++ b/converter/other/pamtosvg/exception.h @@ -1,7 +1,7 @@ /* exception.h: facility to handle error in autotrace */ #ifndef AT_EXCEPTION_H -#define AT_EXCEPTION_H +#define AT_EXCEPTION_H #include "autotrace.h" @@ -10,8 +10,8 @@ extern "C" { #endif /* __cplusplus */ /* Protocol: - If a function raises a FATAL(including propagation), - the function must release resources allocated by the + If a function raises a FATAL(including propagation), + the function must release resources allocated by the function itself. */ typedef struct _at_exception_type at_exception_type; diff --git a/converter/other/pamtosvg/fit.c b/converter/other/pamtosvg/fit.c index d51b010b..ec579584 100644 --- a/converter/other/pamtosvg/fit.c +++ b/converter/other/pamtosvg/fit.c @@ -87,6 +87,7 @@ intCoordFmReal(Point const realCoord) { } + /* Lists of array indices (well, that is what we use it for). */ static IndexList diff --git a/converter/other/pamtosvg/image-header.h b/converter/other/pamtosvg/image-header.h index adcf4771..ef387572 100644 --- a/converter/other/pamtosvg/image-header.h +++ b/converter/other/pamtosvg/image-header.h @@ -9,10 +9,10 @@ the particular formats. */ typedef struct { - unsigned short hres, vres; /* In pixels per inch. */ - unsigned short width, height; /* In bits. */ - unsigned short depth; /* Perhaps the depth? */ - unsigned format; /* (for pbm) Whether packed or not. */ + unsigned short hres, vres; /* In pixels per inch. */ + unsigned short width, height; /* In bits. */ + unsigned short depth; /* Perhaps the depth? */ + unsigned format; /* (for pbm) Whether packed or not. */ } image_header_type; #endif /* not IMAGE_HEADER_H */ diff --git a/converter/other/pamtosvg/image-proc.c b/converter/other/pamtosvg/image-proc.c index d025ee1e..7462219c 100644 --- a/converter/other/pamtosvg/image-proc.c +++ b/converter/other/pamtosvg/image-proc.c @@ -53,7 +53,7 @@ new_distance_map(bitmap_type bitmap, unsigned char target_value, bool padded, at if (dist.d[y] == NULL) pm_error("Unable to get memory for distance map"); memset(dist.d[y], 0, w * sizeof(float)); - + MALLOCARRAY(dist.weight[y], w); if (dist.weight[y] == NULL) pm_error("Unable to get memory for distance map"); @@ -72,7 +72,7 @@ new_distance_map(bitmap_type bitmap, unsigned char target_value, bool padded, at dist.weight[y][x] = 1.0F - fgray; /* dist.weight[y][x] = 1.0F - (fgray * fgray);*/ /* dist.weight[y][x] = (fgray < 0.5F ? 1.0F - fgray : -2.0F * fgray * (fgray - 1.0F));*/ - } + } } } else @@ -158,15 +158,15 @@ new_distance_map(bitmap_type bitmap, unsigned char target_value, bool padded, at /* lower-right neighbor */ d = dist.d[y + 1][x + 1] + (float) M_SQRT2 * dist.weight[y][x]; - if (d < min) min = dist.d[y][x] = d; + if (d < min) min = dist.d[y][x] = d; /* lower neighbor */ d = dist.d[y + 1][x] + dist.weight[y][x]; - if (d < min) min = dist.d[y][x] = d; + if (d < min) min = dist.d[y][x] = d; /* right neighbor */ d = dist.d[y][x + 1] + dist.weight[y][x]; - if (d < min) min = dist.d[y][x] = d; + if (d < min) min = dist.d[y][x] = d; /* lower-left neighbor (except at the first column) */ if (x - 1 >= 0) @@ -180,6 +180,7 @@ new_distance_map(bitmap_type bitmap, unsigned char target_value, bool padded, at } + /* Free the dynamically-allocated storage associated with a distance map. */ void @@ -193,19 +194,20 @@ free_distance_map(distance_map_type *dist) if (dist->d != NULL) { - for (y = 0; y < h; y++) - free(dist->d[y]); + for (y = 0; y < h; y++) + free(dist->d[y]); free(dist->d); } if (dist->weight != NULL) { - for (y = 0; y < h; y++) - free(dist->weight[y]); + for (y = 0; y < h; y++) + free(dist->weight[y]); free(dist->weight); } } + #if 0 void medial_axis(bitmap_type *bitmap, distance_map_type *dist, @@ -233,7 +235,7 @@ medial_axis(bitmap_type *bitmap, distance_map_type *dist, if (bgSpec) bg = bg_color; - else + else PPM_ASSIGN(bg, 255, 255, 255); f = d[0][0] + 0.5; @@ -246,44 +248,44 @@ medial_axis(bitmap_type *bitmap, distance_map_type *dist, for (x = 1; x < w - 1; x++) { - f = d[0][x] + 0.5; - test = (f < d[0][x-1]) + (f < d[0][x+1]) + (f < d[1][x-1]) - + (f < d[1][x]) + (f < d[1][x+1]); - if (test > 1) b[x] = PPM_GETR(bg); + f = d[0][x] + 0.5; + test = (f < d[0][x-1]) + (f < d[0][x+1]) + (f < d[1][x-1]) + + (f < d[1][x]) + (f < d[1][x+1]); + if (test > 1) b[x] = PPM_GETR(bg); } b += w; for (y = 1; y < h - 1; y++) { - f = d[y][0] + 0.5; - test = (f < d[y-1][0]) + (f < d[y-1][1]) + (f < d[y][1]) - + (f < d[y+1][0]) + (f < d[y+1][1]); - if (test > 1) b[0] = PPM_GETR(bg); - - for (x = 1; x < w - 1; x++) - { - f = d[y][x] + 0.5; - test = (f < d[y-1][x-1]) + (f < d[y-1][x]) + (f < d[y-1][x+1]) - + (f < d[y][x-1]) + (f < d[y][x+1]) - + (f < d[y+1][x-1]) + (f < d[y+1][x]) + (f < d[y+1][x+1]); - if (test > 1) b[x] = PPM_GETR(bg) - } - - f = d[y][w-1] + 0.5; - test = (f < d[y-1][w-1]) + (f < d[y-1][w-2]) + (f < d[y][w-2]) - + (f < d[y+1][w-1]) + (f < d[y+1][w-2]); - if (test > 1) - b[w-1] = PPM_GETR(bg); + f = d[y][0] + 0.5; + test = (f < d[y-1][0]) + (f < d[y-1][1]) + (f < d[y][1]) + + (f < d[y+1][0]) + (f < d[y+1][1]); + if (test > 1) b[0] = PPM_GETR(bg); + + for (x = 1; x < w - 1; x++) + { + f = d[y][x] + 0.5; + test = (f < d[y-1][x-1]) + (f < d[y-1][x]) + (f < d[y-1][x+1]) + + (f < d[y][x-1]) + (f < d[y][x+1]) + + (f < d[y+1][x-1]) + (f < d[y+1][x]) + (f < d[y+1][x+1]); + if (test > 1) b[x] = PPM_GETR(bg) + } + + f = d[y][w-1] + 0.5; + test = (f < d[y-1][w-1]) + (f < d[y-1][w-2]) + (f < d[y][w-2]) + + (f < d[y+1][w-1]) + (f < d[y+1][w-2]); + if (test > 1) + b[w-1] = PPM_GETR(bg); b += w; } for (x = 1; x < w - 1; x++) { - f = d[h-1][x] + 0.5; - test = (f < d[h-1][x-1]) + (f < d[h-1][x+1]) - + (f < d[h-2][x-1]) + (f < d[h-2][x]) + (f < d[h-2][x+1]); - if (test > 1) b[x] = PPM_GETR(bg); + f = d[h-1][x] + 0.5; + test = (f < d[h-1][x-1]) + (f < d[h-1][x+1]) + + (f < d[h-2][x-1]) + (f < d[h-2][x]) + (f < d[h-2][x+1]); + if (test > 1) b[x] = PPM_GETR(bg); } f = d[h-1][0] + 0.5; @@ -314,27 +316,28 @@ binarize(bitmap_type *bitmap) if (spp == 1) { - for (i = 0; i < npixels; i++) - b[i] = (b[i] > GRAY_THRESHOLD ? WHITE : BLACK); + for (i = 0; i < npixels; i++) + b[i] = (b[i] > GRAY_THRESHOLD ? WHITE : BLACK); } else if (spp == 3) { - unsigned char *rgb = b; - for (i = 0; i < npixels; i++, rgb += 3) - { - b[i] = (LUMINANCE(rgb[0], rgb[1], rgb[2]) > GRAY_THRESHOLD - ? WHITE : BLACK); - } - REALLOCARRAY_NOFAIL(bitmap->bitmap, npixels); - bitmap->np = 1; + unsigned char *rgb = b; + for (i = 0; i < npixels; i++, rgb += 3) + { + b[i] = (LUMINANCE(rgb[0], rgb[1], rgb[2]) > GRAY_THRESHOLD + ? WHITE : BLACK); + } + REALLOCARRAY_NOFAIL(bitmap->bitmap, npixels); + bitmap->np = 1; } else { - WARNING1("binarize: don't know how to interpret %u-plane images", spp); + WARNING1("binarize: don't know how to interpret %u-plane images", spp); } } + #if 0 /* Thin a binary image, replacing the original image with the thinned one. */ @@ -351,9 +354,9 @@ ip_thin(bitmap_type input_b) if (BITMAP_PLANES(input_b) != 1) { - FATAL1("thin: single-plane image required; " - "%u-plane images cannot be thinned", BITMAP_PLANES(input_b)); - return b; + FATAL1("thin: single-plane image required; " + "%u-plane images cannot be thinned", BITMAP_PLANES(input_b)); + return b; } /* Process and return a copy of the input image. */ @@ -364,149 +367,151 @@ ip_thin(bitmap_type input_b) /* Set background pixels to zero, foreground pixels to one. */ for (i = 0; i < num_bytes; i++) - b.bitmap[i] = (b.bitmap[i] == BLACK ? 1 : 0); + b.bitmap[i] = (b.bitmap[i] == BLACK ? 1 : 0); again = true; while (again) { - again = false; - - for (y = 1; y < h - 1; y++) - { - for (x = 1; x < w - 1; x++) - { - /* During processing, pixels are used to store edge - type codes, so we can't just test for WHITE or BLACK. */ - if (*BITMAP_PIXEL(b, y, x) == 0) continue; - - k = (!get_edge(b, y, x, &t) - || (get_edge(b, y, x+1, &t) && *BITMAP_PIXEL(b, y-1, x) - && *BITMAP_PIXEL(b, y+1, x)) - || (get_edge(b, y+1, x, &t) && *BITMAP_PIXEL(b, y, x-1) - && *BITMAP_PIXEL(b, y, x+1)) - || (get_edge(b, y, x+1, &t) && get_edge(b, y+1, x+1, &t) - && get_edge(b, y+1, x, &t))); - if (k) continue; - - get_edge(b, y, x, &t); - if (t.t01) *BITMAP_PIXEL(b, y, x) |= 4; - *BITMAP_PIXEL(b, y, x) |= 2; - again = true; - } - } - - for (y = 0; y < h; y++) - for (x = 0; x < w; x++) - if (*BITMAP_PIXEL(b, y, x) & 02) *BITMAP_PIXEL(b, y, x) = 0; - - for (y = 1; y < h - 1; y++) - { - for (x = 1; x < w - 1; x++) - { - if (*BITMAP_PIXEL(b, y, x) == 0) continue; - - k = (!get_edge(b, y, x, &t) - || ((*BITMAP_PIXEL(b, y, x) & 04) == 0) - || (get_edge(b, y+1, x, &t) && (*BITMAP_PIXEL(b, y, x-1)) - && *BITMAP_PIXEL(b, y, x+1)) - || (get_edge(b, y, x+1, &t) && *BITMAP_PIXEL(b, y-1, x) - && *BITMAP_PIXEL(b, y+1, x)) - || (get_edge(b, y+1, x, &t) && get_edge(b, y, x+1, &t) - && get_edge(b, y+1, x+1, &t))); - if (k) continue; - - *BITMAP_PIXEL(b, y, x) |= 02; - again = true; - } - } - - for (y = 0; y < h; y++) - { - for (x = 0; x < w; x++) - { - if (*BITMAP_PIXEL(b, y, x) & 02) *BITMAP_PIXEL(b, y, x) = 0; - else if (*BITMAP_PIXEL(b, y, x) > 0) *BITMAP_PIXEL(b, y, x) = 1; - } - } + again = false; + + for (y = 1; y < h - 1; y++) + { + for (x = 1; x < w - 1; x++) + { + /* During processing, pixels are used to store edge + type codes, so we can't just test for WHITE or BLACK. */ + if (*BITMAP_PIXEL(b, y, x) == 0) continue; + + k = (!get_edge(b, y, x, &t) + || (get_edge(b, y, x+1, &t) && *BITMAP_PIXEL(b, y-1, x) + && *BITMAP_PIXEL(b, y+1, x)) + || (get_edge(b, y+1, x, &t) && *BITMAP_PIXEL(b, y, x-1) + && *BITMAP_PIXEL(b, y, x+1)) + || (get_edge(b, y, x+1, &t) && get_edge(b, y+1, x+1, &t) + && get_edge(b, y+1, x, &t))); + if (k) continue; + + get_edge(b, y, x, &t); + if (t.t01) *BITMAP_PIXEL(b, y, x) |= 4; + *BITMAP_PIXEL(b, y, x) |= 2; + again = true; + } + } + + for (y = 0; y < h; y++) + for (x = 0; x < w; x++) + if (*BITMAP_PIXEL(b, y, x) & 02) *BITMAP_PIXEL(b, y, x) = 0; + + for (y = 1; y < h - 1; y++) + { + for (x = 1; x < w - 1; x++) + { + if (*BITMAP_PIXEL(b, y, x) == 0) continue; + + k = (!get_edge(b, y, x, &t) + || ((*BITMAP_PIXEL(b, y, x) & 04) == 0) + || (get_edge(b, y+1, x, &t) && (*BITMAP_PIXEL(b, y, x-1)) + && *BITMAP_PIXEL(b, y, x+1)) + || (get_edge(b, y, x+1, &t) && *BITMAP_PIXEL(b, y-1, x) + && *BITMAP_PIXEL(b, y+1, x)) + || (get_edge(b, y+1, x, &t) && get_edge(b, y, x+1, &t) + && get_edge(b, y+1, x+1, &t))); + if (k) continue; + + *BITMAP_PIXEL(b, y, x) |= 02; + again = true; + } + } + + for (y = 0; y < h; y++) + { + for (x = 0; x < w; x++) + { + if (*BITMAP_PIXEL(b, y, x) & 02) *BITMAP_PIXEL(b, y, x) = 0; + else if (*BITMAP_PIXEL(b, y, x) > 0) *BITMAP_PIXEL(b, y, x) = 1; + } + } } /* Staircase removal; northward bias. */ for (y = 1; y < h - 1; y++) { - for (x = 1; x < w - 1; x++) - { - if (*BITMAP_PIXEL(b, y, x) == 0) continue; - - k = !(*BITMAP_PIXEL(b, y-1, x) - && ((*BITMAP_PIXEL(b, y, x+1) && !*BITMAP_PIXEL(b, y-1, x+1) - && !*BITMAP_PIXEL(b, y+1, x-1) - && (!*BITMAP_PIXEL(b, y, x-1) || !*BITMAP_PIXEL(b, y+1, x))) - || (*BITMAP_PIXEL(b, y, x-1) && !*BITMAP_PIXEL(b, y-1, x-1) - && !*BITMAP_PIXEL(b, y+1, x+1) && - (!*BITMAP_PIXEL(b, y, x+1) || !*BITMAP_PIXEL(b, y+1, x))))); - if (k) continue; - - *BITMAP_PIXEL(b, y, x) |= 02; - } + for (x = 1; x < w - 1; x++) + { + if (*BITMAP_PIXEL(b, y, x) == 0) continue; + + k = !(*BITMAP_PIXEL(b, y-1, x) + && ((*BITMAP_PIXEL(b, y, x+1) && !*BITMAP_PIXEL(b, y-1, x+1) + && !*BITMAP_PIXEL(b, y+1, x-1) + && (!*BITMAP_PIXEL(b, y, x-1) || !*BITMAP_PIXEL(b, y+1, x))) + || (*BITMAP_PIXEL(b, y, x-1) && !*BITMAP_PIXEL(b, y-1, x-1) + && !*BITMAP_PIXEL(b, y+1, x+1) && + (!*BITMAP_PIXEL(b, y, x+1) || !*BITMAP_PIXEL(b, y+1, x))))); + if (k) continue; + + *BITMAP_PIXEL(b, y, x) |= 02; + } } for (y = 0; y < h; y++) { - for (x = 0; x < w; x++) - { - if (*BITMAP_PIXEL(b, y, x) & 02) *BITMAP_PIXEL(b, y, x) = 0; - else if (*BITMAP_PIXEL(b, y, x) > 0) *BITMAP_PIXEL(b, y, x) = 1; - } + for (x = 0; x < w; x++) + { + if (*BITMAP_PIXEL(b, y, x) & 02) *BITMAP_PIXEL(b, y, x) = 0; + else if (*BITMAP_PIXEL(b, y, x) > 0) *BITMAP_PIXEL(b, y, x) = 1; + } } /* Southward bias */ for (y = 1; y < h - 1; y++) { - for (x = 1; x < w - 1; x++) - { - if (*BITMAP_PIXEL(b, y, x) == 0) continue; - - k = !(*BITMAP_PIXEL(b, y+1, x) - && ((*BITMAP_PIXEL(b, y, x+1) && !*BITMAP_PIXEL(b, y+1, x+1) - && !*BITMAP_PIXEL(b, y-1, x-1) && (!*BITMAP_PIXEL(b, y, x-1) - || !*BITMAP_PIXEL(b, y-1, x))) || (*BITMAP_PIXEL(b, y, x-1) - && !*BITMAP_PIXEL(b, y+1, x-1) && !*BITMAP_PIXEL(b, y-1, x+1) - && (!*BITMAP_PIXEL(b, y, x+1) || !*BITMAP_PIXEL(b, y-1, x)) ))); - if (k) continue; - - *BITMAP_PIXEL(b, y, x) |= 02; - } + for (x = 1; x < w - 1; x++) + { + if (*BITMAP_PIXEL(b, y, x) == 0) continue; + + k = !(*BITMAP_PIXEL(b, y+1, x) + && ((*BITMAP_PIXEL(b, y, x+1) && !*BITMAP_PIXEL(b, y+1, x+1) + && !*BITMAP_PIXEL(b, y-1, x-1) && (!*BITMAP_PIXEL(b, y, x-1) + || !*BITMAP_PIXEL(b, y-1, x))) || (*BITMAP_PIXEL(b, y, x-1) + && !*BITMAP_PIXEL(b, y+1, x-1) && !*BITMAP_PIXEL(b, y-1, x+1) + && (!*BITMAP_PIXEL(b, y, x+1) || !*BITMAP_PIXEL(b, y-1, x)) ))); + if (k) continue; + + *BITMAP_PIXEL(b, y, x) |= 02; + } } for (y = 0; y < h; y++) { - for (x = 0; x < w; x++) - { - if (*BITMAP_PIXEL(b, y, x) & 02) *BITMAP_PIXEL(b, y, x) = 0; - else if (*BITMAP_PIXEL(b, y, x) > 0) *BITMAP_PIXEL(b, y, x) = 1; - } + for (x = 0; x < w; x++) + { + if (*BITMAP_PIXEL(b, y, x) & 02) *BITMAP_PIXEL(b, y, x) = 0; + else if (*BITMAP_PIXEL(b, y, x) > 0) *BITMAP_PIXEL(b, y, x) = 1; + } } /* Set background pixels to WHITE, foreground pixels to BLACK. */ for (i = 0; i < num_bytes; i++) - b.bitmap[i] = (b.bitmap[i] == 0 ? WHITE : BLACK); + b.bitmap[i] = (b.bitmap[i] == 0 ? WHITE : BLACK); return b; } + bool get_edge(bitmap_type b, int y, int x, struct etyp *t) { t->t00 = 0; t->t01 = 0; t->t01s = 0; t->t11 = 0; check(*BITMAP_PIXEL(b, y - 1, x - 1), *BITMAP_PIXEL(b, y - 1, x), - *BITMAP_PIXEL(b, y - 1, x + 1), t); + *BITMAP_PIXEL(b, y - 1, x + 1), t); check(*BITMAP_PIXEL(b, y - 1, x + 1), *BITMAP_PIXEL(b, y, x + 1), - *BITMAP_PIXEL(b, y + 1, x + 1), t); + *BITMAP_PIXEL(b, y + 1, x + 1), t); check(*BITMAP_PIXEL(b, y + 1, x + 1), *BITMAP_PIXEL(b, y + 1, x), - *BITMAP_PIXEL(b, y + 1, x - 1), t); + *BITMAP_PIXEL(b, y + 1, x - 1), t); check(*BITMAP_PIXEL(b, y + 1, x - 1), *BITMAP_PIXEL(b, y, x - 1), - *BITMAP_PIXEL(b, y - 1, x - 1), t); + *BITMAP_PIXEL(b, y - 1, x - 1), t); return *BITMAP_PIXEL(b, y, x) && t->t00 && t->t11 && !t->t01s; } + void check(int v1, int v2, int v3, struct etyp *t) { if (!v2 && (!v1 || !v3)) t->t00 = 1; diff --git a/converter/other/pamtosvg/image-proc.h b/converter/other/pamtosvg/image-proc.h index a5b86ec1..0607d3dd 100644 --- a/converter/other/pamtosvg/image-proc.h +++ b/converter/other/pamtosvg/image-proc.h @@ -25,7 +25,7 @@ typedef struct /* Allocate and compute a new distance map. */ extern distance_map_type new_distance_map(bitmap_type, unsigned char target_value, bool padded, - at_exception_type * exp); + at_exception_type * exp); /* Free the dynamically-allocated storage associated with a distance map. */ extern void free_distance_map(distance_map_type*); diff --git a/converter/other/pamtosvg/logreport.c b/converter/other/pamtosvg/logreport.c index 7d726584..63568b96 100644 --- a/converter/other/pamtosvg/logreport.c +++ b/converter/other/pamtosvg/logreport.c @@ -15,3 +15,5 @@ flush_log_output (void) fflush (log_file); } + + diff --git a/converter/other/pamtosvg/logreport.h b/converter/other/pamtosvg/logreport.h index 577da8df..071d42c3 100644 --- a/converter/other/pamtosvg/logreport.h +++ b/converter/other/pamtosvg/logreport.h @@ -11,17 +11,17 @@ extern FILE *at_log_file; extern void flush_log_output (void); -#define LOG(s) \ +#define LOG(s) \ do { if (log_file) fputs (s, log_file); } while (0) -#define LOG1(s, e) \ +#define LOG1(s, e) \ do { if (log_file) fprintf (log_file, s, e); } while (0) -#define LOG2(s, e1, e2) \ +#define LOG2(s, e1, e2) \ do { if (log_file) fprintf (log_file, s, e1, e2); } while (0) -#define LOG3(s, e1, e2, e3) \ +#define LOG3(s, e1, e2, e3) \ do { if (log_file) fprintf (log_file, s, e1, e2, e3); } while (0) -#define LOG4(s, e1, e2, e3, e4) \ +#define LOG4(s, e1, e2, e3, e4) \ do { if (log_file) fprintf (log_file, s, e1, e2, e3, e4); } while (0) -#define LOG5(s, e1, e2, e3, e4, e5) \ +#define LOG5(s, e1, e2, e3, e4, e5) \ do { if (log_file) fprintf (log_file, s, e1, e2, e3, e4, e5); } while (0) #endif /* not LOGREPORT_H */ diff --git a/converter/other/pamtosvg/message.h b/converter/other/pamtosvg/message.h index 0d0b9db5..e6822432 100644 --- a/converter/other/pamtosvg/message.h +++ b/converter/other/pamtosvg/message.h @@ -13,18 +13,18 @@ #define START_FATAL() do { fputs ("fatal: ", stderr); LOG("fatal: ") #define END_FATAL() fputs (".\n", stderr); exit (1); } while (0) -#define FATAL(s) \ +#define FATAL(s) \ START_FATAL (); fprintf (stderr, "%s", s); LOG (s); END_FATAL () -#define FATAL1(s, e1) \ +#define FATAL1(s, e1) \ START_FATAL (); fprintf (stderr, s, e1); LOG1 (s, e1); END_FATAL () #define START_WARNING() do { fputs ("warning: ", stderr); LOG ("warning: ") #define END_WARNING() fputs (".\n", stderr); } while (0) -#define WARNING(s) \ +#define WARNING(s) \ START_WARNING (); fprintf (stderr, "%s", s); LOG (s); END_WARNING () -#define WARNING1(s, e1) \ +#define WARNING1(s, e1) \ START_WARNING (); fprintf (stderr, s, e1); LOG1 (s, e1); END_WARNING () #endif /* not MESSAGE_H */ diff --git a/converter/other/pamtosvg/output-svg.c b/converter/other/pamtosvg/output-svg.c index 13ac5201..59733094 100644 --- a/converter/other/pamtosvg/output-svg.c +++ b/converter/other/pamtosvg/output-svg.c @@ -26,15 +26,15 @@ static void outSplineList(FILE * const fileP, spline_list_type const splineList, unsigned int const height) { - + unsigned splineSeq; - + for (splineSeq = 0; splineSeq < SPLINE_LIST_LENGTH(splineList); ++splineSeq) { - + spline_type const spline = SPLINE_LIST_ELT(splineList, splineSeq); - + if (SPLINE_DEGREE(spline) == LINEARTYPE) { fprintf(fileP, "L%g %g", END_POINT(spline).x, height - END_POINT(spline).y); @@ -55,13 +55,13 @@ out_splines(FILE * const fileP, unsigned listSeq; pixel lastColor; - + PPM_ASSIGN(lastColor, 0, 0, 0); - + for (listSeq = 0; listSeq < SPLINE_LIST_ARRAY_LENGTH(shape); ++listSeq) { - + spline_list_type const splineList = SPLINE_LIST_ARRAY_ELT(shape, listSeq); spline_type const first = SPLINE_LIST_ELT(splineList, 0); @@ -109,10 +109,10 @@ output_svg_writer(FILE * const fileP, int const llx, int const lly, int const urx, - int const ury, + int const ury, at_output_opts_type * const opts, at_spline_list_array_type const shape, - at_msg_func msg_func, + at_msg_func msg_func, void * const msg_data) { int const width = urx - llx; @@ -125,6 +125,9 @@ output_svg_writer(FILE * const fileP, out_splines(fileP, shape, height); fputs("</svg>\n", fileP); - + return 0; } + + + diff --git a/converter/other/pamtosvg/output-svg.h b/converter/other/pamtosvg/output-svg.h index 46fc8f8f..a02e8334 100644 --- a/converter/other/pamtosvg/output-svg.h +++ b/converter/other/pamtosvg/output-svg.h @@ -26,10 +26,10 @@ output_svg_writer(FILE * const file, int const llx, int const lly, int const urx, - int const ury, + int const ury, at_output_opts_type * const opts, at_spline_list_array_type const shape, - at_msg_func msg_func, + at_msg_func msg_func, void * const msg_data); diff --git a/converter/other/pamtosvg/pamtosvg.c b/converter/other/pamtosvg/pamtosvg.c index adf76801..03b0a80f 100644 --- a/converter/other/pamtosvg/pamtosvg.c +++ b/converter/other/pamtosvg/pamtosvg.c @@ -47,12 +47,12 @@ readImageToBitmap(FILE * const ifP, unsigned int col; pnm_scaletuplerow(&pam, row255, tuples[row], 255); - + for (col = 0; col < pam.width; ++col) { unsigned int plane; for (plane = 0; plane < pam.depth; ++plane) { - unsigned int const bitmapIndex = + unsigned int const bitmapIndex = (row * pam.width + col) * pam.depth + plane; bitmapP->bitmap[bitmapIndex] = row255[col][plane]; } @@ -60,7 +60,7 @@ readImageToBitmap(FILE * const ifP, } pnm_freepamrow(row255); pnm_freepamarray(tuples, &pam); - + *bitmapPP = bitmapP; } @@ -73,7 +73,7 @@ dotPrinter(float const percentage, int * const currentP = (int *)clientData; float const unit = (float)1.0 / (float)(dot_printer_max_column) ; int const maximum = (int)(percentage / unit); - + while (*currentP < maximum) { fputc(dot_printer_char, stderr); (*currentP)++; @@ -120,13 +120,13 @@ struct cmdlineInfo { }; -static void -parseCommandLine(int argc, - char ** argv, +static void +parseCommandLine(int argc, + char ** argv, struct cmdlineInfo * const cmdlineP) { /* -------------------------------------------------------------------------- Parse program command line described in Unix standard form by argc - and argv. Return the information in the options as *cmdlineP. + and argv. Return the information in the options as *cmdlineP. If command line is internally inconsistent (invalid options, etc.), issue error message to stderr and abort program. @@ -139,7 +139,7 @@ parseCommandLine(int argc, optStruct3 opt; const char * background_colorOpt; - + unsigned int option_def_index; MALLOCARRAY_NOFAIL(option_def, 100); @@ -151,7 +151,7 @@ parseCommandLine(int argc, &background_colorOpt, &cmdlineP->backgroundSpec, 0); OPTENT3(0, "centerline", OPT_FLAG, NULL, &cmdlineP->centerline, 0); - OPTENT3(0, "corner-always-threshold", OPT_FLOAT, + OPTENT3(0, "corner-always-threshold", OPT_FLOAT, &cmdlineP->corner_always_threshold, NULL, 0); OPTENT3(0, "corner-surround", OPT_UINT, &cmdlineP->corner_surround, NULL, 0); @@ -173,11 +173,11 @@ parseCommandLine(int argc, NULL, &cmdlineP->preserve_width, 0); OPTENT3(0, "remove-adjacent-corners", OPT_UINT, NULL, &cmdlineP->remove_adjacent_corners, 0); - OPTENT3(0, "tangent-surround", OPT_UINT, + OPTENT3(0, "tangent-surround", OPT_UINT, &cmdlineP->tangent_surround, NULL, 0); OPTENT3(0, "report-progress", OPT_FLAG, NULL, &cmdlineP->report_progress, 0); - OPTENT3(0, "width-weight-factor", OPT_FLOAT, + OPTENT3(0, "width-weight-factor", OPT_FLOAT, &cmdlineP->width_weight_factor, NULL, 0); @@ -207,7 +207,7 @@ parseCommandLine(int argc, cmdlineP->inputFileName = "-"; else { cmdlineP->inputFileName = argv[1]; - + if (argc-1 > 1) pm_error("Too many arguments (%u). The only non-option argument " "is the input file name.", argc-1); @@ -228,7 +228,7 @@ fitSplines(at_bitmap_type * const bitmapP, at_fitting_opts_type * fittingOptsP; progressStat = 0; - + fittingOptsP = at_fitting_opts_new(); fittingOptsP->backgroundSpec = cmdline.backgroundSpec; @@ -253,7 +253,7 @@ fitSplines(at_bitmap_type * const bitmapP, at_fitting_opts_free(fittingOptsP); } - + static void @@ -267,12 +267,12 @@ writeSplines(at_spline_list_array_type * const splinesP, outputOptsP = at_output_opts_new(); outputOptsP->dpi = cmdline.dpi; - + at_splines_write(outputWriter, ofP, outputOptsP, splinesP, exceptionHandler, NULL); at_output_opts_free(outputOptsP); -} +} @@ -315,13 +315,13 @@ filenameRoot(const char * const filename) { rootEnd = strlen(filename); MALLOCARRAY(buffer, rootEnd - rootStart + 1); - + j = 0; for (i = rootStart; i < rootEnd; ++i) buffer[j++] = filename[i]; buffer[j] = '\0'; - + return buffer; } @@ -342,7 +342,7 @@ openLogFile(FILE ** const logFileP, if (inputRootName == NULL) pm_error("Can't find the root portion of file name '%s'", inputFileArg); - + pm_asprintf(&logfileName, "%s.log", inputRootName); pm_strfree(inputRootName); @@ -352,7 +352,7 @@ openLogFile(FILE ** const logFileP, pm_strfree(logfileName); } - + int @@ -374,7 +374,7 @@ main(int argc, char * argv[]) { openLogFile(&log_file, cmdline.inputFileName); readImageToBitmap(ifP, &bitmapP); - + if (cmdline.report_progress) { progressReporter = dotPrinter; fprintf(stderr, "%-15s", cmdline.inputFileName); @@ -397,6 +397,9 @@ main(int argc, char * argv[]) { if (cmdline.report_progress) fputs("\n", stderr); - + return 0; } + + + diff --git a/converter/other/pamtosvg/pxl-outline.c b/converter/other/pamtosvg/pxl-outline.c index 19451c04..ff7d6e25 100644 --- a/converter/other/pamtosvg/pxl-outline.c +++ b/converter/other/pamtosvg/pxl-outline.c @@ -85,7 +85,7 @@ getBitmapColor(bitmap_type const bitmap, unsigned char * const p = BITMAP_PIXEL(bitmap, row, col); pixel pix; - + if (bitmap.np >= 3) PPM_ASSIGN(pix, p[0], p[1], p[2]); else @@ -96,7 +96,6 @@ getBitmapColor(bitmap_type const bitmap, - static void append_outline_pixel(pixel_outline_type * const pixelOutlineP, pm_pixelcoord const coord) { @@ -156,6 +155,7 @@ is_outline_edge (edge_type edge, bitmap_type bitmap, } + /* Is this really an edge and is it still unmarked? */ static bool @@ -173,13 +173,14 @@ is_unmarked_outline_edge(unsigned short row, } + static bool is_valid_dir(unsigned int const row, unsigned int const col, direction_type const dir, bitmap_type const bitmap, bitmap_type const marked) { - + return(!is_marked_dir(row, col, dir, marked) && COMPUTE_DELTA(ROW, dir)+row > 0 && COMPUTE_DELTA(COL, dir)+col > 0 @@ -233,7 +234,7 @@ next_unmarked_pixel(unsigned int * const row, break; } while (1); - if ((*row != orig_row || *col != orig_col) && + if ((*row != orig_row || *col != orig_col) && (!(is_other_dir_marked(orig_row, orig_col, test_dir, *marked) && is_other_dir_marked(orig_row + COMPUTE_DELTA(ROW, test_dir), orig_col + COMPUTE_DELTA(COL, test_dir), @@ -297,7 +298,7 @@ findOneCenterline(bitmap_type const bitmap, if (row == originalRow && col == originalCol) break; - + { /* Add the new pixel to the output list. */ pm_pixelcoord pos; @@ -338,7 +339,7 @@ wrongDirection(unsigned int const row, pixel_outline_list_type find_centerline_pixels(bitmap_type const bitmap, - pixel const bg_color, + pixel const bg_color, at_progress_func notify_progress, void * const progress_data, at_testcancel_func test_cancel, @@ -349,7 +350,7 @@ find_centerline_pixels(bitmap_type const bitmap, signed short row; bitmap_type marked = new_bitmap(bitmap.width, bitmap.height); unsigned int const max_progress = bitmap.height * bitmap.width; - + O_LIST_LENGTH(outline_list) = 0; outline_list.data = NULL; @@ -366,9 +367,9 @@ find_centerline_pixels(bitmap_type const bitmap, ((float) max_progress * (float)3.0), progress_data); - if (PPM_EQUAL(getBitmapColor(bitmap, row, col), bg_color)) { - ++col; - continue; + if (PPM_EQUAL(getBitmapColor(bitmap, row, col), bg_color)) { + ++col; + continue; } dir = EAST; @@ -380,8 +381,8 @@ find_centerline_pixels(bitmap_type const bitmap, if (wrongDirection(row, col, dir, bitmap, marked)) { dir = SOUTHWEST; if (wrongDirection(row, col, dir, bitmap, marked)) { - ++col; - continue; + ++col; + continue; } } } @@ -454,8 +455,8 @@ find_centerline_pixels(bitmap_type const bitmap, free(partial_outline.data); } else ++col; - } - + } + /* Outside outlines will start at a top edge, and move counterclockwise, and inside outlines will start at a bottom edge, and move clockwise. This happens because of @@ -493,6 +494,7 @@ append_pixel_outline (pixel_outline_list_type *outline_list, } + /* Free the list of outline lists. */ void @@ -517,6 +519,7 @@ free_pixel_outline_list (pixel_outline_list_type *outline_list) } + /* Return an empty list of pixels. */ @@ -532,6 +535,8 @@ new_pixel_outline (void) return pixel_outline; } + + static void free_pixel_outline (pixel_outline_type * outline) { @@ -543,6 +548,8 @@ free_pixel_outline (pixel_outline_type * outline) } } + + /* Concatenate two pixel lists. The two lists are assumed to have the same starting pixel and to proceed in opposite directions therefrom. */ @@ -569,6 +576,7 @@ concat_pixel_outline(pixel_outline_type *o1, const pixel_outline_type *o2) } + /* If EDGE is not already marked, we mark it; otherwise, it's a fatal error. The position ROW and COL should be inside the bitmap MARKED. EDGE can be NO_EDGE. */ @@ -581,6 +589,7 @@ mark_edge (edge_type edge, unsigned short row, } + /* Mark the direction of the pixel ROW/COL in MARKED. */ static void @@ -590,6 +599,7 @@ mark_dir(unsigned short row, unsigned short col, direction_type dir, bitmap_type } + /* Test if the direction of pixel at ROW/COL in MARKED is marked. */ static bool @@ -599,6 +609,7 @@ is_marked_dir(unsigned short row, unsigned short col, direction_type dir, bitmap } + static bool is_other_dir_marked(unsigned short row, unsigned short col, direction_type dir, bitmap_type marked) { @@ -606,6 +617,7 @@ is_other_dir_marked(unsigned short row, unsigned short col, direction_type dir, } + /* Return the number of pixels adjacent to pixel ROW/COL that are black. */ static unsigned @@ -615,18 +627,19 @@ num_neighbors(unsigned short row, unsigned short col, bitmap_type bitmap) pixel color = getBitmapColor(bitmap, row, col); for (dir = NORTH; dir <= NORTHEAST; dir++) { - int delta_r = COMPUTE_DELTA(ROW, dir); - int delta_c = COMPUTE_DELTA(COL, dir); - unsigned int test_row = row + delta_r; - unsigned int test_col = col + delta_c; - if (BITMAP_VALID_PIXEL(bitmap, test_row, test_col) - && PPM_EQUAL(getBitmapColor(bitmap, test_row, test_col), color)) - ++count; + int delta_r = COMPUTE_DELTA(ROW, dir); + int delta_c = COMPUTE_DELTA(COL, dir); + unsigned int test_row = row + delta_r; + unsigned int test_col = col + delta_c; + if (BITMAP_VALID_PIXEL(bitmap, test_row, test_col) + && PPM_EQUAL(getBitmapColor(bitmap, test_row, test_col), color)) + ++count; } return count; } + /* Test if the edge EDGE at ROW/COL in MARKED is marked. */ static bool @@ -679,7 +692,7 @@ nextClockwisePointTop(bitmap_type const bitmap, posP->col = *col + 1; posP->row = bitmap.height - *row; return; - } + } RETURN_IF_FATAL(); @@ -714,7 +727,7 @@ nextClockwisePointRight(bitmap_type const bitmap, is_outline_edge(RIGHT, bitmap, *row-1, *col, color, exp))) { /* NORTH */ - + *edge = RIGHT; --*row; posP->col = *col+1; @@ -723,7 +736,7 @@ nextClockwisePointRight(bitmap_type const bitmap, } RETURN_IF_FATAL(); - + if ((*col+1 < marked.width && *row >= 1 && !is_marked_edge(BOTTOM, *row-1, *col+1, marked) && is_outline_edge(BOTTOM, bitmap, *row-1, *col+1, @@ -740,7 +753,7 @@ nextClockwisePointRight(bitmap_type const bitmap, posP->col = *col + 1; posP->row = bitmap.height - *row - 1; return; - } + } RETURN_IF_FATAL(); @@ -769,7 +782,7 @@ nextClockwisePointBottom(bitmap_type const bitmap, bitmap_type const marked, at_exception_type * const exp, pm_pixelcoord * const posP) { - + if ((*col+1 < marked.width && !is_marked_edge(BOTTOM, *row, *col+1, marked) && is_outline_edge(BOTTOM, bitmap, *row, *col+1, color, exp))) { @@ -853,16 +866,16 @@ nextClockwisePointLeft(bitmap_type const bitmap, is_marked_edge(TOP, *row+1, *col, marked)) && !(is_marked_edge(BOTTOM, *row, *col-1, marked) && is_marked_edge(LEFT, *row+1, *col, marked))) { - + /* SOUTHWEST */ - + *edge = TOP; --*col; ++*row; posP->col = *col; posP->row = bitmap.height - *row; return; - } + } RETURN_IF_FATAL(); @@ -889,21 +902,21 @@ nextClockwisePoint(bitmap_type const bitmap, bitmap_type const marked, at_exception_type * const exp, pm_pixelcoord * const posP) { - + switch (*edge) { case TOP: nextClockwisePointTop( bitmap, edge, row, col, color, marked, exp, posP); break; - case RIGHT: + case RIGHT: nextClockwisePointRight(bitmap, edge, row, col, color, marked, exp, posP); break; - case BOTTOM: + case BOTTOM: nextClockwisePointBottom(bitmap, edge, row, col, color, marked, exp, posP); break; - case LEFT: + case LEFT: nextClockwisePointLeft( bitmap, edge, row, col, color, marked, exp, posP); break; @@ -952,7 +965,7 @@ nextCcwPointTop(bitmap_type const bitmap, } RETURN_IF_FATAL(); - + if ((*col >= 1 && *row >= 1 && !is_marked_edge(RIGHT, *row-1, *col-1, marked) && is_outline_edge(RIGHT, bitmap, *row-1, *col-1, color, exp))) { @@ -965,7 +978,7 @@ nextCcwPointTop(bitmap_type const bitmap, posP->col = *col + 1; posP->row = bitmap.height - *row; return; - } + } RETURN_IF_FATAL(); @@ -1000,7 +1013,7 @@ nextCcwPointRight(bitmap_type const bitmap, is_outline_edge(RIGHT, bitmap, *row-1, *col, color, exp))) { /* NORTH */ - + *edge = RIGHT; --*row; posP->col = *col + 1; @@ -1082,7 +1095,7 @@ nextCcwPointBottom(bitmap_type const bitmap, } RETURN_IF_FATAL(); - + *edge = NO_EDGE; } @@ -1124,7 +1137,7 @@ nextCcwPointLeft(bitmap_type const bitmap, } RETURN_IF_FATAL(); - + if ((*col >= 1 && *row + 1 < marked.height && !is_marked_edge(TOP, *row+1, *col-1, marked) && is_outline_edge(TOP, bitmap, *row+1, *col-1, color, exp))) { @@ -1144,6 +1157,8 @@ nextCcwPointLeft(bitmap_type const bitmap, *edge = NO_EDGE; } + + static void nextCounterClockwisePoint(bitmap_type const bitmap, edge_type * const edge, @@ -1158,18 +1173,18 @@ nextCounterClockwisePoint(bitmap_type const bitmap, case TOP: nextCcwPointTop( bitmap, edge, row, col, color, marked, exp, posP); break; - case RIGHT: + case RIGHT: nextCcwPointRight( bitmap, edge, row, col, color, marked, exp, posP); break; - case BOTTOM: + case BOTTOM: nextCcwPointBottom(bitmap, edge, row, col, color, marked, exp, posP); break; - case LEFT: + case LEFT: nextCcwPointLeft( bitmap, edge, row, col, color, marked, exp, posP); break; case NO_EDGE: break; - default: + default: *edge = NO_EDGE; break; } @@ -1218,7 +1233,7 @@ find_one_outline(bitmap_type const bitmap, pixel_outline_type outline; pm_pixelcoord pos; - + outline = new_pixel_outline(); outline.color = getBitmapColor(bitmap, originalRow, originalCol); @@ -1228,7 +1243,7 @@ find_one_outline(bitmap_type const bitmap, /* Set initial position */ pos.col = col + ((edge == RIGHT) || (edge == BOTTOM) ? 1 : 0); - pos.row = bitmap.height - row - 1 + + pos.row = bitmap.height - row - 1 + (edge == TOP || edge == RIGHT ? 1 : 0); do { @@ -1237,7 +1252,7 @@ find_one_outline(bitmap_type const bitmap, LOG2(" (%d,%d)", pos.col, pos.row); append_outline_pixel(&outline, pos); } - + mark_edge(edge, row, col, marked); nextPoint(bitmap, &edge, &row, &col, &pos, outline.color, clockwise, *marked, exp); @@ -1255,7 +1270,7 @@ find_one_outline(bitmap_type const bitmap, pixel_outline_list_type find_outline_pixels(bitmap_type const bitmap, bool const bg_spec, - pixel const bg_color, + pixel const bg_color, at_progress_func notify_progress, void * const progress_data, at_testcancel_func test_cancel, @@ -1273,16 +1288,16 @@ find_outline_pixels(bitmap_type const bitmap, to the list, marking the edges in it as we go. */ unsigned int const max_progress = bitmap.height * bitmap.width; - + pixel_outline_list_type outline_list; unsigned int row; bitmap_type marked; - + marked = new_bitmap (bitmap.width, bitmap.height); - + O_LIST_LENGTH(outline_list) = 0; outline_list.data = NULL; - + for (row = 0; row < bitmap.height; ++row) { unsigned int col; for (col = 0; col < bitmap.width; ++col) { @@ -1303,21 +1318,21 @@ find_outline_pixels(bitmap_type const bitmap, is_unmarked_outline_edge(row, col, TOP, bitmap, marked, color, exp)) { pixel_outline_type outline; - + CHECK_FATAL(); /* FREE(DONE) outline_list */ - + LOG1("#%u: (counterclockwise)", O_LIST_LENGTH(outline_list)); - + outline = find_one_outline(bitmap, TOP, row, col, &marked, false, false, exp); CHECK_FATAL(); /* FREE(DONE) outline_list */ - + O_CLOCKWISE(outline) = false; append_pixel_outline(&outline_list, outline); - + LOG1(" [%u].\n", O_LENGTH (outline)); } else - CHECK_FATAL (); /* FREE(DONE) outline_list */ + CHECK_FATAL (); /* FREE(DONE) outline_list */ /* A valid edge can be BOTTOM for an inside outline. Inside outlines are traced clockwise. @@ -1328,20 +1343,20 @@ find_outline_pixels(bitmap_type const bitmap, is_unmarked_outline_edge(row-1, col, BOTTOM, bitmap, marked, colorAbove,exp)) { CHECK_FATAL(); /* FREE(DONE) outline_list */ - + /* This lines are for debugging only:*/ if (is_background) { pixel_outline_type outline; - + LOG1("#%u: (clockwise)", O_LIST_LENGTH(outline_list)); - + outline = find_one_outline(bitmap, BOTTOM, row-1, col, &marked, true, false, exp); CHECK_FATAL(); /* FREE(DONE) outline_list */ - + O_CLOCKWISE(outline) = true; append_pixel_outline(&outline_list, outline); - + LOG1(" [%u].\n", O_LENGTH(outline)); } else { find_one_outline(bitmap, BOTTOM, row-1, col, @@ -1349,7 +1364,7 @@ find_outline_pixels(bitmap_type const bitmap, CHECK_FATAL(); /* FREE(DONE) outline_list */ } } else - CHECK_FATAL(); /* FREE(DONE) outline_list */ + CHECK_FATAL(); /* FREE(DONE) outline_list */ } if (test_cancel && test_cancel(testcancel_data)) { free_pixel_outline_list(&outline_list); @@ -1366,3 +1381,5 @@ find_outline_pixels(bitmap_type const bitmap, return outline_list; } + + diff --git a/converter/other/pamtosvg/pxl-outline.h b/converter/other/pamtosvg/pxl-outline.h index e37ccaf6..64e312cc 100644 --- a/converter/other/pamtosvg/pxl-outline.h +++ b/converter/other/pamtosvg/pxl-outline.h @@ -34,8 +34,8 @@ typedef struct after the last is the first, and the previous coordinate before the first is the last. */ #define O_NEXT(p_o, n) (((n) + 1) % O_LENGTH (p_o)) -#define O_PREV(p_o, n) ((n) == 0 \ - ? O_LENGTH (p_o) - 1 \ +#define O_PREV(p_o, n) ((n) == 0 \ + ? O_LENGTH (p_o) - 1 \ : (n) - 1) /* And the character turns into a list of such lists. */ @@ -55,7 +55,7 @@ typedef struct pixel_outline_list_type find_outline_pixels (bitmap_type const type, bool const bg_spec, - pixel const bg_color, + pixel const bg_color, at_progress_func notify_progress, void * const progress_data, at_testcancel_func test_cancel, @@ -65,7 +65,7 @@ find_outline_pixels (bitmap_type const type, /* Find all pixels on the center line of the character C. */ pixel_outline_list_type find_centerline_pixels (bitmap_type const type, - pixel const bg_color, + pixel const bg_color, at_progress_func notify_progress, void * const progress_data, at_testcancel_func test_cancel, diff --git a/converter/other/pamtosvg/spline.c b/converter/other/pamtosvg/spline.c index 6d867131..a62ce895 100644 --- a/converter/other/pamtosvg/spline.c +++ b/converter/other/pamtosvg/spline.c @@ -30,6 +30,7 @@ print_spline (FILE *f, spline_type s) } + /* Evaluate the spline S at a given T value. This is an implementation of de Casteljau's algorithm. See Schneider's thesis, p.37. The variable names are taken from there. */ @@ -64,6 +65,7 @@ evaluate_spline (spline_type s, float t) } + /* Return a new, empty, spline list. */ spline_list_type * @@ -76,6 +78,8 @@ new_spline_list (void) return answer; } + + spline_list_type empty_spline_list (void) { @@ -85,6 +89,8 @@ empty_spline_list (void) return answer; } + + /* Return a new spline list with SPLINE as the first element. */ spline_list_type * @@ -101,6 +107,7 @@ new_spline_list_with_spline (spline_type spline) } + /* Free the storage in a spline list. We don't have to free the elements, since they are arrays in automatic storage. And we don't want to free the list if it was empty. */ @@ -115,6 +122,7 @@ free_spline_list(spline_list_type spline_list) { } + /* Append the spline S to the list SPLINE_LIST. */ void @@ -128,6 +136,7 @@ append_spline (spline_list_type *l, spline_type s) } + /* Tack the elements in the list S2 onto the end of S1. S2 is not changed. */ @@ -149,6 +158,7 @@ concat_spline_lists (spline_list_type *s1, spline_list_type s2) } + /* Return a new, empty, spline list array. */ spline_list_array_type @@ -163,6 +173,7 @@ new_spline_list_array (void) } + /* Free the storage in a spline list array. We don't want to free the list if it is empty. */ void @@ -182,6 +193,7 @@ free_spline_list_array (spline_list_array_type *spline_list_array) } + /* Append the spline S to the list SPLINE_LIST_ARRAY. */ void @@ -192,3 +204,6 @@ append_spline_list (spline_list_array_type *l, spline_list_type s) SPLINE_LIST_ARRAY_LENGTH(*l)); LAST_SPLINE_LIST_ARRAY_ELT (*l) = s; } + + + diff --git a/converter/other/pamtosvg/thin-image.c b/converter/other/pamtosvg/thin-image.c index 364f67cc..ad15247f 100644 --- a/converter/other/pamtosvg/thin-image.c +++ b/converter/other/pamtosvg/thin-image.c @@ -27,78 +27,78 @@ #include "logreport.h" #include "message.h" #include "bitmap.h" - + #define PIXEL_SET(p, new) ((void)memcpy((p), (new), sizeof(Pixel))) #define PIXEL_EQUAL(p1, p2) \ ((p1)[0] == (p2)[0] && (p1)[1] == (p2)[1] && (p1)[2] == (p2)[2]) - -typedef unsigned char Pixel[3]; /* RGB pixel data type */ - - -void thin3(bitmap_type *image, Pixel colour); -void thin1(bitmap_type *image, unsigned char colour); - - -/* -------------------------------- ThinImage - Thin binary image. --------------------------- * - * - * Description: - * Thins the supplied binary image using Rosenfeld's parallel - * thinning algorithm. - * - * On Entry: - * image = Image to thin. - * - * -------------------------------------------------------------------------------------------- */ - - -/* Direction masks: */ -/* N S W E */ -static unsigned int masks[] = { 0200, 0002, 0040, 0010 }; - -/* True if pixel neighbor map indicates the pixel is 8-simple and */ -/* not an end point and thus can be deleted. The neighborhood */ -/* map is defined as an integer of bits abcdefghi with a non-zero */ -/* bit representing a non-zero pixel. The bit assignment for the */ -/* neighborhood is: */ -/* */ -/* a b c */ -/* d e f */ -/* g h i */ - -static unsigned char todelete[512] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}; + +typedef unsigned char Pixel[3]; /* RGB pixel data type */ + + +void thin3(bitmap_type *image, Pixel colour); +void thin1(bitmap_type *image, unsigned char colour); + + +/* -------------------------------- ThinImage - Thin binary image. --------------------------- * + * + * Description: + * Thins the supplied binary image using Rosenfeld's parallel + * thinning algorithm. + * + * On Entry: + * image = Image to thin. + * + * -------------------------------------------------------------------------------------------- */ + + +/* Direction masks: */ +/* N S W E */ +static unsigned int masks[] = { 0200, 0002, 0040, 0010 }; + +/* True if pixel neighbor map indicates the pixel is 8-simple and */ +/* not an end point and thus can be deleted. The neighborhood */ +/* map is defined as an integer of bits abcdefghi with a non-zero */ +/* bit representing a non-zero pixel. The bit assignment for the */ +/* neighborhood is: */ +/* */ +/* a b c */ +/* d e f */ +/* g h i */ + +static unsigned char todelete[512] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}; static pixel background; @@ -106,268 +106,273 @@ static pixel background; void thin_image(bitmap_type *image, bool bgSpec, pixel bg, at_exception_type * exp) -{ - /* This is nasty as we need to call thin once for each - * colour in the image the way I do this is to keep a second - * copy of the bitmap and to use this to keep - * track of which colours have not yet been processed, - * trades time for pathological case memory.....*/ +{ + /* This is nasty as we need to call thin once for each + * colour in the image the way I do this is to keep a second + * copy of the bitmap and to use this to keep + * track of which colours have not yet been processed, + * trades time for pathological case memory.....*/ long m, n, num_pixels; - bitmap_type bm; + bitmap_type bm; unsigned int const spp = image->np; - unsigned int const width = image->width; - unsigned int const height = image->height; + unsigned int const width = image->width; + unsigned int const height = image->height; if (bgSpec) background = bg; - else + else PPM_ASSIGN(background, 255, 255, 255); /* Clone the image */ bm.height = image->height; bm.width = image->width; bm.np = image->np; - MALLOCARRAY(bm.bitmap, height * width * spp); + MALLOCARRAY(bm.bitmap, height * width * spp); if (bm.bitmap == NULL) pm_error("Unable to get memory for thin image bitmap clone"); - memcpy(bm.bitmap, image->bitmap, height * width * spp); + memcpy(bm.bitmap, image->bitmap, height * width * spp); num_pixels = height * width; switch (spp) { - case 3: - { - Pixel *ptr = (Pixel*)bm.bitmap; - Pixel bg_color; - bg_color[0] = PPM_GETR(background); - bg_color[1] = PPM_GETG(background); - bg_color[2] = PPM_GETB(background); - - for (n = num_pixels - 1; n >= 0L; --n) - { - Pixel p; - - PIXEL_SET(p, ptr[n]); - if (!PIXEL_EQUAL(p, bg_color)) - { - /* we have a new colour in the image */ - LOG3("Thinning colour (%x, %x, %x)\n", p[0], p[1], p[2]); - for (m = n - 1; m >= 0L; --m) - { - if (PIXEL_EQUAL(ptr[m], p)) - PIXEL_SET(ptr[m], bg_color); - } - thin3(image, p); - } - } - break; - } - - case 1: - { - unsigned char * const ptr = bm.bitmap; - unsigned char bg_color; - - if (PPM_ISGRAY(background)) + case 3: + { + Pixel *ptr = (Pixel*)bm.bitmap; + Pixel bg_color; + bg_color[0] = PPM_GETR(background); + bg_color[1] = PPM_GETG(background); + bg_color[2] = PPM_GETB(background); + + for (n = num_pixels - 1; n >= 0L; --n) + { + Pixel p; + + PIXEL_SET(p, ptr[n]); + if (!PIXEL_EQUAL(p, bg_color)) + { + /* we have a new colour in the image */ + LOG3("Thinning colour (%x, %x, %x)\n", p[0], p[1], p[2]); + for (m = n - 1; m >= 0L; --m) + { + if (PIXEL_EQUAL(ptr[m], p)) + PIXEL_SET(ptr[m], bg_color); + } + thin3(image, p); + } + } + break; + } + + case 1: + { + unsigned char * const ptr = bm.bitmap; + unsigned char bg_color; + + if (PPM_ISGRAY(background)) bg_color = PPM_GETR(background); - else + else bg_color = ppm_luminosity(background); - for (n = num_pixels - 1; n >= 0L; --n) - { - unsigned char c = ptr[n]; - if (c != bg_color) - { - LOG1 ("Thinning colour %x\n", c); - for (m = n - 1; m >= 0L; --m) - if (ptr[m] == c) ptr[m] = bg_color; - thin1(image, c); - } - } - break; - } - - default: - { - LOG1 ("thin_image: Don't know how to interpret %u-plane images", spp); - at_exception_fatal(exp, "thin_image: wrong plane images are passed"); - goto cleanup; - } + for (n = num_pixels - 1; n >= 0L; --n) + { + unsigned char c = ptr[n]; + if (c != bg_color) + { + LOG1 ("Thinning colour %x\n", c); + for (m = n - 1; m >= 0L; --m) + if (ptr[m] == c) ptr[m] = bg_color; + thin1(image, c); + } + } + break; + } + + default: + { + LOG1 ("thin_image: Don't know how to interpret %u-plane images", spp); + at_exception_fatal(exp, "thin_image: wrong plane images are passed"); + goto cleanup; + } } cleanup: - free (bm.bitmap); -} + free (bm.bitmap); +} + - -void thin3(bitmap_type *image, Pixel colour) -{ + +void thin3(bitmap_type *image, Pixel colour) +{ Pixel *ptr, *y_ptr, *y1_ptr; Pixel bg_color; - unsigned int xsize, ysize; /* Image resolution */ - unsigned int x, y; /* Pixel location */ - unsigned int i; /* Pass index */ - unsigned int pc = 0; /* Pass count */ - unsigned int count = 1; /* Deleted pixel count */ - unsigned int p, q; /* Neighborhood maps of adjacent*/ - /* cells */ - unsigned char *qb; /* Neighborhood maps of previous*/ - /* scanline */ - unsigned int m; /* Deletion direction mask */ - + unsigned int xsize, ysize; /* Image resolution */ + unsigned int x, y; /* Pixel location */ + unsigned int i; /* Pass index */ + unsigned int pc = 0; /* Pass count */ + unsigned int count = 1; /* Deleted pixel count */ + unsigned int p, q; /* Neighborhood maps of adjacent*/ + /* cells */ + unsigned char *qb; /* Neighborhood maps of previous*/ + /* scanline */ + unsigned int m; /* Deletion direction mask */ + bg_color[0] = PPM_GETR(background); bg_color[1] = PPM_GETG(background); bg_color[2] = PPM_GETB(background); - LOG (" Thinning image.....\n "); + LOG (" Thinning image.....\n "); xsize = image->width; ysize = image->height; - MALLOCARRAY_NOFAIL(qb, xsize); - qb[xsize-1] = 0; /* Used for lower-right pixel */ + MALLOCARRAY_NOFAIL(qb, xsize); + qb[xsize-1] = 0; /* Used for lower-right pixel */ ptr = (Pixel*)image->bitmap; - - while ( count ) { /* Scan image while deletions */ - pc++; - count = 0; - - for ( i = 0 ; i < 4 ; i++ ) { - - m = masks[i]; - - /* Build initial previous scan buffer. */ - p = PIXEL_EQUAL(ptr[0], colour); - for ( x = 0 ; x < xsize-1 ; x++ ) + + while ( count ) { /* Scan image while deletions */ + pc++; + count = 0; + + for ( i = 0 ; i < 4 ; i++ ) { + + m = masks[i]; + + /* Build initial previous scan buffer. */ + p = PIXEL_EQUAL(ptr[0], colour); + for ( x = 0 ; x < xsize-1 ; x++ ) qb[x] = (unsigned char) (p = ((p<<1)&0006) | (unsigned int) PIXEL_EQUAL(ptr[x+1], - colour)); - - /* Scan image for pixel deletion candidates. */ - y_ptr = ptr; y1_ptr = ptr + xsize; + colour)); + + /* Scan image for pixel deletion candidates. */ + y_ptr = ptr; y1_ptr = ptr + xsize; for (y = 0; y < ysize - 1; y++, y_ptr += xsize, y1_ptr += xsize) - { - q = qb[0]; - p = ((q<<2)&0330) | (unsigned int) PIXEL_EQUAL(y1_ptr[0], colour); - - for ( x = 0 ; x < xsize-1 ; x++ ) { - q = qb[x]; - p = ((p<<1)&0666) | ((q<<3)&0110) | - (unsigned int) PIXEL_EQUAL(y1_ptr[x+1], colour); - qb[x] = (unsigned char) p; - if ((i != 2 || x != 0) && ((p&m) == 0) && todelete[p] ) { - count++; /* delete the pixel */ - PIXEL_SET(y_ptr[x], bg_color); - } - } - - /* Process right edge pixel. */ - p = (p<<1)&0666; - if (i != 3 && (p&m) == 0 && todelete[p] ) { - count++; - PIXEL_SET(y_ptr[xsize-1], bg_color); - } - } - - if (i != 1) - { - /* Process bottom scan line. */ - q = qb[0]; - p = ((q<<2)&0330); + { + q = qb[0]; + p = ((q<<2)&0330) | (unsigned int) PIXEL_EQUAL(y1_ptr[0], colour); + + for ( x = 0 ; x < xsize-1 ; x++ ) { + q = qb[x]; + p = ((p<<1)&0666) | ((q<<3)&0110) | + (unsigned int) PIXEL_EQUAL(y1_ptr[x+1], colour); + qb[x] = (unsigned char) p; + if ((i != 2 || x != 0) && ((p&m) == 0) && todelete[p] ) { + count++; /* delete the pixel */ + PIXEL_SET(y_ptr[x], bg_color); + } + } + + /* Process right edge pixel. */ + p = (p<<1)&0666; + if (i != 3 && (p&m) == 0 && todelete[p] ) { + count++; + PIXEL_SET(y_ptr[xsize-1], bg_color); + } + } + + if (i != 1) + { + /* Process bottom scan line. */ + q = qb[0]; + p = ((q<<2)&0330); y_ptr = ptr + xsize * (ysize - 1); - for ( x = 0 ; x < xsize ; x++ ) { - q = qb[x]; - p = ((p<<1)&0666) | ((q<<3)&0110); - if ((i != 2 || x != 0) && (p&m) == 0 && todelete[p]) { - count++; + for ( x = 0 ; x < xsize ; x++ ) { + q = qb[x]; + p = ((p<<1)&0666) | ((q<<3)&0110); + if ((i != 2 || x != 0) && (p&m) == 0 && todelete[p]) { + count++; PIXEL_SET(y_ptr[x], bg_color); - } - } + } + } } - } - LOG2 ("ThinImage: pass %d, %d pixels deleted\n", pc, count); - } - free (qb); -} - - -void thin1(bitmap_type *image, unsigned char colour) -{ + } + LOG2 ("ThinImage: pass %d, %d pixels deleted\n", pc, count); + } + free (qb); +} + + + +void thin1(bitmap_type *image, unsigned char colour) +{ unsigned char *ptr, *y_ptr, *y1_ptr; unsigned char bg_color; - unsigned int xsize, ysize; /* Image resolution */ - unsigned int x, y; /* Pixel location */ - unsigned int i; /* Pass index */ - unsigned int pc = 0; /* Pass count */ - unsigned int count = 1; /* Deleted pixel count */ - unsigned int p, q; /* Neighborhood maps of adjacent*/ - /* cells */ - unsigned char *qb; /* Neighborhood maps of previous*/ - /* scanline */ - unsigned int m; /* Deletion direction mask */ + unsigned int xsize, ysize; /* Image resolution */ + unsigned int x, y; /* Pixel location */ + unsigned int i; /* Pass index */ + unsigned int pc = 0; /* Pass count */ + unsigned int count = 1; /* Deleted pixel count */ + unsigned int p, q; /* Neighborhood maps of adjacent*/ + /* cells */ + unsigned char *qb; /* Neighborhood maps of previous*/ + /* scanline */ + unsigned int m; /* Deletion direction mask */ if (PPM_ISGRAY(background)) bg_color = PPM_GETR(background); else bg_color = ppm_luminosity(background); - LOG (" Thinning image.....\n "); + LOG (" Thinning image.....\n "); xsize = image->width; ysize = image->height; - MALLOCARRAY_NOFAIL(qb, xsize); - qb[xsize-1] = 0; /* Used for lower-right pixel */ + MALLOCARRAY_NOFAIL(qb, xsize); + qb[xsize-1] = 0; /* Used for lower-right pixel */ ptr = image->bitmap; - - while ( count ) { /* Scan image while deletions */ - pc++; - count = 0; - - for ( i = 0 ; i < 4 ; i++ ) { - - m = masks[i]; - - /* Build initial previous scan buffer. */ - p = (ptr[0] == colour); - for ( x = 0 ; x < xsize-1 ; x++ ) - qb[x] = (unsigned char) (p = ((p<<1)&0006) | (unsigned int)(ptr[x+1] == colour)); - - /* Scan image for pixel deletion candidates. */ - y_ptr = ptr; y1_ptr = ptr + xsize; + + while ( count ) { /* Scan image while deletions */ + pc++; + count = 0; + + for ( i = 0 ; i < 4 ; i++ ) { + + m = masks[i]; + + /* Build initial previous scan buffer. */ + p = (ptr[0] == colour); + for ( x = 0 ; x < xsize-1 ; x++ ) + qb[x] = (unsigned char) (p = ((p<<1)&0006) | (unsigned int)(ptr[x+1] == colour)); + + /* Scan image for pixel deletion candidates. */ + y_ptr = ptr; y1_ptr = ptr + xsize; for (y = 0; y < ysize - 1; y++, y_ptr += xsize, y1_ptr += xsize) - { - q = qb[0]; - p = ((q<<2)&0330) | (y1_ptr[0] == colour); - - for ( x = 0 ; x < xsize-1 ; x++ ) { - q = qb[x]; - p = ((p<<1)&0666) | ((q<<3)&0110) | (unsigned int) (y1_ptr[x+1]==colour); - qb[x] = (unsigned char) p; - if ( ((p&m) == 0) && todelete[p] ) { - count++; - y_ptr[x] = bg_color; /* delete the pixel */ - } - } - - /* Process right edge pixel. */ - p = (p<<1)&0666; - if ( (p&m) == 0 && todelete[p] ) { - count++; + { + q = qb[0]; + p = ((q<<2)&0330) | (y1_ptr[0] == colour); + + for ( x = 0 ; x < xsize-1 ; x++ ) { + q = qb[x]; + p = ((p<<1)&0666) | ((q<<3)&0110) | (unsigned int) (y1_ptr[x+1]==colour); + qb[x] = (unsigned char) p; + if ( ((p&m) == 0) && todelete[p] ) { + count++; + y_ptr[x] = bg_color; /* delete the pixel */ + } + } + + /* Process right edge pixel. */ + p = (p<<1)&0666; + if ( (p&m) == 0 && todelete[p] ) { + count++; y_ptr[xsize-1] = bg_color; - } - } - - /* Process bottom scan line. */ - q = qb[0]; - p = ((q<<2)&0330); - - y_ptr = ptr + xsize * (ysize - 1); - for ( x = 0 ; x < xsize ; x++ ) { - q = qb[x]; - p = ((p<<1)&0666) | ((q<<3)&0110); - if ( (p&m) == 0 && todelete[p] ) { - count++; + } + } + + /* Process bottom scan line. */ + q = qb[0]; + p = ((q<<2)&0330); + + y_ptr = ptr + xsize * (ysize - 1); + for ( x = 0 ; x < xsize ; x++ ) { + q = qb[x]; + p = ((p<<1)&0666) | ((q<<3)&0110); + if ( (p&m) == 0 && todelete[p] ) { + count++; y_ptr[x] = bg_color; - } - } - } - LOG2("thin1: pass %d, %d pixels deleted\n", pc, count); - } - free (qb); -} + } + } + } + LOG2("thin1: pass %d, %d pixels deleted\n", pc, count); + } + free (qb); +} + + + diff --git a/converter/other/pamtosvg/vector.c b/converter/other/pamtosvg/vector.c index 8972f4a5..a02b933b 100644 --- a/converter/other/pamtosvg/vector.c +++ b/converter/other/pamtosvg/vector.c @@ -271,6 +271,7 @@ vector_horizontal(void) { } + Vector vector_zero(void) { @@ -284,6 +285,7 @@ vector_zero(void) { } + bool vector_equal(Vector const comparand, Vector const comparator) { diff --git a/converter/other/pamtotga.c b/converter/other/pamtotga.c index 1daa1e25..f596a313 100644 --- a/converter/other/pamtotga.c +++ b/converter/other/pamtotga.c @@ -120,6 +120,7 @@ parseCommandLine(int argc, const char ** argv, } + static void putPixel(struct pam * const pamP, tuple const tuple, @@ -271,7 +272,7 @@ computeOutName(struct CmdlineInfo const cmdline, workarea = strdup(cmdline.inputFileName); cp = strchr(workarea, '.'); if (cp != NULL) - *cp = '\0'; /* remove extension */ + *cp = '\0'; /* remove extension */ } if (workarea == NULL) @@ -648,3 +649,6 @@ main(int argc, const char **argv) { return 0; } + + + diff --git a/converter/other/pamtotiff.c b/converter/other/pamtotiff.c index 1718c933..4f25d93a 100644 --- a/converter/other/pamtotiff.c +++ b/converter/other/pamtotiff.c @@ -1311,3 +1311,4 @@ main(int argc, const char *argv[]) { } + diff --git a/converter/other/pamtouil.c b/converter/other/pamtouil.c index 01858cbc..46fb76e7 100644 --- a/converter/other/pamtouil.c +++ b/converter/other/pamtouil.c @@ -71,9 +71,9 @@ parseCommandLine(int argc, char ** argv, const char *outnameOpt; option_def_index = 0; /* incremented by OPTENTRY */ - OPTENT3(0, "name", OPT_STRING, &outnameOpt, + OPTENT3(0, "name", OPT_STRING, &outnameOpt, &outnameSpec, 0); - OPTENT3(0, "verbose", OPT_FLAG, NULL, + OPTENT3(0, "verbose", OPT_FLAG, NULL, &cmdlineP->verbose, 0); opt.opt_table = option_def; @@ -87,7 +87,7 @@ parseCommandLine(int argc, char ** argv, cmdlineP->inputFilespec = "-"; /* stdin */ else if (argc-1 == 1) cmdlineP->inputFilespec = argv[1]; - else + else pm_error("Too many arguments (%d). " "Only need one: the input filespec", argc-1); @@ -98,7 +98,7 @@ parseCommandLine(int argc, char ** argv, /* Remove trailing "_icon" */ barPos = strrchr(cmdlineP->outname, '_'); - if (barPos && streq(barPos, "_icon")) + if (barPos && streq(barPos, "_icon")) *barPos = '\0'; } else { if (streq(cmdlineP->inputFilespec, "-")) @@ -118,11 +118,10 @@ parseCommandLine(int argc, char ** argv, - static char* -genNumstr(int const number, - int const base, - char const low_char, +genNumstr(int const number, + int const base, + char const low_char, int const digits ) { /*---------------------------------------------------------------------------- Generate a string 'digits' characters long in newly malloc'ed @@ -130,7 +129,7 @@ genNumstr(int const number, the left with zero digits and truncate on the left if it doesn't fit. Use the characters 'low_char' to 'low_char' + 'base' to represent the - digits 0 to 'base'. + digits 0 to 'base'. -----------------------------------------------------------------------------*/ char* str; char* p; @@ -156,11 +155,11 @@ genNumstr(int const number, -static const char * +static const char * uilName(const char * const rgbname, bool const transparent) { /*---------------------------------------------------------------------------- - Return a string in newly malloc'ed storage which is an appropriate + Return a string in newly malloc'ed storage which is an appropriate color name for the UIL palette. It is the same as the rgb name, except that blanks are replaced by underscores, and if 'transparent' is true, it is "background color". The latter is a strange name of @@ -176,7 +175,7 @@ uilName(const char * const rgbname, output = malloc(strlen(rgbname) + 5 + 1); if (output == NULL) pm_error( "out of memory allocating color name" ); - + for (i = 0; i < strlen(rgbname); ++i) { if (rgbname[i] == ' ') output[i] = '_'; @@ -193,9 +192,9 @@ uilName(const char * const rgbname, static void genCmap(struct pam * const pamP, - tupletable const chv, - unsigned int const ncolors, - cixel_map cmap[MAXCOLORS], + tupletable const chv, + unsigned int const ncolors, + cixel_map cmap[MAXCOLORS], unsigned int * const charsppP, bool const verbose) { @@ -205,7 +204,7 @@ genCmap(struct pam * const pamP, { /* Figure out how many characters per pixel we'll be using. Don't want to be forced to link with libm.a, so using a - division loop rather than a log function. + division loop rather than a log function. */ unsigned int i; for (*charsppP = 0, i = ncolors; i > 0; ++(*charsppP)) @@ -220,15 +219,15 @@ genCmap(struct pam * const pamP, unsigned int indexOfName; bool transparent; int j; - + if (pamP->depth-1 < PAM_TRN_PLANE) transparent = FALSE; - else - transparent = + else + transparent = chv[colorIndex]->tuple[PAM_TRN_PLANE] < pamP->maxval/2; /* Generate color name string. */ - colorname = pam_colorname(pamP, chv[colorIndex]->tuple, + colorname = pam_colorname(pamP, chv[colorIndex]->tuple, PAM_COLORNAME_ENGLISH); /* We may have already assigned a character code to this color @@ -236,11 +235,11 @@ genCmap(struct pam * const pamP, two different colors because we said we wanted the closest matching color that has an English name, and we recognize only one transparent color. If that's the case, we just - make a cross-reference. + make a cross-reference. */ nameAlreadyInCmap = FALSE; /* initial assumption */ for (j = 0; j < colorIndex; ++j) { - if (cmap[j].rgbname != NULL && + if (cmap[j].rgbname != NULL && streq(colorname, cmap[j].rgbname) && cmap[j].transparent == transparent) { nameAlreadyInCmap = TRUE; @@ -257,15 +256,15 @@ genCmap(struct pam * const pamP, cmap[colorIndex].rgbname = strdup(colorname); if (cmap[colorIndex].rgbname == NULL) pm_error("out of memory allocating color name"); - + cmap[colorIndex].transparent = transparent; - + /* Generate color value characters. */ - cmap[colorIndex].cixel = + cmap[colorIndex].cixel = genNumstr(colorIndex, base, LOW_CHAR, *charsppP); if (verbose) pm_message("Adding color '%s' %s = '%s' to UIL colormap", - cmap[colorIndex].rgbname, + cmap[colorIndex].rgbname, cmap[colorIndex].transparent ? "TRANS" : "OPAQUE", cmap[colorIndex].cixel); } @@ -286,8 +285,8 @@ writeUilHeader(const char * const outname) { static void -writeColormap(const char * const outname, - cixel_map cmap[MAXCOLORS], +writeColormap(const char * const outname, + cixel_map cmap[MAXCOLORS], unsigned int const ncolors) { { @@ -297,8 +296,8 @@ writeColormap(const char * const outname, printf("\n"); printf("value\n"); for (i = 0; i < ncolors; ++i) - if (cmap[i].uilname != NULL && !cmap[i].transparent) - printf(" %s : color( '%s' );\n", + if (cmap[i].uilname != NULL && !cmap[i].transparent) + printf(" %s : color( '%s' );\n", cmap[i].uilname, cmap[i].rgbname ); } { @@ -310,14 +309,14 @@ writeColormap(const char * const outname, printf("\n"); printf("value\n"); printf(" %s_rgb : color_table (\n", outname); - printedOne = FALSE; + printedOne = FALSE; for (i = 0; i < ncolors; ++i) if (cmap[i].uilname != NULL) { if (printedOne) printf(",\n"); printf(" %s = '%s'", cmap[i].uilname, cmap[i].cixel); printedOne = TRUE; - } + } printf("\n"); printf(" );\n"); } @@ -326,12 +325,12 @@ writeColormap(const char * const outname, static void -writeRaster(struct pam * const pamP, +writeRaster(struct pam * const pamP, tuple ** const tuples, const char * const outname, - cixel_map cmap[MAXCOLORS], + cixel_map cmap[MAXCOLORS], unsigned int const ncolors, - tuplehash const cht, + tuplehash const cht, unsigned int const charspp) { /*---------------------------------------------------------------------------- Write out the ascii character-pixel image. @@ -358,7 +357,7 @@ writeRaster(struct pam * const pamP, if (row != pamP->height - 1) printf("',\n"); else - printf("'\n"); + printf("'\n"); } printf(");\n"); printf("\n"); @@ -433,3 +432,6 @@ main(int argc, char *argv[]) { return 0; } + + + diff --git a/converter/other/pamtowinicon.c b/converter/other/pamtowinicon.c index 3c2c06bf..14b29f34 100644 --- a/converter/other/pamtowinicon.c +++ b/converter/other/pamtowinicon.c @@ -177,6 +177,7 @@ get_rgbPixel(tuple ** const tuples, } + static bool andMakesOpaque(const struct pam * const pamP, tuple ** const tuples, @@ -701,7 +702,6 @@ blackenXor(const struct pam * const pamP, - static void readAndScalePam(struct pam * const pamP, bool const doingPng, diff --git a/converter/other/pbmtopgm.c b/converter/other/pbmtopgm.c index 44d8cbc2..8344bcf2 100644 --- a/converter/other/pbmtopgm.c +++ b/converter/other/pbmtopgm.c @@ -124,3 +124,6 @@ main(int argc, const char ** argv) { return 0; } + + + diff --git a/converter/other/pdbimgtopam.c b/converter/other/pdbimgtopam.c index b191644f..4c064630 100644 --- a/converter/other/pdbimgtopam.c +++ b/converter/other/pdbimgtopam.c @@ -313,6 +313,7 @@ imageReadHeader(FILE * const fileP, } + static int imageReadData(FILE * const fileP, IMAGE * const imgP, diff --git a/converter/other/pfmtopam.c b/converter/other/pfmtopam.c index 080ec7ff..7e26d9c2 100644 --- a/converter/other/pfmtopam.c +++ b/converter/other/pfmtopam.c @@ -2,7 +2,7 @@ pfmtopam ****************************************************************************** This program converts a PFM (Portable Float Map) image to PAM. - + By Bryan Henderson, San Jose, CA April 2004. Contributed to the public domain by its author. @@ -30,13 +30,13 @@ struct cmdlineInfo { -static void -parseCommandLine(int argc, - char ** argv, +static void +parseCommandLine(int argc, + char ** argv, struct cmdlineInfo * const cmdlineP) { /* -------------------------------------------------------------------------- Parse program command line described in Unix standard form by argc - and argv. Return the information in the options as *cmdlineP. + and argv. Return the information in the options as *cmdlineP. If command line is internally inconsistent (invalid options, etc.), issue error message to stderr and abort program. @@ -47,14 +47,14 @@ parseCommandLine(int argc, optEntry *option_def = malloc( 100*sizeof( optEntry ) ); /* Instructions to pm_optParseOptions3 on how to parse our options. */ optStruct3 opt; - + unsigned int option_def_index; unsigned int maxvalSpec; option_def_index = 0; /* incremented by OPTENTRY */ OPTENT3(0, "maxval", OPT_UINT, &cmdlineP->maxval, &maxvalSpec, 0); OPTENT3(0, "verbose", OPT_FLAG, NULL, &cmdlineP->verbose, 0); - + opt.opt_table = option_def; opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */ opt.allowNegNum = FALSE; /* We have no parms that are negative numbers */ @@ -77,13 +77,14 @@ parseCommandLine(int argc, cmdlineP->inputFilespec = argv[1]; else cmdlineP->inputFilespec = "-"; - + if (argc-1 > 1) pm_error("Program takes at most one argument: the file name. " "You specified %d", argc-1); } + enum endian {ENDIAN_BIG, ENDIAN_LITTLE}; @@ -99,7 +100,7 @@ thisMachineEndianness(void) { that varies among typical machines. Big endianness is the natural format. In this format, if an integer is - 4 bytes, to be stored at memory address 100-103, the most significant + 4 bytes, to be stored at memory address 100-103, the most significant byte goes at 100, the next most significant at 101, and the least significant byte at 103. This is natural because it matches the way humans read and write numbers. I.e. 258 is stored as 0x00000102. @@ -115,7 +116,7 @@ thisMachineEndianness(void) { unsigned char * const storedNumber = (unsigned char *)&testNumber; enum endian endianness; - + if (storedNumber[0] == 0x01) endianness = ENDIAN_LITTLE; else @@ -137,7 +138,7 @@ typedef union { static float -floatFromPfmSample(pfmSample const sample, +floatFromPfmSample(pfmSample const sample, enum endian const pfmEndianness) { /*---------------------------------------------------------------------------- Type converter @@ -147,11 +148,11 @@ floatFromPfmSample(pfmSample const sample, } else { pfmSample rightEndianSample; unsigned int i, j; - - for (i = 0, j = sizeof(sample.bytes)-1; - i < sizeof(sample.bytes); + + for (i = 0, j = sizeof(sample.bytes)-1; + i < sizeof(sample.bytes); ++i, --j) - + rightEndianSample.bytes[i] = sample.bytes[j]; return rightEndianSample.value; @@ -203,7 +204,7 @@ readPfmHeader(FILE * const ifP, int rc; char whitespace; - rc = fscanf(ifP, "%u %u%c", + rc = fscanf(ifP, "%u %u%c", &pfmHeaderP->width, &pfmHeaderP->height, &whitespace); if (rc == EOF) @@ -213,7 +214,7 @@ readPfmHeader(FILE * const ifP, "are supposed to be (should be two positive decimal " "integers separated by a space and followed by " "white space)"); - + if (!isspace(whitespace)) pm_error("Invalid input file format -- '%c' instead of " "white space after height", whitespace); @@ -235,13 +236,13 @@ readPfmHeader(FILE * const ifP, pm_error("Invalid input file format where scale factor " "is supposed to be (should be a floating point decimal " "number followed by white space"); - + if (!isspace(whitespace)) pm_error("Invalid input file format -- '%c' instead of " "white space after scale factor", whitespace); } - pfmHeaderP->color = (secondChar == 'F'); + pfmHeaderP->color = (secondChar == 'F'); /* 'PF' = RGB, 'Pf' = monochrome */ if (scaleFactorEndian > 0.0) { @@ -255,12 +256,13 @@ readPfmHeader(FILE * const ifP, } + static void dumpPfmHeader(struct pfmHeader const pfmHeader) { pm_message("width: %u, height: %u", pfmHeader.width, pfmHeader.height); pm_message("color: %s", pfmHeader.color ? "YES" : "NO"); - pm_message("endian: %s", + pm_message("endian: %s", pfmHeader.endian == ENDIAN_BIG ? "BIG" : "LITTLE"); pm_message("scale factor: %f", pfmHeader.scaleFactor); } @@ -268,9 +270,9 @@ dumpPfmHeader(struct pfmHeader const pfmHeader) { static void -initPam(struct pam * const pamP, - int const width, - int const height, +initPam(struct pam * const pamP, + int const width, + int const height, bool const color, sample const maxval) { @@ -306,7 +308,7 @@ makePamRow(struct pam * const pamP, Make a PAM (tuple) row of the form described by *pamP, from the next row in the PFM file identified by 'ifP'. Place it in the proper location in the tuple array 'tuplenArray'. - + 'endian' is the endianness of the samples in the PFM file. 'pfmRowNum' is the sequence number (starting at 0, which is the @@ -333,7 +335,7 @@ makePamRow(struct pam * const pamP, /* The order of planes (R, G, B) is the same in PFM as in PAM. */ unsigned int plane; for (plane = 0; plane < pamP->depth; ++plane) { - float const val = + float const val = floatFromPfmSample(pfmRowBuffer[pfmCursor++], endian); tuplenRow[col][plane] = val / scaleFactor; } @@ -368,14 +370,14 @@ main(int argc, char **argv ) { if (cmdline.verbose) dumpPfmHeader(pfmHeader); - initPam(&pam, + initPam(&pam, pfmHeader.width, pfmHeader.height, pfmHeader.color, cmdline.maxval); tuplenArray = pnm_allocpamarrayn(&pam); pfmSamplesPerRow = pam.width * pam.depth; - + MALLOCARRAY_NOFAIL(pfmRowBuffer, pfmSamplesPerRow); /* PFMs are upside down like BMPs */ @@ -388,9 +390,12 @@ main(int argc, char **argv ) { pnm_freepamarrayn(tuplenArray, &pam); free(pfmRowBuffer); - + pm_close(ifP); pm_close(pam.file); return 0; } + + + diff --git a/converter/other/pm_tiff.h b/converter/other/pm_tiff.h index f98110e3..f6fb8403 100644 --- a/converter/other/pm_tiff.h +++ b/converter/other/pm_tiff.h @@ -18,7 +18,7 @@ typedef struct tagDefinition { This is the definition of a type of tag, e.g. ORIENTATION. -----------------------------------------------------------------------------*/ const char * name; - /* The name by which our user knows the tag type, e.g. + /* The name by which our user knows the tag type, e.g. "ORIENTATION" */ unsigned int tagnum; diff --git a/converter/other/pngtxt.c b/converter/other/pngtxt.c index e02ee227..cf331bd9 100644 --- a/converter/other/pngtxt.c +++ b/converter/other/pngtxt.c @@ -32,15 +32,15 @@ readToken(char const textline[], unsigned int cursor; cursor = *cursorP; - + MALLOCARRAY(tokenBuffer, lineLength + 1); /* leave room for terminating NUL */ - if (tokenBuffer == NULL) + if (tokenBuffer == NULL) pm_error("Unable to allocate memory for a %u-character " "text string file line", lineLength); cp = &tokenBuffer[0]; /* initial value */ - + if (textline[0] == '"') { ++cursor; /* skip past opening quotation mark */ while (textline[cursor] != '"') { @@ -56,9 +56,9 @@ readToken(char const textline[], } ++cursor; /* skip past closing quotation mark */ } else { - while ((cursor < lineLength) && + while ((cursor < lineLength) && (textline[cursor] != ' ') && (textline[cursor] != '\t')) { - + if (textline[cursor] == '\0') pm_error("Invalid text string file format: Token contains " "a NUL character. Text leading up to the NUL " @@ -75,7 +75,6 @@ readToken(char const textline[], - static void skipWhiteSpace(char const textline[], unsigned int const lineLength, @@ -88,7 +87,7 @@ skipWhiteSpace(char const textline[], cursor = *cursorP; /* initial value */ - while (cursor < lineLength && + while (cursor < lineLength && (textline[cursor] == ' ' || textline[cursor] == '\t' || textline[cursor] == '\0')) ++cursor; @@ -113,7 +112,7 @@ readTextString(char const textline[], char * cp; MALLOCARRAY(cp, lineLength + 1); /* incl '\0' */ - if (!cp) + if (!cp) pm_error("Unable to allocate memory for text chunks"); memcpy(cp, textline + startPos, lineLength - startPos); @@ -125,7 +124,7 @@ readTextString(char const textline[], static void -startTextChunkEngl(png_text * const textChunkP, +startTextChunkEngl(png_text * const textChunkP, char const textline[], unsigned int const lineLength, bool const isCompressed, @@ -169,7 +168,7 @@ startTextChunkEngl(png_text * const textChunkP, static void -startTextChunkIntl(png_text * const textChunkP, +startTextChunkIntl(png_text * const textChunkP, char const textline[], unsigned int const lineLength, bool const isCompressed, @@ -219,7 +218,7 @@ startTextChunkIntl(png_text * const textChunkP, { const char * langKey; - + readToken(textline, lineLength, &cursor, &langKey); pngx_setTextLangKey(textChunkP, langKey); @@ -233,14 +232,14 @@ startTextChunkIntl(png_text * const textChunkP, readTextString(textline, lineLength, cursor, &textChunkP->text, &textChunkP->text_length); - textChunkP->compression = + textChunkP->compression = isCompressed ? PNG_ITXT_COMPRESSION_zTXt :PNG_ITXT_COMPRESSION_NONE; } static void -continueTextString(png_text * const textChunkP, +continueTextString(png_text * const textChunkP, char const textline[], unsigned int const lineLength) { /*---------------------------------------------------------------------------- @@ -264,7 +263,7 @@ continueTextString(png_text * const textChunkP, textChunkP->text[textChunkP->text_length++] = '\n'; - cursor = 0; + cursor = 0; skipWhiteSpace(textline, lineLength, &cursor); @@ -280,12 +279,12 @@ continueTextString(png_text * const textChunkP, static void -getFileLine(FILE * const fileP, - const char ** const textP, +getFileLine(FILE * const fileP, + const char ** const textP, unsigned int * const lengthP) { /*---------------------------------------------------------------------------- Read the next line (characters from current position through the first - newline character) and return it. Put the text in newly malloc'ed + newline character) and return it. Put the text in newly malloc'ed storage. Do not include the newline. @@ -300,7 +299,7 @@ getFileLine(FILE * const fileP, unsigned int cursor; /* cursor into textline[] */ unsigned int allocatedSz; /* The number of characters of space that are allocated for - 'textline' + 'textline' */ bool eol; bool gotSomething; @@ -310,14 +309,14 @@ getFileLine(FILE * const fileP, MALLOCARRAY(textline, allocatedSz); if (textline == NULL) pm_error("Unable to allocate buffer to read a line of a file."); - + cursor = 0; eol = FALSE; gotSomething = FALSE; while (!eol) { int const c = getc(fileP); - + if (c != EOF) gotSomething = TRUE; @@ -356,7 +355,7 @@ handleArrayAllocation(png_text ** const arrayP, if (chunkIdx >= *allocatedChunkCtP) { *allocatedChunkCtP *= 2; REALLOCARRAY(*arrayP, *allocatedChunkCtP); - if (*arrayP == NULL) + if (*arrayP == NULL) pm_error("unable to allocate memory for %u text chunks", *allocatedChunkCtP); } @@ -404,9 +403,9 @@ reportChunkCt(bool const ztxt, ******************************************************************************/ -void +void pngtxt_addChunk(struct pngx * const pngxP, - FILE * const tfP, + FILE * const tfP, bool const ztxt, bool const itxt, bool const verbose) { @@ -436,7 +435,7 @@ pngtxt_addChunk(struct pngx * const pngxP, allocatedChunkCt = 256; /* initial value */ MALLOCARRAY(text, allocatedChunkCt); - if (text == NULL) + if (text == NULL) pm_error("unable to allocate memory for text chunk array"); for (chunkCt = 0, noChunksYet = true, eof = false; !eof; ) { @@ -460,15 +459,15 @@ pngtxt_addChunk(struct pngx * const pngxP, } else ++chunkCt; noChunksYet = false; - + textChunkP = &text[chunkCt]; - + if (itxt) - startTextChunkIntl(textChunkP, + startTextChunkIntl(textChunkP, textline, lineLength, ztxt, verbose); else - startTextChunkEngl(textChunkP, + startTextChunkEngl(textChunkP, textline, lineLength, ztxt, verbose); } else { diff --git a/converter/other/pngtxt.h b/converter/other/pngtxt.h index 3e6ff2af..30fba1fc 100644 --- a/converter/other/pngtxt.h +++ b/converter/other/pngtxt.h @@ -7,9 +7,9 @@ struct pngx; -void +void pngtxt_addChunk(struct pngx * const pngxP, - FILE * const tfp, + FILE * const tfp, bool const ztxt, bool const itxt, bool const verbose); diff --git a/converter/other/pngx.c b/converter/other/pngx.c index c8703443..d360e554 100644 --- a/converter/other/pngx.c +++ b/converter/other/pngx.c @@ -653,6 +653,7 @@ pngx_setTextLangKey(png_text * const textP, } + void pngx_termText(png_text * const textP) { diff --git a/converter/other/pnmtoddif.c b/converter/other/pnmtoddif.c index b7b942b3..868ece92 100644 --- a/converter/other/pnmtoddif.c +++ b/converter/other/pnmtoddif.c @@ -1,7 +1,7 @@ /* * Author: Burkhard Neidecker-Lutz * Digital CEC Karlsruhe - * neideck@nestvx.enet.dec.com + * neideck@nestvx.enet.dec.com Copyright (c) Digital Equipment Corporation, 1992 @@ -75,7 +75,7 @@ static void tag(unsigned char ** buffer, int cl, int constructed, *p++ = tag_first | 31; sp = 0; while (t > 0) { - stack[sp++] = t & 0x7f; + stack[sp++] = t & 0x7f; t >>= 7; } while (--sp > 0) { /* Tag values with continuation bits */ @@ -89,7 +89,7 @@ static void tag(unsigned char ** buffer, int cl, int constructed, /* Emit indefinite length encoding */ -static void +static void ind(unsigned char **buffer) { unsigned char *p = *buffer; @@ -101,7 +101,7 @@ ind(unsigned char **buffer) /* Emit ASN.1 NULL */ -static void +static void wr_null(unsigned char **buffer) { unsigned char *p = *buffer; @@ -113,7 +113,7 @@ wr_null(unsigned char **buffer) /* Emit ASN.1 length only into buffer, no data */ -static void +static void wr_length(unsigned char ** buffer, int amount) { int length; @@ -144,7 +144,7 @@ wr_length(unsigned char ** buffer, int amount) /* BER encode an integer and write it's length and value */ -static void +static void wr_int(unsigned char ** buffer, int val) { int length; @@ -178,7 +178,7 @@ wr_int(unsigned char ** buffer, int val) /* Emit and End Of Coding sequence */ -static void +static void eoc(unsigned char ** buffer) { unsigned char *p = *buffer; @@ -191,13 +191,13 @@ eoc(unsigned char ** buffer) /* Emit a simple string */ -static +static void wr_string(unsigned char ** const buffer, const char * const val) { int length; unsigned char *p = *buffer; - length = strlen(val); + length = strlen(val); if (length > 127) { fprintf(stderr,"Can't encode length > 127 yet (%d)\n",length); exit(1); @@ -214,7 +214,7 @@ void wr_string(unsigned char ** const buffer, const char * const val) /* Emit a ISOLATIN-1 string */ -static void +static void emit_isolatin1(unsigned char ** const buffer, const char * const val) { int length; @@ -242,7 +242,7 @@ emit_isolatin1(unsigned char ** const buffer, const char * const val) /* values. A lot of the values here are hardcoded to be just right for */ /* the bit grammars that the PBMPLUS formats want. */ -static int +static int write_header(FILE *file, imageparams *ip) { unsigned char buffer[300]; /* Be careful with the size ! */ @@ -287,7 +287,7 @@ write_header(FILE *file, imageparams *ip) tag(&p,CONTEXT,PRIM, 0); wr_int(&p,1); /* PP Pixel Dist */ tag(&p,CONTEXT,PRIM, 1); wr_int(&p,1); /* LP Pixel Dist */ eoc(&p); /* Pixel Aspect Ratio */ - tag(&p,CONTEXT,PRIM, 4); wr_int(&p,ip->polarity); + tag(&p,CONTEXT,PRIM, 4); wr_int(&p,ip->polarity); /* Brightness Polarity */ tag(&p,CONTEXT,PRIM, 5); wr_int(&p,1); /* Grid Type */ tag(&p,CONTEXT,PRIM, 7); wr_int(&p,ip->spectral); /* Spectral Mapping */ @@ -300,7 +300,7 @@ write_header(FILE *file, imageparams *ip) tag(&p,CONTEXT,PRIM, 0); wr_int(&p,1); /* Component Space Organization */ tag(&p,CONTEXT,PRIM, 1); wr_int(&p,1); /* Planes per Pixel */ tag(&p,CONTEXT,PRIM, 2); wr_int(&p,1); /* Plane Significance */ - tag(&p,CONTEXT,PRIM, 3); wr_int(&p,ip->components); + tag(&p,CONTEXT,PRIM, 3); wr_int(&p,ip->components); /* Number of Components */ tag(&p,CONTEXT,CONS, 4); ind(&p); /* Bits per Component */ for (i = 0; i < ip->components; i++) { @@ -355,7 +355,7 @@ write_header(FILE *file, imageparams *ip) tag(&p,CONTEXT,PRIM, 7); wr_int(&p,ip->bytes_per_line * 8); /* Scanline Stride */ tag(&p,CONTEXT,PRIM, 8); wr_int(&p,1); /* Bit Order */ - tag(&p,CONTEXT,PRIM, 9); wr_int(&p,ip->bits_per_pixel); + tag(&p,CONTEXT,PRIM, 9); wr_int(&p,ip->bits_per_pixel); /* Planebits per Pixel */ tag(&p,CONTEXT,CONS,10); ind(&p); /* Byteorder Info */ tag(&p,CONTEXT,PRIM, 0); wr_int(&p,1); /* Byte Unit */ @@ -363,7 +363,7 @@ write_header(FILE *file, imageparams *ip) eoc(&p); /* Byteorder Info */ tag(&p,CONTEXT,PRIM,11); wr_int(&p,3); /* Data Type */ eoc(&p); /* Image Coding Attributes */ - tag(&p,CONTEXT,PRIM, 1); wr_length(&p,ip->bytes_per_line*ip->height); + tag(&p,CONTEXT,PRIM, 1); wr_length(&p,ip->bytes_per_line*ip->height); /* Component Plane Data */ /* End of DDIF document Indentation */ headersize = p - buffer; @@ -380,7 +380,7 @@ write_header(FILE *file, imageparams *ip) /* Write all the closing brackets of the DDIF grammar that are missing */ /* The strange indentation reflects exactly the same indentation that */ /* we left off in the write_header procedure. */ -static int +static int write_trailer(FILE * file) { unsigned char buffer[30]; @@ -406,7 +406,6 @@ write_trailer(FILE * file) - static void convertPbmRaster(FILE * const ifP, int const format, @@ -415,7 +414,7 @@ convertPbmRaster(FILE * const ifP, FILE * const ofP, unsigned int const bytesPerLine, unsigned char * const data) { - + bit * const pixels = pbm_allocrow(cols); unsigned int row; @@ -490,7 +489,6 @@ convertPgmRaster(FILE * const ifP, - static void convertPpmRaster(FILE * const ifP, int const format, @@ -677,3 +675,6 @@ main(int argc, char *argv[]) { return(0); } + + + diff --git a/converter/other/pnmtojpeg.c b/converter/other/pnmtojpeg.c index 1a7aa22c..99efa734 100644 --- a/converter/other/pnmtojpeg.c +++ b/converter/other/pnmtojpeg.c @@ -20,7 +20,7 @@ #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ -#include <ctype.h> /* to declare isdigit(), etc. */ +#include <ctype.h> /* to declare isdigit(), etc. */ #include <stdbool.h> #include <stdlib.h> #include <string.h> @@ -147,7 +147,6 @@ interpretRestart(const char * const restartOpt, - static void interpretDensity(const char * const densityString, struct Density * const densityP) { @@ -506,7 +505,7 @@ readScanInteger(FILE * const fileP, while (ch != EOF && isspace(ch)) ch = textGetc(fileP); - if (isdigit(ch)) { /* oops, put it back */ + if (isdigit(ch)) { /* oops, put it back */ if (ungetc(ch, fileP) == EOF) pm_error("Unexpected failure of ungetc"); ch = ' '; @@ -820,10 +819,10 @@ setQuantSlots(j_compress_ptr const cinfo, for (ci = 0, i = 0; ci < MAX_COMPONENTS; ++ci) { if (arg[i]) { - ch = ','; /* if not set by sscanf, will be ',' */ + ch = ','; /* if not set by sscanf, will be ',' */ if (sscanf(&arg[i], "%d%c", &val, &ch) < 1) return false; - if (ch != ',') /* syntax check */ + if (ch != ',') /* syntax check */ return false; if (val < 0 || val >= NUM_QUANT_TBLS) { pm_message("Invalid quantization table number: %d. " @@ -845,6 +844,7 @@ setQuantSlots(j_compress_ptr const cinfo, } + static bool setSampleFactors (j_compress_ptr const cinfo, const char * const arg) { @@ -861,7 +861,7 @@ setSampleFactors (j_compress_ptr const cinfo, for (ci = 0, i = 0; ci < MAX_COMPONENTS; ++ci) { if (arg[i]) { - ch2 = ','; /* if not set by sscanf, will be ',' */ + ch2 = ','; /* if not set by sscanf, will be ',' */ if (sscanf(&arg[i], "%d%c%d%c", &val1, &ch1, &val2, &ch2) < 3) return false; if ((ch1 != 'x' && ch1 != 'X') || ch2 != ',') /* syntax check */ diff --git a/converter/other/pnmtopalm/gen_palm_colormap.c b/converter/other/pnmtopalm/gen_palm_colormap.c index 0f3f8a5f..04555221 100644 --- a/converter/other/pnmtopalm/gen_palm_colormap.c +++ b/converter/other/pnmtopalm/gen_palm_colormap.c @@ -15,7 +15,7 @@ main(int argc, Colormap defaultMap; unsigned int i; pixel pix; - + defaultMap = palmcolor_build_default_8bit_colormap(); qsort (defaultMap->color_entries, defaultMap->ncolors, sizeof(Color_s), palmcolor_compare_indices); @@ -44,3 +44,5 @@ main(int argc, return 0; } + + diff --git a/converter/other/pnmtopalm/palm.h b/converter/other/pnmtopalm/palm.h index 0edf9a28..0a2a7cfc 100644 --- a/converter/other/pnmtopalm/palm.h +++ b/converter/other/pnmtopalm/palm.h @@ -7,7 +7,7 @@ #define PALM_INDIRECT_BITMAP 0x1000 /* Palm says internal use only */ #define PALM_FOR_SCREEN 0x0800 /* Palm says internal use only */ #define PALM_DIRECT_COLOR_FLAG 0x0400 -#define PALM_INDIRECT_COLORMAP 0x0200 /* Palm says internal use only */ +#define PALM_INDIRECT_COLORMAP 0x0200 /* Palm says internal use only */ #define PALM_NO_DITHER_FLAG 0x0100 /* rather mysterious */ #define PALM_COMPRESSION_SCANLINE 0x00 diff --git a/converter/other/pnmtopalm/palmcolormap.c b/converter/other/pnmtopalm/palmcolormap.c index 1341ca2b..de3def22 100644 --- a/converter/other/pnmtopalm/palmcolormap.c +++ b/converter/other/pnmtopalm/palmcolormap.c @@ -28,7 +28,7 @@ palmcolor_mapEntryColorFmPixel(pixel const color, return 0 - | (scaleSample(PPM_GETR(color), maxval, newMaxval) << 16) + | (scaleSample(PPM_GETR(color), maxval, newMaxval) << 16) | (scaleSample(PPM_GETG(color), maxval, newMaxval) << 8) | (scaleSample(PPM_GETB(color), maxval, newMaxval) << 0); } @@ -68,6 +68,8 @@ palmcolor_compare_colors(const void * const p1, return 0; } + + /*********************************************************************** *********************************************************************** *********************************************************************** @@ -81,7 +83,7 @@ palmcolor_compare_colors(const void * const p1, /* * The 1bit-2 color system palette for Palm Computing Devices. */ -static int PalmPalette1bpp[2][3] = +static int PalmPalette1bpp[2][3] = { { 255, 255, 255}, { 0, 0, 0 } }; @@ -89,7 +91,7 @@ static int PalmPalette1bpp[2][3] = /* * The 2bit-4 color system palette for Palm Computing Devices. */ -static int PalmPalette2bpp[4][3] = +static int PalmPalette2bpp[4][3] = { { 255, 255, 255}, { 192, 192, 192}, { 128, 128, 128 }, { 0, 0, 0 } }; @@ -97,7 +99,7 @@ static int PalmPalette2bpp[4][3] = /* * The 4bit-16 color system palette for Palm Computing Devices. */ -static int PalmPalette4bpp[16][3] = +static int PalmPalette4bpp[16][3] = { { 255, 255, 255}, { 238, 238, 238 }, { 221, 221, 221 }, { 204, 204, 204 }, { 187, 187, 187}, { 170, 170, 170 }, { 153, 153, 153 }, { 136, 136, 136 }, @@ -108,7 +110,7 @@ static int PalmPalette4bpp[16][3] = /* * The 4bit-16 color system palette for Palm Computing Devices. */ -static int PalmPalette4bppColor[16][3] = +static int PalmPalette4bppColor[16][3] = { { 255, 255, 255}, { 128, 128, 128 }, { 128, 0, 0 }, { 128, 128, 0 }, { 0, 128, 0}, { 0, 128, 128 }, { 0, 0, 128 }, { 128, 0, 128 }, @@ -123,12 +125,12 @@ static int PalmPalette4bppColor[16][3] = * * NOTE: only the first 231, plus the last one, are valid. */ -static int PalmPalette8bpp[256][3] = +static int PalmPalette8bpp[256][3] = { - { 255, 255, 255 }, { 255, 204, 255 }, { 255, 153, 255 }, { 255, 102, 255 }, - { 255, 51, 255 }, { 255, 0, 255 }, { 255, 255, 204 }, { 255, 204, 204 }, - { 255, 153, 204 }, { 255, 102, 204 }, { 255, 51, 204 }, { 255, 0, 204 }, - { 255, 255, 153 }, { 255, 204, 153 }, { 255, 153, 153 }, { 255, 102, 153 }, + { 255, 255, 255 }, { 255, 204, 255 }, { 255, 153, 255 }, { 255, 102, 255 }, + { 255, 51, 255 }, { 255, 0, 255 }, { 255, 255, 204 }, { 255, 204, 204 }, + { 255, 153, 204 }, { 255, 102, 204 }, { 255, 51, 204 }, { 255, 0, 204 }, + { 255, 255, 153 }, { 255, 204, 153 }, { 255, 153, 153 }, { 255, 102, 153 }, { 255, 51, 153 }, { 255, 0, 153 }, { 204, 255, 255 }, { 204, 204, 255 }, { 204, 153, 255 }, { 204, 102, 255 }, { 204, 51, 255 }, { 204, 0, 255 }, { 204, 255, 204 }, { 204, 204, 204 }, { 204, 153, 204 }, { 204, 102, 204 }, @@ -215,7 +217,7 @@ palmcolor_build_default_8bit_colormap(void) { cmP->ncolors = 232; /* now sort the table */ - qsort(cmP->color_entries, cmP->ncolors, sizeof(ColormapEntry), + qsort(cmP->color_entries, cmP->ncolors, sizeof(ColormapEntry), palmcolor_compare_colors); return cmP; } @@ -235,7 +237,7 @@ palmcolor_build_custom_8bit_colormap(pixel ** const pixels, colormapP->nentries = 256; MALLOCARRAY_NOFAIL(colormapP->color_entries, colormapP->nentries); colormapP->ncolors = 0; /* initial value */ - + for (row = 0; row < rows; ++row) { unsigned int col; for (col = 0; col < cols; ++col) { @@ -259,7 +261,7 @@ palmcolor_build_custom_8bit_colormap(pixel ** const pixels, ColormapEntry const newEntry = searchTarget | (colorIndex << 24); colormapP->color_entries[colorIndex] = newEntry; - qsort(colormapP->color_entries, colormapP->ncolors, + qsort(colormapP->color_entries, colormapP->ncolors, sizeof(ColormapEntry), palmcolor_compare_colors); } } @@ -276,7 +278,7 @@ palmcolor_read_colormap (FILE * const ifP) { unsigned short ncolors; Colormap * retval; int rc; - + rc = pm_readbigshort(ifP, (short *) &ncolors); if (rc != 0) retval = NULL; @@ -289,7 +291,7 @@ palmcolor_read_colormap (FILE * const ifP) { MALLOCVAR_NOFAIL(colormapP); colormapP->nentries = ncolors; MALLOCARRAY_NOFAIL(colormapP->color_entries, colormapP->nentries); - + for (i = 0, error = FALSE; i < ncolors && !error; ++i) { int rc; rc = pm_readbiglong(ifP, &colorentry); @@ -309,3 +311,6 @@ palmcolor_read_colormap (FILE * const ifP) { } return retval; } + + + diff --git a/converter/other/pnmtopalm/palmtopnm.c b/converter/other/pnmtopalm/palmtopnm.c index a64ab01c..0e83f5e0 100644 --- a/converter/other/pnmtopalm/palmtopnm.c +++ b/converter/other/pnmtopalm/palmtopnm.c @@ -445,6 +445,7 @@ yesno(bool const arg) { } + static void reportPalmHeader(struct PalmHeader const palmHeader, struct DirectColorInfo const directColorInfo) { @@ -1250,3 +1251,6 @@ main(int argc, const char **argv) { return 0; } + + + diff --git a/converter/other/pnmtopalm/pnmtopalm.c b/converter/other/pnmtopalm/pnmtopalm.c index 9fc92790..ab82996e 100644 --- a/converter/other/pnmtopalm/pnmtopalm.c +++ b/converter/other/pnmtopalm/pnmtopalm.c @@ -816,6 +816,7 @@ computeRawRowNonDirect(const xel * const xelrow, } + typedef struct { /*---------------------------------------------------------------------------- A buffer to which one can write bytes sequentially. @@ -1352,3 +1353,6 @@ main( int argc, const char **argv ) { return 0; } + + + diff --git a/converter/other/pnmtopclxl.c b/converter/other/pnmtopclxl.c index f7db62ee..c7d0642c 100644 --- a/converter/other/pnmtopclxl.c +++ b/converter/other/pnmtopclxl.c @@ -456,7 +456,6 @@ createPclGenerator(struct pam * const pamP, - struct tPrinter { const char *name; float topmargin; @@ -1136,3 +1135,6 @@ main(int argc, char *argv[]) { return 0; } + + + diff --git a/converter/other/pnmtopng.c b/converter/other/pnmtopng.c index 3c84e1d3..08647045 100644 --- a/converter/other/pnmtopng.c +++ b/converter/other/pnmtopng.c @@ -601,6 +601,7 @@ alloccoloralphahash(void) { } + static void freecoloralphahash(coloralphahash_table const caht) { int i; @@ -2210,6 +2211,7 @@ computeRasterWidth(bool const colorMapped, } + static void createPngPalette(pixel palette_pnm[], unsigned int const paletteSize, @@ -2556,6 +2558,7 @@ reportTrans(struct pngx * const pngxP) { } + static void doTrnsChunk(struct pngx * const pngxP, png_byte const transPalette[], diff --git a/converter/other/pnmtorast.c b/converter/other/pnmtorast.c index e11d3cb7..14c0be0a 100644 --- a/converter/other/pnmtorast.c +++ b/converter/other/pnmtorast.c @@ -31,7 +31,7 @@ allocPrColormap(void) { MALLOCARRAY(prColormapP->map[0], MAXCOLORS); MALLOCARRAY(prColormapP->map[1], MAXCOLORS); MALLOCARRAY(prColormapP->map[2], MAXCOLORS); - if (prColormapP->map[0] == NULL || + if (prColormapP->map[0] == NULL || prColormapP->map[1] == NULL || prColormapP->map[2] == NULL) pm_error("out of memory"); @@ -92,7 +92,7 @@ doRowDepth1(const xel * const xelrow, xelval const maxval, colorhash_table const cht, unsigned int * const lenP) { - + unsigned int col; int bitcount; unsigned int cursor; @@ -191,7 +191,6 @@ doRowDepth8(const xel * const xelrow, - static void doRowDepth24(const xel * const xelrow, unsigned char * const rastRow, @@ -232,7 +231,7 @@ computeRaster(unsigned char * const rastRaster, xelval const maxval, xel ** const xels, colorhash_table const cht) { - + unsigned int row; unsigned char * rastRow; @@ -375,7 +374,7 @@ main(int argc, const char ** argv) { if (maxval > 255 && depth != 1) pm_message( "maxval is not 255 - automatically rescaling colors"); - + /* Allocate space for the Sun-format image. */ prP = mem_create(cols, rows, depth); if (!prP) @@ -398,3 +397,5 @@ main(int argc, const char ** argv) { return 0; } + + diff --git a/converter/other/pnmtorle.c b/converter/other/pnmtorle.c index 17c9cfbc..0c256311 100644 --- a/converter/other/pnmtorle.c +++ b/converter/other/pnmtorle.c @@ -388,3 +388,6 @@ main(int argc, char ** argv) { return 0; } + + + diff --git a/converter/other/pnmtosgi.c b/converter/other/pnmtosgi.c index cc57349f..adf89bce 100644 --- a/converter/other/pnmtosgi.c +++ b/converter/other/pnmtosgi.c @@ -225,12 +225,12 @@ buildChannels(FILE * const ifP, static void -writeHeader(unsigned int const cols, - unsigned int const rows, - xelval const maxval, - unsigned int const bpc, - unsigned int const dimensions, - unsigned int const channels, +writeHeader(unsigned int const cols, + unsigned int const rows, + xelval const maxval, + unsigned int const bpc, + unsigned int const dimensions, + unsigned int const channels, const char * const imagename) { unsigned int i; @@ -314,7 +314,7 @@ main(int argc,char * argv[]) { pm_error ("Input image is too large."); pnmrow = pnm_allocrow(cols); - + switch (PNM_FORMAT_TYPE(format)) { case PBM_TYPE: pm_message("promoting PBM to PGM"); @@ -359,3 +359,4 @@ main(int argc,char * argv[]) { } + diff --git a/converter/other/pnmtotiffcmyk.c b/converter/other/pnmtotiffcmyk.c index b7e3228e..a2fa0a4c 100644 --- a/converter/other/pnmtotiffcmyk.c +++ b/converter/other/pnmtotiffcmyk.c @@ -79,7 +79,7 @@ Software copyrights will soon need family trees... :-) /* only support 8 bit values */ #define MAXTIFFBITS 8 -#define MAXTIFFVAL 255 +#define MAXTIFFVAL 255 /* definitions for error values */ @@ -111,9 +111,9 @@ typedef int Err ; #ifndef PI #define PI 3.1415926 #endif -#define ONETWENTY ( 2.0 * PI / 3.0 ) +#define ONETWENTY ( 2.0 * PI / 3.0 ) #define TWOFORTY ( 4.0 * PI / 3.0 ) -#define THREESIXTY ( 2.0 * PI ) +#define THREESIXTY ( 2.0 * PI ) /* expand from 0-90 to 0-120 degrees */ #define EXPAND(x) ( 4.0 * ( x ) / 3.0 ) /* contract from 0-120 to 0-90 degrees */ @@ -144,7 +144,7 @@ typedef struct { /* parse an arg with a float value. name should be the full key name, preceded by '-' */ -static Err +static Err floatArg( float *arg, const char *name, int size, float lo, float hi, int *argn, int argc, char **argv ) { @@ -165,7 +165,7 @@ floatArg( float *arg, const char *name, int size, float lo, float hi, extra, name ) ; } if ( *arg > hi || *arg < lo ) { - fprintf( stderr, "%s (%f) must be in range %f to %f\n", + fprintf( stderr, "%s (%f) must be in range %f to %f\n", name, *arg, lo, hi ) ; return ERR_ARG ; } @@ -176,9 +176,10 @@ floatArg( float *arg, const char *name, int size, float lo, float hi, } + /* parse an arg with a long value. name should be the full key name, preceded by '-' */ -static Err +static Err longArg( long *arg, const char *name, int size, long lo, long hi, int *argn, int argc, char **argv ) { @@ -199,7 +200,7 @@ longArg( long *arg, const char *name, int size, long lo, long hi, extra, name ) ; } if ( *arg > hi || *arg < lo ) { - fprintf( stderr, "%s (%ld) must be in range %ld to %ld\n", + fprintf( stderr, "%s (%ld) must be in range %ld to %ld\n", name, *arg, lo, hi ) ; return ERR_ARG ; } @@ -210,13 +211,14 @@ longArg( long *arg, const char *name, int size, long lo, long hi, } + /* print usage. for simplicity this routine is *not* split amongst the various components - when you add a component (eg a new conversion algorithm, or maybe new input or output code), you must also change this routine. by keeping all the options in one place it is also easier to calculate the minimum key name length (passed to pnm_keymatch) */ -static void +static void printUsage( ) { fprintf( stderr, "\nusage: pnmtocmyk [Compargs] [Tiffargs] [Convargs] [pnmfile]\n" ) ; fprintf( stderr, " Compargs: [-none|-packbits|-lzw [-predictor 1|-predictor 2]]\n" ) ; @@ -233,6 +235,8 @@ printUsage( ) { fprintf( stderr, "No warranty.\n\n" ) ; } + + /* list of key args and number of significant letters required -default 2 -gamma 6 @@ -261,11 +265,11 @@ printUsage( ) { /* encapsulate the file reader - uses pnm library at the moment, but could be changed if we move to libtiff */ -typedef Err OptIn( struct tagIn *conv, Root *r, +typedef Err OptIn( struct tagIn *conv, Root *r, int *argn, int argc, char **argv ) ; typedef int HasMore( struct tagIn *in ) ; typedef Err Next( struct tagIn *in, float *r, float *g, float *b ) ; -typedef Err OpenIn( struct tagIn *in, Root *r ) ; +typedef Err OpenIn( struct tagIn *in, Root *r ) ; typedef void CloseIn( struct tagIn *in ) ; typedef struct tagIn { @@ -294,7 +298,7 @@ typedef struct { /* the only output option is the filename, which will be the last argument, if it doesn't start with '-' */ -static Err +static Err pnmOpt( In *in, Root *r, int *argn, int argc, char **argv ) { PnmIn *p = (PnmIn*)in->private ; if ( *argn + 1 == argc && argv[*argn][0] != '\0' && @@ -306,8 +310,9 @@ pnmOpt( In *in, Root *r, int *argn, int argc, char **argv ) { } + /* free the row buffer when closing the input */ -static void +static void pnmClose( In *in ) { if ( in ) { PnmIn *p = (PnmIn*)in->private ; @@ -320,16 +325,17 @@ pnmClose( In *in ) { } + /* open the file, storing dimensions both locally and in the global root structure */ -static Err +static Err pnmOpen( In *in, Root *r ) { PnmIn *p = (PnmIn*)in->private ; if ( ! p->in ) p->in = stdin ; - pnm_readpnminit( p->in, &(r->nCols), &(r->nRows), &(p->maxVal), + pnm_readpnminit( p->in, &(r->nCols), &(r->nRows), &(p->maxVal), &(p->type) ) ; p->maxPix = r->nCols * r->nRows ; p->iPix = 0 ; @@ -341,16 +347,18 @@ pnmOpen( In *in, Root *r ) { } + /* more data available? */ -static int +static int pnmHasMore( In *in ) { PnmIn *p = (PnmIn*)in->private ; return p->iPix < p->maxPix ; } + /* read next pixel - buffered by row. return values in range 0 to 1 */ -static Err +static Err pnmNext( In *in, float *r, float *g, float *b ) { PnmIn *p = (PnmIn*)in->private ; @@ -374,8 +382,9 @@ pnmNext( In *in, float *r, float *g, float *b ) { } + /* build the input struct */ -static Err +static Err newPnmInput( In **in ) { if ( ! (*in = (In*)calloc( 1, sizeof( In ) )) ) { fprintf( stderr, "cannot allocate memory\n" ) ; @@ -433,7 +442,7 @@ typedef struct { /* these options come from either the tiff 6.0 spec or the pnmtotiff code */ -static Err +static Err tiffOpt( Out *out, Root* rt, int *argn, int argc, char **argv ) { Err err ; @@ -478,14 +487,14 @@ tiffOpt( Out *out, Root* rt, int *argn, int argc, char **argv ) { if ( oldn != *argn ) { t->rowsperstrip = (uint32)lVal ; } else { - if ( (err = longArg( &lVal, "-lowdotrange", 3, 0, + if ( (err = longArg( &lVal, "-lowdotrange", 3, 0, (int)(t->highdotrange - 1), argn, argc, argv )) ) return err ; } if ( oldn != *argn ) { t->lowdotrange = (uint16)lVal ; } else { - if ( (err = longArg( &lVal, "-highdotrange", 2, + if ( (err = longArg( &lVal, "-highdotrange", 2, (int)(t->lowdotrange + 1), MAXTIFFVAL, argn, argc, argv )) ) return err ; } @@ -498,8 +507,9 @@ tiffOpt( Out *out, Root* rt, int *argn, int argc, char **argv ) { } + /* helper routine - writes individual bytes */ -static Err +static Err tiffWriteByte( TiffOut *t, int b ) { ((unsigned char*)(t->buffer))[t->iBuffer] = (unsigned char)b ; if ( ++(t->iBuffer) == t->maxBuffer ) { @@ -513,8 +523,9 @@ tiffWriteByte( TiffOut *t, int b ) { } + /* write the pixel to the tiff file */ -static Err +static Err tiffWrite( Out *out, int c, int m, int y, int k ) { Err err ; TiffOut *t = (TiffOut*)out->private ; @@ -531,8 +542,9 @@ tiffWrite( Out *out, int c, int m, int y, int k ) { } + /* open output to stdout - see warning below */ -static Err +static Err tiffOpen( Out* out, Root *r ) { TiffOut *t = (TiffOut*)out->private ; @@ -554,7 +566,7 @@ tiffOpen( Out* out, Root *r ) { TIFFSetField( t->tiff, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT ) ; TIFFSetField( t->tiff, TIFFTAG_COMPRESSION, t->compression ) ; if ( t->compression == COMPRESSION_LZW && t->predictor ) { - TIFFSetField( t->tiff, TIFFTAG_PREDICTOR, t->predictor ) ; + TIFFSetField( t->tiff, TIFFTAG_PREDICTOR, t->predictor ) ; } TIFFSetField( t->tiff, TIFFTAG_PHOTOMETRIC, photometric ) ; TIFFSetField( t->tiff, TIFFTAG_FILLORDER, t->fillorder ) ; @@ -575,13 +587,14 @@ tiffOpen( Out* out, Root *r ) { fprintf( stderr, "cannot allocate memory\n" ) ; return ERR_MEMORY ; } - + return ERR_OK ; } + /* close file and tidy memory */ -static void +static void tiffClose( Out *out ) { if ( out ) { TiffOut *t = (TiffOut*)out->private ; @@ -595,8 +608,9 @@ tiffClose( Out *out ) { } + /* assemble the routines above into a single struct/object */ -static Err +static Err newTiffOutput( Out **out ) { TiffOut *t ; @@ -635,7 +649,7 @@ newTiffOutput( Out **out ) { typedef Err Opt( struct tagConv *conv, Root *r, int *argn, int argc, char **argv ) ; typedef Err Convert( struct tagConv *conv, Root *rt, - float r, float g, float b, + float r, float g, float b, int *c, int *m, int *y, int *k ) ; typedef void Close( struct tagConv *conv ) ; @@ -649,7 +663,7 @@ typedef struct tagConv { /* include two conversion routines to show how the code can be extended. first, the standard converter, as outlined in the - proposal, then a simple replacement that produces colour + proposal, then a simple replacement that produces colour negatives */ @@ -667,8 +681,8 @@ typedef struct { /* represent an rgb colour as a hue (angle), white level and colour strength */ -static void -rgbToHueWhiteColour( float r, float g, float b, +static void +rgbToHueWhiteColour( float r, float g, float b, double *phi, float *white, float *colour ) { *white = MIN( r, MIN( g, b ) ) ; r -= *white ; @@ -676,19 +690,20 @@ rgbToHueWhiteColour( float r, float g, float b, b -= *white ; *colour = sqrt( r * r + g * g + b * b ) ; if ( r > TINY || g > TINY || b > TINY ) { - if ( b < r && b <= g ) { + if ( b < r && b <= g ) { *phi = EXPAND( atan2( g, r ) ) ; } else if ( r < g && r <= b ) { *phi = ONETWENTY + EXPAND( atan2( b, g ) ) ; } else { *phi = TWOFORTY + EXPAND( atan2( r, b ) ) ; } - } + } } + /* represent hue, white and colour values as rgb */ -static void +static void hueWhiteColourToRgb( double phi, float white, float colour, float *r, float *g, float *b ) { while ( phi < 0 ) { phi += THREESIXTY ; } @@ -715,10 +730,11 @@ hueWhiteColourToRgb( double phi, float white, float colour, } + /* for details, see the proposal. it's pretty simple - a rotation before conversion, with colour removal */ -static Err -standardConvert( Conv *conv, Root *rt, float r, float g, float b, +static Err +standardConvert( Conv *conv, Root *rt, float r, float g, float b, int *c, int *m, int *y, int *k ) { float c0, m0, y0, k0 ; /* CMYK before colour removal */ @@ -767,9 +783,10 @@ standardConvert( Conv *conv, Root *rt, float r, float g, float b, } + /* parse options for this conversion - note the ugly use of -1 for gammap to indicate no removal of cmy under k */ -static Err +static Err standardOpt( Conv *conv, Root *r, int *argn, int argc, char **argv ) { Err err ; @@ -790,7 +807,7 @@ standardOpt( Conv *conv, Root *r, int *argn, int argc, char **argv ) { *argn + 1 < argc && streq(argv[*argn + 1], "-1") ) { p->remove = 0 ; *argn = (*argn) + 2 ; - } + } if ( oldn == *argn ) { if ( (err = floatArg( &(p->gammap), "-gammap", 7, 0.1, 10.0, argn, argc, argv )) ) return err ; @@ -801,18 +818,20 @@ standardOpt( Conv *conv, Root *r, int *argn, int argc, char **argv ) { } + /* free conversion structure */ -static void +static void standardClose( Conv *conv ) { if ( conv ) { if ( conv->private ) { free( conv->private ) ; } - free( conv ) ; + free( conv ) ; } } + /* build new conversion structure */ -static Err +static Err newStandardMap( Conv **conv ) { Standard *s ; @@ -842,7 +861,7 @@ newStandardMap( Conv **conv ) { /* the conversion routine must match the Convert typedef */ -static Err +static Err negativeConvert( Conv *conv, Root *rt, float r, float g, float b, int *c, int *m, int *y, int *k ) { @@ -858,24 +877,26 @@ negativeConvert( Conv *conv, Root *rt, float r, float g, float b, } + /* since this simple conversion takes no parameters, we don't need to parse them - this routine must match the Opt typedef */ -static Err +static Err negativeOpt( Conv *conv, Root *r, int *argn, int argc, char **argv ) { return ERR_OK ; } + /* with no parameters we haven't needed the private data structure, so closing is trivial - this routine must match the Close typedef */ -static void +static void negativeClose( Conv *conv ) { } /* and that's it, apart from assembling the routines above into a single struct/object (and adding code in parseOpts to select the algorithm and printUsage to help the user) */ -static Err +static Err newNegativeMap( Conv **conv ) { if ( ! (*conv = (Conv*)calloc( 1, sizeof( Conv ) )) ) goto error ; @@ -896,7 +917,7 @@ newNegativeMap( Conv **conv ) { /* run through args, passing to sub components */ -static Err +static Err parseOpts( int argc, char **argv, Root *r ) { int argn = 1 ; @@ -947,6 +968,7 @@ parseOpts( int argc, char **argv, Root *r ) { } + /* drive the reading, conversion, and writing */ int main( int argc, char **argv ) { @@ -966,7 +988,7 @@ int main( int argc, char **argv ) { rt->maxOut = MAXTIFFVAL ; if ( (err = parseOpts( argc, argv, rt )) ) goto exit ; - + if ( (err = rt->in->open( rt->in, rt )) ) goto exit ; if ( (err = rt->out->open( rt->out, rt )) ) goto exit ; diff --git a/converter/other/pnmtoxwd.c b/converter/other/pnmtoxwd.c index eda2ee8f..6a008610 100644 --- a/converter/other/pnmtoxwd.c +++ b/converter/other/pnmtoxwd.c @@ -31,13 +31,13 @@ struct CmdlineInfo { -static void -parseCommandLine(int argc, - char ** argv, +static void +parseCommandLine(int argc, + char ** argv, struct CmdlineInfo * const cmdlineP) { /* -------------------------------------------------------------------------- Parse program command line described in Unix standard form by argc - and argv. Return the information in the options as *cmdlineP. + and argv. Return the information in the options as *cmdlineP. If command line is internally inconsistent (invalid options, etc.), issue error message to stderr and abort program. @@ -53,12 +53,12 @@ parseCommandLine(int argc, unsigned int depthSpec; MALLOCARRAY_NOFAIL(option_def, 100); - + option_def_index = 0; /* incremented by OPTENT3 */ OPTENT3(0, "directcolor", OPT_FLAG, NULL, &cmdlineP->directcolor, 0); - OPTENT3(0, "pseudodepth", OPT_UINT, &cmdlineP->pseudodepth, + OPTENT3(0, "pseudodepth", OPT_UINT, &cmdlineP->pseudodepth, &depthSpec, 0); - + opt.opt_table = option_def; opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */ opt.allowNegNum = FALSE; /* We have no parms that are negative numbers */ @@ -77,7 +77,7 @@ parseCommandLine(int argc, "You specified %u", cmdlineP->pseudodepth); } - if (argc-1 == 0) + if (argc-1 == 0) cmdlineP->inputFilename = "-"; else if (argc-1 != 1) pm_error("Program takes zero or one argument (filename). You " @@ -165,7 +165,6 @@ setupX11Header(X11WDFileHeader * const h11P, - static void writeX11Header(X11WDFileHeader const h11, FILE * const ofP) { @@ -209,7 +208,7 @@ writePseudoColormap(FILE * const ofP, bool const backwardMap, xelval const maxval) { /* Write out the colormap, big-endian order. */ - + X11XColor color; unsigned int i; @@ -219,13 +218,13 @@ writePseudoColormap(FILE * const ofP, color.num = i; if (grayscale) { /* Stupid hack because xloadimage and xwud disagree on - how to interpret bitmaps. + how to interpret bitmaps. */ if (backwardMap) color.red = (long) (colors-1-i) * 65535L / (colors - 1); else color.red = (long) i * 65535L / (colors - 1); - + color.green = color.red; color.blue = color.red; } else { @@ -269,7 +268,7 @@ writeDirectColormap(FILE * const ofP) { color.green = (short)(i << 8 | i); color.blue = (short)(i << 8 | i); color.num = i << 16 | i << 8 | i; - + pm_writebiglong( ofP, color.num); pm_writebigshort(ofP, color.red); pm_writebigshort(ofP, color.green); @@ -288,12 +287,12 @@ writeRowDirect(FILE * const ofP, int const format, long const xmaxval, xelval const maxval) { - + switch (PNM_FORMAT_TYPE(format)) { case PPM_TYPE: { unsigned int col; for (col = 0; col < cols; ++col) { - unsigned long const ul = + unsigned long const ul = ((PPM_GETR(xelrow[col]) * xmaxval / maxval) << 16) | ((PPM_GETG(xelrow[col]) * xmaxval / maxval) << 8) | (PPM_GETB(xelrow[col]) * xmaxval / maxval); @@ -331,7 +330,7 @@ writeRowGrayscale(FILE * const ofP, int bitshift; unsigned char byte; unsigned int col; - + bigger_maxval = pm_bitstomaxval(bitsPerPixel); bitshift = 8 - bitsPerPixel; byte = 0; @@ -340,7 +339,7 @@ writeRowGrayscale(FILE * const ofP, s = PNM_GET1(xelrow[col]); if (backwardMap) s = 1 - s; - + if (maxval != bigger_maxval) s = (long) s * bigger_maxval / maxval; byte |= s << bitshift; @@ -362,7 +361,7 @@ writeRowPseudoColor(FILE * const ofP, xel * const xelrow, unsigned int const cols, colorhash_table const cht) { - + unsigned int col; for (col = 0; col < cols; ++col) @@ -391,7 +390,7 @@ writeRaster(FILE * const ofP, if (chv) cht = ppm_colorhisttocolorhash(chv, colors); - + for (row = 0; row < rows; ++row) { if (direct) writeRowDirect(ofP, xels[row], cols, format, xmaxval, maxval); @@ -431,7 +430,7 @@ main(int argc, char * argv[]) { xels = pnm_readpnm(ifP, &cols, &rows, &maxval, &format); xmaxval = (1 << cmdline.pseudodepth) - 1; pm_close(ifP); - + if (cmdline.directcolor) { direct = TRUE; grayscale = FALSE; @@ -482,7 +481,7 @@ main(int argc, char * argv[]) { dumpname = cmdline.inputFilename; } - setupX11Header(&h11, dumpname, cols, rows, format, + setupX11Header(&h11, dumpname, cols, rows, format, direct, grayscale, colors, cmdline.pseudodepth); @@ -496,12 +495,15 @@ main(int argc, char * argv[]) { if (direct) writeDirectColormap(stdout); else - writePseudoColormap(stdout, chv, colors, + writePseudoColormap(stdout, chv, colors, grayscale, backwardMap, maxval); - - writeRaster(stdout, xels, cols, rows, format, maxval, xmaxval, + + writeRaster(stdout, xels, cols, rows, format, maxval, xmaxval, chv, colors, direct, grayscale, backwardMap, h11.bits_per_pixel); return 0; } + + + diff --git a/converter/other/ppmtopgm.c b/converter/other/ppmtopgm.c index e20c5660..40df422e 100644 --- a/converter/other/ppmtopgm.c +++ b/converter/other/ppmtopgm.c @@ -20,9 +20,9 @@ convertRaster(FILE * const ifP, unsigned int const cols, unsigned int const rows, pixval const maxval, - int const format, + int const format, pixel * const inputRow, - gray * const outputRow, + gray * const outputRow, FILE * const ofP) { unsigned int row; @@ -37,7 +37,7 @@ convertRaster(FILE * const ifP, } else { /* Can't use fast approximation, so fall back on floats. */ unsigned int col; - for (col = 0; col < cols; ++col) + for (col = 0; col < cols; ++col) outputRow[col] = ppm_luminosity(inputRow[col]); } pgm_writepgmrow(ofP, outputRow, cols, maxval, 0); @@ -52,7 +52,7 @@ main(int argc, char *argv[]) { FILE* ifP; const char * inputFilespec; int eof; - + ppm_init( &argc, argv ); if (argc-1 > 1) @@ -62,7 +62,7 @@ main(int argc, char *argv[]) { inputFilespec = argv[1]; else inputFilespec = "-"; - + ifP = pm_openr(inputFilespec); eof = FALSE; /* initial assumption */ @@ -81,7 +81,7 @@ main(int argc, char *argv[]) { inputRow = ppm_allocrow(cols); outputRow = pgm_allocrow(cols); - convertRaster(ifP, cols, rows, maxval, format, + convertRaster(ifP, cols, rows, maxval, format, inputRow, outputRow, stdout); ppm_freerow(inputRow); @@ -93,3 +93,6 @@ main(int argc, char *argv[]) { return 0; } + + + diff --git a/converter/other/pstopnm.c b/converter/other/pstopnm.c index 25f2c429..dfc1b1b8 100644 --- a/converter/other/pstopnm.c +++ b/converter/other/pstopnm.c @@ -899,8 +899,8 @@ execGhostscript(int const inputPipeFd, "-dSAFER", "-"); } - execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, - textalphabitsopt, "-q", "-dNOPAUSE", "-dSAFER", "-", NULL); + execl(ghostscriptProg, arg0, deviceopt, outfileopt, gopt, ropt, + textalphabitsopt, "-q", "-dNOPAUSE", "-dSAFER", "-", NULL); pm_error("execl() of Ghostscript ('%s') failed, errno=%d (%s)", ghostscriptProg, errno, strerror(errno)); @@ -1161,3 +1161,4 @@ main(int argc, char ** argv) { } + diff --git a/converter/other/qoi.h b/converter/other/qoi.h index 52ee95e2..4bd7c024 100644 --- a/converter/other/qoi.h +++ b/converter/other/qoi.h @@ -82,6 +82,8 @@ qoi_colorHash(qoi_Rgba const x) { (x.rgba.r*3 + x.rgba.g*5 + x.rgba.b*7 + x.rgba.a*11) % QOI_INDEX_SIZE; } + + static __inline__ void qoi_clearQoiIndex(qoi_Rgba * index) { @@ -89,6 +91,8 @@ qoi_clearQoiIndex(qoi_Rgba * index) { } + + #define QOI_MAGIC_SIZE 4 static char const qoi_magic[QOI_MAGIC_SIZE + 1] = {'q','o','i','f','\0'}; diff --git a/converter/other/qoitopam.c b/converter/other/qoitopam.c index af6817b7..51dfd1e8 100644 --- a/converter/other/qoitopam.c +++ b/converter/other/qoitopam.c @@ -122,6 +122,7 @@ readAndValidateMagic(FILE * const ifP){ } + /* The following two functions are from lib/pmfileio.c */ static void @@ -321,3 +322,4 @@ main(int argc, const char **argv) { } + diff --git a/converter/other/rast.c b/converter/other/rast.c index 1c787089..1a64f7e5 100644 --- a/converter/other/rast.c +++ b/converter/other/rast.c @@ -61,6 +61,8 @@ mem_create( w, h, depth ) return p; } + + void mem_free( p ) struct pixrect* p; @@ -70,6 +72,8 @@ mem_free( p ) free( p ); } + + int pr_dump( p, out, colormap, type, copy_flag ) struct pixrect* p; @@ -371,11 +375,11 @@ pr_load_colormap( in, hP, colormap ) free( colormap->map[1] ); return PIX_ERR; } - if ( fread( colormap->map[0], 1, colormap->length, in ) != + if ( fread( colormap->map[0], 1, colormap->length, in ) != colormap->length || - fread( colormap->map[1], 1, colormap->length, in ) != + fread( colormap->map[1], 1, colormap->length, in ) != colormap->length || - fread( colormap->map[2], 1, colormap->length, in ) != + fread( colormap->map[2], 1, colormap->length, in ) != colormap->length ) { free( colormap->map[0] ); @@ -409,6 +413,8 @@ pr_load_colormap( in, hP, colormap ) return 0; } + + struct pixrect* pr_load_image( in, hP, colormap ) FILE* in; @@ -502,3 +508,6 @@ pr_load_image( in, hP, colormap ) return p; } + + + diff --git a/converter/other/rast.h b/converter/other/rast.h index eb6f4ec4..2a6b0126 100644 --- a/converter/other/rast.h +++ b/converter/other/rast.h @@ -27,44 +27,44 @@ #ifndef RAST_H_INCLUDED #define RAST_H_INCLUDED -#define PIX_ERR -1 +#define PIX_ERR -1 struct rasterfile { long ras_magic; -#define RAS_MAGIC 0x59a66a95 +#define RAS_MAGIC 0x59a66a95 long ras_width; long ras_height; long ras_depth; long ras_length; long ras_type; -#define RT_OLD 0 /* Raw pixrect image in 68000 byte order */ -#define RT_STANDARD 1 /* Raw pixrect image in 68000 byte order */ -#define RT_BYTE_ENCODED 2 /* Run-length compression of bytes */ -#define RT_FORMAT_RGB 3 /* XRGB or RGB instead of XBGR or BGR */ -#define RT_FORMAT_TIFF 4 /* tiff <-> standard rasterfile */ -#define RT_FORMAT_IFF 5 /* iff (TAAC format) <-> standard rasterfile */ -#define RT_EXPERIMENTAL 0xffff /* Reserved for testing */ +#define RT_OLD 0 /* Raw pixrect image in 68000 byte order */ +#define RT_STANDARD 1 /* Raw pixrect image in 68000 byte order */ +#define RT_BYTE_ENCODED 2 /* Run-length compression of bytes */ +#define RT_FORMAT_RGB 3 /* XRGB or RGB instead of XBGR or BGR */ +#define RT_FORMAT_TIFF 4 /* tiff <-> standard rasterfile */ +#define RT_FORMAT_IFF 5 /* iff (TAAC format) <-> standard rasterfile */ +#define RT_EXPERIMENTAL 0xffff /* Reserved for testing */ long ras_maptype; -#define RMT_NONE 0 -#define RMT_EQUAL_RGB 1 -#define RMT_RAW 2 +#define RMT_NONE 0 +#define RMT_EQUAL_RGB 1 +#define RMT_RAW 2 long ras_maplength; }; struct pixrectops { - int (*pro_rop)(); - int (*pro_stencil)(); - int (*pro_batchrop)(); - int (*pro_nop)(); - int (*pro_destroy)(); - int (*pro_get)(); - int (*pro_put)(); - int (*pro_vector)(); + int (*pro_rop)(); + int (*pro_stencil)(); + int (*pro_batchrop)(); + int (*pro_nop)(); + int (*pro_destroy)(); + int (*pro_get)(); + int (*pro_put)(); + int (*pro_vector)(); struct pixrect* (*pro_region)(); - int (*pro_putcolormap)(); - int (*pro_getcolormap)(); - int (*pro_putattributes)(); - int (*pro_getattributes)(); + int (*pro_putcolormap)(); + int (*pro_getcolormap)(); + int (*pro_putattributes)(); + int (*pro_getattributes)(); }; struct pr_size { @@ -79,12 +79,12 @@ struct pixrect { struct pixrectops* pr_ops; struct pr_size pr_size; int pr_depth; - struct mpr_data* pr_data; /* work-alike only handles memory pixrects */ + struct mpr_data* pr_data; /* work-alike only handles memory pixrects */ }; struct mpr_data { int md_linebytes; - unsigned char* md_image; /* note, byte not short -- avoid pr_flip() */ + unsigned char* md_image; /* note, byte not short -- avoid pr_flip() */ struct pr_pos md_offset; short md_primary; short md_flags; diff --git a/converter/other/rasttopnm.c b/converter/other/rasttopnm.c index 285fc5e0..7f6015a3 100644 --- a/converter/other/rasttopnm.c +++ b/converter/other/rasttopnm.c @@ -47,7 +47,7 @@ parseCommandLine(int argc, const char ** argv, MALLOCARRAY_NOFAIL(option_def, 100); option_def_index = 0; /* incremented by OPTENT3 */ - + opt.opt_table = option_def; opt.short_allowed = false; /* We have no short (old-fashioned) options */ opt.allowNegNum = false; /* We have no parms that are negative numbers */ @@ -62,7 +62,7 @@ parseCommandLine(int argc, const char ** argv, pm_optParseOptions3(&argc, (char **)argv, opt, sizeof(opt), 0); /* Uses and sets argc, argv, and some of *cmdlineP and others. */ - if (argc-1 == 0) + if (argc-1 == 0) cmdlineP->inputFileName = "-"; else if (argc-1 != 1) pm_error("Program takes zero or one argument (filename). You " @@ -258,7 +258,7 @@ convertRowDepth8(const unsigned char * const lineStart, ++byteP; } -} +} @@ -299,7 +299,7 @@ convertRowRgb(const unsigned char * const lineStart, else PPM_ASSIGN(xelrow[col], r, g, b); } -} +} @@ -387,9 +387,9 @@ dumpHeader(struct rasterfile const header) { static void -dumpHeaderAnalysis(bool const grayscale, +dumpHeaderAnalysis(bool const grayscale, unsigned int const depth, - xel const zero, + xel const zero, xel const one) { pm_message("grayscale: %s", grayscale ? "YES" : "NO"); @@ -464,9 +464,9 @@ main(int argc, const char ** const argv) { if (header.ras_maplength != 0) { int rc; - + rc = pr_load_colormap(ifP, &header, &colorMap); - + if (rc != 0 ) pm_error("unable to read colormap from RAST file"); @@ -488,7 +488,7 @@ main(int argc, const char ** const argv) { "but this is not a color mapped image"); writePnm(stdout, pr, header.ras_width, header.ras_height, maxval, format, - header.ras_depth, header.ras_type, grayscale, + header.ras_depth, header.ras_type, grayscale, header.ras_maplength > 0, colorMap, zero, one, cmdline.index); pm_close(ifP); @@ -496,3 +496,6 @@ main(int argc, const char ** const argv) { return 0; } + + + diff --git a/converter/other/rla.h b/converter/other/rla.h index 875cbfc6..e8bb6da1 100644 --- a/converter/other/rla.h +++ b/converter/other/rla.h @@ -8,9 +8,9 @@ typedef struct typedef struct { - window_s window; - window_s active_window; - short frame; + window_s window; + window_s active_window; + short frame; short storage_type; short num_chan; short num_matte; diff --git a/converter/other/rletopnm.c b/converter/other/rletopnm.c index 97f271dc..2edad50b 100644 --- a/converter/other/rletopnm.c +++ b/converter/other/rletopnm.c @@ -503,3 +503,6 @@ main(int argc, char ** argv) { return 0; } + + + diff --git a/converter/other/sgitopnm.c b/converter/other/sgitopnm.c index 6fd4efcf..4bacc411 100644 --- a/converter/other/sgitopnm.c +++ b/converter/other/sgitopnm.c @@ -522,3 +522,4 @@ main(int argc, const char * argv[]) { } + diff --git a/converter/other/sirtopnm.c b/converter/other/sirtopnm.c index 6a36a110..8bdeb6b5 100644 --- a/converter/other/sirtopnm.c +++ b/converter/other/sirtopnm.c @@ -159,3 +159,6 @@ main(int argc, const char ** argv) { exit(0); } + + + diff --git a/converter/other/srf.c b/converter/other/srf.c index b0f97242..a6d51a5d 100644 --- a/converter/other/srf.c +++ b/converter/other/srf.c @@ -24,7 +24,7 @@ csumRaw(void * const p, for (i = 0, retval = 0, c = p; i < len; ++i) retval += *c++; - + return retval; } @@ -419,10 +419,10 @@ csum(struct srf * const srfP, for (i = 0; i < srfP->header.img_cnt; ++i) retval += csumImg(&srfP->imgs[i]); - + for (i = 0; i < padLen; ++i) retval += 0xff; - + return retval; } @@ -540,7 +540,7 @@ void srf_term(struct srf * const srfP) { unsigned int i; - + free(srfP->header.s578.val); free(srfP->header.ver.val); free(srfP->header.prod.val); @@ -634,12 +634,12 @@ srf_create_img(struct srf * const srfP, uint16_t const width, uint16_t const height) { /*---------------------------------------------------------------------------- - Add an "image" to the SRF. An image is a horizontal series of 36 + Add an "image" to the SRF. An image is a horizontal series of 36 square frames, each showing a different angle view of an object, 10 degrees about. At least that's what it's supposed to be. We don't really care -- it's just an arbitrary rectangular raster image to us. -----------------------------------------------------------------------------*/ - + ++srfP->header.img_cnt; REALLOCARRAY(srfP->imgs, srfP->header.img_cnt); @@ -650,4 +650,6 @@ srf_create_img(struct srf * const srfP, srf_img_init(&srfP->imgs[srfP->header.img_cnt-1], width, height); } - + + + diff --git a/converter/other/srftopam.c b/converter/other/srftopam.c index efe55253..78d535fb 100644 --- a/converter/other/srftopam.c +++ b/converter/other/srftopam.c @@ -82,18 +82,21 @@ srfRed(uint16_t const pixel) { } + static unsigned int srfGrn(uint16_t const pixel) { return ((pixel >> 6) & 0x1f) << 3; } + static unsigned int srfBlu(uint16_t const pixel) { return ((pixel >> 0) & 0x1f) << 3; } + static uint8_t srfAlpha(uint8_t const d) { @@ -130,7 +133,7 @@ writeRaster(struct pam * const pamP, uint16_t const alpha = imgP->alpha.data[rowStart + col]; assert(col < pamP->width); - + tuplerow[col][PAM_RED_PLANE] = srfRed(data); tuplerow[col][PAM_GRN_PLANE] = srfGrn(data); tuplerow[col][PAM_BLU_PLANE] = srfBlu(data); @@ -142,7 +145,7 @@ writeRaster(struct pam * const pamP, tuplerow[col][PAM_GRN_PLANE] = 0; tuplerow[col][PAM_BLU_PLANE] = 0; tuplerow[col][PAM_TRN_PLANE] = 0; - } + } pnm_writepamrow(pamP, tuplerow); } diff --git a/converter/other/sunicontopnm.c b/converter/other/sunicontopnm.c index 93ddc0ab..8d67179a 100644 --- a/converter/other/sunicontopnm.c +++ b/converter/other/sunicontopnm.c @@ -184,3 +184,6 @@ main(int argc, const char ** argv) { pm_close(stdout); return 0; } + + + diff --git a/converter/other/svgtopam.c b/converter/other/svgtopam.c index ca6f4dc7..c94a5ca2 100644 --- a/converter/other/svgtopam.c +++ b/converter/other/svgtopam.c @@ -23,7 +23,7 @@ 10.3.9 user reports in April 2007 that he has 2.6.16 installed and it doesn't have xmlReaderTypes. Another MacOS user reported that in December 2008. Apparently that OS has a broken libxml2 installation. - + ============================================================================*/ #define _DEFAULT_SOURCE /* New name for SVID & BSD source defines */ @@ -54,13 +54,13 @@ struct cmdlineInfo { -static void -parseCommandLine(int argc, - char ** argv, +static void +parseCommandLine(int argc, + char ** argv, struct cmdlineInfo * const cmdlineP) { /* -------------------------------------------------------------------------- Parse program command line described in Unix standard form by argc - and argv. Return the information in the options as *cmdlineP. + and argv. Return the information in the options as *cmdlineP. If command line is internally inconsistent (invalid options, etc.), issue error message to stderr and abort program. @@ -77,7 +77,7 @@ parseCommandLine(int argc, MALLOCARRAY_NOFAIL(option_def, 100); option_def_index = 0; /* incremented by OPTENT3 */ - OPTENT3(0, "trace", OPT_FLAG, NULL, + OPTENT3(0, "trace", OPT_FLAG, NULL, &cmdlineP->trace, 0); opt.opt_table = option_def; @@ -91,7 +91,7 @@ parseCommandLine(int argc, cmdlineP->inputFileName = "-"; else { cmdlineP->inputFileName = argv[1]; - + if (argc-1 > 1) pm_error("Too many arguments (%u). The only non-option argument " "is the input file name.", argc-1); @@ -177,7 +177,7 @@ createPath(const char * const pathText, -----------------------------------------------------------------------------*/ bool error; Path * pathP; - + MALLOCVAR(pathP); if (pathP == NULL) error = TRUE; @@ -205,7 +205,7 @@ createPath(const char * const pathText, static void destroyPath(Path * const pathP) { - + assert(pathP->pathTextLength == strlen(pathP->pathText)); pm_strfree(pathP->pathText); @@ -225,13 +225,15 @@ makePoint(unsigned int const x, unsigned int const y) { Point p; - + p.x = x; p.y = y; - + return p; } + + static ppmd_point makePpmdPoint(Point const arg) { @@ -243,6 +245,8 @@ makePpmdPoint(Point const arg) { return p; } + + typedef enum { PATH_MOVETO, PATH_LINETO, @@ -310,6 +314,8 @@ pathReader_create(Path * const pathP, *pathReaderPP = pathReaderP; } + + static void pathReader_destroy(PathReader * const pathReaderP) { free(pathReaderP); @@ -432,7 +438,7 @@ pathReader_getNextCommand(PathReader * const pathReaderP, break; default: { const char * const context = pathReader_context(pathReaderP); - + pm_errormsg("Unrecognized command in <path>: '%c'. %s", pathText[pathReaderP->cursor++], context); @@ -544,7 +550,7 @@ drawPath(Canvas * const canvasP, ppmd_fill(canvasP->pixels, canvasP->width, canvasP->height, canvasP->maxval, - fillObjP, + fillObjP, PPMD_NULLDRAWPROC, &pathP->style.fillColor); ppmd_fill_destroy(fillObjP); @@ -574,7 +580,7 @@ interpretStyle(const char * const styleAttr) { char * buffer; for (p = &token[0]; isspace(*p); ++p); - + strippedToken = p; buffer = strdup(strippedToken); @@ -589,7 +595,7 @@ interpretStyle(const char * const styleAttr) { else { const char * const value = colonPos + 1; const char * const name = &buffer[0]; - + *colonPos = '\0'; if (streq(name, "fill")) { @@ -614,6 +620,7 @@ interpretStyle(const char * const styleAttr) { } + static void getPathAttributes(xmlTextReaderPtr const xmlReaderP, Style * const styleP, @@ -652,7 +659,7 @@ processSubPathNode(xmlTextReaderPtr const xmlReaderP, } break; default: /* Just ignore whatever this is. Contents of <path> are - meaningless; all the information is in the attributes + meaningless; all the information is in the attributes */ break; } @@ -687,7 +694,7 @@ processPathElement(xmlTextReaderPtr const xmlReaderP, int rc; rc = xmlTextReaderRead(xmlReaderP); - + switch (rc) { case 1: processSubPathNode(xmlReaderP, &endOfPath); @@ -736,7 +743,7 @@ processSubSvgElement(xmlTextReaderPtr const xmlReaderP, const char * const nodeName = currentNodeName(xmlReaderP); assert(xmlTextReaderNodeType(xmlReaderP) == XML_READER_TYPE_ELEMENT); - + if (streq(nodeName, "path")) processPathElement(xmlReaderP, canvasP); else @@ -822,7 +829,7 @@ writePam(FILE * const ofP, pam.depth = 3; pam.maxval = OUTPUT_MAXVAL; strcpy(pam.tuple_type, PAM_PPM_TUPLETYPE); - + pnm_writepaminit(&pam); tuplerow = pnm_allocpamrow(&pam); @@ -867,7 +874,7 @@ processSvgElement(xmlTextReaderPtr const xmlReaderP, int rc; rc = xmlTextReaderRead(xmlReaderP); - + switch (rc) { case 1: processSubSvgNode(xmlReaderP, canvasP, &endOfSvg); @@ -938,7 +945,7 @@ processDocument(xmlTextReaderPtr const xmlReaderP, int rc; rc = xmlTextReaderRead(xmlReaderP); - + switch (rc) { case 1: processTopLevelNode(xmlReaderP, ofP); @@ -968,7 +975,7 @@ main(int argc, char **argv) { LIBXML_TEST_VERSION; parseCommandLine(argc, argv, &cmdline); - + traceDraw = cmdline.trace; ifP = pm_openr(cmdline.inputFileName); @@ -990,3 +997,6 @@ main(int argc, char **argv) { return 0; } + + + diff --git a/converter/other/tiff.c b/converter/other/tiff.c index 39e3b0ce..62a6dc94 100644 --- a/converter/other/tiff.c +++ b/converter/other/tiff.c @@ -24,14 +24,14 @@ static uint32 number(const char * const value, tagvalmap const tagvallist[]) { - + char * ep; long num; if (strlen(value) == 0) pm_error("null string where numeric tag value or enumerated tag " "value name expected"); - + num = strtol(value, &ep, 10); if (*ep != '\0') { /* It's not a numeric string, so it must be an enumerated value name */ @@ -53,7 +53,7 @@ dnumber(const char * const value) { char * ep; double num; - + num = strtod(value, &ep); if (ep == value || *ep != '\0') pm_error("Bad floating point number %s", value); @@ -162,7 +162,7 @@ putCountBytes(TIFF * const tifP, #define TV(p,a) { #a, p##a, } -static tagvalmap const +static tagvalmap const tvm_compression[] = { TV(COMPRESSION_,NONE), TV(COMPRESSION_,CCITTRLE), @@ -463,3 +463,6 @@ tagDefFind(const char * const name) { return NULL; } + + + diff --git a/converter/other/x10wd.h b/converter/other/x10wd.h index 3c4fb8ca..e60e416a 100644 --- a/converter/other/x10wd.h +++ b/converter/other/x10wd.h @@ -9,19 +9,19 @@ #define X10WD_FILE_VERSION 6 typedef struct { - int header_size; /* Size of the entire file header (bytes). */ - int file_version; /* X10WD_FILE_VERSION */ - int display_type; /* Display type. */ - int display_planes; /* Number of display planes. */ - int pixmap_format; /* Pixmap format. */ - int pixmap_width; /* Pixmap width. */ - int pixmap_height; /* Pixmap height. */ - short window_width; /* Window width. */ - short window_height; /* Window height. */ - short window_x; /* Window upper left X coordinate. */ - short window_y; /* Window upper left Y coordinate. */ - short window_bdrwidth; /* Window border width. */ - short window_ncolors; /* number of Color entries in this window */ + int header_size; /* Size of the entire file header (bytes). */ + int file_version; /* X10WD_FILE_VERSION */ + int display_type; /* Display type. */ + int display_planes; /* Number of display planes. */ + int pixmap_format; /* Pixmap format. */ + int pixmap_width; /* Pixmap width. */ + int pixmap_height; /* Pixmap height. */ + short window_width; /* Window width. */ + short window_height; /* Window height. */ + short window_x; /* Window upper left X coordinate. */ + short window_y; /* Window upper left Y coordinate. */ + short window_bdrwidth; /* Window border width. */ + short window_ncolors; /* number of Color entries in this window */ } X10WDFileHeader; typedef struct { diff --git a/converter/other/x11wd.h b/converter/other/x11wd.h index 7161260b..3c1d996d 100644 --- a/converter/other/x11wd.h +++ b/converter/other/x11wd.h @@ -55,7 +55,7 @@ typedef struct { instead. That's how Pnmtoxwd sets ncolors, and is how Xwdtopnm interprets it. Xwdtopnm doesn't even look at 'colormap_entries'. - This could be an old mistake; maybe colormap_entries was + This could be an old mistake; maybe colormap_entries was originally the number of entries in the colormap, and ncolors was the number of distinct colors in the image (which might be less than colormap_entries or, for direct color, could be much @@ -63,7 +63,7 @@ typedef struct { */ xwdval ncolors; /* Number of entries in the color map (for direct color, it's the - number of entries in each of them). See 'colormap_entries'. + number of entries in each of them). See 'colormap_entries'. */ xwdval window_width; /* Window width */ xwdval window_height; /* Window height */ diff --git a/converter/other/xwdtopnm.c b/converter/other/xwdtopnm.c index 5523acab..810d302a 100644 --- a/converter/other/xwdtopnm.c +++ b/converter/other/xwdtopnm.c @@ -504,6 +504,7 @@ computeComponentMasks(X11WDFileHeader * const h11P, } + /* About TrueColor maxval: The X11 spec says that in TrueColor, you use the bits in the raster for a diff --git a/converter/other/yuy2topam.c b/converter/other/yuy2topam.c index 49f284ac..b4742bf5 100644 --- a/converter/other/yuy2topam.c +++ b/converter/other/yuy2topam.c @@ -264,3 +264,6 @@ main(int argc, const char *argv[]) { return 0; } + + + diff --git a/converter/other/zeisstopnm.c b/converter/other/zeisstopnm.c index e94d9b44..5f1e97ec 100644 --- a/converter/other/zeisstopnm.c +++ b/converter/other/zeisstopnm.c @@ -75,34 +75,34 @@ main( argc, argv ) argn = 1; while ( argn < argc && argv[argn][0] == '-' && argv[argn][1] != '\0' ) - { - if ( pm_keymatch( argv[argn], "-pgm", 3 ) ) - { - if ( argn >= argc ) - pm_usage( usage ); - format = PGM_TYPE; - } - else if ( pm_keymatch( argv[argn], "-ppm", 3 ) ) - { - if ( argn >= argc ) - pm_usage( usage ); - format = PPM_TYPE; - } - else - pm_usage( usage ); - ++argn; - } + { + if ( pm_keymatch( argv[argn], "-pgm", 3 ) ) + { + if ( argn >= argc ) + pm_usage( usage ); + format = PGM_TYPE; + } + else if ( pm_keymatch( argv[argn], "-ppm", 3 ) ) + { + if ( argn >= argc ) + pm_usage( usage ); + format = PPM_TYPE; + } + else + pm_usage( usage ); + ++argn; + } if ( argn < argc ) - { - ifp = pm_openr( argv[argn] ); - ++argn; - } + { + ifp = pm_openr( argv[argn] ); + ++argn; + } else - ifp = stdin; + ifp = stdin; if ( argn != argc ) - pm_usage( usage ); + pm_usage( usage ); /* Read the image to a buffer */ @@ -111,35 +111,35 @@ main( argc, argv ) /* Check the format of the file */ if (nread <=1024) - pm_error( "Input file not in Zeiss format (too small)" ); + pm_error( "Input file not in Zeiss format (too small)" ); lutg = (unsigned char *)buf+(nread-1024+512); lutr = (unsigned char *)buf+(nread-1024+256); lutb = (unsigned char *)buf+(nread-1024); cols = ((unsigned char) buf[nread-1024+768+8]) + - (((unsigned char) buf[nread-1024+768+9]) << 8); + (((unsigned char) buf[nread-1024+768+9]) << 8); rows = ((unsigned char) buf[nread-1024+768+10]) + - (((unsigned char) buf[nread-1024+768+11]) << 8); + (((unsigned char) buf[nread-1024+768+11]) << 8); if ( cols <= 0 ) - pm_error( "invalid cols: %d", cols ); + pm_error( "invalid cols: %d", cols ); if ( rows <= 0 ) - pm_error( "invalid rows: %d", rows ); + pm_error( "invalid rows: %d", rows ); if (cols*rows != nread-1024) - pm_error( "Hmm, %d rows, %d cols, %ld total image size", - rows, cols, nread-1024); + pm_error( "Hmm, %d rows, %d cols, %ld total image size", + rows, cols, nread-1024); /* Choose pgm or ppm */ /* If the LUTs all contain 0,1,2,3,4..255, it is a pgm file */ for (i=0; i<256 && format==0; i++) - if (lutr[i] != i || lutg[i] != i || lutb[i] != i) - format = PPM_TYPE; + if (lutr[i] != i || lutg[i] != i || lutb[i] != i) + format = PPM_TYPE; if (format == 0) - format = PGM_TYPE; + format = PGM_TYPE; pnm_writepnminit( stdout, cols, rows, 255, format, 0 ); xelrow = pnm_allocrow( cols ); @@ -161,23 +161,23 @@ main( argc, argv ) for ( row = 0; row < rows; ++row ) { - switch ( PNM_FORMAT_TYPE(format) ) - { - case PGM_TYPE: - for ( col = 0, xP = xelrow; col < cols; ++col, ++xP, ++byteP ) - PNM_ASSIGN1( *xP, *byteP ); - break; - - case PPM_TYPE: - for ( col = 0, xP = xelrow; col < cols; ++col, ++xP, ++byteP ) - PPM_ASSIGN( *xP, lutr[*byteP], lutg[*byteP], lutb[*byteP] ); - break; + switch ( PNM_FORMAT_TYPE(format) ) + { + case PGM_TYPE: + for ( col = 0, xP = xelrow; col < cols; ++col, ++xP, ++byteP ) + PNM_ASSIGN1( *xP, *byteP ); + break; + + case PPM_TYPE: + for ( col = 0, xP = xelrow; col < cols; ++col, ++xP, ++byteP ) + PPM_ASSIGN( *xP, lutr[*byteP], lutg[*byteP], lutb[*byteP] ); + break; default: - pm_error( "shouldn't happen" ); + pm_error( "shouldn't happen" ); } - pnm_writepnmrow( stdout, xelrow, cols, 255, format, 0 ); + pnm_writepnmrow( stdout, xelrow, cols, 255, format, 0 ); } free( buf ); @@ -185,3 +185,6 @@ main( argc, argv ) exit( 0 ); } + + + |