diff options
| -rw-r--r-- | converter/ppm/ppmtompeg/jpeg.c | 2 | ||||
| -rw-r--r-- | doc/HISTORY | 2 | ||||
| -rw-r--r-- | editor/pampaintspill.c | 5 | ||||
| -rw-r--r-- | editor/pbmpscale.c | 42 | ||||
| -rw-r--r-- | editor/pnmconvol.c | 8 | ||||
| -rw-r--r-- | lib/util/shhopt.h | 12 |
6 files changed, 38 insertions, 33 deletions
diff --git a/converter/ppm/ppmtompeg/jpeg.c b/converter/ppm/ppmtompeg/jpeg.c index a703cf39..2567666d 100644 --- a/converter/ppm/ppmtompeg/jpeg.c +++ b/converter/ppm/ppmtompeg/jpeg.c @@ -360,7 +360,7 @@ JMovie2JPEG(const char * const infilename, * * allocate and initialize JPEG decompression object * specify data source (eg, a file) - * jpeg_read_header(); // obtain image dimensions and other parameters + * jpeg_read_header(); obtain image dimensions and other parameters * set parameters for decompression * jpeg_start_decompress(); * while (scan lines remain to be read) diff --git a/doc/HISTORY b/doc/HISTORY index 63d3545e..d5097040 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,7 +4,7 @@ Netpbm. CHANGE HISTORY -------------- -not yet BJH Release 10.50.00 +10.03.27 BJH Release 10.50.00 Add pamtoavs, avstopam. Thanks Scott Pakin. diff --git a/editor/pampaintspill.c b/editor/pampaintspill.c index e2091e60..2b6535c1 100644 --- a/editor/pampaintspill.c +++ b/editor/pampaintspill.c @@ -308,8 +308,9 @@ produceOutputImage(struct pam * const pamP, pamP->width, pamP->height); if (distSqr > 0.0) { - // We do special cases for some common cases with code - // that is much faster than pow(). + /* We do special cases for some common cases with code + that is much faster than pow(). + */ double const weight = distPower == -2.0 ? 1.0 / distSqr : distPower == -1.0 ? 1.0 / sqrt(distSqr): diff --git a/editor/pbmpscale.c b/editor/pbmpscale.c index 4aa7dc37..acdb862c 100644 --- a/editor/pbmpscale.c +++ b/editor/pbmpscale.c @@ -207,28 +207,30 @@ setFlags(const bit * const prevrow, 0x00 appears 180 times, 0xff 109 times. -----------------------------------------------------------------------------*/ -/*--------------------------------------------------------------------------- - - The following code is from the previous version, which examined - the corners one by one: - -// list of corner patterns; bit 7 is current color, bits 0-6 are squares -// around (excluding square behind), going clockwise. -// The high byte of the patterns is a mask, which determines which bits are -// not ignored. - -uint16_t const patterns[] - = { 0x0000, 0xd555, // no corner - 0x0001, 0xffc1, 0xd514, // normal corner - 0x0002, 0xd554, 0xd515, 0xbea2, 0xdfc0, 0xfd81, 0xfd80, 0xdf80, - // reduced corners - 0x0003, 0xbfa1, 0xfec2 }; // reduced if cutoff > 1 +#if 0 + /* The following code is from the previous version, which examined + the corners one by one: + */ - For example, the NE corner is examined with the following 8 bit sample: - Current : W : NW : N : NE : E : SE : S - (SW is the "square behind") + /* list of corner patterns; bit 7 is current color, bits 0-6 are squares + around (excluding square behind), going clockwise. + The high byte of the patterns is a mask, which determines which bits are + not ignored. + */ + uint16_t const patterns[] + = { 0x0000, 0xd555, /* no corner */ + 0x0001, 0xffc1, 0xd514, /* normal corner */ + 0x0002, 0xd554, 0xd515, 0xbea2, 0xdfc0, 0xfd81, 0xfd80, 0xdf80, + /* reduced corners */ + 0x0003, 0xbfa1, 0xfec2 }; /* reduced if cutoff > 1 */ + + /* + For example, the NE corner is examined with the following 8 bit sample: + Current : W : NW : N : NE : E : SE : S + (SW is the "square behind") + */ +#endif ------------------------------------------------------------------------------*/ uint32_t prevrow24, thisrow24, nextrow24; unsigned int col; diff --git a/editor/pnmconvol.c b/editor/pnmconvol.c index 93e99e84..c29a6fe4 100644 --- a/editor/pnmconvol.c +++ b/editor/pnmconvol.c @@ -1753,7 +1753,7 @@ convolveHorizontalRowPlane(struct pam * const pamP, outputrow[col][plane] = window[crowso2][col][plane]; else if (col == ccolso2) { unsigned int const leftcol = 0; - // Window is up againt left edge of image + /* Window is up againt left edge of image */ float matrixSum; @@ -1917,12 +1917,12 @@ convolveVerticalRowPlane(struct pam * const pamP, outputrow[col][plane] = circMap[crowso2][col][plane]; else if (col == ccolso2) { unsigned int const leftcol = 0; - // Convolution window is againt left edge of image + /* Convolution window is againt left edge of image */ float matrixSum; unsigned int ccol; - // Slide window down in the first kernel's worth of columns + /* Slide window down in the first kernel's worth of columns */ for (ccol = 0; ccol < convKernelP->cols; ++ccol) { convColumnSum[leftcol + ccol] += circMap[addrow][leftcol + ccol][plane]; @@ -1942,7 +1942,7 @@ convolveVerticalRowPlane(struct pam * const pamP, float matrixSum; unsigned int ccol; - // Slide window down in the column that just entered the window + /* Slide window down in the column that just entered the window */ convColumnSum[addcol] += circMap[addrow][addcol][plane]; convColumnSum[addcol] -= circMap[subrow][addcol][plane]; diff --git a/lib/util/shhopt.h b/lib/util/shhopt.h index 2175fc5d..e5e138e1 100644 --- a/lib/util/shhopt.h +++ b/lib/util/shhopt.h @@ -1,4 +1,5 @@ -/*============================================================================= +#if 0 +============================================================================= HERE IS AN EXAMPLE OF THE USE OF SHHOPT: @@ -6,8 +7,9 @@ HERE IS AN EXAMPLE OF THE USE OF SHHOPT: int main ( int argc, char **argv ) { - // initial values here are just to demonstrate what gets set and - // what doesn't by the code below. + /* initial values here are just to demonstrate what gets set and + what doesn't by the code below. + */ int help_flag = 7; unsigned int help_spec =7; unsigned int height_spec =7; @@ -67,8 +69,8 @@ Now run this program with something like myprog -v /etc/passwd -name=Bryan --hei=4 -========================================================================*/ - +======================================================================== +#endif /* 0 */ #ifndef SHHOPT_H #define SHHOPT_H |