OSDN -- Desarrollar y descargar software de código abierto
Translation Status of Español translation status for es
  • R/O
  • SSH
Fork

GM: Commit

Main GraphicsMagick source repository


Commit MetaInfo

Revisiónbb05e046dbc1e7f25794c4058ed332c3164e2291 (tree)
Tiempo2022-01-23 05:38:19
AutorBob Friesenhahn <bfriesen@Grap...>
CommiterBob Friesenhahn

Log Message

Compare command: Support '-compress' option.

Cambiar Resumen

Diferencia incremental

diff -r fbd0632291cf -r bb05e046dbc1 ChangeLog
--- a/ChangeLog Sat Jan 22 11:19:07 2022 -0600
+++ b/ChangeLog Sat Jan 22 14:38:19 2022 -0600
@@ -1,5 +1,11 @@
11 2022-01-22 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
22
3+ * utilities/tests: Write compressed MIFF files to reduce disk
4+ space usage.
5+
6+ * magick/command.c (CompareImageCommand): Support '-compress'
7+ option.
8+
39 * coders/mpc.c: Fix warnings from GCC 11.
410
511 * coders/miff.c: Fix warnings from GCC 11.
diff -r fbd0632291cf -r bb05e046dbc1 common.shi.in
--- a/common.shi.in Sat Jan 22 11:19:07 2022 -0600
+++ b/common.shi.in Sat Jan 22 14:38:19 2022 -0600
@@ -38,6 +38,9 @@
3838 if test -z "$MAGICK_LIMIT_DISK" ; then
3939 export MAGICK_LIMIT_DISK=0
4040 fi
41+#if test -z "$MAGICK_LIMIT_READ" ; then
42+# export MAGICK_LIMIT_READ=800000
43+#fi
4144 # Enable debug traces for exceptions
4245 if test -z "MAGICK_DEBUG" ; then
4346 export MAGICK_DEBUG=exception
diff -r fbd0632291cf -r bb05e046dbc1 doc/options.imdoc
--- a/doc/options.imdoc Sat Jan 22 11:19:07 2022 -0600
+++ b/doc/options.imdoc Sat Jan 22 14:38:19 2022 -0600
@@ -870,7 +870,7 @@
870870
871871 <!-- ------------ -compress ----------------------------------------- -->
872872
873-<utils apps=composite,convert,display,mogrify,montage>
873+<utils apps=composite,compare,convert,display,mogrify,montage>
874874 <dopt>-compress <type></opt>
875875
876876 <abs>the type of image compression</abs>
diff -r fbd0632291cf -r bb05e046dbc1 magick/command.c
--- a/magick/command.c Sat Jan 22 11:19:07 2022 -0600
+++ b/magick/command.c Sat Jan 22 14:38:19 2022 -0600
@@ -2398,7 +2398,7 @@
23982398 }
23992399 break;
24002400 }
2401- ThrowCompareException(OptionError,UnrecognizedOption,option)
2401+ ThrowCompareException(OptionError,UnrecognizedOption,option);
24022402 }
24032403 case 'c':
24042404 {
@@ -2418,7 +2418,23 @@
24182418 }
24192419 break;
24202420 }
2421- ThrowCompareException(OptionError,UnrecognizedOption,option)
2421+ if (LocaleCompare("compress",option+1) == 0)
2422+ {
2423+ image_info->compression=NoCompression;
2424+ if (*option == '-')
2425+ {
2426+ i++;
2427+ if (i == argc)
2428+ ThrowCompareException(OptionError,MissingArgument,option);
2429+ option=argv[i];
2430+ image_info->compression=StringToCompressionType(option);
2431+ if (image_info->compression == UndefinedCompression)
2432+ ThrowCompareException(OptionError,UnrecognizedImageCompression,
2433+ option);
2434+ }
2435+ break;
2436+ }
2437+ ThrowCompareException(OptionError,UnrecognizedOption,option);
24222438 }
24232439 case 'd':
24242440 {
@@ -2913,6 +2929,7 @@
29132929 (void) puts("Where options include:");
29142930 (void) puts(" -authenticate value decrypt image with this password");
29152931 (void) puts(" -colorspace type alternate image colorspace");
2932+ (void) puts(" -compress type image compression type");
29162933 (void) puts(" -debug events display copious debugging information");
29172934 (void) puts(" -define values coder/decoder specific options");
29182935 (void) puts(" -density geometry horizontal and vertical density of the image");
diff -r fbd0632291cf -r bb05e046dbc1 utilities/gm.1
--- a/utilities/gm.1 Sat Jan 22 11:19:07 2022 -0600
+++ b/utilities/gm.1 Sat Jan 22 14:38:19 2022 -0600
@@ -1,4 +1,4 @@
1-.TH gm 1 "2022/01/08" "GraphicsMagick"
1+.TH gm 1 "2022/01/22" "GraphicsMagick"
22 .TP
33 .in 15
44 .in 15
@@ -5894,6 +5894,9 @@
58945894 .B "-colorspace \fI<value>"\fP
58955895 \fRthe type of colorspace
58965896 .TP
5897+.B "-compress \fI<type>"\fP
5898+\fRthe type of image compression
5899+.TP
58975900 .B "-debug \fI<events>"\fP
58985901 \fRenable debug printout
58995902 .TP
diff -r fbd0632291cf -r bb05e046dbc1 utilities/tests/common.sh
--- a/utilities/tests/common.sh Sat Jan 22 11:19:07 2022 -0600
+++ b/utilities/tests/common.sh Sat Jan 22 14:38:19 2022 -0600
@@ -14,3 +14,10 @@
1414 #CONVERT_FLAGS='-monitor'
1515 #COMPOSITE_FLAGS='-monitor'
1616 #MONTAGE_FLAGS='-monitor'
17+
18+MIFF_COMPRESS=none
19+if [ "${MAGICK_FEATURE_BZLIB}" = "yes" ] ; then
20+ MIFF_COMPRESS=bzip
21+elif [ "${MAGICK_FEATURE_ZLIB}" = "yes" ] ; then
22+ MIFF_COMPRESS=zip
23+fi
diff -r fbd0632291cf -r bb05e046dbc1 utilities/tests/effects.tap
--- a/utilities/tests/effects.tap Sat Jan 22 11:19:07 2022 -0600
+++ b/utilities/tests/effects.tap Sat Jan 22 14:38:19 2022 -0600
@@ -11,11 +11,11 @@
1111
1212 OUTFILE=TileAddNoise_out.miff
1313 rm -f ${OUTFILE}
14-test_command_fn 'AddNoise' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} +noise Laplacian -label AddNoise ${OUTFILE}
14+test_command_fn 'AddNoise' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} +noise Laplacian -label AddNoise -compress ${MIFF_COMPRESS} ${OUTFILE}
1515
1616 OUTFILE=TileAffine_out.miff
1717 rm -f ${OUTFILE}
18-test_command_fn 'Affine' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -affine 1,0,0.785,1,0,0 -transform -label Affine ${OUTFILE}
18+test_command_fn 'Affine' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -affine 1,0,0.785,1,0,0 -transform -label Affine -compress ${MIFF_COMPRESS} ${OUTFILE}
1919
2020 OUTFILE=TileAnnotate_out.miff
2121 ANNOTATE_CMD_FILE=annotate_cmds_out.txt
@@ -24,32 +24,32 @@
2424 test_command_fn 'Annotate' -F TTF ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -fill gold -pointsize 14 \
2525 -font ${GENERIC_TTF} \
2626 -draw @${ANNOTATE_CMD_FILE} \
27- -label Annotate ${OUTFILE}
27+ -label Annotate -compress ${MIFF_COMPRESS} ${OUTFILE}
2828
2929 OUTFILE=TileThresholdBlack_out.miff
3030 rm -f ${OUTFILE}
3131 test_command_fn 'Black-Threshold' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -black-threshold "20%" \
32- -label 'Black-Threshold' ${OUTFILE}
32+ -label 'Black-Threshold' -compress ${MIFF_COMPRESS} ${OUTFILE}
3333
3434 OUTFILE=TileBlur_out.miff
3535 rm -f ${OUTFILE}
36-test_command_fn 'Blur' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -blur 0x1 -label Blur ${OUTFILE}
36+test_command_fn 'Blur' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -blur 0x1 -label Blur -compress ${MIFF_COMPRESS} ${OUTFILE}
3737
3838 OUTFILE=TileBorder_out.miff
3939 rm -f ${OUTFILE}
40-test_command_fn 'Border' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -bordercolor gold -border 6x6 -label Border ${OUTFILE}
40+test_command_fn 'Border' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -bordercolor gold -border 6x6 -label Border -compress ${MIFF_COMPRESS} ${OUTFILE}
4141
4242 OUTFILE=TileChannel_out.miff
4343 rm -f ${OUTFILE}
44-test_command_fn 'Channel' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -colorspace cmyk -channel yellow -label Channel ${OUTFILE}
44+test_command_fn 'Channel' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -colorspace cmyk -channel yellow -label Channel -compress ${MIFF_COMPRESS} ${OUTFILE}
4545
4646 OUTFILE=TileCharcoal_out.miff
4747 rm -f ${OUTFILE}
48-test_command_fn 'Charcoal' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -charcoal 0x1 -label Charcoal ${OUTFILE}
48+test_command_fn 'Charcoal' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -charcoal 0x1 -label Charcoal -compress ${MIFF_COMPRESS} ${OUTFILE}
4949
5050 OUTFILE=TileComposite_out.miff
5151 rm -f ${OUTFILE}
52-test_command_fn 'Composite' ${GM} composite ${COMPOSITE_FLAGS} ${SMILE_MIFF} -geometry +35+65 ${MODEL_MIFF} -label Composite ${OUTFILE}
52+test_command_fn 'Composite' ${GM} composite ${COMPOSITE_FLAGS} ${SMILE_MIFF} -geometry +35+65 ${MODEL_MIFF} -label Composite -compress ${MIFF_COMPRESS} ${OUTFILE}
5353
5454 OUTFILE=TileContrast_out.miff
5555 rm -f ${OUTFILE}
@@ -60,211 +60,211 @@
6060 # 1,1,1,
6161 # 1,4,1,
6262 # 1,1,1
63-test_command_fn 'Convolve' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -convolve 1,1,1,1,4,1,1,1,1 -label Convolve ${OUTFILE}
63+test_command_fn 'Convolve' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -convolve 1,1,1,1,4,1,1,1,1 -label Convolve -compress ${MIFF_COMPRESS} ${OUTFILE}
6464
6565 OUTFILE=TileCrop_out.miff
6666 rm -f ${OUTFILE}
67-test_command_fn 'Crop' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -crop '80x80+25+50' -label Crop ${OUTFILE}
67+test_command_fn 'Crop' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -crop '80x80+25+50' -label Crop -compress ${MIFF_COMPRESS} ${OUTFILE}
6868
6969 OUTFILE=TileDespeckle_out.miff
7070 rm -f ${OUTFILE}
71-test_command_fn 'Despeckle' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -despeckle -label Despeckle ${OUTFILE}
71+test_command_fn 'Despeckle' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -despeckle -label Despeckle -compress ${MIFF_COMPRESS} ${OUTFILE}
7272
7373 OUTFILE=TileDraw_out.miff
7474 DRAWFILE=draw_circle_out.txt
7575 rm -f ${OUTFILE}
7676 echo 'circle 60,90 60,120' > ${DRAWFILE}
7777 test_command_fn 'Draw' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -fill none -stroke gold \
78- -draw @${DRAWFILE} -label Draw ${OUTFILE}
78+ -draw @${DRAWFILE} -label Draw -compress ${MIFF_COMPRESS} ${OUTFILE}
7979 rm -f ${DRAWFILE}
8080
8181 OUTFILE=TileEdge_out.miff
8282 rm -f ${OUTFILE}
83-test_command_fn 'Edge' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -edge 0x1 -label Edge ${OUTFILE}
83+test_command_fn 'Edge' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -edge 0x1 -label Edge -compress ${MIFF_COMPRESS} ${OUTFILE}
8484
8585 OUTFILE=TileEmboss_out.miff
8686 rm -f ${OUTFILE}
87-test_command_fn 'Emboss' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -emboss 0x1 -label Emboss ${OUTFILE}
87+test_command_fn 'Emboss' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -emboss 0x1 -label Emboss -compress ${MIFF_COMPRESS} ${OUTFILE}
8888
8989 OUTFILE=TileEqualize_out.miff
9090 rm -f ${OUTFILE}
91-test_command_fn 'Equalize' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -equalize -label Equalize ${OUTFILE}
91+test_command_fn 'Equalize' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -equalize -label Equalize -compress ${MIFF_COMPRESS} ${OUTFILE}
9292
9393 OUTFILE=TileExplode_out.miff
9494 rm -f ${OUTFILE}
95-test_command_fn 'Explode' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -implode -1 -label Explode ${OUTFILE}
95+test_command_fn 'Explode' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -implode -1 -label Explode -compress ${MIFF_COMPRESS} ${OUTFILE}
9696
9797 OUTFILE=TileFlip_out.miff
9898 rm -f ${OUTFILE}
99-test_command_fn 'Flip' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -flip -label Flip ${OUTFILE}
99+test_command_fn 'Flip' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -flip -label Flip -compress ${MIFF_COMPRESS} ${OUTFILE}
100100
101101 OUTFILE=TileFlop_out.miff
102102 rm -f ${OUTFILE}
103-test_command_fn 'Flop' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -flop -label Flop ${OUTFILE}
103+test_command_fn 'Flop' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -flop -label Flop -compress ${MIFF_COMPRESS} ${OUTFILE}
104104
105105 OUTFILE=TileFrame_out.miff
106106 rm -f ${OUTFILE}
107-test_command_fn 'Frame' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -frame 15x15+3+3 -label Frame ${OUTFILE}
107+test_command_fn 'Frame' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -frame 15x15+3+3 -label Frame -compress ${MIFF_COMPRESS} ${OUTFILE}
108108
109109 OUTFILE=TileGamma_out.miff
110110 rm -f ${OUTFILE}
111-test_command_fn 'Gamma' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -gamma 1.6 -label Gamma ${OUTFILE}
111+test_command_fn 'Gamma' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -gamma 1.6 -label Gamma -compress ${MIFF_COMPRESS} ${OUTFILE}
112112
113113 OUTFILE=TileGaussianBlur_out.miff
114114 rm -f ${OUTFILE}
115-test_command_fn 'GaussianBlur' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -gaussian 0x1.5 -label GaussianBlur ${OUTFILE}
115+test_command_fn 'GaussianBlur' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -gaussian 0x1.5 -label GaussianBlur -compress ${MIFF_COMPRESS} ${OUTFILE}
116116
117117 OUTFILE=TileGradient_out.miff
118118 rm -f ${OUTFILE}
119-test_command_fn 'Gradient' ${GM} convert ${CONVERT_FLAGS} -size 130x194 gradient:'#20a0ff-#ffff00' -label Gradient ${OUTFILE}
119+test_command_fn 'Gradient' ${GM} convert ${CONVERT_FLAGS} -size 130x194 gradient:'#20a0ff-#ffff00' -label Gradient -compress ${MIFF_COMPRESS} ${OUTFILE}
120120
121121 OUTFILE=TileGrayscale_out.miff
122122 rm -f ${OUTFILE}
123-test_command_fn 'Grayscale' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -colorspace gray -label Grayscale ${OUTFILE}
123+test_command_fn 'Grayscale' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -colorspace gray -label Grayscale -compress ${MIFF_COMPRESS} ${OUTFILE}
124124
125125 OUTFILE=TileImplode_out.miff
126126 rm -f ${OUTFILE}
127-test_command_fn 'Implode' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -implode 0.5 -label Implode ${OUTFILE}
127+test_command_fn 'Implode' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -implode 0.5 -label Implode -compress ${MIFF_COMPRESS} ${OUTFILE}
128128
129129 OUTFILE=TileLevel_out.miff
130130 rm -f ${OUTFILE}
131-test_command_fn 'Level' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -level 10%,1.2,90% -label Level ${OUTFILE}
131+test_command_fn 'Level' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -level 10%,1.2,90% -label Level -compress ${MIFF_COMPRESS} ${OUTFILE}
132132
133133 rm -f mask_out.miff TileMask_out.miff
134-${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -threshold "30%" mask_out.miff
135-test_command_fn 'Mask' ${GM} convert ${CONVERT_FLAGS} -mask mask_out.miff ${MODEL_MIFF} -negate -label Mask TileMask_out.miff
134+${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -threshold "30%" -compress ${MIFF_COMPRESS} mask_out.miff
135+test_command_fn 'Mask' ${GM} convert ${CONVERT_FLAGS} -mask mask_out.miff ${MODEL_MIFF} -negate -label Mask -compress ${MIFF_COMPRESS} TileMask_out.miff
136136
137137 OUTFILE=TileMedian_out.miff
138138 rm -f ${OUTFILE}
139-test_command_fn 'MedianFilter' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -median 3 -label MedianFilter ${OUTFILE}
139+test_command_fn 'MedianFilter' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -median 3 -label MedianFilter -compress ${MIFF_COMPRESS} ${OUTFILE}
140140
141141 OUTFILE=TileModulate_out.miff
142142 rm -f ${OUTFILE}
143-test_command_fn 'Modulate' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -modulate 110/110/110 -label Modulate ${OUTFILE}
143+test_command_fn 'Modulate' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -modulate 110/110/110 -label Modulate -compress ${MIFF_COMPRESS} ${OUTFILE}
144144
145145 OUTFILE=TileMonochrome_out.miff
146146 rm -f ${OUTFILE}
147147 test_command_fn 'Monochrome' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -colorspace gray -colors 2 \
148- +dither -label Monochrome ${OUTFILE}
148+ +dither -label Monochrome -compress ${MIFF_COMPRESS} ${OUTFILE}
149149
150150 OUTFILE=TileNegate_out.miff
151151 rm -f ${OUTFILE}
152-test_command_fn 'Negate' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -negate -label Negate ${OUTFILE}
152+test_command_fn 'Negate' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -negate -label Negate -compress ${MIFF_COMPRESS} ${OUTFILE}
153153
154154 OUTFILE=TileNormalize_out.miff
155155 rm -f ${OUTFILE}
156-test_command_fn 'Normalize' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -normalize -label Normalize ${OUTFILE}
156+test_command_fn 'Normalize' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -normalize -label Normalize -compress ${MIFF_COMPRESS} ${OUTFILE}
157157
158158 OUTFILE=TileOilPaint_out.miff
159159 rm -f ${OUTFILE}
160-test_command_fn 'Oilpaint' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -paint 0x1 -label Oilpaint ${OUTFILE}
160+test_command_fn 'Oilpaint' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -paint 0x1 -label Oilpaint -compress ${MIFF_COMPRESS} ${OUTFILE}
161161
162162 OUTFILE=TileOrderedDither2_out.miff
163163 rm -f ${OUTFILE}
164-test_command_fn 'Ordered2x2' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -equalize -ordered-dither intensity 2x2 -label Ordered2x2 ${OUTFILE}
164+test_command_fn 'Ordered2x2' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -equalize -ordered-dither intensity 2x2 -label Ordered2x2 -compress ${MIFF_COMPRESS} ${OUTFILE}
165165
166166 OUTFILE=TileOrderedDither3_out.miff
167167 rm -f ${OUTFILE}
168-test_command_fn 'Ordered3x3' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -equalize -ordered-dither intensity 3x3 -label Ordered3x3 ${OUTFILE}
168+test_command_fn 'Ordered3x3' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -equalize -ordered-dither intensity 3x3 -label Ordered3x3 -compress ${MIFF_COMPRESS} ${OUTFILE}
169169
170170 OUTFILE=TileOrderedDither4_out.miff
171171 rm -f ${OUTFILE}
172-test_command_fn 'Ordered4x4' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -equalize -ordered-dither intensity 4x4 -label Ordered4x4 ${OUTFILE}
172+test_command_fn 'Ordered4x4' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -equalize -ordered-dither intensity 4x4 -label Ordered4x4 -compress ${MIFF_COMPRESS} ${OUTFILE}
173173
174174 OUTFILE=TilePlasma_out.miff
175175 rm -f ${OUTFILE}
176-test_command_fn 'Plasma' ${GM} convert ${CONVERT_FLAGS} -size 130x194 plasma:fractal -label Plasma ${OUTFILE}
176+test_command_fn 'Plasma' ${GM} convert ${CONVERT_FLAGS} -size 130x194 plasma:fractal -label Plasma -compress ${MIFF_COMPRESS} ${OUTFILE}
177177
178178 OUTFILE=TileQuantize_out.miff
179179 rm -f ${OUTFILE}
180-test_command_fn 'Quantize' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -colors 16 -label Quantize ${OUTFILE}
180+test_command_fn 'Quantize' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -colors 16 -label Quantize -compress ${MIFF_COMPRESS} ${OUTFILE}
181181
182182 OUTFILE=TileRaise_out.miff
183183 rm -f ${OUTFILE}
184-test_command_fn 'Raise' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -raise 10x10 -label Raise ${OUTFILE}
184+test_command_fn 'Raise' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -raise 10x10 -label Raise -compress ${MIFF_COMPRESS} ${OUTFILE}
185185
186186 OUTFILE=TileRandomThreshold_out.miff
187187 rm -f ${OUTFILE}
188-test_command_fn 'Random 10%' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -equalize -random-threshold intensity '10%' -label 'Random10%%' ${OUTFILE}
188+test_command_fn 'Random 10%' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -equalize -random-threshold intensity '10%' -label 'Random10%%' -compress ${MIFF_COMPRESS} ${OUTFILE}
189189
190190 OUTFILE=TileRecolor_out.miff
191191 MATRIXFILE=recolor_matrix_out.txt
192192 echo '0.9 0 0, 0 0.9 0, 0 0 1.2' > ${MATRIXFILE}
193193 rm -f ${OUTFILE}
194-test_command_fn 'Recolor' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -recolor @${MATRIXFILE} -label Recolor ${OUTFILE}
194+test_command_fn 'Recolor' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -recolor @${MATRIXFILE} -label Recolor -compress ${MIFF_COMPRESS} ${OUTFILE}
195195 rm -f ${MATRIXFILE}
196196
197197 OUTFILE=TileReduceNoise_out.miff
198198 rm -f ${OUTFILE}
199-test_command_fn 'ReduceNoise' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -noise 0x1 -label ReduceNoise ${OUTFILE}
199+test_command_fn 'ReduceNoise' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -noise 0x1 -label ReduceNoise -compress ${MIFF_COMPRESS} ${OUTFILE}
200200
201201 OUTFILE=TileResize_out.miff
202202 rm -f ${OUTFILE}
203-test_command_fn 'Resize' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -resize 50% -label Resize ${OUTFILE}
203+test_command_fn 'Resize' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -resize 50% -label Resize -compress ${MIFF_COMPRESS} ${OUTFILE}
204204
205205 OUTFILE=TileRoll_out.miff
206206 rm -f ${OUTFILE}
207-test_command_fn 'Roll' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -roll +20+10 -label Roll ${OUTFILE}
207+test_command_fn 'Roll' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -roll +20+10 -label Roll -compress ${MIFF_COMPRESS} ${OUTFILE}
208208
209209 OUTFILE=TileRotate_out.miff
210210 rm -f ${OUTFILE}
211211 test_command_fn 'Rotate 45' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -fill black -rotate 45 \
212- -transparent black -label Rotate ${OUTFILE}
212+ -transparent black -label Rotate -compress ${MIFF_COMPRESS} ${OUTFILE}
213213
214214 OUTFILE=TileScale_out.miff
215215 rm -f ${OUTFILE}
216-test_command_fn 'Scale' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -scale 60% -label Scale ${OUTFILE}
216+test_command_fn 'Scale' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -scale 60% -label Scale -compress ${MIFF_COMPRESS} ${OUTFILE}
217217
218218 OUTFILE=TileSegment_out.miff
219219 rm -f ${OUTFILE}
220-test_command_fn 'Segment' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -segment 0.5x0.25 -label Segment ${OUTFILE}
220+test_command_fn 'Segment' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -segment 0.5x0.25 -label Segment -compress ${MIFF_COMPRESS} ${OUTFILE}
221221
222222 OUTFILE=TileShade_out.miff
223223 rm -f ${OUTFILE}
224-test_command_fn 'Shade' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -shade 30x30 -label Shade ${OUTFILE}
224+test_command_fn 'Shade' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -shade 30x30 -label Shade -compress ${MIFF_COMPRESS} ${OUTFILE}
225225
226226 OUTFILE=TileSharpen_out.miff
227227 rm -f ${OUTFILE}
228-test_command_fn 'Sharpen' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -sharpen 0x1 -label Sharpen ${OUTFILE}
228+test_command_fn 'Sharpen' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -sharpen 0x1 -label Sharpen -compress ${MIFF_COMPRESS} ${OUTFILE}
229229
230230 OUTFILE=TileShave_out.miff
231231 rm -f ${OUTFILE}
232-test_command_fn 'Shave' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -shave 10x10 -label Shave ${OUTFILE}
232+test_command_fn 'Shave' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -shave 10x10 -label Shave -compress ${MIFF_COMPRESS} ${OUTFILE}
233233
234234 OUTFILE=TileShear_out.miff
235235 rm -f ${OUTFILE}
236236 test_command_fn 'Shear' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -fill black -shear 45x45 \
237- -transparent black -label Shear ${OUTFILE}
237+ -transparent black -label Shear -compress ${MIFF_COMPRESS} ${OUTFILE}
238238
239239 OUTFILE=TileSolar_out.miff
240240 rm -f ${OUTFILE}
241-test_command_fn 'Solarize' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -solarize 50% -label Solarize ${OUTFILE}
241+test_command_fn 'Solarize' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -solarize 50% -label Solarize -compress ${MIFF_COMPRESS} ${OUTFILE}
242242
243243 OUTFILE=TileSpread_out.miff
244244 rm -f ${OUTFILE}
245-test_command_fn 'Spread' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -spread 3 -label Spread ${OUTFILE}
245+test_command_fn 'Spread' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -spread 3 -label Spread -compress ${MIFF_COMPRESS} ${OUTFILE}
246246
247247 OUTFILE=TileSwirl_out.miff
248248 rm -f ${OUTFILE}
249249 test_command_fn 'Swirl' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -background '#000000FF' \
250- -swirl 90 -label Swirl ${OUTFILE}
250+ -swirl 90 -label Swirl -compress ${MIFF_COMPRESS} ${OUTFILE}
251251
252252 OUTFILE=TileThreshold_out.miff
253253 rm -f ${OUTFILE}
254254 test_command_fn 'Threshold' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -threshold "35%" \
255- -label Threshold ${OUTFILE}
255+ -label Threshold -compress ${MIFF_COMPRESS} ${OUTFILE}
256256
257257 OUTFILE=TileUnsharpMask_out.miff
258258 rm -f ${OUTFILE}
259-test_command_fn 'UnsharpMask' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -unsharp 0x1+10+10 -label UnsharpMask ${OUTFILE}
259+test_command_fn 'UnsharpMask' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -unsharp 0x1+10+10 -label UnsharpMask -compress ${MIFF_COMPRESS} ${OUTFILE}
260260
261261 OUTFILE=TileWave_out.miff
262262 rm -f ${OUTFILE}
263263 test_command_fn 'Wave' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -background '#000000FF' \
264- -wave 25x150 -label Wave ${OUTFILE}
264+ -wave 25x150 -label Wave -compress ${MIFF_COMPRESS} ${OUTFILE}
265265
266266 OUTFILE=TileThresholdWhite_out.miff
267267 rm -f ${OUTFILE}
268268 test_command_fn 'White-Threshold' ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -white-threshold "80%" \
269- -label 'White-Threshold' ${OUTFILE}
269+ -label 'White-Threshold' -compress ${MIFF_COMPRESS} ${OUTFILE}
270270 :
diff -r fbd0632291cf -r bb05e046dbc1 utilities/tests/hald-clut.tap
--- a/utilities/tests/hald-clut.tap Sat Jan 22 11:19:07 2022 -0600
+++ b/utilities/tests/hald-clut.tap Sat Jan 22 14:38:19 2022 -0600
@@ -17,8 +17,8 @@
1717 echo "Testing Hald CLUT identity level ${level} ..."
1818 identity_image=identity:${level}
1919 rm -f ${OUTFILE}
20- test_command_fn 'Hald CLUT identity' ${GM} convert ${CONVERT_FLAGS} ${identity_image} -hald-clut ${identity_image} -label Hald-Clut ${OUTFILE}
21- test_command_fn 'Hald CLUT verify' ${GM} compare -maximum-error 1.5e-11 -metric MAE ${identity_image} ${OUTFILE}
20+ test_command_fn 'Hald CLUT identity' ${GM} convert ${CONVERT_FLAGS} ${identity_image} -hald-clut ${identity_image} -label Hald-Clut -compress ${MIFF_COMPRESS} ${OUTFILE}
21+ test_command_fn 'Hald CLUT verify' ${GM} compare -maximum-error 1.5e-11 -metric MAE ${identity_image} -compress ${MIFF_COMPRESS} ${OUTFILE}
2222 echo
2323 done
2424
@@ -28,8 +28,8 @@
2828 REFERENCE_OUTPUT=HaldClutTransformRef_out.miff
2929 XFORM_CLUT=HaldClutTransformCLUT_out.miff
3030
31-eval ${GM} convert ${IDENTITY_CLUT} ${XFORM} ${XFORM_CLUT}
32-eval ${GM} convert ${MODEL_MIFF} ${XFORM} ${REFERENCE_OUTPUT}
33-test_command_fn 'Hald CLUT emulate negate' ${GM} convert ${MODEL_MIFF} -hald-clut ${XFORM_CLUT} ${CLUT_OUTPUT}
34-test_command_fn 'Hald CLUT verify' ${GM} compare -maximum-error 4.0e-12 -metric MAE ${REFERENCE_OUTPUT} ${CLUT_OUTPUT}
31+eval ${GM} convert ${IDENTITY_CLUT} ${XFORM} -compress ${MIFF_COMPRESS} ${XFORM_CLUT}
32+eval ${GM} convert ${MODEL_MIFF} ${XFORM} -compress ${MIFF_COMPRESS} ${REFERENCE_OUTPUT}
33+test_command_fn 'Hald CLUT emulate negate' ${GM} convert ${MODEL_MIFF} -hald-clut ${XFORM_CLUT} -compress ${MIFF_COMPRESS} ${CLUT_OUTPUT}
34+test_command_fn 'Hald CLUT verify' ${GM} compare -maximum-error 4.0e-12 -metric MAE ${REFERENCE_OUTPUT} -compress ${MIFF_COMPRESS} ${CLUT_OUTPUT}
3535 :
diff -r fbd0632291cf -r bb05e046dbc1 utilities/tests/icc-transform.tap
--- a/utilities/tests/icc-transform.tap Sat Jan 22 11:19:07 2022 -0600
+++ b/utilities/tests/icc-transform.tap Sat Jan 22 14:38:19 2022 -0600
@@ -14,7 +14,7 @@
1414 rm -f ${ORIGINAL_PROFILE}
1515 rm -f ${IMAGE_OUTPUT}
1616 test_command_fn 'Extract ICC profile' ${GM} convert ${SUNRISE_MIFF} ${ORIGINAL_PROFILE}
17-test_command_fn 'Apply ICC profile and then reverse it' -F LCMS ${GM} convert ${SUNRISE_MIFF} -profile ${BETARGB_PROFILE} -profile ${ORIGINAL_PROFILE} ${IMAGE_OUTPUT}
17+test_command_fn 'Apply ICC profile and then reverse it' -F LCMS ${GM} convert ${SUNRISE_MIFF} -profile ${BETARGB_PROFILE} -profile ${ORIGINAL_PROFILE} -compress ${MIFF_COMPRESS} ${IMAGE_OUTPUT}
1818 test_command_fn 'Verify results' ${GM} compare -maximum-error 0.004 -metric MAE ${SUNRISE_MIFF} ${IMAGE_OUTPUT}
1919 rm -f ${ORIGINAL_PROFILE}
2020 rm -f ${IMAGE_OUTPUT}
diff -r fbd0632291cf -r bb05e046dbc1 utilities/tests/montage.tap
--- a/utilities/tests/montage.tap Sat Jan 22 11:19:07 2022 -0600
+++ b/utilities/tests/montage.tap Sat Jan 22 14:38:19 2022 -0600
@@ -12,7 +12,7 @@
1212 -bordercolor 'green' -borderwidth 1x1 -tile '7x4' -compose 'over' \
1313 -background '#ffffff' -font ${GENERIC_TTF} -pointsize 18 -fill '#600' \
1414 -stroke 'none' null: null: null: null: null: null: null: 'Tile*_out.miff' \
15- -compress rle montage_out.miff
16-test_command_fn 'Prepare logo' ${GM} convert ${CONVERT_FLAGS} logo: -resize 40% logo_out.miff
17-test_command_fn 'Composite logo' ${GM} composite ${COMPOSITE_FLAGS} 'tmp:logo_out.miff' -gravity north 'tmp:montage_out.miff' -depth 8 demo.miff
15+ -compress ${MIFF_COMPRESS} montage_out.miff
16+test_command_fn 'Prepare logo' ${GM} convert ${CONVERT_FLAGS} logo: -resize 40% -compress ${MIFF_COMPRESS} logo_out.miff
17+test_command_fn 'Composite logo' ${GM} composite ${COMPOSITE_FLAGS} 'tmp:logo_out.miff' -gravity north 'tmp:montage_out.miff' -depth 8 -compress ${MIFF_COMPRESS} demo.miff
1818 :
diff -r fbd0632291cf -r bb05e046dbc1 utilities/tests/preview.tap
--- a/utilities/tests/preview.tap Sat Jan 22 11:19:07 2022 -0600
+++ b/utilities/tests/preview.tap Sat Jan 22 14:38:19 2022 -0600
@@ -17,6 +17,6 @@
1717 do
1818 OUTFILE="Preview${preview}_out.miff"
1919 rm -f ${OUTFILE}
20- test_command_fn "${preview}" ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -preview ${preview} "preview:${OUTFILE}"
20+ test_command_fn "${preview}" ${GM} convert ${CONVERT_FLAGS} ${MODEL_MIFF} -preview ${preview} -compress ${MIFF_COMPRESS} "preview:${OUTFILE}"
2121 done
2222 :
diff -r fbd0632291cf -r bb05e046dbc1 www/compare.html
--- a/www/compare.html Sat Jan 22 11:19:07 2022 -0600
+++ b/www/compare.html Sat Jan 22 14:38:19 2022 -0600
@@ -174,6 +174,17 @@
174174 ALT=">" BORDER=0 height=14
175175 width=15><b><font face="Helvetica, Arial"
176176 ><font color="#00B04F"><font size="+1">
177+ <a href="GraphicsMagick.html#details-compress">-compress</a> <i>&lt;type&gt;</i>
178+</font></font></font></b></td></tr></table>
179+<table width="90%" border="0" cellspacing="0" cellpadding="8"> <tr><td width="6%"><br></td><td>the type of image compression</td></tr></table>
180+<table BORDER=0 WIDTH="94%">
181+<tr>
182+<td width="3%"><br></td>
183+<td ALIGN=LEFT BGCOLOR="#FFFFFF">
184+<img SRC="images/right_triangle_option.png"
185+ALT=">" BORDER=0 height=14
186+width=15><b><font face="Helvetica, Arial"
187+><font color="#00B04F"><font size="+1">
177188 -debug <i>&lt;events&gt;</i>
178189 </font></font></font></b></td></tr></table>
179190 <table width="90%" border="0" cellspacing="0" cellpadding="8"> <tr><td width="6%"><br></td><td>enable debug printout</td></tr></table>
diff -r fbd0632291cf -r bb05e046dbc1 www/gm.html
--- a/www/gm.html Sat Jan 22 11:19:07 2022 -0600
+++ b/www/gm.html Sat Jan 22 14:38:19 2022 -0600
@@ -7777,6 +7777,17 @@
77777777 ALT=">" BORDER=0 height=14
77787778 width=15><b><font face="Helvetica, Arial"
77797779 ><font color="#00B04F"><font size="+1">
7780+ <a href="GraphicsMagick.html#details-compress">-compress</a> <i>&lt;type&gt;</i>
7781+</font></font></font></b></td></tr></table>
7782+<table width="90%" border="0" cellspacing="0" cellpadding="8"> <tr><td width="6%"><br></td><td>the type of image compression</td></tr></table>
7783+<table BORDER=0 WIDTH="94%">
7784+<tr>
7785+<td width="3%"><br></td>
7786+<td ALIGN=LEFT BGCOLOR="#FFFFFF">
7787+<img SRC="images/right_triangle_option.png"
7788+ALT=">" BORDER=0 height=14
7789+width=15><b><font face="Helvetica, Arial"
7790+><font color="#00B04F"><font size="+1">
77807791 -debug <i>&lt;events&gt;</i>
77817792 </font></font></font></b></td></tr></table>
77827793 <table width="90%" border="0" cellspacing="0" cellpadding="8"> <tr><td width="6%"><br></td><td>enable debug printout</td></tr></table>
Show on old repository browser