Skip to content

Commit 561002b

Browse files
author
giraffedata
committed
Adapt test of ppmchange.c to recent change in rounding
git-svn-id: https://svn.code.sf.net/p/netpbm/code/trunk@2886 9d0c8265-081b-0410-96cb-a4ca84ce46f8
1 parent f43ca7d commit 561002b

File tree

2 files changed

+28
-20
lines changed

2 files changed

+28
-20
lines changed

test/ppmchange.ok

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
22488533 203
22
1008787190 613
3-
3885709071 613
4-
2101746192 613
3+
1983174784 613
4+
2146447222 613
5+
1216791938 613
6+
0 0 0 0 78
7+
0 0 255 29 40
8+
0 50 2 30 41
9+
100 0 1 30 41

test/ppmchange.test

+21-18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/bash
22
# This script tests: ppmchange
3-
# Also requires: ppmrainbow pgmramp
3+
# Also requires: ppmrainbow pgmramp ppmhist
44

55

66
# Failure message
@@ -10,17 +10,18 @@
1010

1111
tmpdir=${tmpdir:-/tmp}
1212
rainbow_ppm=${tmpdir}/rainbow.ppm
13+
changed_ppm=${tmpdir}/changed.ppm
1314

14-
# Explicit values for intermediate colors: rgb.txt may be defining them
15-
# in unusual ways.
15+
# Explicit values for intermediate colors: rgb.txt may not be the one
16+
# Netpbm provides; they may be defined in unusual ways.
1617

1718
brown=rgb:67/43/00
1819
cyan=rgb:00/ff/ff
1920
yellow=rgb:ff/ff/00
2021
gray=rgb:7f/7f/7f
2122

2223

23-
# Test 1. Should print 811868957 60
24+
# Test 1. Should print 22488533 203
2425
pgmramp -lr 8 8 | ppmchange black black white white $gray $gray \
2526
-close=10 -remainder=blue | cksum
2627

@@ -31,29 +32,31 @@ ppmrainbow -tmpdir=$tmpdir -width=200 -height=1 red green blue | \
3132
tee ${rainbow_ppm} | \
3233
ppmchange red $brown green $brown blue $brown | cksum
3334

35+
# Validate ${rainbow_ppm}
36+
# Should print 1983174784 613
3437

35-
# Test 3. Should print 3885709071 613
38+
cat ${rainbow_ppm} | cksum
39+
40+
41+
# Test 3. Should print 2146447222 613
3642

3743
ppmchange red $brown green $cyan blue $yellow \
3844
-closeness=25 ${rainbow_ppm} | cksum
3945

4046

41-
# Test 4. Should print 2101746192 613
47+
# Test 4. Should print 1216791938 613
4248

4349
ppmchange red rgb:64/00/01 rgb:00/ff/00 rgb:00/32/02 blue blue \
44-
-remainder=black -closeness=25 ${rainbow_ppm} | cksum
50+
-remainder=black -closeness=25 ${rainbow_ppm} | tee ${changed_ppm} | cksum
4551

46-
rm ${rainbow_ppm}
52+
# Produce a histogram of the colors in the output image
53+
# Should produce
54+
# 0 0 0 0 78
55+
# 0 0 255 29 40
56+
# 0 50 2 30 41
57+
# 100 0 1 30 41
4758

59+
ppmhist -sort=rgb -noheader ${changed_ppm}
4860

49-
# cksum ${rainbow_ppm}
50-
# 1983174784 613 rainbow.ppm
5161

52-
# ppmchange red rgb:64/00/01 rgb:00/ff/00 rgb:00/32/02 blue blue \
53-
# -remainder=black -closeness=25 ${rainbow_ppm} | \
54-
# pphist -sort=rgb -noheader
55-
#
56-
# 0 0 0 0 75
57-
# 0 0 255 29 42
58-
# 0 50 2 30 42
59-
# 100 0 1 30 41
62+
rm ${rainbow_ppm} ${changed_ppm}

0 commit comments

Comments
 (0)