From 0555419e532766d215e558de832fcd079969493b Mon Sep 17 00:00:00 2001 From: GitHub Date: Tue, 5 Dec 2023 01:22:55 +0000 Subject: [PATCH] Update ImageMagick from 7.1.1-21 -> 7.1.1-22 --- Android.mk | 2 +- .../Magick++/lib/Blob.cpp | 0 .../Magick++/lib/BlobRef.cpp | 0 .../Magick++/lib/CoderInfo.cpp | 0 .../Magick++/lib/Color.cpp | 0 .../Magick++/lib/Drawable.cpp | 0 .../Magick++/lib/Exception.cpp | 0 .../Magick++/lib/Functions.cpp | 0 .../Magick++/lib/Geometry.cpp | 0 .../Magick++/lib/Image.cpp | 0 .../Magick++/lib/ImageRef.cpp | 0 .../Magick++/lib/Magick++.h | 0 .../Magick++/lib/Magick++/Blob.h | 0 .../Magick++/lib/Magick++/BlobRef.h | 0 .../Magick++/lib/Magick++/CoderInfo.h | 0 .../Magick++/lib/Magick++/Color.h | 0 .../Magick++/lib/Magick++/Drawable.h | 0 .../Magick++/lib/Magick++/Exception.h | 0 .../Magick++/lib/Magick++/Functions.h | 0 .../Magick++/lib/Magick++/Geometry.h | 0 .../Magick++/lib/Magick++/Image.h | 0 .../Magick++/lib/Magick++/ImageRef.h | 0 .../Magick++/lib/Magick++/Include.h | 0 .../Magick++/lib/Magick++/Montage.h | 0 .../Magick++/lib/Magick++/Options.h | 0 .../Magick++/lib/Magick++/Pixels.h | 0 .../Magick++/lib/Magick++/ResourceLimits.h | 0 .../Magick++/lib/Magick++/STL.h | 0 .../Magick++/lib/Magick++/SecurityPolicy.h | 0 .../Magick++/lib/Magick++/Statistic.h | 0 .../Magick++/lib/Magick++/Thread.h | 0 .../Magick++/lib/Magick++/TypeMetric.h | 0 .../Magick++/lib/Montage.cpp | 0 .../Magick++/lib/Options.cpp | 0 .../Magick++/lib/Pixels.cpp | 0 .../Magick++/lib/ResourceLimits.cpp | 0 .../Magick++/lib/STL.cpp | 0 .../Magick++/lib/SecurityPolicy.cpp | 0 .../Magick++/lib/Statistic.cpp | 0 .../Magick++/lib/Thread.cpp | 0 .../Magick++/lib/TypeMetric.cpp | 0 .../MagickCore/MagickCore.h | 0 .../MagickCore/accelerate-kernels-private.h | 0 .../MagickCore/accelerate-private.h | 0 .../MagickCore/accelerate.c | 0 .../MagickCore/animate-private.h | 0 .../MagickCore/animate.c | 62 ++-- .../MagickCore/animate.h | 0 .../MagickCore/annotate-private.h | 0 .../MagickCore/annotate.c | 0 .../MagickCore/annotate.h | 0 .../MagickCore/artifact.c | 0 .../MagickCore/artifact.h | 0 .../MagickCore/attribute.c | 16 +- .../MagickCore/attribute.h | 0 .../MagickCore/blob-private.h | 0 .../MagickCore/blob.c | 49 ++- .../MagickCore/blob.h | 0 .../MagickCore/cache-private.h | 11 + .../MagickCore/cache-view.c | 0 .../MagickCore/cache-view.h | 0 .../MagickCore/cache.c | 83 ++--- .../MagickCore/cache.h | 0 .../MagickCore/channel.c | 6 +- .../MagickCore/channel.h | 0 .../MagickCore/cipher.c | 0 .../MagickCore/cipher.h | 0 .../MagickCore/client.c | 0 .../MagickCore/client.h | 0 .../MagickCore/coder-private.h | 0 .../MagickCore/coder.c | 0 .../MagickCore/coder.h | 0 .../MagickCore/color-private.h | 0 .../MagickCore/color.c | 0 .../MagickCore/color.h | 0 .../MagickCore/colormap-private.h | 0 .../MagickCore/colormap.c | 0 .../MagickCore/colormap.h | 0 .../MagickCore/colorspace-private.h | 0 .../MagickCore/colorspace.c | 20 +- .../MagickCore/colorspace.h | 0 .../MagickCore/compare.c | 0 .../MagickCore/compare.h | 0 .../MagickCore/composite-private.h | 0 .../MagickCore/composite.c | 0 .../MagickCore/composite.h | 0 .../MagickCore/compress.c | 0 .../MagickCore/compress.h | 0 .../MagickCore/configure-private.h | 0 .../MagickCore/configure.c | 0 .../MagickCore/configure.h | 0 .../MagickCore/constitute-private.h | 0 .../MagickCore/constitute.c | 6 +- .../MagickCore/constitute.h | 0 .../MagickCore/decorate.c | 0 .../MagickCore/decorate.h | 0 .../MagickCore/delegate-private.h | 0 .../MagickCore/delegate.c | 1 - .../MagickCore/delegate.h | 0 .../MagickCore/deprecate.c | 0 .../MagickCore/deprecate.h | 0 .../MagickCore/display-private.h | 0 .../MagickCore/display.c | 82 ++--- .../MagickCore/display.h | 0 .../MagickCore/distort.c | 0 .../MagickCore/distort.h | 0 .../MagickCore/distribute-cache-private.h | 0 .../MagickCore/distribute-cache.c | 0 .../MagickCore/distribute-cache.h | 0 .../MagickCore/draw-private.h | 0 .../MagickCore/draw.c | 5 +- .../MagickCore/draw.h | 0 .../MagickCore/effect.c | 0 .../MagickCore/effect.h | 0 .../MagickCore/enhance.c | 0 .../MagickCore/enhance.h | 0 .../MagickCore/exception-private.h | 0 .../MagickCore/exception.c | 0 .../MagickCore/exception.h | 0 .../MagickCore/feature.c | 3 +- .../MagickCore/feature.h | 0 .../MagickCore/fourier.c | 0 .../MagickCore/fourier.h | 0 .../MagickCore/fx-private.h | 0 .../MagickCore/fx.c | 0 .../MagickCore/fx.h | 0 .../MagickCore/gem-private.h | 0 .../MagickCore/gem.c | 0 .../MagickCore/gem.h | 0 .../MagickCore/geometry-private.h | 0 .../MagickCore/geometry.c | 0 .../MagickCore/geometry.h | 0 .../MagickCore/histogram.c | 176 ++++----- .../MagickCore/histogram.h | 0 .../MagickCore/identify.c | 263 ++++++++------ .../MagickCore/identify.h | 0 .../MagickCore/image-private.h | 0 .../MagickCore/image-view.c | 0 .../MagickCore/image-view.h | 0 .../MagickCore/image.c | 3 +- .../MagickCore/image.h | 0 .../MagickCore/layer.c | 0 .../MagickCore/layer.h | 0 .../MagickCore/linked-list-private.h | 0 .../MagickCore/linked-list.c | 0 .../MagickCore/linked-list.h | 0 .../MagickCore/list.c | 6 +- .../MagickCore/list.h | 0 .../MagickCore/locale-private.h | 0 .../MagickCore/locale.c | 0 .../MagickCore/locale_.h | 0 .../MagickCore/log-private.h | 0 .../MagickCore/log.c | 0 .../MagickCore/log.h | 0 .../MagickCore/magic-private.h | 0 .../MagickCore/magic.c | 0 .../MagickCore/magic.h | 0 .../MagickCore/magick-config.h | 0 .../MagickCore/magick-private.h | 0 .../MagickCore/magick-type.h | 0 .../MagickCore/magick.c | 0 .../MagickCore/magick.h | 0 .../MagickCore/matrix-private.h | 0 .../MagickCore/matrix.c | 0 .../MagickCore/matrix.h | 0 .../MagickCore/memory-private.h | 3 +- .../MagickCore/memory.c | 27 ++ .../MagickCore/memory_.h | 0 .../MagickCore/method-attribute.h | 0 .../MagickCore/methods.h | 0 .../MagickCore/mime-private.h | 0 .../MagickCore/mime.c | 0 .../MagickCore/mime.h | 0 .../MagickCore/module-private.h | 0 .../MagickCore/module.c | 0 .../MagickCore/module.h | 0 .../MagickCore/monitor-private.h | 0 .../MagickCore/monitor.c | 0 .../MagickCore/monitor.h | 0 .../MagickCore/montage.c | 0 .../MagickCore/montage.h | 0 .../MagickCore/morphology-private.h | 0 .../MagickCore/morphology.c | 0 .../MagickCore/morphology.h | 0 .../MagickCore/mutex.h | 0 .../MagickCore/nt-base-private.h | 1 + .../MagickCore/nt-base.c | 60 +++- .../MagickCore/nt-base.h | 0 .../MagickCore/nt-feature.c | 0 .../MagickCore/nt-feature.h | 0 .../MagickCore/opencl-private.h | 0 .../MagickCore/opencl.c | 24 +- .../MagickCore/opencl.h | 0 .../MagickCore/option-private.h | 0 .../MagickCore/option.c | 0 .../MagickCore/option.h | 0 .../MagickCore/paint.c | 0 .../MagickCore/paint.h | 0 .../MagickCore/pixel-accessor.h | 0 .../MagickCore/pixel-private.h | 0 .../MagickCore/pixel.c | 0 .../MagickCore/pixel.h | 0 .../MagickCore/policy-private.h | 0 .../MagickCore/policy.c | 14 +- .../MagickCore/policy.h | 0 .../MagickCore/prepress.c | 0 .../MagickCore/prepress.h | 0 .../MagickCore/profile-private.h | 0 .../MagickCore/profile.c | 18 +- .../MagickCore/profile.h | 0 .../MagickCore/property.c | 3 +- .../MagickCore/property.h | 0 .../MagickCore/quantize.c | 337 +++++++++--------- .../MagickCore/quantize.h | 0 .../MagickCore/quantum-export.c | 0 .../MagickCore/quantum-import.c | 0 .../MagickCore/quantum-private.h | 0 .../MagickCore/quantum.c | 0 .../MagickCore/quantum.h | 0 .../MagickCore/random-private.h | 0 .../MagickCore/random.c | 0 .../MagickCore/random_.h | 0 .../MagickCore/registry-private.h | 0 .../MagickCore/registry.c | 0 .../MagickCore/registry.h | 0 .../MagickCore/resample-private.h | 0 .../MagickCore/resample.c | 0 .../MagickCore/resample.h | 0 .../MagickCore/resize-private.h | 0 .../MagickCore/resize.c | 0 .../MagickCore/resize.h | 0 .../MagickCore/resource-private.h | 0 .../MagickCore/resource.c | 6 +- .../MagickCore/resource_.h | 0 .../MagickCore/segment.c | 0 .../MagickCore/segment.h | 0 .../MagickCore/semaphore-private.h | 0 .../MagickCore/semaphore.c | 0 .../MagickCore/semaphore.h | 0 .../MagickCore/shear.c | 0 .../MagickCore/shear.h | 0 .../MagickCore/signature-private.h | 0 .../MagickCore/signature.c | 0 .../MagickCore/signature.h | 0 .../MagickCore/splay-tree.c | 0 .../MagickCore/splay-tree.h | 0 .../MagickCore/static.c | 0 .../MagickCore/static.h | 0 .../MagickCore/statistic-private.h | 0 .../MagickCore/statistic.c | 1 + .../MagickCore/statistic.h | 0 .../MagickCore/stream-private.h | 0 .../MagickCore/stream.c | 0 .../MagickCore/stream.h | 0 .../MagickCore/string-private.h | 0 .../MagickCore/string.c | 4 + .../MagickCore/string_.h | 0 .../MagickCore/studio.h | 0 .../MagickCore/thread-private.h | 0 .../MagickCore/thread.c | 0 .../MagickCore/thread_.h | 0 .../MagickCore/threshold.c | 0 .../MagickCore/threshold.h | 0 .../MagickCore/timer-private.h | 0 .../MagickCore/timer.c | 0 .../MagickCore/timer.h | 0 .../MagickCore/token-private.h | 0 .../MagickCore/token.c | 0 .../MagickCore/token.h | 0 .../MagickCore/transform-private.h | 0 .../MagickCore/transform.c | 0 .../MagickCore/transform.h | 0 .../MagickCore/type-private.h | 0 .../MagickCore/type.c | 0 .../MagickCore/type.h | 0 .../MagickCore/utility-private.h | 0 .../MagickCore/utility.c | 0 .../MagickCore/utility.h | 0 .../MagickCore/version-private.h | 0 .../MagickCore/version.c | 0 .../MagickCore/vision.c | 0 .../MagickCore/vision.h | 0 .../MagickCore/visual-effects.c | 28 +- .../MagickCore/visual-effects.h | 0 .../MagickCore/vms.c | 0 .../MagickCore/vms.h | 0 .../MagickCore/widget-private.h | 0 .../MagickCore/widget.c | 0 .../MagickCore/widget.h | 0 .../MagickCore/xml-tree-private.h | 0 .../MagickCore/xml-tree.c | 0 .../MagickCore/xml-tree.h | 0 .../MagickCore/xwindow-private.h | 0 .../MagickCore/xwindow.c | 0 .../MagickCore/xwindow.h | 0 .../MagickWand/MagickWand.h | 0 .../MagickWand/animate.c | 0 .../MagickWand/animate.h | 0 .../MagickWand/compare.c | 0 .../MagickWand/compare.h | 0 .../MagickWand/composite.c | 0 .../MagickWand/composite.h | 0 .../MagickWand/conjure.c | 0 .../MagickWand/conjure.h | 0 .../MagickWand/convert.c | 0 .../MagickWand/convert.h | 0 .../MagickWand/deprecate.c | 0 .../MagickWand/deprecate.h | 0 .../MagickWand/display.c | 0 .../MagickWand/display.h | 0 .../MagickWand/drawing-wand.c | 0 .../MagickWand/drawing-wand.h | 0 .../MagickWand/identify.c | 0 .../MagickWand/identify.h | 0 .../MagickWand/import.c | 0 .../MagickWand/import.h | 0 .../MagickWand/magick-cli.c | 0 .../MagickWand/magick-cli.h | 0 .../MagickWand/magick-image.c | 0 .../MagickWand/magick-image.h | 0 .../MagickWand/magick-property.c | 0 .../MagickWand/magick-property.h | 0 .../MagickWand/magick-wand-private.h | 0 .../MagickWand/magick-wand.c | 0 .../MagickWand/method-attribute.h | 0 .../MagickWand/mogrify-private.h | 0 .../MagickWand/mogrify.c | 0 .../MagickWand/mogrify.h | 0 .../MagickWand/montage.c | 0 .../MagickWand/montage.h | 0 .../MagickWand/operation-private.h | 0 .../MagickWand/operation.c | 2 +- .../MagickWand/operation.h | 0 .../MagickWand/pixel-iterator.c | 0 .../MagickWand/pixel-iterator.h | 0 .../MagickWand/pixel-wand-private.h | 0 .../MagickWand/pixel-wand.c | 0 .../MagickWand/pixel-wand.h | 0 .../MagickWand/script-token.c | 0 .../MagickWand/script-token.h | 0 .../MagickWand/stream.c | 0 .../MagickWand/stream.h | 0 .../MagickWand/studio.h | 0 .../MagickWand/wand-view.c | 0 .../MagickWand/wand-view.h | 0 .../MagickWand/wand.c | 0 .../MagickWand/wand.h | 0 .../MagickWand/wandcli-private.h | 0 .../MagickWand/wandcli.c | 0 .../MagickWand/wandcli.h | 0 .../coders/aai.c | 8 +- .../coders/aai.h | 0 .../coders/art.c | 8 +- .../coders/art.h | 0 .../coders/ashlar.c | 0 .../coders/ashlar.h | 0 .../coders/avs.c | 8 +- .../coders/avs.h | 0 .../coders/bayer.c | 0 .../coders/bayer.h | 0 .../coders/bgr.c | 30 +- .../coders/bgr.h | 0 .../coders/bmp.c | 16 +- .../coders/bmp.h | 0 .../coders/braille.c | 5 +- .../coders/braille.h | 0 .../coders/bytebuffer-private.h | 0 .../coders/cals.c | 3 +- .../coders/cals.h | 0 .../coders/caption.c | 0 .../coders/caption.h | 0 .../coders/cin.c | 8 +- .../coders/cin.h | 0 .../coders/cip.c | 5 +- .../coders/cip.h | 0 .../coders/clip.c | 0 .../coders/clip.h | 0 .../coders/clipboard.c | 0 .../coders/clipboard.h | 0 .../coders/cmyk.c | 40 ++- .../coders/cmyk.h | 0 .../coders/coders-list.h | 0 .../coders/coders-private.h | 0 .../coders/coders.h | 0 .../coders/cube.c | 3 +- .../coders/cube.h | 0 .../coders/cut.c | 5 +- .../coders/cut.h | 0 .../coders/dcm.c | 3 +- .../coders/dcm.h | 0 .../coders/dds.c | 10 +- .../coders/dds.h | 0 .../coders/debug.c | 5 +- .../coders/debug.h | 0 .../coders/dib.c | 10 +- .../coders/dib.h | 0 .../coders/djvu.c | 0 .../coders/djvu.h | 0 .../coders/dmr.c | 0 .../coders/dmr.h | 0 .../coders/dng.c | 0 .../coders/dng.h | 0 .../coders/dot.c | 0 .../coders/dot.h | 0 .../coders/dps.c | 5 +- .../coders/dps.h | 0 .../coders/dpx.c | 6 +- .../coders/dpx.h | 0 .../coders/emf.c | 0 .../coders/emf.h | 0 .../coders/ept.c | 5 +- .../coders/ept.h | 0 .../coders/exr.c | 10 +- .../coders/exr.h | 0 .../coders/farbfeld.c | 8 +- .../coders/farbfeld.h | 0 .../coders/fax.c | 8 +- .../coders/fax.h | 0 .../coders/fits.c | 10 +- .../coders/fits.h | 0 .../coders/fl32.c | 8 +- .../coders/fl32.h | 0 .../coders/flif.c | 0 .../coders/flif.h | 0 .../coders/fpx.c | 0 .../coders/fpx.h | 0 .../coders/ftxt.c | 10 +- .../coders/ftxt.h | 0 .../coders/ghostscript-private.h | 0 .../coders/gif.c | 8 +- .../coders/gif.h | 0 .../coders/gradient.c | 0 .../coders/gradient.h | 0 .../coders/gray.c | 18 +- .../coders/gray.h | 0 .../coders/hald.c | 3 +- .../coders/hald.h | 0 .../coders/hdr.c | 10 +- .../coders/hdr.h | 0 .../coders/heic.c | 5 +- .../coders/heic.h | 0 .../coders/histogram.c | 0 .../coders/histogram.h | 0 .../coders/hrz.c | 10 +- .../coders/hrz.h | 0 .../coders/html.c | 0 .../coders/html.h | 0 .../coders/icon.c | 9 +- .../coders/icon.h | 0 .../coders/info.c | 5 +- .../coders/info.h | 0 .../coders/inline.c | 5 +- .../coders/inline.h | 0 .../coders/ipl.c | 0 .../coders/ipl.h | 0 .../coders/jbig.c | 10 +- .../coders/jbig.h | 0 .../coders/jnx.c | 4 +- .../coders/jnx.h | 0 .../coders/jp2.c | 12 +- .../coders/jp2.h | 0 .../coders/jpeg.c | 25 +- .../coders/jpeg.h | 0 .../coders/json.c | 5 +- .../coders/json.h | 0 .../coders/jxl.c | 8 +- .../coders/jxl.h | 0 .../coders/kernel.c | 5 +- .../coders/kernel.h | 0 .../coders/label.c | 0 .../coders/label.h | 0 .../coders/mac.c | 5 +- .../coders/mac.h | 0 .../coders/magick.c | 0 .../coders/magick.h | 0 .../coders/map.c | 8 +- .../coders/map.h | 0 .../coders/mask.c | 0 .../coders/mask.h | 0 .../coders/mat.c | 8 +- .../coders/mat.h | 0 .../coders/matte.c | 0 .../coders/matte.h | 0 .../coders/meta.c | 5 +- .../coders/meta.h | 0 .../coders/miff.c | 15 +- .../coders/miff.h | 0 .../coders/mono.c | 10 +- .../coders/mono.h | 0 .../coders/mpc.c | 6 +- .../coders/mpc.h | 0 .../coders/mpr.c | 0 .../coders/mpr.h | 0 .../coders/msl.c | 0 .../coders/msl.h | 0 .../coders/mtv.c | 8 +- .../coders/mtv.h | 0 .../coders/mvg.c | 10 +- .../coders/mvg.h | 0 .../coders/null.c | 0 .../coders/null.h | 0 .../coders/ora.c | 0 .../coders/ora.h | 0 .../coders/otb.c | 10 +- .../coders/otb.h | 0 .../coders/palm.c | 8 +- .../coders/palm.h | 0 .../coders/pango.c | 0 .../coders/pango.h | 0 .../coders/pattern.c | 0 .../coders/pattern.h | 0 .../coders/pcd.c | 0 .../coders/pcd.h | 0 .../coders/pcl.c | 21 +- .../coders/pcl.h | 0 .../coders/pcx.c | 8 +- .../coders/pcx.h | 0 .../coders/pdb.c | 10 +- .../coders/pdb.h | 0 .../coders/pdf.c | 5 +- .../coders/pdf.h | 0 .../coders/pes.c | 0 .../coders/pes.h | 0 .../coders/pgx.c | 8 +- .../coders/pgx.h | 0 .../coders/pict.c | 10 +- .../coders/pict.h | 0 .../coders/pix.c | 3 +- .../coders/pix.h | 0 .../coders/plasma.c | 0 .../coders/plasma.h | 0 .../coders/png.c | 0 .../coders/png.h | 0 .../coders/pnm.c | 5 +- .../coders/pnm.h | 0 .../coders/ps.c | 5 +- .../coders/ps.h | 0 .../coders/ps2.c | 5 +- .../coders/ps2.h | 0 .../coders/ps3.c | 5 +- .../coders/ps3.h | 0 .../coders/psd-private.h | 0 .../coders/psd.c | 8 +- .../coders/psd.h | 0 .../coders/pwp.c | 0 .../coders/pwp.h | 0 .../coders/qoi.c | 8 +- .../coders/qoi.h | 0 .../coders/raw.c | 8 +- .../coders/raw.h | 0 .../coders/rgb.c | 33 +- .../coders/rgb.h | 0 .../coders/rgf.c | 10 +- .../coders/rgf.h | 0 .../coders/rla.c | 5 +- .../coders/rla.h | 0 .../coders/rle.c | 6 +- .../coders/rle.h | 0 .../coders/scr.c | 5 +- .../coders/scr.h | 0 .../coders/screenshot.c | 0 .../coders/screenshot.h | 0 .../coders/sct.c | 5 +- .../coders/sct.h | 0 .../coders/sfw.c | 4 +- .../coders/sfw.h | 0 .../coders/sgi.c | 8 +- .../coders/sgi.h | 0 .../coders/sixel.c | 8 +- .../coders/sixel.h | 0 .../coders/stegano.c | 0 .../coders/stegano.h | 0 .../coders/strimg.c | 8 +- .../coders/strimg.h | 0 .../coders/sun.c | 8 +- .../coders/sun.h | 0 .../coders/svg.c | 14 +- .../coders/svg.h | 0 .../coders/tga.c | 10 +- .../coders/tga.h | 0 .../coders/thumbnail.c | 0 .../coders/thumbnail.h | 0 .../coders/tiff.c | 8 +- .../coders/tiff.h | 0 .../coders/tile.c | 0 .../coders/tile.h | 0 .../coders/tim.c | 3 +- .../coders/tim.h | 0 .../coders/tim2.c | 3 +- .../coders/tim2.h | 0 .../coders/ttf.c | 5 +- .../coders/ttf.h | 0 .../coders/txt.c | 8 +- .../coders/txt.h | 0 .../coders/uil.c | 5 +- .../coders/uil.h | 0 .../coders/url.c | 0 .../coders/url.h | 0 .../coders/uyvy.c | 10 +- .../coders/uyvy.h | 0 .../coders/vicar.c | 10 +- .../coders/vicar.h | 0 .../coders/vid.c | 0 .../coders/vid.h | 0 .../coders/video.c | 0 .../coders/video.h | 0 .../coders/viff.c | 8 +- .../coders/viff.h | 0 .../coders/vips.c | 6 +- .../coders/vips.h | 0 .../coders/wbmp.c | 10 +- .../coders/wbmp.h | 0 .../coders/webp.c | 3 +- .../coders/webp.h | 0 .../coders/wmf.c | 0 .../coders/wmf.h | 0 .../coders/wpg.c | 5 +- .../coders/wpg.h | 0 .../coders/x.c | 0 .../coders/x.h | 0 .../coders/xbm.c | 10 +- .../coders/xbm.h | 0 .../coders/xc.c | 0 .../coders/xc.h | 0 .../coders/xcf.c | 0 .../coders/xcf.h | 0 .../coders/xpm.c | 10 +- .../coders/xpm.h | 0 .../coders/xps.c | 0 .../coders/xps.h | 0 .../coders/xwd.c | 5 +- .../coders/xwd.h | 0 .../coders/yaml.c | 5 +- .../coders/yaml.h | 0 .../coders/ycbcr.c | 27 +- .../coders/ycbcr.h | 0 .../coders/yuv.c | 23 +- .../coders/yuv.h | 0 .../arm64/MagickCore/magick-baseconfig.h | 6 +- .../configs/arm64/MagickCore/version.h | 6 +- .../filters/analyze.c | 0 .../utilities/magick.c | 0 README.md | 2 +- 643 files changed, 1317 insertions(+), 888 deletions(-) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Blob.cpp (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/BlobRef.cpp (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/CoderInfo.cpp (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Color.cpp (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Drawable.cpp (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Exception.cpp (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Functions.cpp (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Geometry.cpp (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Image.cpp (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/ImageRef.cpp (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/Blob.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/BlobRef.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/CoderInfo.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/Color.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/Drawable.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/Exception.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/Functions.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/Geometry.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/Image.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/ImageRef.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/Include.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/Montage.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/Options.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/Pixels.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/ResourceLimits.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/STL.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/SecurityPolicy.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/Statistic.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/Thread.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Magick++/TypeMetric.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Montage.cpp (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Options.cpp (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Pixels.cpp (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/ResourceLimits.cpp (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/STL.cpp (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/SecurityPolicy.cpp (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Statistic.cpp (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/Thread.cpp (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/Magick++/lib/TypeMetric.cpp (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/MagickCore.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/accelerate-kernels-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/accelerate-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/accelerate.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/animate-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/animate.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/animate.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/annotate-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/annotate.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/annotate.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/artifact.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/artifact.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/attribute.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/attribute.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/blob-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/blob.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/blob.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/cache-private.h (95%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/cache-view.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/cache-view.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/cache.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/cache.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/channel.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/channel.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/cipher.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/cipher.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/client.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/client.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/coder-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/coder.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/coder.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/color-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/color.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/color.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/colormap-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/colormap.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/colormap.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/colorspace-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/colorspace.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/colorspace.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/compare.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/compare.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/composite-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/composite.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/composite.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/compress.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/compress.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/configure-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/configure.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/configure.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/constitute-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/constitute.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/constitute.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/decorate.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/decorate.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/delegate-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/delegate.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/delegate.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/deprecate.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/deprecate.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/display-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/display.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/display.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/distort.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/distort.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/distribute-cache-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/distribute-cache.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/distribute-cache.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/draw-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/draw.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/draw.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/effect.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/effect.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/enhance.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/enhance.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/exception-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/exception.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/exception.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/feature.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/feature.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/fourier.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/fourier.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/fx-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/fx.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/fx.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/gem-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/gem.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/gem.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/geometry-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/geometry.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/geometry.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/histogram.c (91%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/histogram.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/identify.c (86%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/identify.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/image-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/image-view.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/image-view.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/image.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/image.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/layer.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/layer.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/linked-list-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/linked-list.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/linked-list.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/list.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/list.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/locale-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/locale.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/locale_.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/log-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/log.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/log.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/magic-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/magic.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/magic.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/magick-config.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/magick-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/magick-type.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/magick.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/magick.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/matrix-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/matrix.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/matrix.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/memory-private.h (95%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/memory.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/memory_.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/method-attribute.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/methods.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/mime-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/mime.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/mime.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/module-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/module.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/module.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/monitor-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/monitor.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/monitor.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/montage.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/montage.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/morphology-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/morphology.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/morphology.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/mutex.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/nt-base-private.h (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/nt-base.c (97%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/nt-base.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/nt-feature.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/nt-feature.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/opencl-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/opencl.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/opencl.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/option-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/option.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/option.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/paint.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/paint.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/pixel-accessor.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/pixel-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/pixel.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/pixel.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/policy-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/policy.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/policy.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/prepress.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/prepress.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/profile-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/profile.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/profile.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/property.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/property.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/quantize.c (94%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/quantize.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/quantum-export.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/quantum-import.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/quantum-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/quantum.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/quantum.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/random-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/random.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/random_.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/registry-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/registry.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/registry.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/resample-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/resample.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/resample.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/resize-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/resize.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/resize.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/resource-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/resource.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/resource_.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/segment.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/segment.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/semaphore-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/semaphore.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/semaphore.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/shear.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/shear.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/signature-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/signature.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/signature.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/splay-tree.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/splay-tree.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/static.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/static.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/statistic-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/statistic.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/statistic.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/stream-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/stream.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/stream.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/string-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/string.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/string_.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/studio.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/thread-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/thread.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/thread_.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/threshold.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/threshold.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/timer-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/timer.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/timer.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/token-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/token.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/token.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/transform-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/transform.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/transform.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/type-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/type.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/type.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/utility-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/utility.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/utility.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/version-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/version.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/vision.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/vision.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/visual-effects.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/visual-effects.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/vms.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/vms.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/widget-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/widget.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/widget.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/xml-tree-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/xml-tree.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/xml-tree.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/xwindow-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/xwindow.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickCore/xwindow.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/MagickWand.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/animate.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/animate.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/compare.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/compare.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/composite.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/composite.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/conjure.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/conjure.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/convert.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/convert.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/deprecate.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/deprecate.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/display.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/display.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/drawing-wand.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/drawing-wand.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/identify.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/identify.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/import.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/import.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/magick-cli.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/magick-cli.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/magick-image.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/magick-image.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/magick-property.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/magick-property.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/magick-wand-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/magick-wand.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/method-attribute.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/mogrify-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/mogrify.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/mogrify.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/montage.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/montage.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/operation-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/operation.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/operation.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/pixel-iterator.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/pixel-iterator.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/pixel-wand-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/pixel-wand.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/pixel-wand.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/script-token.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/script-token.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/stream.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/stream.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/studio.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/wand-view.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/wand-view.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/wand.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/wand.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/wandcli-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/wandcli.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/MagickWand/wandcli.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/aai.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/aai.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/art.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/art.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ashlar.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ashlar.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/avs.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/avs.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/bayer.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/bayer.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/bgr.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/bgr.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/bmp.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/bmp.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/braille.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/braille.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/bytebuffer-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/cals.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/cals.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/caption.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/caption.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/cin.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/cin.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/cip.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/cip.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/clip.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/clip.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/clipboard.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/clipboard.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/cmyk.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/cmyk.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/coders-list.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/coders-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/coders.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/cube.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/cube.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/cut.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/cut.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/dcm.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/dcm.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/dds.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/dds.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/debug.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/debug.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/dib.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/dib.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/djvu.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/djvu.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/dmr.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/dmr.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/dng.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/dng.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/dot.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/dot.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/dps.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/dps.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/dpx.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/dpx.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/emf.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/emf.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ept.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ept.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/exr.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/exr.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/farbfeld.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/farbfeld.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/fax.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/fax.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/fits.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/fits.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/fl32.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/fl32.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/flif.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/flif.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/fpx.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/fpx.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ftxt.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ftxt.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ghostscript-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/gif.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/gif.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/gradient.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/gradient.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/gray.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/gray.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/hald.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/hald.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/hdr.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/hdr.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/heic.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/heic.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/histogram.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/histogram.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/hrz.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/hrz.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/html.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/html.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/icon.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/icon.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/info.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/info.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/inline.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/inline.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ipl.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ipl.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/jbig.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/jbig.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/jnx.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/jnx.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/jp2.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/jp2.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/jpeg.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/jpeg.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/json.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/json.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/jxl.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/jxl.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/kernel.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/kernel.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/label.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/label.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/mac.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/mac.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/magick.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/magick.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/map.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/map.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/mask.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/mask.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/mat.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/mat.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/matte.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/matte.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/meta.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/meta.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/miff.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/miff.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/mono.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/mono.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/mpc.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/mpc.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/mpr.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/mpr.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/msl.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/msl.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/mtv.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/mtv.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/mvg.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/mvg.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/null.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/null.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ora.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ora.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/otb.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/otb.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/palm.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/palm.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pango.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pango.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pattern.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pattern.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pcd.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pcd.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pcl.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pcl.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pcx.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pcx.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pdb.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pdb.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pdf.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pdf.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pes.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pes.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pgx.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pgx.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pict.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pict.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pix.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pix.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/plasma.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/plasma.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/png.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/png.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pnm.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pnm.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ps.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ps.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ps2.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ps2.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ps3.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ps3.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/psd-private.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/psd.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/psd.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pwp.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/pwp.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/qoi.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/qoi.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/raw.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/raw.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/rgb.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/rgb.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/rgf.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/rgf.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/rla.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/rla.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/rle.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/rle.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/scr.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/scr.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/screenshot.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/screenshot.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/sct.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/sct.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/sfw.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/sfw.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/sgi.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/sgi.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/sixel.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/sixel.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/stegano.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/stegano.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/strimg.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/strimg.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/sun.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/sun.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/svg.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/svg.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/tga.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/tga.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/thumbnail.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/thumbnail.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/tiff.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/tiff.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/tile.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/tile.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/tim.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/tim.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/tim2.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/tim2.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ttf.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ttf.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/txt.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/txt.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/uil.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/uil.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/url.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/url.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/uyvy.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/uyvy.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/vicar.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/vicar.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/vid.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/vid.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/video.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/video.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/viff.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/viff.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/vips.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/vips.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/wbmp.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/wbmp.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/webp.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/webp.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/wmf.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/wmf.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/wpg.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/wpg.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/x.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/x.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/xbm.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/xbm.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/xc.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/xc.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/xcf.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/xcf.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/xpm.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/xpm.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/xps.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/xps.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/xwd.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/xwd.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/yaml.c (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/yaml.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ycbcr.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/ycbcr.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/yuv.c (98%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/coders/yuv.h (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/configs/arm64/MagickCore/magick-baseconfig.h (99%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/configs/arm64/MagickCore/version.h (96%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/filters/analyze.c (100%) rename {ImageMagick-7.1.1-21 => ImageMagick-7.1.1-22}/utilities/magick.c (100%) diff --git a/Android.mk b/Android.mk index aeed5145..a92b9b52 100644 --- a/Android.mk +++ b/Android.mk @@ -30,7 +30,7 @@ OPENCL_INCLUDE_PATH := $(OPENCL_PATH)/qualcomm/include LTDL_LIB_PATH := $(LOCAL_PATH)/libltdl-2.4.6 -IMAGE_MAGICK_BASEDIR := ImageMagick-7.1.1-21 +IMAGE_MAGICK_BASEDIR := ImageMagick-7.1.1-22 IMAGE_MAGICK := $(LOCAL_PATH)/$(IMAGE_MAGICK_BASEDIR) JPEG_LIB_PATH := $(LOCAL_PATH)/libjpeg-turbo-2.0.2 diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Blob.cpp b/ImageMagick-7.1.1-22/Magick++/lib/Blob.cpp similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Blob.cpp rename to ImageMagick-7.1.1-22/Magick++/lib/Blob.cpp diff --git a/ImageMagick-7.1.1-21/Magick++/lib/BlobRef.cpp b/ImageMagick-7.1.1-22/Magick++/lib/BlobRef.cpp similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/BlobRef.cpp rename to ImageMagick-7.1.1-22/Magick++/lib/BlobRef.cpp diff --git a/ImageMagick-7.1.1-21/Magick++/lib/CoderInfo.cpp b/ImageMagick-7.1.1-22/Magick++/lib/CoderInfo.cpp similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/CoderInfo.cpp rename to ImageMagick-7.1.1-22/Magick++/lib/CoderInfo.cpp diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Color.cpp b/ImageMagick-7.1.1-22/Magick++/lib/Color.cpp similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Color.cpp rename to ImageMagick-7.1.1-22/Magick++/lib/Color.cpp diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Drawable.cpp b/ImageMagick-7.1.1-22/Magick++/lib/Drawable.cpp similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Drawable.cpp rename to ImageMagick-7.1.1-22/Magick++/lib/Drawable.cpp diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Exception.cpp b/ImageMagick-7.1.1-22/Magick++/lib/Exception.cpp similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Exception.cpp rename to ImageMagick-7.1.1-22/Magick++/lib/Exception.cpp diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Functions.cpp b/ImageMagick-7.1.1-22/Magick++/lib/Functions.cpp similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Functions.cpp rename to ImageMagick-7.1.1-22/Magick++/lib/Functions.cpp diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Geometry.cpp b/ImageMagick-7.1.1-22/Magick++/lib/Geometry.cpp similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Geometry.cpp rename to ImageMagick-7.1.1-22/Magick++/lib/Geometry.cpp diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Image.cpp b/ImageMagick-7.1.1-22/Magick++/lib/Image.cpp similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Image.cpp rename to ImageMagick-7.1.1-22/Magick++/lib/Image.cpp diff --git a/ImageMagick-7.1.1-21/Magick++/lib/ImageRef.cpp b/ImageMagick-7.1.1-22/Magick++/lib/ImageRef.cpp similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/ImageRef.cpp rename to ImageMagick-7.1.1-22/Magick++/lib/ImageRef.cpp diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/Blob.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/Blob.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/Blob.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/Blob.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/BlobRef.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/BlobRef.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/BlobRef.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/BlobRef.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/CoderInfo.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/CoderInfo.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/CoderInfo.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/CoderInfo.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/Color.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/Color.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/Color.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/Color.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/Drawable.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/Drawable.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/Drawable.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/Drawable.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/Exception.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/Exception.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/Exception.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/Exception.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/Functions.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/Functions.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/Functions.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/Functions.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/Geometry.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/Geometry.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/Geometry.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/Geometry.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/Image.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/Image.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/Image.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/Image.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/ImageRef.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/ImageRef.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/ImageRef.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/ImageRef.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/Include.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/Include.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/Include.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/Include.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/Montage.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/Montage.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/Montage.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/Montage.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/Options.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/Options.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/Options.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/Options.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/Pixels.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/Pixels.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/Pixels.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/Pixels.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/ResourceLimits.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/ResourceLimits.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/ResourceLimits.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/ResourceLimits.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/STL.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/STL.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/STL.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/STL.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/SecurityPolicy.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/SecurityPolicy.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/SecurityPolicy.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/SecurityPolicy.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/Statistic.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/Statistic.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/Statistic.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/Statistic.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/Thread.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/Thread.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/Thread.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/Thread.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Magick++/TypeMetric.h b/ImageMagick-7.1.1-22/Magick++/lib/Magick++/TypeMetric.h similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Magick++/TypeMetric.h rename to ImageMagick-7.1.1-22/Magick++/lib/Magick++/TypeMetric.h diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Montage.cpp b/ImageMagick-7.1.1-22/Magick++/lib/Montage.cpp similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Montage.cpp rename to ImageMagick-7.1.1-22/Magick++/lib/Montage.cpp diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Options.cpp b/ImageMagick-7.1.1-22/Magick++/lib/Options.cpp similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Options.cpp rename to ImageMagick-7.1.1-22/Magick++/lib/Options.cpp diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Pixels.cpp b/ImageMagick-7.1.1-22/Magick++/lib/Pixels.cpp similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Pixels.cpp rename to ImageMagick-7.1.1-22/Magick++/lib/Pixels.cpp diff --git a/ImageMagick-7.1.1-21/Magick++/lib/ResourceLimits.cpp b/ImageMagick-7.1.1-22/Magick++/lib/ResourceLimits.cpp similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/ResourceLimits.cpp rename to ImageMagick-7.1.1-22/Magick++/lib/ResourceLimits.cpp diff --git a/ImageMagick-7.1.1-21/Magick++/lib/STL.cpp b/ImageMagick-7.1.1-22/Magick++/lib/STL.cpp similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/STL.cpp rename to ImageMagick-7.1.1-22/Magick++/lib/STL.cpp diff --git a/ImageMagick-7.1.1-21/Magick++/lib/SecurityPolicy.cpp b/ImageMagick-7.1.1-22/Magick++/lib/SecurityPolicy.cpp similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/SecurityPolicy.cpp rename to ImageMagick-7.1.1-22/Magick++/lib/SecurityPolicy.cpp diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Statistic.cpp b/ImageMagick-7.1.1-22/Magick++/lib/Statistic.cpp similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Statistic.cpp rename to ImageMagick-7.1.1-22/Magick++/lib/Statistic.cpp diff --git a/ImageMagick-7.1.1-21/Magick++/lib/Thread.cpp b/ImageMagick-7.1.1-22/Magick++/lib/Thread.cpp similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/Thread.cpp rename to ImageMagick-7.1.1-22/Magick++/lib/Thread.cpp diff --git a/ImageMagick-7.1.1-21/Magick++/lib/TypeMetric.cpp b/ImageMagick-7.1.1-22/Magick++/lib/TypeMetric.cpp similarity index 100% rename from ImageMagick-7.1.1-21/Magick++/lib/TypeMetric.cpp rename to ImageMagick-7.1.1-22/Magick++/lib/TypeMetric.cpp diff --git a/ImageMagick-7.1.1-21/MagickCore/MagickCore.h b/ImageMagick-7.1.1-22/MagickCore/MagickCore.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/MagickCore.h rename to ImageMagick-7.1.1-22/MagickCore/MagickCore.h diff --git a/ImageMagick-7.1.1-21/MagickCore/accelerate-kernels-private.h b/ImageMagick-7.1.1-22/MagickCore/accelerate-kernels-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/accelerate-kernels-private.h rename to ImageMagick-7.1.1-22/MagickCore/accelerate-kernels-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/accelerate-private.h b/ImageMagick-7.1.1-22/MagickCore/accelerate-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/accelerate-private.h rename to ImageMagick-7.1.1-22/MagickCore/accelerate-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/accelerate.c b/ImageMagick-7.1.1-22/MagickCore/accelerate.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/accelerate.c rename to ImageMagick-7.1.1-22/MagickCore/accelerate.c diff --git a/ImageMagick-7.1.1-21/MagickCore/animate-private.h b/ImageMagick-7.1.1-22/MagickCore/animate-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/animate-private.h rename to ImageMagick-7.1.1-22/MagickCore/animate-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/animate.c b/ImageMagick-7.1.1-22/MagickCore/animate.c similarity index 98% rename from ImageMagick-7.1.1-21/MagickCore/animate.c rename to ImageMagick-7.1.1-22/MagickCore/animate.c index e92ee77b..d9c41a2f 100644 --- a/ImageMagick-7.1.1-21/MagickCore/animate.c +++ b/ImageMagick-7.1.1-22/MagickCore/animate.c @@ -229,7 +229,7 @@ typedef enum StepBackwardCommand, StepForwardCommand, NullCommand -} CommandType; +} AnimateCommand; /* Stipples. @@ -243,7 +243,7 @@ typedef enum Forward declarations. */ static Image - *XMagickCommand(Display *,XResourceInfo *,XWindows *,const CommandType, + *XMagickCommand(Display *,XResourceInfo *,XWindows *,const AnimateCommand, Image **,MagickStatusType *,ExceptionInfo *); static MagickBooleanType @@ -346,7 +346,7 @@ MagickExport MagickBooleanType AnimateImages(const ImageInfo *image_info, % The format of the XMagickCommand method is: % % Image *XMagickCommand(Display *display,XResourceInfo *resource_info, -% XWindows *windows,const CommandType command_type,Image **image, +% XWindows *windows,const AnimateCommand animate_command,Image **image, % MagickStatusType *state,ExceptionInfo *exception) % % A description of each parameter follows: @@ -369,7 +369,7 @@ MagickExport MagickBooleanType AnimateImages(const ImageInfo *image_info, % */ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, - XWindows *windows,const CommandType command_type,Image **image, + XWindows *windows,const AnimateCommand animate_command,Image **image, MagickStatusType *state,ExceptionInfo *exception) { Image @@ -388,7 +388,7 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, Process user command. */ nexus=NewImageList(); - switch (command_type) + switch (animate_command) { case OpenCommand: { @@ -519,9 +519,9 @@ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, { *state|=StepAnimationState; *state&=(~PlayAnimationState); - if (command_type == StepBackwardCommand) + if (animate_command == StepBackwardCommand) *state&=(~ForwardAnimationState); - if (command_type == StepForwardCommand) + if (animate_command == StepForwardCommand) *state|=ForwardAnimationState; break; } @@ -1262,7 +1262,7 @@ MagickExport Image *XAnimateImages(Display *display, HelpMenu }; - static const CommandType + static const AnimateCommand CommandMenus[]= { NullCommand, @@ -1272,7 +1272,7 @@ MagickExport Image *XAnimateImages(Display *display, InfoCommand, QuitCommand }, - CommandTypes[]= + AnimateCommands[]= { OpenCommand, PlayCommand, @@ -1298,15 +1298,18 @@ MagickExport Image *XAnimateImages(Display *display, VersionCommand }; - static const CommandType + static const AnimateCommand *Commands[MagickMenus]= { - CommandTypes, + AnimateCommands, SpeedCommands, DirectionCommands, HelpCommands }; + AnimateCommand + animate_command; + char command[MagickPathExtent], *directory, @@ -1314,9 +1317,6 @@ MagickExport Image *XAnimateImages(Display *display, *p, resource_name[MagickPathExtent]; - CommandType - command_type; - Image *coalesce_image, *display_image, @@ -2197,7 +2197,7 @@ MagickExport Image *XAnimateImages(Display *display, if (id < 0) continue; (void) CopyMagickString(command,CommandMenu[id],MagickPathExtent); - command_type=CommandMenus[id]; + animate_command=CommandMenus[id]; if (id < MagickMenus) { int @@ -2211,11 +2211,11 @@ MagickExport Image *XAnimateImages(Display *display, if (entry < 0) continue; (void) CopyMagickString(command,Menus[id][entry],MagickPathExtent); - command_type=Commands[id][entry]; + animate_command=Commands[id][entry]; } - if (command_type != NullCommand) - nexus=XMagickCommand(display,resource_info,windows, - command_type,&image,&state,exception); + if (animate_command != NullCommand) + nexus=XMagickCommand(display,resource_info,windows,animate_command, + &image,&state,exception); continue; } switch (event.type) @@ -2527,63 +2527,63 @@ MagickExport Image *XAnimateImages(Display *display, if (resource_info->debug != MagickFalse) (void) LogMagickEvent(X11Event,GetMagickModule(), "Key press: 0x%lx (%c)",(unsigned long) key_symbol,*command); - command_type=NullCommand; + animate_command=NullCommand; switch (key_symbol) { case XK_o: { if ((event.xkey.state & ControlMask) == MagickFalse) break; - command_type=OpenCommand; + animate_command=OpenCommand; break; } case XK_BackSpace: { - command_type=StepBackwardCommand; + animate_command=StepBackwardCommand; break; } case XK_space: { - command_type=StepForwardCommand; + animate_command=StepForwardCommand; break; } case XK_less: { - command_type=FasterCommand; + animate_command=FasterCommand; break; } case XK_greater: { - command_type=SlowerCommand; + animate_command=SlowerCommand; break; } case XK_F1: { - command_type=HelpCommand; + animate_command=HelpCommand; break; } case XK_Find: { - command_type=BrowseDocumentationCommand; + animate_command=BrowseDocumentationCommand; break; } case XK_question: { - command_type=InfoCommand; + animate_command=InfoCommand; break; } case XK_q: case XK_Escape: { - command_type=QuitCommand; + animate_command=QuitCommand; break; } default: break; } - if (command_type != NullCommand) + if (animate_command != NullCommand) nexus=XMagickCommand(display,resource_info,windows, - command_type,&image,&state,exception); + animate_command,&image,&state,exception); break; } case KeyRelease: diff --git a/ImageMagick-7.1.1-21/MagickCore/animate.h b/ImageMagick-7.1.1-22/MagickCore/animate.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/animate.h rename to ImageMagick-7.1.1-22/MagickCore/animate.h diff --git a/ImageMagick-7.1.1-21/MagickCore/annotate-private.h b/ImageMagick-7.1.1-22/MagickCore/annotate-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/annotate-private.h rename to ImageMagick-7.1.1-22/MagickCore/annotate-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/annotate.c b/ImageMagick-7.1.1-22/MagickCore/annotate.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/annotate.c rename to ImageMagick-7.1.1-22/MagickCore/annotate.c diff --git a/ImageMagick-7.1.1-21/MagickCore/annotate.h b/ImageMagick-7.1.1-22/MagickCore/annotate.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/annotate.h rename to ImageMagick-7.1.1-22/MagickCore/annotate.h diff --git a/ImageMagick-7.1.1-21/MagickCore/artifact.c b/ImageMagick-7.1.1-22/MagickCore/artifact.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/artifact.c rename to ImageMagick-7.1.1-22/MagickCore/artifact.c diff --git a/ImageMagick-7.1.1-21/MagickCore/artifact.h b/ImageMagick-7.1.1-22/MagickCore/artifact.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/artifact.h rename to ImageMagick-7.1.1-22/MagickCore/artifact.h diff --git a/ImageMagick-7.1.1-21/MagickCore/attribute.c b/ImageMagick-7.1.1-22/MagickCore/attribute.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/attribute.c rename to ImageMagick-7.1.1-22/MagickCore/attribute.c index 6f0cbd6e..d193b58c 100644 --- a/ImageMagick-7.1.1-21/MagickCore/attribute.c +++ b/ImageMagick-7.1.1-22/MagickCore/attribute.c @@ -17,7 +17,7 @@ % October 2002 % % % % % -% Copyright @ 2002 ImageMagick Studio LLC, a non-profit organization % +% Copyright @ 1999 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may % @@ -124,14 +124,14 @@ % */ -typedef struct _EdgeInfo +typedef struct _CensusInfo { double left, right, top, bottom; -} EdgeInfo; +} CensusInfo; static double GetEdgeBackgroundCensus(const Image *image, const CacheView *image_view,const GravityType gravity,const size_t width, @@ -238,7 +238,7 @@ static double GetEdgeBackgroundCensus(const Image *image, return(census); } -static inline double GetMinEdgeBackgroundCensus(const EdgeInfo *edge) +static inline double GetMinEdgeBackgroundCensus(const CensusInfo *edge) { double census; @@ -254,6 +254,10 @@ static RectangleInfo GetEdgeBoundingBox(const Image *image, CacheView *edge_view; + CensusInfo + edge, + vertex; + const char *artifact; @@ -261,10 +265,6 @@ static RectangleInfo GetEdgeBoundingBox(const Image *image, background_census, percent_background; - EdgeInfo - edge, - vertex; - Image *edge_image; diff --git a/ImageMagick-7.1.1-21/MagickCore/attribute.h b/ImageMagick-7.1.1-22/MagickCore/attribute.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/attribute.h rename to ImageMagick-7.1.1-22/MagickCore/attribute.h diff --git a/ImageMagick-7.1.1-21/MagickCore/blob-private.h b/ImageMagick-7.1.1-22/MagickCore/blob-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/blob-private.h rename to ImageMagick-7.1.1-22/MagickCore/blob-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/blob.c b/ImageMagick-7.1.1-22/MagickCore/blob.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/blob.c rename to ImageMagick-7.1.1-22/MagickCore/blob.c index 5d3a6edc..42eaecce 100644 --- a/ImageMagick-7.1.1-21/MagickCore/blob.c +++ b/ImageMagick-7.1.1-22/MagickCore/blob.c @@ -140,9 +140,11 @@ struct _BlobInfo MagickBooleanType exempt, synchronize, - status, temporary; + int + status; + StreamType type; @@ -197,7 +199,7 @@ struct _CustomStreamInfo Forward declarations. */ static int - SyncBlob(Image *); + SyncBlob(const Image *); /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -593,9 +595,9 @@ MagickExport BlobInfo *CloneBlobInfo(const BlobInfo *blob_info) static inline void ThrowBlobException(BlobInfo *blob_info) { - if ((blob_info->status == MagickFalse) && (errno != 0)) + if ((blob_info->status == 0) && (errno != 0)) blob_info->error_number=errno; - blob_info->status=MagickTrue; + blob_info->status=(-1); } MagickExport MagickBooleanType CloseBlob(Image *image) @@ -616,12 +618,14 @@ MagickExport MagickBooleanType CloseBlob(Image *image) blob_info=image->blob; if ((blob_info == (BlobInfo *) NULL) || (blob_info->type == UndefinedStream)) return(MagickTrue); - status=SyncBlob(image); + if (SyncBlob(image) != 0) + ThrowBlobException(blob_info); + status=blob_info->status; switch (blob_info->type) { case UndefinedStream: - case StandardStream: break; + case StandardStream: case FileStream: case PipeStream: { @@ -689,7 +693,7 @@ MagickExport MagickBooleanType CloseBlob(Image *image) if (blob_info->exempt != MagickFalse) { blob_info->type=UndefinedStream; - return(blob_info->status); + return(blob_info->status != 0 ? MagickFalse : MagickTrue); } switch (blob_info->type) { @@ -747,7 +751,7 @@ MagickExport MagickBooleanType CloseBlob(Image *image) break; } (void) DetachBlob(blob_info); - return(blob_info->status); + return(blob_info->status != 0 ? MagickFalse : MagickTrue); } /* @@ -824,8 +828,6 @@ MagickExport Image *CustomStreamToImage(const ImageInfo *image_info, (void) FormatLocaleString(blob_info->filename,MagickPathExtent,"%s:%s", blob_info->magick,filename); image=ReadImage(blob_info,exception); - if (image != (Image *) NULL) - (void) CloseBlob(image); } else { @@ -897,7 +899,6 @@ MagickExport Image *CustomStreamToImage(const ImageInfo *image_info, image_info->filename,MagickPathExtent); (void) CopyMagickString(images->magick,magick_info->name, MagickPathExtent); - (void) CloseBlob(images); images=GetNextImageInList(images); } } @@ -907,6 +908,9 @@ MagickExport Image *CustomStreamToImage(const ImageInfo *image_info, (void) RelinquishUniqueFileResource(unique); } blob_info=DestroyImageInfo(blob_info); + if (image != (Image *) NULL) + if (CloseBlob(image) == MagickFalse) + image=DestroyImageList(image); return(image); } @@ -1045,6 +1049,7 @@ MagickExport void *DetachBlob(BlobInfo *blob_info) blob_info->mapped=MagickFalse; blob_info->length=0; blob_info->offset=0; + blob_info->mode=UndefinedBlobMode; blob_info->eof=MagickFalse; blob_info->error=0; blob_info->exempt=MagickFalse; @@ -1723,9 +1728,9 @@ MagickExport MagickBooleanType GetBlobError(const Image *image) assert(image->signature == MagickCoreSignature); if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); - if ((image->blob->status != MagickFalse) && (image->blob->error_number != 0)) + if ((image->blob->status != 0) && (image->blob->error_number != 0)) errno=image->blob->error_number; - return(image->blob->status); + return(image->blob->status == 0 ? MagickFalse : MagickTrue); } /* @@ -2118,7 +2123,6 @@ MagickExport void *ImageToBlob(const ImageInfo *image_info, (void) FormatLocaleString(image->filename,MagickPathExtent, "%s:%s",image->magick,unique); status=WriteImage(blob_info,image,exception); - (void) CloseBlob(image); (void) fclose(blob_info->file); if (status != MagickFalse) blob=FileToBlob(unique,SIZE_MAX,length,exception); @@ -2213,7 +2217,6 @@ MagickExport void ImageToCustomStream(const ImageInfo *image_info,Image *image, (void) CloseBlob(image); *image->filename='\0'; (void) WriteImage(clone_info,image,exception); - (void) CloseBlob(image); } else { @@ -2257,7 +2260,6 @@ MagickExport void ImageToCustomStream(const ImageInfo *image_info,Image *image, (void) FormatLocaleString(image->filename,MagickPathExtent, "%s:%s",image->magick,unique); status=WriteImage(clone_info,image,exception); - (void) CloseBlob(image); if (status != MagickFalse) { (void) fseek(clone_info->file,0,SEEK_SET); @@ -2529,7 +2531,6 @@ MagickExport void *ImagesToBlob(const ImageInfo *image_info,Image *images, (void) FormatLocaleString(filename,MagickPathExtent,"%s:%s", images->magick,unique); status=WriteImages(blob_info,images,filename,exception); - (void) CloseBlob(images); (void) fclose(blob_info->file); if (status != MagickFalse) blob=FileToBlob(unique,SIZE_MAX,length,exception); @@ -2624,7 +2625,6 @@ MagickExport void ImagesToCustomStream(const ImageInfo *image_info, (void) CloseBlob(images); *images->filename='\0'; (void) WriteImages(clone_info,images,images->filename,exception); - (void) CloseBlob(images); } else { @@ -2669,7 +2669,6 @@ MagickExport void ImagesToCustomStream(const ImageInfo *image_info, (void) FormatLocaleString(filename,MagickPathExtent,"%s:%s", images->magick,unique); status=WriteImages(clone_info,images,filename,exception); - (void) CloseBlob(images); if (status != MagickFalse) { (void) fseek(clone_info->file,0,SEEK_SET); @@ -3564,7 +3563,7 @@ MagickExport MagickBooleanType OpenBlob(const ImageInfo *image_info, (void) SetStreamBuffering(image_info,blob_info); } } - blob_info->status=MagickFalse; + blob_info->status=0; blob_info->error_number=0; if (blob_info->type != UndefinedStream) blob_info->size=GetBlobSize(image); @@ -5494,18 +5493,19 @@ MagickExport void SetCustomStreamWriter(CustomStreamInfo *custom_stream, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % SyncBlob() flushes the datastream if it is a file or synchronizes the data -% attributes if it is an blob. +% attributes if it is an blob. It returns 0 on success; otherwise, it returns +% -1 and set errno to indicate the error. % % The format of the SyncBlob method is: % -% int SyncBlob(Image *image) +% int SyncBlob(const Image *image) % % A description of each parameter follows: % % o image: the image. % */ -static int SyncBlob(Image *image) +static int SyncBlob(const Image *image) { BlobInfo *magick_restrict blob_info; @@ -5516,7 +5516,6 @@ static int SyncBlob(Image *image) assert(image != (Image *) NULL); assert(image->signature == MagickCoreSignature); assert(image->blob != (BlobInfo *) NULL); - assert(image->blob->type != UndefinedStream); if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); blob_info=image->blob; @@ -5535,7 +5534,7 @@ static int SyncBlob(Image *image) case ZipStream: { #if defined(MAGICKCORE_ZLIB_DELEGATE) - status=gzflush(blob_info->file_info.gzfile,Z_SYNC_FLUSH); + (void) gzflush(blob_info->file_info.gzfile,Z_SYNC_FLUSH); #endif break; } diff --git a/ImageMagick-7.1.1-21/MagickCore/blob.h b/ImageMagick-7.1.1-22/MagickCore/blob.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/blob.h rename to ImageMagick-7.1.1-22/MagickCore/blob.h diff --git a/ImageMagick-7.1.1-21/MagickCore/cache-private.h b/ImageMagick-7.1.1-22/MagickCore/cache-private.h similarity index 95% rename from ImageMagick-7.1.1-21/MagickCore/cache-private.h rename to ImageMagick-7.1.1-22/MagickCore/cache-private.h index cf39c365..18db2588 100644 --- a/ImageMagick-7.1.1-21/MagickCore/cache-private.h +++ b/ImageMagick-7.1.1-22/MagickCore/cache-private.h @@ -235,6 +235,17 @@ typedef struct _CacheInfo height_limit; } CacheInfo; +static inline MagickBooleanType IsValidPixelOffset(const ssize_t x, + const size_t a) +{ + if (a == 0) + return(MagickTrue); + if ((x >= (MAGICK_SSIZE_MAX/MaxPixelChannels/(ssize_t) a)) || + (x <= (MAGICK_SSIZE_MIN/MaxPixelChannels/(ssize_t) a))) + return(MagickFalse); + return(MagickTrue); +} + extern MagickPrivate Cache AcquirePixelCache(const size_t), ClonePixelCache(const Cache), diff --git a/ImageMagick-7.1.1-21/MagickCore/cache-view.c b/ImageMagick-7.1.1-22/MagickCore/cache-view.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/cache-view.c rename to ImageMagick-7.1.1-22/MagickCore/cache-view.c diff --git a/ImageMagick-7.1.1-21/MagickCore/cache-view.h b/ImageMagick-7.1.1-22/MagickCore/cache-view.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/cache-view.h rename to ImageMagick-7.1.1-22/MagickCore/cache-view.h diff --git a/ImageMagick-7.1.1-21/MagickCore/cache.c b/ImageMagick-7.1.1-22/MagickCore/cache.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/cache.c rename to ImageMagick-7.1.1-22/MagickCore/cache.c index 049f3504..b457083b 100644 --- a/ImageMagick-7.1.1-21/MagickCore/cache.c +++ b/ImageMagick-7.1.1-22/MagickCore/cache.c @@ -1696,11 +1696,8 @@ static Cache GetImagePixelCache(Image *image,const MagickBooleanType clone, if (difftime(GetMagickTime(),image->timestamp) > (double) image->ttl) { - cache_info=(CacheInfo *) image->cache; - if (cache_info->file != -1) - (void) ClosePixelCacheOnDisk(cache_info); (void) ThrowMagickException(exception,GetMagickModule(), - ResourceLimitFatalError,"TimeLimitExceeded","`%s'",image->filename); + ResourceLimitError,"TimeLimitExceeded","`%s'",image->filename); return((Cache) NULL); } if (cpu_throttle == MagickResourceInfinity) @@ -2574,9 +2571,13 @@ MagickExport const void *GetVirtualMetacontent(const Image *image) assert(image->cache != (Cache) NULL); cache_info=(CacheInfo *) image->cache; assert(cache_info->signature == MagickCoreSignature); - metacontent=cache_info->methods.get_virtual_metacontent_from_handler(image); - if (metacontent != (void *) NULL) - return(metacontent); + if (cache_info->methods.get_virtual_metacontent_from_handler != (GetVirtualMetacontentFromHandler) NULL) + { + metacontent=cache_info->methods.get_virtual_metacontent_from_handler( + image); + if (metacontent != (const void *) NULL) + return(metacontent); + } assert(id < (int) cache_info->number_threads); metacontent=GetVirtualMetacontentFromNexus(cache_info, cache_info->nexus_info[id]); @@ -2686,17 +2687,6 @@ static inline MagickBooleanType IsOffsetOverflow(const ssize_t x, return(MagickTrue); } -static inline MagickBooleanType IsValidOffset(const ssize_t y, - const size_t columns) -{ - if (columns == 0) - return(MagickTrue); - if ((y >= (MAGICK_SSIZE_MAX/(ssize_t) columns)) || - (y <= (MAGICK_SSIZE_MIN/(ssize_t) columns))) - return(MagickFalse); - return(MagickTrue); -} - static inline ssize_t RandomX(RandomInfo *random_info,const size_t columns) { return((ssize_t) (columns*GetPseudoRandomValue(random_info))); @@ -2736,6 +2726,12 @@ MagickPrivate const Quantum *GetVirtualPixelCacheNexus(const Image *image, CacheInfo *magick_restrict cache_info; + const Quantum + *magick_restrict p; + + const void + *magick_restrict r; + MagickOffsetType offset; @@ -2748,27 +2744,17 @@ MagickPrivate const Quantum *GetVirtualPixelCacheNexus(const Image *image, Quantum *magick_restrict pixels, + *magick_restrict q, virtual_pixel[MaxPixelChannels]; - const Quantum - *magick_restrict p; - - const void - *magick_restrict r; - - Quantum - *magick_restrict q; - ssize_t i, - u; + u, + v; unsigned char *magick_restrict s; - ssize_t - v; - void *magick_restrict virtual_metacontent; @@ -2791,7 +2777,7 @@ MagickPrivate const Quantum *GetVirtualPixelCacheNexus(const Image *image, nexus_info,exception); if (pixels == (Quantum *) NULL) return((const Quantum *) NULL); - if (IsValidOffset(nexus_info->region.y,cache_info->columns) == MagickFalse) + if (IsValidPixelOffset(nexus_info->region.y,cache_info->columns) == MagickFalse) return((const Quantum *) NULL); offset=nexus_info->region.y*(MagickOffsetType) cache_info->columns; if (IsOffsetOverflow(offset,nexus_info->region.x) == MagickFalse) @@ -4201,7 +4187,7 @@ MagickPrivate Quantum *QueueAuthenticPixelCacheNexus(Image *image, "PixelsAreNotAuthentic","`%s'",image->filename); return((Quantum *) NULL); } - if (IsValidOffset(y,cache_info->columns) == MagickFalse) + if (IsValidPixelOffset(y,cache_info->columns) == MagickFalse) return((Quantum *) NULL); offset=y*(MagickOffsetType) cache_info->columns+x; if (offset < 0) @@ -4452,7 +4438,7 @@ static MagickBooleanType ReadPixelCacheMetacontent( return(MagickFalse); if (nexus_info->authentic_pixel_cache != MagickFalse) return(MagickTrue); - if (IsValidOffset(nexus_info->region.y,cache_info->columns) == MagickFalse) + if (IsValidPixelOffset(nexus_info->region.y,cache_info->columns) == MagickFalse) return(MagickFalse); offset=nexus_info->region.y*(MagickOffsetType) cache_info->columns+ nexus_info->region.x; @@ -4626,7 +4612,7 @@ static MagickBooleanType ReadPixelCachePixels( if (nexus_info->authentic_pixel_cache != MagickFalse) return(MagickTrue); - if (IsValidOffset(nexus_info->region.y,cache_info->columns) == MagickFalse) + if (IsValidPixelOffset(nexus_info->region.y,cache_info->columns) == MagickFalse) return(MagickFalse); offset=nexus_info->region.y*(MagickOffsetType) cache_info->columns; if ((offset/(MagickOffsetType) cache_info->columns) != nexus_info->region.y) @@ -5080,16 +5066,6 @@ static inline void PrefetchPixelCacheNexusPixels(const NexusInfo *nexus_info, MagickCachePrefetch((unsigned char *) nexus_info->pixels+CACHE_LINE_SIZE,1,1); } -static inline MagickBooleanType ValidatePixelOffset(const ssize_t x, - const size_t a) -{ - if ((x >= 0) && (x >= ((ssize_t) (MAGICK_SSIZE_MAX-MaxPixelChannels*a)))) - return(MagickFalse); - if (x <= ((ssize_t) (MAGICK_SSIZE_MIN+MaxPixelChannels*(MagickOffsetType) a))) - return(MagickFalse); - return(MagickTrue); -} - static Quantum *SetPixelCacheNexusPixels( const CacheInfo *magick_restrict cache_info,const MapMode mode, const ssize_t x,const ssize_t y,const size_t width,const size_t height, @@ -5116,14 +5092,19 @@ static Quantum *SetPixelCacheNexusPixels( return((Quantum *) NULL); } if (((MagickSizeType) width > cache_info->width_limit) || - ((MagickSizeType) height > cache_info->height_limit) || - (ValidatePixelOffset(x,width) == MagickFalse) || - (ValidatePixelOffset(y,height) == MagickFalse)) + ((MagickSizeType) height > cache_info->height_limit)) { (void) ThrowMagickException(exception,GetMagickModule(),ImageError, "WidthOrHeightExceedsLimit","`%s'",cache_info->filename); return((Quantum *) NULL); } + if ((IsValidPixelOffset(x,width) == MagickFalse) || + (IsValidPixelOffset(y,height) == MagickFalse)) + { + (void) ThrowMagickException(exception,GetMagickModule(),CorruptImageError, + "InvalidPixel","`%s'",cache_info->filename); + return((Quantum *) NULL); + } if (((cache_info->type == MemoryCache) || (cache_info->type == MapCache)) && (buffered == MagickFalse)) { @@ -5138,7 +5119,7 @@ static Quantum *SetPixelCacheNexusPixels( /* Pixels are accessed directly from memory. */ - if (IsValidOffset(y,cache_info->columns) == MagickFalse) + if (IsValidPixelOffset(y,cache_info->columns) == MagickFalse) return((Quantum *) NULL); offset=y*(MagickOffsetType) cache_info->columns+x; nexus_info->pixels=cache_info->pixels+(MagickOffsetType) @@ -5638,7 +5619,7 @@ static MagickBooleanType WritePixelCacheMetacontent(CacheInfo *cache_info, return(MagickTrue); if (nexus_info->metacontent == (unsigned char *) NULL) return(MagickFalse); - if (IsValidOffset(nexus_info->region.y,cache_info->columns) == MagickFalse) + if (IsValidPixelOffset(nexus_info->region.y,cache_info->columns) == MagickFalse) return(MagickFalse); offset=nexus_info->region.y*(MagickOffsetType) cache_info->columns+ nexus_info->region.x; @@ -5811,7 +5792,7 @@ static MagickBooleanType WritePixelCachePixels( if (nexus_info->authentic_pixel_cache != MagickFalse) return(MagickTrue); - if (IsValidOffset(nexus_info->region.y,cache_info->columns) == MagickFalse) + if (IsValidPixelOffset(nexus_info->region.y,cache_info->columns) == MagickFalse) return(MagickFalse); offset=nexus_info->region.y*(MagickOffsetType) cache_info->columns+ nexus_info->region.x; diff --git a/ImageMagick-7.1.1-21/MagickCore/cache.h b/ImageMagick-7.1.1-22/MagickCore/cache.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/cache.h rename to ImageMagick-7.1.1-22/MagickCore/cache.h diff --git a/ImageMagick-7.1.1-21/MagickCore/channel.c b/ImageMagick-7.1.1-22/MagickCore/channel.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/channel.c rename to ImageMagick-7.1.1-22/MagickCore/channel.c index 3ca1ecdd..fa027c7e 100644 --- a/ImageMagick-7.1.1-21/MagickCore/channel.c +++ b/ImageMagick-7.1.1-22/MagickCore/channel.c @@ -79,8 +79,9 @@ % => copy one channel to another channel (e.g. red=>green) % = assign a constant value to a channel (e.g. red=50%) % , write new image channels in the specified order (e.g. red, green) -% | add a new output image for the next set of channel operations -% ; move to the next input image for the source of channel data +% ; add a new output image for the next set of channel operations +% | move to the next input image for the source of channel data +% If there are no more images in the list, | has no effect. % % For example, to create 3 grayscale images from the red, green, and blue % channels of an image, use: @@ -269,7 +270,6 @@ MagickExport Image *ChannelFxImage(const Image *image,const char *expression, } case '|': { - source_image=GetFirstImageInList(source_image); if (GetNextImageInList(source_image) != (Image *) NULL) source_image=GetNextImageInList(source_image); (void) GetNextToken(p,&p,MagickPathExtent,token); diff --git a/ImageMagick-7.1.1-21/MagickCore/channel.h b/ImageMagick-7.1.1-22/MagickCore/channel.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/channel.h rename to ImageMagick-7.1.1-22/MagickCore/channel.h diff --git a/ImageMagick-7.1.1-21/MagickCore/cipher.c b/ImageMagick-7.1.1-22/MagickCore/cipher.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/cipher.c rename to ImageMagick-7.1.1-22/MagickCore/cipher.c diff --git a/ImageMagick-7.1.1-21/MagickCore/cipher.h b/ImageMagick-7.1.1-22/MagickCore/cipher.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/cipher.h rename to ImageMagick-7.1.1-22/MagickCore/cipher.h diff --git a/ImageMagick-7.1.1-21/MagickCore/client.c b/ImageMagick-7.1.1-22/MagickCore/client.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/client.c rename to ImageMagick-7.1.1-22/MagickCore/client.c diff --git a/ImageMagick-7.1.1-21/MagickCore/client.h b/ImageMagick-7.1.1-22/MagickCore/client.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/client.h rename to ImageMagick-7.1.1-22/MagickCore/client.h diff --git a/ImageMagick-7.1.1-21/MagickCore/coder-private.h b/ImageMagick-7.1.1-22/MagickCore/coder-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/coder-private.h rename to ImageMagick-7.1.1-22/MagickCore/coder-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/coder.c b/ImageMagick-7.1.1-22/MagickCore/coder.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/coder.c rename to ImageMagick-7.1.1-22/MagickCore/coder.c diff --git a/ImageMagick-7.1.1-21/MagickCore/coder.h b/ImageMagick-7.1.1-22/MagickCore/coder.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/coder.h rename to ImageMagick-7.1.1-22/MagickCore/coder.h diff --git a/ImageMagick-7.1.1-21/MagickCore/color-private.h b/ImageMagick-7.1.1-22/MagickCore/color-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/color-private.h rename to ImageMagick-7.1.1-22/MagickCore/color-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/color.c b/ImageMagick-7.1.1-22/MagickCore/color.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/color.c rename to ImageMagick-7.1.1-22/MagickCore/color.c diff --git a/ImageMagick-7.1.1-21/MagickCore/color.h b/ImageMagick-7.1.1-22/MagickCore/color.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/color.h rename to ImageMagick-7.1.1-22/MagickCore/color.h diff --git a/ImageMagick-7.1.1-21/MagickCore/colormap-private.h b/ImageMagick-7.1.1-22/MagickCore/colormap-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/colormap-private.h rename to ImageMagick-7.1.1-22/MagickCore/colormap-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/colormap.c b/ImageMagick-7.1.1-22/MagickCore/colormap.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/colormap.c rename to ImageMagick-7.1.1-22/MagickCore/colormap.c diff --git a/ImageMagick-7.1.1-21/MagickCore/colormap.h b/ImageMagick-7.1.1-22/MagickCore/colormap.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/colormap.h rename to ImageMagick-7.1.1-22/MagickCore/colormap.h diff --git a/ImageMagick-7.1.1-21/MagickCore/colorspace-private.h b/ImageMagick-7.1.1-22/MagickCore/colorspace-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/colorspace-private.h rename to ImageMagick-7.1.1-22/MagickCore/colorspace-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/colorspace.c b/ImageMagick-7.1.1-22/MagickCore/colorspace.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/colorspace.c rename to ImageMagick-7.1.1-22/MagickCore/colorspace.c index 864e5a03..989f8419 100644 --- a/ImageMagick-7.1.1-21/MagickCore/colorspace.c +++ b/ImageMagick-7.1.1-22/MagickCore/colorspace.c @@ -1048,7 +1048,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, #pragma omp parallel for schedule(static) #endif for (i=0; i <= (ssize_t) MaxMap; i++) - logmap[i]=ScaleMapToQuantum((double) (MaxMap*(reference_white+ + logmap[i]=ScaleMapToQuantum(((double) MaxMap*(reference_white+ log10(black+(1.0*i/MaxMap)*(1.0-black))/((gamma/density)*0.002* PerceptibleReciprocal(film_gamma)))/1024.0)); image_view=AcquireAuthenticCacheView(image,exception); @@ -1207,8 +1207,8 @@ static MagickBooleanType sRGBTransformImage(Image *image, I and Q, normally -0.5 through 0.5, are normalized to the range 0 through QuantumRange. */ - primary_info.y=(double) (MaxMap+1.0)/2.0; - primary_info.z=(double) (MaxMap+1.0)/2.0; + primary_info.y=(MagickRealType) ((MaxMap+1)/2); + primary_info.z=(MagickRealType) ((MaxMap+1)/2); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) #endif @@ -1238,8 +1238,8 @@ static MagickBooleanType sRGBTransformImage(Image *image, Cb and Cr, normally -0.5 through 0.5, are normalized to the range 0 through QuantumRange. */ - primary_info.y=(double) (MaxMap+1.0)/2.0; - primary_info.z=(double) (MaxMap+1.0)/2.0; + primary_info.y=(MagickRealType) ((MaxMap+1)/2); + primary_info.z=(MagickRealType) ((MaxMap+1)/2); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) #endif @@ -1269,8 +1269,8 @@ static MagickBooleanType sRGBTransformImage(Image *image, Cb and Cr, normally -0.5 through 0.5, are normalized to the range 0 through QuantumRange. */ - primary_info.y=(double) (MaxMap+1.0)/2.0; - primary_info.z=(double) (MaxMap+1.0)/2.0; + primary_info.y=(double) ((MaxMap+1)/2); + primary_info.z=(double) ((MaxMap+1)/2); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) #endif @@ -1299,8 +1299,10 @@ static MagickBooleanType sRGBTransformImage(Image *image, YCC is scaled by 1.3584. C1 zero is 156 and C2 is at 137. */ - primary_info.y=(double) ScaleQuantumToMap(ScaleCharToQuantum(156)); - primary_info.z=(double) ScaleQuantumToMap(ScaleCharToQuantum(137)); + primary_info.y=(MagickRealType) ScaleQuantumToMap( + ScaleCharToQuantum(156)); + primary_info.z=(MagickRealType) ScaleQuantumToMap( + ScaleCharToQuantum(137)); for (i=0; i <= (ssize_t) (0.018*MaxMap); i++) { x_map[i].x=0.005382*i; diff --git a/ImageMagick-7.1.1-21/MagickCore/colorspace.h b/ImageMagick-7.1.1-22/MagickCore/colorspace.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/colorspace.h rename to ImageMagick-7.1.1-22/MagickCore/colorspace.h diff --git a/ImageMagick-7.1.1-21/MagickCore/compare.c b/ImageMagick-7.1.1-22/MagickCore/compare.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/compare.c rename to ImageMagick-7.1.1-22/MagickCore/compare.c diff --git a/ImageMagick-7.1.1-21/MagickCore/compare.h b/ImageMagick-7.1.1-22/MagickCore/compare.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/compare.h rename to ImageMagick-7.1.1-22/MagickCore/compare.h diff --git a/ImageMagick-7.1.1-21/MagickCore/composite-private.h b/ImageMagick-7.1.1-22/MagickCore/composite-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/composite-private.h rename to ImageMagick-7.1.1-22/MagickCore/composite-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/composite.c b/ImageMagick-7.1.1-22/MagickCore/composite.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/composite.c rename to ImageMagick-7.1.1-22/MagickCore/composite.c diff --git a/ImageMagick-7.1.1-21/MagickCore/composite.h b/ImageMagick-7.1.1-22/MagickCore/composite.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/composite.h rename to ImageMagick-7.1.1-22/MagickCore/composite.h diff --git a/ImageMagick-7.1.1-21/MagickCore/compress.c b/ImageMagick-7.1.1-22/MagickCore/compress.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/compress.c rename to ImageMagick-7.1.1-22/MagickCore/compress.c diff --git a/ImageMagick-7.1.1-21/MagickCore/compress.h b/ImageMagick-7.1.1-22/MagickCore/compress.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/compress.h rename to ImageMagick-7.1.1-22/MagickCore/compress.h diff --git a/ImageMagick-7.1.1-21/MagickCore/configure-private.h b/ImageMagick-7.1.1-22/MagickCore/configure-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/configure-private.h rename to ImageMagick-7.1.1-22/MagickCore/configure-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/configure.c b/ImageMagick-7.1.1-22/MagickCore/configure.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/configure.c rename to ImageMagick-7.1.1-22/MagickCore/configure.c diff --git a/ImageMagick-7.1.1-21/MagickCore/configure.h b/ImageMagick-7.1.1-22/MagickCore/configure.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/configure.h rename to ImageMagick-7.1.1-22/MagickCore/configure.h diff --git a/ImageMagick-7.1.1-21/MagickCore/constitute-private.h b/ImageMagick-7.1.1-22/MagickCore/constitute-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/constitute-private.h rename to ImageMagick-7.1.1-22/MagickCore/constitute-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/constitute.c b/ImageMagick-7.1.1-22/MagickCore/constitute.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/constitute.c rename to ImageMagick-7.1.1-22/MagickCore/constitute.c index 08a3fa8c..46e270f6 100644 --- a/ImageMagick-7.1.1-21/MagickCore/constitute.c +++ b/ImageMagick-7.1.1-22/MagickCore/constitute.c @@ -1332,7 +1332,8 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info, (void) AcquireUniqueFilename(image->filename); temporary=MagickTrue; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; } } encoder=GetImageEncoder(magick_info); @@ -1436,7 +1437,8 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info, (void) RelinquishUniqueFileResource(write_info->filename); status=ImageToFile(image,write_info->filename,exception); } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; (void) RelinquishUniqueFileResource(image->filename); (void) CopyMagickString(image->filename,write_info->filename, MagickPathExtent); diff --git a/ImageMagick-7.1.1-21/MagickCore/constitute.h b/ImageMagick-7.1.1-22/MagickCore/constitute.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/constitute.h rename to ImageMagick-7.1.1-22/MagickCore/constitute.h diff --git a/ImageMagick-7.1.1-21/MagickCore/decorate.c b/ImageMagick-7.1.1-22/MagickCore/decorate.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/decorate.c rename to ImageMagick-7.1.1-22/MagickCore/decorate.c diff --git a/ImageMagick-7.1.1-21/MagickCore/decorate.h b/ImageMagick-7.1.1-22/MagickCore/decorate.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/decorate.h rename to ImageMagick-7.1.1-22/MagickCore/decorate.h diff --git a/ImageMagick-7.1.1-21/MagickCore/delegate-private.h b/ImageMagick-7.1.1-22/MagickCore/delegate-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/delegate-private.h rename to ImageMagick-7.1.1-22/MagickCore/delegate-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/delegate.c b/ImageMagick-7.1.1-22/MagickCore/delegate.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/delegate.c rename to ImageMagick-7.1.1-22/MagickCore/delegate.c index 5193d221..b780bcfb 100644 --- a/ImageMagick-7.1.1-21/MagickCore/delegate.c +++ b/ImageMagick-7.1.1-22/MagickCore/delegate.c @@ -1828,7 +1828,6 @@ MagickExport MagickBooleanType InvokeDelegate(ImageInfo *image_info, { (void) FormatLocaleString(p->filename,MagickPathExtent,"%s:%s", delegate_info->decode,clone_info->filename); - (void) SetImageOption(clone_info,"quantum:format","floating-point"); status=WriteImage(clone_info,p,exception); if (status == MagickFalse) { diff --git a/ImageMagick-7.1.1-21/MagickCore/delegate.h b/ImageMagick-7.1.1-22/MagickCore/delegate.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/delegate.h rename to ImageMagick-7.1.1-22/MagickCore/delegate.h diff --git a/ImageMagick-7.1.1-21/MagickCore/deprecate.c b/ImageMagick-7.1.1-22/MagickCore/deprecate.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/deprecate.c rename to ImageMagick-7.1.1-22/MagickCore/deprecate.c diff --git a/ImageMagick-7.1.1-21/MagickCore/deprecate.h b/ImageMagick-7.1.1-22/MagickCore/deprecate.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/deprecate.h rename to ImageMagick-7.1.1-22/MagickCore/deprecate.h diff --git a/ImageMagick-7.1.1-21/MagickCore/display-private.h b/ImageMagick-7.1.1-22/MagickCore/display-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/display-private.h rename to ImageMagick-7.1.1-22/MagickCore/display-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/display.c b/ImageMagick-7.1.1-22/MagickCore/display.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/display.c rename to ImageMagick-7.1.1-22/MagickCore/display.c index 3f23fd89..907a05f2 100644 --- a/ImageMagick-7.1.1-21/MagickCore/display.c +++ b/ImageMagick-7.1.1-22/MagickCore/display.c @@ -1408,7 +1408,7 @@ typedef enum SaveToUndoBufferCommand, FreeBuffersCommand, NullCommand -} CommandType; +} DisplayCommand; typedef enum { @@ -1537,12 +1537,12 @@ static const unsigned char /* Function prototypes. */ -static CommandType +static DisplayCommand XImageWindowCommand(Display *,XResourceInfo *,XWindows *, const MagickStatusType,KeySym,Image **,ExceptionInfo *); static Image - *XMagickCommand(Display *,XResourceInfo *,XWindows *,const CommandType, + *XMagickCommand(Display *,XResourceInfo *,XWindows *,const DisplayCommand, Image **,ExceptionInfo *), *XOpenImage(Display *,XResourceInfo *,XWindows *,const MagickBooleanType), *XTileImage(Display *,XResourceInfo *,XWindows *,Image *,XEvent *, @@ -1578,7 +1578,7 @@ static MagickBooleanType static void XDrawPanRectangle(Display *,XWindows *), - XImageCache(Display *,XResourceInfo *,XWindows *,const CommandType,Image **, + XImageCache(Display *,XResourceInfo *,XWindows *,const DisplayCommand,Image **, ExceptionInfo *), XMagnifyImage(Display *,XWindows *,XEvent *,ExceptionInfo *), XMakePanImage(Display *,XResourceInfo *,XWindows *,Image *,ExceptionInfo *), @@ -6379,7 +6379,7 @@ static void XDrawPanRectangle(Display *display,XWindows *windows) % The format of the XImageCache method is: % % void XImageCache(Display *display,XResourceInfo *resource_info, -% XWindows *windows,const CommandType command,Image **image, +% XWindows *windows,const DisplayCommand command,Image **image, % ExceptionInfo *exception) % % A description of each parameter follows: @@ -6400,7 +6400,7 @@ static void XDrawPanRectangle(Display *display,XWindows *windows) % */ static void XImageCache(Display *display,XResourceInfo *resource_info, - XWindows *windows,const CommandType command,Image **image, + XWindows *windows,const DisplayCommand command,Image **image, ExceptionInfo *exception) { Image @@ -6659,7 +6659,7 @@ static void XImageCache(Display *display,XResourceInfo *resource_info, % % The format of the XImageWindowCommand method is: % -% CommandType XImageWindowCommand(Display *display, +% DisplayCommand XImageWindowCommand(Display *display, % XResourceInfo *resource_info,XWindows *windows, % const MagickStatusType state,KeySym key_symbol,Image **image, % ExceptionInfo *exception) @@ -6687,7 +6687,7 @@ static void XImageCache(Display *display,XResourceInfo *resource_info, % o exception: return any errors or warnings in this structure. % */ -static CommandType XImageWindowCommand(Display *display, +static DisplayCommand XImageWindowCommand(Display *display, XResourceInfo *resource_info,XWindows *windows,const MagickStatusType state, KeySym key_symbol,Image **image,ExceptionInfo *exception) { @@ -7055,7 +7055,7 @@ static CommandType XImageWindowCommand(Display *display, % The format of the XMagickCommand method is: % % Image *XMagickCommand(Display *display,XResourceInfo *resource_info, -% XWindows *windows,const CommandType command,Image **image, +% XWindows *windows,const DisplayCommand command,Image **image, % ExceptionInfo *exception) % % A description of each parameter follows: @@ -7076,7 +7076,7 @@ static CommandType XImageWindowCommand(Display *display, % */ static Image *XMagickCommand(Display *display,XResourceInfo *resource_info, - XWindows *windows,const CommandType command,Image **image, + XWindows *windows,const DisplayCommand command,Image **image, ExceptionInfo *exception) { char @@ -11169,7 +11169,7 @@ static MagickBooleanType XROIImage(Display *display, MiscellanyMenu }; - static const CommandType + static const DisplayCommand ApplyCommands[] = { NullCommand, @@ -11255,7 +11255,7 @@ static MagickBooleanType XROIImage(Display *display, ROIDismissCommand }; - static const CommandType + static const DisplayCommand *Commands[ApplyMenus] = { FileCommands, @@ -11271,8 +11271,8 @@ static MagickBooleanType XROIImage(Display *display, command[MagickPathExtent], text[MagickPathExtent]; - CommandType - command_type; + DisplayCommand + display_command; Cursor cursor; @@ -11580,7 +11580,7 @@ static MagickBooleanType XROIImage(Display *display, Wait for user to grab a corner of the rectangle or press return. */ state=DefaultState; - command_type=NullCommand; + display_command=NullCommand; crop_info.x=0; crop_info.y=0; (void) XMapWindow(display,windows->info.id); @@ -11608,13 +11608,13 @@ static MagickBooleanType XROIImage(Display *display, if ((state & UpdateRegionState) != 0) { (void) XSetFunction(display,windows->image.highlight_context,GXcopy); - switch (command_type) + switch (display_command) { case UndoCommand: case RedoCommand: { - (void) XMagickCommand(display,resource_info,windows,command_type, - image,exception); + (void) XMagickCommand(display,resource_info,windows, + display_command,image,exception); break; } default: @@ -11651,8 +11651,8 @@ static MagickBooleanType XROIImage(Display *display, Apply image processing technique to the region of interest. */ windows->image.orphan=MagickTrue; - (void) XMagickCommand(display,resource_info,windows,command_type, - &roi_image,exception); + (void) XMagickCommand(display,resource_info,windows, + display_command,&roi_image,exception); progress_monitor=SetImageProgressMonitor(*image, (MagickProgressMonitor) NULL,(*image)->client_data); (void) XMagickCommand(display,resource_info,windows, @@ -11666,7 +11666,7 @@ static MagickBooleanType XROIImage(Display *display, break; } } - if (command_type != InfoCommand) + if (display_command != InfoCommand) { XConfigureImageColormap(display,resource_info,windows,*image, exception); @@ -11688,12 +11688,12 @@ static MagickBooleanType XROIImage(Display *display, Select a command from the Command widget. */ (void) XSetFunction(display,windows->image.highlight_context,GXcopy); - command_type=NullCommand; + display_command=NullCommand; id=XCommandWidget(display,windows,ApplyMenu,&event); if (id >= 0) { (void) CopyMagickString(command,ApplyMenu[id],MagickPathExtent); - command_type=ApplyCommands[id]; + display_command=ApplyCommands[id]; if (id < ApplyMenus) { /* @@ -11705,7 +11705,7 @@ static MagickBooleanType XROIImage(Display *display, { (void) CopyMagickString(command,Menus[id][entry], MagickPathExtent); - command_type=Commands[id][entry]; + display_command=Commands[id][entry]; } } } @@ -11713,7 +11713,7 @@ static MagickBooleanType XROIImage(Display *display, GXinvert); XHighlightRectangle(display,windows->image.id, windows->image.highlight_context,&highlight_info); - if (command_type == HelpCommand) + if (display_command == HelpCommand) { (void) XSetFunction(display,windows->image.highlight_context, GXcopy); @@ -11723,7 +11723,7 @@ static MagickBooleanType XROIImage(Display *display, GXinvert); continue; } - if (command_type == QuitCommand) + if (display_command == QuitCommand) { /* exit. @@ -11732,7 +11732,7 @@ static MagickBooleanType XROIImage(Display *display, state|=ExitState; continue; } - if (command_type != NullCommand) + if (display_command != NullCommand) state|=UpdateRegionState; continue; } @@ -11890,9 +11890,9 @@ static MagickBooleanType XROIImage(Display *display, } default: { - command_type=XImageWindowCommand(display,resource_info,windows, + display_command=XImageWindowCommand(display,resource_info,windows, event.xkey.state,key_symbol,image,exception); - if (command_type != NullCommand) + if (display_command != NullCommand) state|=UpdateRegionState; break; } @@ -14276,7 +14276,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, HelpMenu }; - static CommandType + static DisplayCommand CommandMenus[] = { NullCommand, @@ -14427,7 +14427,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, QuitCommand }; - static CommandType + static DisplayCommand *Commands[MagickMenus] = { FileCommands, @@ -14448,8 +14448,8 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, geometry[MagickPathExtent], resource_name[MagickPathExtent]; - CommandType - command_type; + DisplayCommand + display_command; Image *display_image, @@ -15172,7 +15172,7 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, if (id < 0) continue; (void) CopyMagickString(command,CommandMenu[id],MagickPathExtent); - command_type=CommandMenus[id]; + display_command=CommandMenus[id]; if (id < MagickMenus) { /* @@ -15183,10 +15183,10 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, if (entry < 0) continue; (void) CopyMagickString(command,Menus[id][entry],MagickPathExtent); - command_type=Commands[id][entry]; + display_command=Commands[id][entry]; } - if (command_type != NullCommand) - nexus=XMagickCommand(display,resource_info,windows,command_type, + if (display_command != NullCommand) + nexus=XMagickCommand(display,resource_info,windows,display_command, &display_image,exception); continue; } @@ -15814,11 +15814,11 @@ MagickExport Image *XDisplayImage(Display *display,XResourceInfo *resource_info, key_symbol,command); if (event.xkey.window == windows->image.id) { - command_type=XImageWindowCommand(display,resource_info,windows, + display_command=XImageWindowCommand(display,resource_info,windows, event.xkey.state,key_symbol,&display_image,exception); - if (command_type != NullCommand) - nexus=XMagickCommand(display,resource_info,windows,command_type, - &display_image,exception); + if (display_command != NullCommand) + nexus=XMagickCommand(display,resource_info,windows, + display_command,&display_image,exception); } if (event.xkey.window == windows->magnify.id) XMagnifyWindowCommand(display,windows,event.xkey.state,key_symbol, diff --git a/ImageMagick-7.1.1-21/MagickCore/display.h b/ImageMagick-7.1.1-22/MagickCore/display.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/display.h rename to ImageMagick-7.1.1-22/MagickCore/display.h diff --git a/ImageMagick-7.1.1-21/MagickCore/distort.c b/ImageMagick-7.1.1-22/MagickCore/distort.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/distort.c rename to ImageMagick-7.1.1-22/MagickCore/distort.c diff --git a/ImageMagick-7.1.1-21/MagickCore/distort.h b/ImageMagick-7.1.1-22/MagickCore/distort.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/distort.h rename to ImageMagick-7.1.1-22/MagickCore/distort.h diff --git a/ImageMagick-7.1.1-21/MagickCore/distribute-cache-private.h b/ImageMagick-7.1.1-22/MagickCore/distribute-cache-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/distribute-cache-private.h rename to ImageMagick-7.1.1-22/MagickCore/distribute-cache-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/distribute-cache.c b/ImageMagick-7.1.1-22/MagickCore/distribute-cache.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/distribute-cache.c rename to ImageMagick-7.1.1-22/MagickCore/distribute-cache.c diff --git a/ImageMagick-7.1.1-21/MagickCore/distribute-cache.h b/ImageMagick-7.1.1-22/MagickCore/distribute-cache.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/distribute-cache.h rename to ImageMagick-7.1.1-22/MagickCore/distribute-cache.h diff --git a/ImageMagick-7.1.1-21/MagickCore/draw-private.h b/ImageMagick-7.1.1-22/MagickCore/draw-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/draw-private.h rename to ImageMagick-7.1.1-22/MagickCore/draw-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/draw.c b/ImageMagick-7.1.1-22/MagickCore/draw.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/draw.c rename to ImageMagick-7.1.1-22/MagickCore/draw.c index de67f746..bb83e8ba 100644 --- a/ImageMagick-7.1.1-21/MagickCore/draw.c +++ b/ImageMagick-7.1.1-22/MagickCore/draw.c @@ -6557,13 +6557,16 @@ static MagickBooleanType TraceEllipse(MVGInfo *mvg_info,const PointInfo center, y+=360.0; angle.y=DegreesToRadians(y); coordinates=ceil((angle.y-angle.x)/step+1.0); - if (CheckPrimitiveExtent(mvg_info,coordinates) == MagickFalse) + if (CheckPrimitiveExtent(mvg_info,coordinates+1) == MagickFalse) return(MagickFalse); + i=0; primitive_info=(*mvg_info->primitive_info)+mvg_info->offset; for (p=primitive_info; angle.x < angle.y; angle.x+=step) { point.x=cos(fmod(angle.x,DegreesToRadians(360.0)))*radii.x+center.x; point.y=sin(fmod(angle.x,DegreesToRadians(360.0)))*radii.y+center.y; + if (i++ >= (ssize_t) coordinates) + break; if (TracePoint(p,point) == MagickFalse) return(MagickFalse); p+=(ssize_t) p->coordinates; diff --git a/ImageMagick-7.1.1-21/MagickCore/draw.h b/ImageMagick-7.1.1-22/MagickCore/draw.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/draw.h rename to ImageMagick-7.1.1-22/MagickCore/draw.h diff --git a/ImageMagick-7.1.1-21/MagickCore/effect.c b/ImageMagick-7.1.1-22/MagickCore/effect.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/effect.c rename to ImageMagick-7.1.1-22/MagickCore/effect.c diff --git a/ImageMagick-7.1.1-21/MagickCore/effect.h b/ImageMagick-7.1.1-22/MagickCore/effect.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/effect.h rename to ImageMagick-7.1.1-22/MagickCore/effect.h diff --git a/ImageMagick-7.1.1-21/MagickCore/enhance.c b/ImageMagick-7.1.1-22/MagickCore/enhance.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/enhance.c rename to ImageMagick-7.1.1-22/MagickCore/enhance.c diff --git a/ImageMagick-7.1.1-21/MagickCore/enhance.h b/ImageMagick-7.1.1-22/MagickCore/enhance.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/enhance.h rename to ImageMagick-7.1.1-22/MagickCore/enhance.h diff --git a/ImageMagick-7.1.1-21/MagickCore/exception-private.h b/ImageMagick-7.1.1-22/MagickCore/exception-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/exception-private.h rename to ImageMagick-7.1.1-22/MagickCore/exception-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/exception.c b/ImageMagick-7.1.1-22/MagickCore/exception.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/exception.c rename to ImageMagick-7.1.1-22/MagickCore/exception.c diff --git a/ImageMagick-7.1.1-21/MagickCore/exception.h b/ImageMagick-7.1.1-22/MagickCore/exception.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/exception.h rename to ImageMagick-7.1.1-22/MagickCore/exception.h diff --git a/ImageMagick-7.1.1-21/MagickCore/feature.c b/ImageMagick-7.1.1-22/MagickCore/feature.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/feature.c rename to ImageMagick-7.1.1-22/MagickCore/feature.c index 76b9900c..e873e48e 100644 --- a/ImageMagick-7.1.1-21/MagickCore/feature.c +++ b/ImageMagick-7.1.1-22/MagickCore/feature.c @@ -1822,7 +1822,8 @@ static Image *RenderHoughLines(const ImageInfo *image_info,const size_t columns, } (void) DrawImage(image,draw_info,exception); draw_info=DestroyDrawInfo(draw_info); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + image=DestroyImageList(image); return(GetFirstImageInList(image)); } diff --git a/ImageMagick-7.1.1-21/MagickCore/feature.h b/ImageMagick-7.1.1-22/MagickCore/feature.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/feature.h rename to ImageMagick-7.1.1-22/MagickCore/feature.h diff --git a/ImageMagick-7.1.1-21/MagickCore/fourier.c b/ImageMagick-7.1.1-22/MagickCore/fourier.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/fourier.c rename to ImageMagick-7.1.1-22/MagickCore/fourier.c diff --git a/ImageMagick-7.1.1-21/MagickCore/fourier.h b/ImageMagick-7.1.1-22/MagickCore/fourier.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/fourier.h rename to ImageMagick-7.1.1-22/MagickCore/fourier.h diff --git a/ImageMagick-7.1.1-21/MagickCore/fx-private.h b/ImageMagick-7.1.1-22/MagickCore/fx-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/fx-private.h rename to ImageMagick-7.1.1-22/MagickCore/fx-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/fx.c b/ImageMagick-7.1.1-22/MagickCore/fx.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/fx.c rename to ImageMagick-7.1.1-22/MagickCore/fx.c diff --git a/ImageMagick-7.1.1-21/MagickCore/fx.h b/ImageMagick-7.1.1-22/MagickCore/fx.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/fx.h rename to ImageMagick-7.1.1-22/MagickCore/fx.h diff --git a/ImageMagick-7.1.1-21/MagickCore/gem-private.h b/ImageMagick-7.1.1-22/MagickCore/gem-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/gem-private.h rename to ImageMagick-7.1.1-22/MagickCore/gem-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/gem.c b/ImageMagick-7.1.1-22/MagickCore/gem.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/gem.c rename to ImageMagick-7.1.1-22/MagickCore/gem.c diff --git a/ImageMagick-7.1.1-21/MagickCore/gem.h b/ImageMagick-7.1.1-22/MagickCore/gem.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/gem.h rename to ImageMagick-7.1.1-22/MagickCore/gem.h diff --git a/ImageMagick-7.1.1-21/MagickCore/geometry-private.h b/ImageMagick-7.1.1-22/MagickCore/geometry-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/geometry-private.h rename to ImageMagick-7.1.1-22/MagickCore/geometry-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/geometry.c b/ImageMagick-7.1.1-22/MagickCore/geometry.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/geometry.c rename to ImageMagick-7.1.1-22/MagickCore/geometry.c diff --git a/ImageMagick-7.1.1-21/MagickCore/geometry.h b/ImageMagick-7.1.1-22/MagickCore/geometry.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/geometry.h rename to ImageMagick-7.1.1-22/MagickCore/geometry.h diff --git a/ImageMagick-7.1.1-21/MagickCore/histogram.c b/ImageMagick-7.1.1-22/MagickCore/histogram.c similarity index 91% rename from ImageMagick-7.1.1-21/MagickCore/histogram.c rename to ImageMagick-7.1.1-22/MagickCore/histogram.c index 612de0db..eb0c1364 100644 --- a/ImageMagick-7.1.1-21/MagickCore/histogram.c +++ b/ImageMagick-7.1.1-22/MagickCore/histogram.c @@ -66,14 +66,14 @@ Define declarations. */ #define MaxTreeDepth 8 -#define NodesInAList 1536 +#define HNodesInAList 1536 /* Typedef declarations. */ -typedef struct _NodeInfo +typedef struct _HNodeInfo { - struct _NodeInfo + struct _HNodeInfo *child[16]; PixelInfo @@ -87,20 +87,20 @@ typedef struct _NodeInfo size_t level; -} NodeInfo; +} HNodeInfo; -typedef struct _Nodes +typedef struct _HNodes { - NodeInfo - nodes[NodesInAList]; + HNodeInfo + nodes[HNodesInAList]; - struct _Nodes + struct _HNodes *next; -} Nodes; +} HNodes; -typedef struct _CubeInfo +typedef struct _HCubeInfo { - NodeInfo + HNodeInfo *root; ssize_t @@ -113,24 +113,24 @@ typedef struct _CubeInfo colors, free_nodes; - NodeInfo + HNodeInfo *node_info; - Nodes + HNodes *node_queue; -} CubeInfo; +} HCubeInfo; /* Forward declarations. */ -static CubeInfo - *GetCubeInfo(void); +static HCubeInfo + *GetHCubeInfo(void); -static NodeInfo - *GetNodeInfo(CubeInfo *,const size_t); +static HNodeInfo + *GetHNodeInfo(HCubeInfo *,const size_t); static void - DestroyColorCube(const Image *,NodeInfo *); + DestroyColorCube(const Image *,HNodeInfo *); /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -143,13 +143,13 @@ static void % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% ClassifyImageColors() builds a populated CubeInfo tree for the specified -% image. The returned tree should be deallocated using DestroyCubeInfo() +% ClassifyImageColors() builds a populated HCubeInfo tree for the specified +% image. The returned tree should be deallocated using DestroyHCubeInfo() % once it is no longer needed. % % The format of the ClassifyImageColors() method is: % -% CubeInfo *ClassifyImageColors(const Image *image, +% HCubeInfo *ClassifyImageColors(const Image *image, % ExceptionInfo *exception) % % A description of each parameter follows. @@ -203,7 +203,7 @@ static inline MagickBooleanType IsPixelInfoColorMatch( } -static CubeInfo *ClassifyImageColors(const Image *image, +static HCubeInfo *ClassifyImageColors(const Image *image, ExceptionInfo *exception) { #define EvaluateImageTag " Compute image colors... " @@ -211,7 +211,7 @@ static CubeInfo *ClassifyImageColors(const Image *image, CacheView *image_view; - CubeInfo + HCubeInfo *cube_info; MagickBooleanType @@ -220,7 +220,7 @@ static CubeInfo *ClassifyImageColors(const Image *image, PixelInfo pixel; - NodeInfo + HNodeInfo *node_info; const Quantum @@ -245,8 +245,8 @@ static CubeInfo *ClassifyImageColors(const Image *image, assert(image->signature == MagickCoreSignature); if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); - cube_info=GetCubeInfo(); - if (cube_info == (CubeInfo *) NULL) + cube_info=GetHCubeInfo(); + if (cube_info == (HCubeInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); @@ -270,10 +270,10 @@ static CubeInfo *ClassifyImageColors(const Image *image, { GetPixelInfoPixel(image,p,&pixel); id=ColorToNodeId(&pixel,index); - if (node_info->child[id] == (NodeInfo *) NULL) + if (node_info->child[id] == (HNodeInfo *) NULL) { - node_info->child[id]=GetNodeInfo(cube_info,level); - if (node_info->child[id] == (NodeInfo *) NULL) + node_info->child[id]=GetHNodeInfo(cube_info,level); + if (node_info->child[id] == (HNodeInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), ResourceLimitError,"MemoryAllocationFailed","`%s'", @@ -350,20 +350,20 @@ static CubeInfo *ClassifyImageColors(const Image *image, % % The format of the DefineImageHistogram method is: % -% DefineImageHistogram(const Image *image,NodeInfo *node_info, +% DefineImageHistogram(const Image *image,HNodeInfo *node_info, % PixelInfo **unique_colors) % % A description of each parameter follows. % % o image: the image. % -% o node_info: the address of a structure of type NodeInfo which points to a +% o node_info: the address of a structure of type HNodeInfo which points to a % node in the color cube tree that is to be pruned. % % o histogram: the image histogram. % */ -static void DefineImageHistogram(const Image *image,NodeInfo *node_info, +static void DefineImageHistogram(const Image *image,HNodeInfo *node_info, PixelInfo **histogram) { ssize_t @@ -377,7 +377,7 @@ static void DefineImageHistogram(const Image *image,NodeInfo *node_info, */ number_children=image->alpha_trait == UndefinedPixelTrait ? 8UL : 16UL; for (i=0; i < (ssize_t) number_children; i++) - if (node_info->child[i] != (NodeInfo *) NULL) + if (node_info->child[i] != (HNodeInfo *) NULL) DefineImageHistogram(image,node_info->child[i],histogram); if (node_info->level == (MaxTreeDepth-1)) { @@ -405,22 +405,22 @@ static void DefineImageHistogram(const Image *image,NodeInfo *node_info, % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% DestroyCubeInfo() deallocates memory associated with a CubeInfo structure. +% DestroyHCubeInfo() deallocates memory associated with a HCubeInfo structure. % -% The format of the DestroyCubeInfo method is: +% The format of the DestroyHCubeInfo method is: % -% DestroyCubeInfo(const Image *image,CubeInfo *cube_info) +% DestroyHCubeInfo(const Image *image,HCubeInfo *cube_info) % % A description of each parameter follows: % % o image: the image. % -% o cube_info: the address of a structure of type CubeInfo. +% o cube_info: the address of a structure of type HCubeInfo. % */ -static CubeInfo *DestroyCubeInfo(const Image *image,CubeInfo *cube_info) +static HCubeInfo *DestroyHCubeInfo(const Image *image,HCubeInfo *cube_info) { - Nodes + HNodes *nodes; /* @@ -430,11 +430,11 @@ static CubeInfo *DestroyCubeInfo(const Image *image,CubeInfo *cube_info) do { nodes=cube_info->node_queue->next; - cube_info->node_queue=(Nodes *) + cube_info->node_queue=(HNodes *) RelinquishMagickMemory(cube_info->node_queue); cube_info->node_queue=nodes; - } while (cube_info->node_queue != (Nodes *) NULL); - return((CubeInfo *) RelinquishMagickMemory(cube_info)); + } while (cube_info->node_queue != (HNodes *) NULL); + return((HCubeInfo *) RelinquishMagickMemory(cube_info)); } /* @@ -453,17 +453,17 @@ static CubeInfo *DestroyCubeInfo(const Image *image,CubeInfo *cube_info) % % The format of the DestroyColorCube method is: % -% void DestroyColorCube(const Image *image,const NodeInfo *node_info) +% void DestroyColorCube(const Image *image,const HNodeInfo *node_info) % % A description of each parameter follows. % % o image: the image. % -% o node_info: the address of a structure of type NodeInfo which points to a +% o node_info: the address of a structure of type HNodeInfo which points to a % node in the color cube tree that is to be pruned. % */ -static void DestroyColorCube(const Image *image,NodeInfo *node_info) +static void DestroyColorCube(const Image *image,HNodeInfo *node_info) { ssize_t i; @@ -476,7 +476,7 @@ static void DestroyColorCube(const Image *image,NodeInfo *node_info) */ number_children=image->alpha_trait == UndefinedPixelTrait ? 8UL : 16UL; for (i=0; i < (ssize_t) number_children; i++) - if (node_info->child[i] != (NodeInfo *) NULL) + if (node_info->child[i] != (HNodeInfo *) NULL) DestroyColorCube(image,node_info->child[i]); if (node_info->list != (PixelInfo *) NULL) node_info->list=(PixelInfo *) RelinquishMagickMemory(node_info->list); @@ -493,35 +493,35 @@ static void DestroyColorCube(const Image *image,NodeInfo *node_info) % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% GetCubeInfo() initializes the CubeInfo data structure. +% GetHCubeInfo() initializes the HCubeInfo data structure. % -% The format of the GetCubeInfo method is: +% The format of the GetHCubeInfo method is: % -% cube_info=GetCubeInfo() +% cube_info=GetHCubeInfo() % % A description of each parameter follows. % % o cube_info: A pointer to the Cube structure. % */ -static CubeInfo *GetCubeInfo(void) +static HCubeInfo *GetHCubeInfo(void) { - CubeInfo + HCubeInfo *cube_info; /* Initialize tree to describe color cube. */ - cube_info=(CubeInfo *) AcquireMagickMemory(sizeof(*cube_info)); - if (cube_info == (CubeInfo *) NULL) - return((CubeInfo *) NULL); + cube_info=(HCubeInfo *) AcquireMagickMemory(sizeof(*cube_info)); + if (cube_info == (HCubeInfo *) NULL) + return((HCubeInfo *) NULL); (void) memset(cube_info,0,sizeof(*cube_info)); /* Initialize root node. */ - cube_info->root=GetNodeInfo(cube_info,0); - if (cube_info->root == (NodeInfo *) NULL) - return((CubeInfo *) NULL); + cube_info->root=GetHNodeInfo(cube_info,0); + if (cube_info->root == (HNodeInfo *) NULL) + return((HCubeInfo *) NULL); return(cube_info); } @@ -558,13 +558,13 @@ MagickExport PixelInfo *GetImageHistogram(const Image *image, PixelInfo *histogram; - CubeInfo + HCubeInfo *cube_info; *number_colors=0; histogram=(PixelInfo *) NULL; cube_info=ClassifyImageColors(image,exception); - if (cube_info != (CubeInfo *) NULL) + if (cube_info != (HCubeInfo *) NULL) { histogram=(PixelInfo *) AcquireQuantumMemory((size_t) cube_info->colors+1, sizeof(*histogram)); @@ -580,7 +580,7 @@ MagickExport PixelInfo *GetImageHistogram(const Image *image, root=histogram; DefineImageHistogram(image,cube_info->root,&root); } - cube_info=DestroyCubeInfo(image,cube_info); + cube_info=DestroyHCubeInfo(image,cube_info); } return(histogram); } @@ -596,40 +596,40 @@ MagickExport PixelInfo *GetImageHistogram(const Image *image, % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% GetNodeInfo() allocates memory for a new node in the color cube tree and +% GetHNodeInfo() allocates memory for a new node in the color cube tree and % presets all fields to zero. % -% The format of the GetNodeInfo method is: +% The format of the GetHNodeInfo method is: % -% NodeInfo *GetNodeInfo(CubeInfo *cube_info,const size_t level) +% HNodeInfo *GetHNodeInfo(HCubeInfo *cube_info,const size_t level) % % A description of each parameter follows. % -% o cube_info: A pointer to the CubeInfo structure. +% o cube_info: A pointer to the HCubeInfo structure. % % o level: Specifies the level in the storage_class the node resides. % */ -static NodeInfo *GetNodeInfo(CubeInfo *cube_info,const size_t level) +static HNodeInfo *GetHNodeInfo(HCubeInfo *cube_info,const size_t level) { - NodeInfo + HNodeInfo *node_info; if (cube_info->free_nodes == 0) { - Nodes + HNodes *nodes; /* Allocate a new nodes of nodes. */ - nodes=(Nodes *) AcquireMagickMemory(sizeof(*nodes)); - if (nodes == (Nodes *) NULL) - return((NodeInfo *) NULL); + nodes=(HNodes *) AcquireMagickMemory(sizeof(*nodes)); + if (nodes == (HNodes *) NULL) + return((HNodeInfo *) NULL); nodes->next=cube_info->node_queue; cube_info->node_queue=nodes; cube_info->node_info=nodes->nodes; - cube_info->free_nodes=NodesInAList; + cube_info->free_nodes=HNodesInAList; } cube_info->free_nodes--; node_info=cube_info->node_info++; @@ -676,10 +676,10 @@ static MagickBooleanType CheckImageColors(const Image *image, const Quantum *p; - CubeInfo + HCubeInfo *cube_info; - NodeInfo + HNodeInfo *node_info; PixelInfo @@ -700,8 +700,8 @@ static MagickBooleanType CheckImageColors(const Image *image, /* Initialize color description tree. */ - cube_info=GetCubeInfo(); - if (cube_info == (CubeInfo *) NULL) + cube_info=GetHCubeInfo(); + if (cube_info == (HCubeInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); @@ -729,10 +729,10 @@ static MagickBooleanType CheckImageColors(const Image *image, { GetPixelInfoPixel(image,p,&pixel); id=ColorToNodeId(&pixel,index); - if (node_info->child[id] == (NodeInfo *) NULL) + if (node_info->child[id] == (HNodeInfo *) NULL) { - node_info->child[id]=GetNodeInfo(cube_info,level); - if (node_info->child[id] == (NodeInfo *) NULL) + node_info->child[id]=GetHNodeInfo(cube_info,level); + if (node_info->child[id] == (HNodeInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), ResourceLimitError,"MemoryAllocationFailed","`%s'", @@ -790,7 +790,7 @@ static MagickBooleanType CheckImageColors(const Image *image, break; } image_view=DestroyCacheView(image_view); - cube_info=DestroyCubeInfo(image,cube_info); + cube_info=DestroyHCubeInfo(image,cube_info); return(y < (ssize_t) image->rows ? MagickFalse : MagickTrue); } @@ -1059,14 +1059,14 @@ MagickExport size_t GetNumberColors(const Image *image,FILE *file, number_colors=0; if (file == (FILE *) NULL) { - CubeInfo + HCubeInfo *cube_info; cube_info=ClassifyImageColors(image,exception); - if (cube_info != (CubeInfo *) NULL) + if (cube_info != (HCubeInfo *) NULL) { number_colors=cube_info->colors; - cube_info=DestroyCubeInfo(image,cube_info); + cube_info=DestroyHCubeInfo(image,cube_info); } return(number_colors); } @@ -1150,7 +1150,7 @@ MagickExport size_t GetNumberColors(const Image *image,FILE *file, */ static void UniqueColorsToImage(Image *unique_image,CacheView *unique_view, - CubeInfo *cube_info,const NodeInfo *node_info,ExceptionInfo *exception) + HCubeInfo *cube_info,const HNodeInfo *node_info,ExceptionInfo *exception) { #define UniqueColorsImageTag "UniqueColors/Image" @@ -1168,7 +1168,7 @@ static void UniqueColorsToImage(Image *unique_image,CacheView *unique_view, */ number_children=unique_image->alpha_trait == UndefinedPixelTrait ? 8UL : 16UL; for (i=0; i < (ssize_t) number_children; i++) - if (node_info->child[i] != (NodeInfo *) NULL) + if (node_info->child[i] != (HNodeInfo *) NULL) UniqueColorsToImage(unique_image,unique_view,cube_info, node_info->child[i],exception); if (node_info->level == (MaxTreeDepth-1)) @@ -1220,14 +1220,14 @@ MagickExport Image *UniqueImageColors(const Image *image, CacheView *unique_view; - CubeInfo + HCubeInfo *cube_info; Image *unique_image; cube_info=ClassifyImageColors(image,exception); - if (cube_info == (CubeInfo *) NULL) + if (cube_info == (HCubeInfo *) NULL) return((Image *) NULL); unique_image=CloneImage(image,cube_info->colors,1,MagickTrue,exception); if (unique_image == (Image *) NULL) @@ -1241,6 +1241,6 @@ MagickExport Image *UniqueImageColors(const Image *image, UniqueColorsToImage(unique_image,unique_view,cube_info,cube_info->root, exception); unique_view=DestroyCacheView(unique_view); - cube_info=DestroyCubeInfo(image,cube_info); + cube_info=DestroyHCubeInfo(image,cube_info); return(unique_image); } diff --git a/ImageMagick-7.1.1-21/MagickCore/histogram.h b/ImageMagick-7.1.1-22/MagickCore/histogram.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/histogram.h rename to ImageMagick-7.1.1-22/MagickCore/histogram.h diff --git a/ImageMagick-7.1.1-21/MagickCore/identify.c b/ImageMagick-7.1.1-22/MagickCore/identify.c similarity index 86% rename from ImageMagick-7.1.1-21/MagickCore/identify.c rename to ImageMagick-7.1.1-22/MagickCore/identify.c index 418b1f7a..a2295956 100644 --- a/ImageMagick-7.1.1-21/MagickCore/identify.c +++ b/ImageMagick-7.1.1-22/MagickCore/identify.c @@ -567,31 +567,39 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, case RGBColorspace: case sRGBColorspace: { - (void) PrintChannelLocations(file,image,RedPixelChannel,"Red", - statistic_type,max_locations,channel_statistics); - (void) PrintChannelLocations(file,image,GreenPixelChannel,"Green", - statistic_type,max_locations,channel_statistics); - (void) PrintChannelLocations(file,image,BluePixelChannel,"Blue", - statistic_type,max_locations,channel_statistics); + if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelLocations(file,image,RedPixelChannel,"Red", + statistic_type,max_locations,channel_statistics); + if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelLocations(file,image,GreenPixelChannel,"Green", + statistic_type,max_locations,channel_statistics); + if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelLocations(file,image,BluePixelChannel,"Blue", + statistic_type,max_locations,channel_statistics); break; } case CMYKColorspace: { - (void) PrintChannelLocations(file,image,CyanPixelChannel,"Cyan", - statistic_type,max_locations,channel_statistics); - (void) PrintChannelLocations(file,image,MagentaPixelChannel, - "Magenta",statistic_type,max_locations,channel_statistics); - (void) PrintChannelLocations(file,image,YellowPixelChannel,"Yellow", - statistic_type,max_locations,channel_statistics); - (void) PrintChannelLocations(file,image,BlackPixelChannel,"Black", - statistic_type,max_locations,channel_statistics); + if ((GetPixelCyanTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelLocations(file,image,CyanPixelChannel,"Cyan", + statistic_type,max_locations,channel_statistics); + if ((GetPixelMagentaTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelLocations(file,image,MagentaPixelChannel, + "Magenta",statistic_type,max_locations,channel_statistics); + if ((GetPixelYellowTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelLocations(file,image,YellowPixelChannel,"Yellow", + statistic_type,max_locations,channel_statistics); + if ((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelLocations(file,image,BlackPixelChannel,"Black", + statistic_type,max_locations,channel_statistics); break; } case LinearGRAYColorspace: case GRAYColorspace: { - (void) PrintChannelLocations(file,image,GrayPixelChannel,"Gray", - statistic_type,max_locations,channel_statistics); + if ((GetPixelGrayTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelLocations(file,image,GrayPixelChannel,"Gray", + statistic_type,max_locations,channel_statistics); break; } default: @@ -599,10 +607,10 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { PixelChannel channel = GetPixelChannelChannel(image,i); - if (channel == AlphaPixelChannel) - continue; - (void) PrintChannelLocations(file,image,channel,"Channel", - statistic_type,max_locations,channel_statistics); + PixelTrait traits = GetPixelChannelTraits(image,channel); + if ((traits & UpdatePixelTrait) != 0) + (void) PrintChannelLocations(file,image,channel,"Channel", + statistic_type,max_locations,channel_statistics); } break; } @@ -798,31 +806,39 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, case RGBColorspace: case sRGBColorspace: { - (void) FormatLocaleFile(file," Red: %.20g-bit\n",(double) - channel_statistics[RedPixelChannel].depth); - (void) FormatLocaleFile(file," Green: %.20g-bit\n",(double) - channel_statistics[GreenPixelChannel].depth); - (void) FormatLocaleFile(file," Blue: %.20g-bit\n",(double) - channel_statistics[BluePixelChannel].depth); + if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) + (void) FormatLocaleFile(file," Red: %.20g-bit\n",(double) + channel_statistics[RedPixelChannel].depth); + if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) + (void) FormatLocaleFile(file," Green: %.20g-bit\n",(double) + channel_statistics[GreenPixelChannel].depth); + if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0) + (void) FormatLocaleFile(file," Blue: %.20g-bit\n",(double) + channel_statistics[BluePixelChannel].depth); break; } case CMYKColorspace: { - (void) FormatLocaleFile(file," Cyan: %.20g-bit\n",(double) - channel_statistics[CyanPixelChannel].depth); - (void) FormatLocaleFile(file," Magenta: %.20g-bit\n",(double) - channel_statistics[MagentaPixelChannel].depth); - (void) FormatLocaleFile(file," Yellow: %.20g-bit\n",(double) - channel_statistics[YellowPixelChannel].depth); - (void) FormatLocaleFile(file," Black: %.20g-bit\n",(double) - channel_statistics[BlackPixelChannel].depth); + if ((GetPixelCyanTraits(image) & UpdatePixelTrait) != 0) + (void) FormatLocaleFile(file," Cyan: %.20g-bit\n",(double) + channel_statistics[CyanPixelChannel].depth); + if ((GetPixelMagentaTraits(image) & UpdatePixelTrait) != 0) + (void) FormatLocaleFile(file," Magenta: %.20g-bit\n",(double) + channel_statistics[MagentaPixelChannel].depth); + if ((GetPixelYellowTraits(image) & UpdatePixelTrait) != 0) + (void) FormatLocaleFile(file," Yellow: %.20g-bit\n",(double) + channel_statistics[YellowPixelChannel].depth); + if ((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) + (void) FormatLocaleFile(file," Black: %.20g-bit\n",(double) + channel_statistics[BlackPixelChannel].depth); break; } case LinearGRAYColorspace: case GRAYColorspace: { - (void) FormatLocaleFile(file," Gray: %.20g-bit\n",(double) - channel_statistics[GrayPixelChannel].depth); + if ((GetPixelGrayTraits(image) & UpdatePixelTrait) != 0) + (void) FormatLocaleFile(file," Gray: %.20g-bit\n",(double) + channel_statistics[GrayPixelChannel].depth); break; } default: @@ -830,13 +846,10 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { PixelChannel channel = GetPixelChannelChannel(image,i); - if ((channel == AlphaPixelChannel) || - (channel == ReadMaskPixelChannel) || - (channel == WriteMaskPixelChannel) || - (channel == CompositeMaskPixelChannel)) - continue; - (void) FormatLocaleFile(file," Channel %.20g: %.20g-bit\n", - (double) i,(double) channel_statistics[channel].depth); + PixelTrait traits = GetPixelChannelTraits(image,channel); + if ((traits & UpdatePixelTrait) != 0) + (void) FormatLocaleFile(file," Channel %.20g: %.20g-bit\n", + (double) i,(double) channel_statistics[channel].depth); } break; } @@ -874,31 +887,39 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, case RGBColorspace: case sRGBColorspace: { - (void) PrintChannelStatistics(file,RedPixelChannel,"Red",1.0/ - scale,channel_statistics); - (void) PrintChannelStatistics(file,GreenPixelChannel,"Green",1.0/ - scale,channel_statistics); - (void) PrintChannelStatistics(file,BluePixelChannel,"Blue",1.0/ - scale,channel_statistics); + if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelStatistics(file,RedPixelChannel,"Red",1.0/ + scale,channel_statistics); + if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelStatistics(file,GreenPixelChannel,"Green",1.0/ + scale,channel_statistics); + if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelStatistics(file,BluePixelChannel,"Blue",1.0/ + scale,channel_statistics); break; } case CMYKColorspace: { - (void) PrintChannelStatistics(file,CyanPixelChannel,"Cyan",1.0/ - scale,channel_statistics); - (void) PrintChannelStatistics(file,MagentaPixelChannel,"Magenta",1.0/ - scale,channel_statistics); - (void) PrintChannelStatistics(file,YellowPixelChannel,"Yellow",1.0/ - scale,channel_statistics); - (void) PrintChannelStatistics(file,BlackPixelChannel,"Black",1.0/ - scale,channel_statistics); + if ((GetPixelCyanTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelStatistics(file,CyanPixelChannel,"Cyan",1.0/ + scale,channel_statistics); + if ((GetPixelMagentaTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelStatistics(file,MagentaPixelChannel,"Magenta", + 1.0/scale,channel_statistics); + if ((GetPixelYellowTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelStatistics(file,YellowPixelChannel,"Yellow",1.0/ + scale,channel_statistics); + if ((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelStatistics(file,BlackPixelChannel,"Black",1.0/ + scale,channel_statistics); break; } case LinearGRAYColorspace: case GRAYColorspace: { - (void) PrintChannelStatistics(file,GrayPixelChannel,"Gray",1.0/ - scale,channel_statistics); + if ((GetPixelGrayTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelStatistics(file,GrayPixelChannel,"Gray",1.0/ + scale,channel_statistics); break; } default: @@ -909,15 +930,14 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, label[MagickPathExtent]; PixelChannel channel = GetPixelChannelChannel(image,i); - if ((channel == AlphaPixelChannel) || - (channel == ReadMaskPixelChannel) || - (channel == WriteMaskPixelChannel) || - (channel == CompositeMaskPixelChannel)) - continue; - (void) FormatLocaleString(label,MagickPathExtent,"Channel %.20g", - (double) i); - (void) PrintChannelStatistics(file,channel,label,1.0/scale, - channel_statistics); + PixelTrait traits = GetPixelChannelTraits(image,channel); + if ((traits & UpdatePixelTrait) != 0) + { + (void) FormatLocaleString(label,MagickPathExtent, + "Channel %.20g",(double) i); + (void) PrintChannelStatistics(file,channel,label,1.0/scale, + channel_statistics); + } } break; } @@ -967,30 +987,38 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, case RGBColorspace: case sRGBColorspace: { - (void) PrintChannelMoments(file,RedPixelChannel,"Red",scale, - channel_moments); - (void) PrintChannelMoments(file,GreenPixelChannel,"Green",scale, - channel_moments); - (void) PrintChannelMoments(file,BluePixelChannel,"Blue",scale, - channel_moments); + if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelMoments(file,RedPixelChannel,"Red",scale, + channel_moments); + if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelMoments(file,GreenPixelChannel,"Green",scale, + channel_moments); + if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelMoments(file,BluePixelChannel,"Blue",scale, + channel_moments); break; } case CMYKColorspace: { - (void) PrintChannelMoments(file,CyanPixelChannel,"Cyan",scale, - channel_moments); - (void) PrintChannelMoments(file,MagentaPixelChannel,"Magenta",scale, - channel_moments); - (void) PrintChannelMoments(file,YellowPixelChannel,"Yellow",scale, - channel_moments); - (void) PrintChannelMoments(file,BlackPixelChannel,"Black",scale, - channel_moments); + if ((GetPixelCyanTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelMoments(file,CyanPixelChannel,"Cyan",scale, + channel_moments); + if ((GetPixelMagentaTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelMoments(file,MagentaPixelChannel,"Magenta",scale, + channel_moments); + if ((GetPixelYellowTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelMoments(file,YellowPixelChannel,"Yellow",scale, + channel_moments); + if ((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelMoments(file,BlackPixelChannel,"Black",scale, + channel_moments); break; } case GRAYColorspace: { - (void) PrintChannelMoments(file,GrayPixelChannel,"Gray",scale, - channel_moments); + if ((GetPixelGrayTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelMoments(file,GrayPixelChannel,"Gray",scale, + channel_moments); break; } default: @@ -1001,12 +1029,14 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, label[MagickPathExtent]; PixelChannel channel = GetPixelChannelChannel(image,i); - if (channel == AlphaPixelChannel) - continue; - (void) FormatLocaleString(label,MagickPathExtent,"Channel %.20g", - (double) i); - (void) PrintChannelMoments(file,channel,label,scale, - channel_moments); + PixelTrait traits = GetPixelChannelTraits(image,channel); + if ((traits & UpdatePixelTrait) != 0) + { + (void) FormatLocaleString(label,MagickPathExtent, + "Channel %.20g",(double) i); + (void) PrintChannelMoments(file,channel,label,scale, + channel_moments); + } } break; } @@ -1038,30 +1068,38 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, case RGBColorspace: case sRGBColorspace: { - (void) PrintChannelFeatures(file,RedPixelChannel,"Red", - channel_features); - (void) PrintChannelFeatures(file,GreenPixelChannel,"Green", - channel_features); - (void) PrintChannelFeatures(file,BluePixelChannel,"Blue", - channel_features); + if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelFeatures(file,RedPixelChannel,"Red", + channel_features); + if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelFeatures(file,GreenPixelChannel,"Green", + channel_features); + if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelFeatures(file,BluePixelChannel,"Blue", + channel_features); break; } case CMYKColorspace: { - (void) PrintChannelFeatures(file,CyanPixelChannel,"Cyan", - channel_features); - (void) PrintChannelFeatures(file,MagentaPixelChannel,"Magenta", - channel_features); - (void) PrintChannelFeatures(file,YellowPixelChannel,"Yellow", - channel_features); - (void) PrintChannelFeatures(file,BlackPixelChannel,"Black", - channel_features); + if ((GetPixelCyanTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelFeatures(file,CyanPixelChannel,"Cyan", + channel_features); + if ((GetPixelMagentaTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelFeatures(file,MagentaPixelChannel,"Magenta", + channel_features); + if ((GetPixelYellowTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelFeatures(file,YellowPixelChannel,"Yellow", + channel_features); + if ((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelFeatures(file,BlackPixelChannel,"Black", + channel_features); break; } case GRAYColorspace: { - (void) PrintChannelFeatures(file,GrayPixelChannel,"Gray", - channel_features); + if ((GetPixelGrayTraits(image) & UpdatePixelTrait) != 0) + (void) PrintChannelFeatures(file,GrayPixelChannel,"Gray", + channel_features); break; } default: @@ -1072,11 +1110,14 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, label[MagickPathExtent]; PixelChannel channel = GetPixelChannelChannel(image,i); - if (channel == AlphaPixelChannel) - continue; - (void) FormatLocaleString(label,MagickPathExtent,"Channel %.20g", - (double) i); - (void) PrintChannelFeatures(file,channel,label,channel_features); + PixelTrait traits = GetPixelChannelTraits(image,channel); + if ((traits & UpdatePixelTrait) != 0) + { + (void) FormatLocaleString(label,MagickPathExtent, + "Channel %.20g",(double) i); + (void) PrintChannelFeatures(file,channel,label, + channel_features); + } } break; } diff --git a/ImageMagick-7.1.1-21/MagickCore/identify.h b/ImageMagick-7.1.1-22/MagickCore/identify.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/identify.h rename to ImageMagick-7.1.1-22/MagickCore/identify.h diff --git a/ImageMagick-7.1.1-21/MagickCore/image-private.h b/ImageMagick-7.1.1-22/MagickCore/image-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/image-private.h rename to ImageMagick-7.1.1-22/MagickCore/image-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/image-view.c b/ImageMagick-7.1.1-22/MagickCore/image-view.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/image-view.c rename to ImageMagick-7.1.1-22/MagickCore/image-view.c diff --git a/ImageMagick-7.1.1-21/MagickCore/image-view.h b/ImageMagick-7.1.1-22/MagickCore/image-view.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/image-view.h rename to ImageMagick-7.1.1-22/MagickCore/image-view.h diff --git a/ImageMagick-7.1.1-21/MagickCore/image.c b/ImageMagick-7.1.1-22/MagickCore/image.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/image.c rename to ImageMagick-7.1.1-22/MagickCore/image.c index a207db5f..567419f9 100644 --- a/ImageMagick-7.1.1-21/MagickCore/image.c +++ b/ImageMagick-7.1.1-22/MagickCore/image.c @@ -2986,7 +2986,8 @@ MagickExport MagickBooleanType SetImageInfo(ImageInfo *image_info, */ *component='\0'; status=ImageToFile(image,component,exception); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) { (void) RelinquishUniqueFileResource(component); diff --git a/ImageMagick-7.1.1-21/MagickCore/image.h b/ImageMagick-7.1.1-22/MagickCore/image.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/image.h rename to ImageMagick-7.1.1-22/MagickCore/image.h diff --git a/ImageMagick-7.1.1-21/MagickCore/layer.c b/ImageMagick-7.1.1-22/MagickCore/layer.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/layer.c rename to ImageMagick-7.1.1-22/MagickCore/layer.c diff --git a/ImageMagick-7.1.1-21/MagickCore/layer.h b/ImageMagick-7.1.1-22/MagickCore/layer.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/layer.h rename to ImageMagick-7.1.1-22/MagickCore/layer.h diff --git a/ImageMagick-7.1.1-21/MagickCore/linked-list-private.h b/ImageMagick-7.1.1-22/MagickCore/linked-list-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/linked-list-private.h rename to ImageMagick-7.1.1-22/MagickCore/linked-list-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/linked-list.c b/ImageMagick-7.1.1-22/MagickCore/linked-list.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/linked-list.c rename to ImageMagick-7.1.1-22/MagickCore/linked-list.c diff --git a/ImageMagick-7.1.1-21/MagickCore/linked-list.h b/ImageMagick-7.1.1-22/MagickCore/linked-list.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/linked-list.h rename to ImageMagick-7.1.1-22/MagickCore/linked-list.h diff --git a/ImageMagick-7.1.1-21/MagickCore/list.c b/ImageMagick-7.1.1-22/MagickCore/list.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/list.c rename to ImageMagick-7.1.1-22/MagickCore/list.c index e9cc022d..48427393 100644 --- a/ImageMagick-7.1.1-21/MagickCore/list.c +++ b/ImageMagick-7.1.1-22/MagickCore/list.c @@ -17,7 +17,7 @@ % December 2002 % % % % % -% Copyright @ 2002 ImageMagick Studio LLC, a non-profit organization % +% Copyright @ 1999 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may % @@ -719,7 +719,7 @@ MagickExport ssize_t GetImageIndexInList(const Image *images) */ MagickExport size_t GetImageListLength(const Image *images) { - ssize_t + size_t i; if (images == (Image *) NULL) @@ -733,7 +733,7 @@ MagickExport size_t GetImageListLength(const Image *images) assert(images != images->previous); i++; } - return((size_t) i); + return(i); } /* diff --git a/ImageMagick-7.1.1-21/MagickCore/list.h b/ImageMagick-7.1.1-22/MagickCore/list.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/list.h rename to ImageMagick-7.1.1-22/MagickCore/list.h diff --git a/ImageMagick-7.1.1-21/MagickCore/locale-private.h b/ImageMagick-7.1.1-22/MagickCore/locale-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/locale-private.h rename to ImageMagick-7.1.1-22/MagickCore/locale-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/locale.c b/ImageMagick-7.1.1-22/MagickCore/locale.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/locale.c rename to ImageMagick-7.1.1-22/MagickCore/locale.c diff --git a/ImageMagick-7.1.1-21/MagickCore/locale_.h b/ImageMagick-7.1.1-22/MagickCore/locale_.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/locale_.h rename to ImageMagick-7.1.1-22/MagickCore/locale_.h diff --git a/ImageMagick-7.1.1-21/MagickCore/log-private.h b/ImageMagick-7.1.1-22/MagickCore/log-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/log-private.h rename to ImageMagick-7.1.1-22/MagickCore/log-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/log.c b/ImageMagick-7.1.1-22/MagickCore/log.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/log.c rename to ImageMagick-7.1.1-22/MagickCore/log.c diff --git a/ImageMagick-7.1.1-21/MagickCore/log.h b/ImageMagick-7.1.1-22/MagickCore/log.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/log.h rename to ImageMagick-7.1.1-22/MagickCore/log.h diff --git a/ImageMagick-7.1.1-21/MagickCore/magic-private.h b/ImageMagick-7.1.1-22/MagickCore/magic-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/magic-private.h rename to ImageMagick-7.1.1-22/MagickCore/magic-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/magic.c b/ImageMagick-7.1.1-22/MagickCore/magic.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/magic.c rename to ImageMagick-7.1.1-22/MagickCore/magic.c diff --git a/ImageMagick-7.1.1-21/MagickCore/magic.h b/ImageMagick-7.1.1-22/MagickCore/magic.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/magic.h rename to ImageMagick-7.1.1-22/MagickCore/magic.h diff --git a/ImageMagick-7.1.1-21/MagickCore/magick-config.h b/ImageMagick-7.1.1-22/MagickCore/magick-config.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/magick-config.h rename to ImageMagick-7.1.1-22/MagickCore/magick-config.h diff --git a/ImageMagick-7.1.1-21/MagickCore/magick-private.h b/ImageMagick-7.1.1-22/MagickCore/magick-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/magick-private.h rename to ImageMagick-7.1.1-22/MagickCore/magick-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/magick-type.h b/ImageMagick-7.1.1-22/MagickCore/magick-type.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/magick-type.h rename to ImageMagick-7.1.1-22/MagickCore/magick-type.h diff --git a/ImageMagick-7.1.1-21/MagickCore/magick.c b/ImageMagick-7.1.1-22/MagickCore/magick.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/magick.c rename to ImageMagick-7.1.1-22/MagickCore/magick.c diff --git a/ImageMagick-7.1.1-21/MagickCore/magick.h b/ImageMagick-7.1.1-22/MagickCore/magick.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/magick.h rename to ImageMagick-7.1.1-22/MagickCore/magick.h diff --git a/ImageMagick-7.1.1-21/MagickCore/matrix-private.h b/ImageMagick-7.1.1-22/MagickCore/matrix-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/matrix-private.h rename to ImageMagick-7.1.1-22/MagickCore/matrix-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/matrix.c b/ImageMagick-7.1.1-22/MagickCore/matrix.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/matrix.c rename to ImageMagick-7.1.1-22/MagickCore/matrix.c diff --git a/ImageMagick-7.1.1-21/MagickCore/matrix.h b/ImageMagick-7.1.1-22/MagickCore/matrix.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/matrix.h rename to ImageMagick-7.1.1-22/MagickCore/matrix.h diff --git a/ImageMagick-7.1.1-21/MagickCore/memory-private.h b/ImageMagick-7.1.1-22/MagickCore/memory-private.h similarity index 95% rename from ImageMagick-7.1.1-21/MagickCore/memory-private.h rename to ImageMagick-7.1.1-22/MagickCore/memory-private.h index f251bdf6..bfbed086 100644 --- a/ImageMagick-7.1.1-21/MagickCore/memory-private.h +++ b/ImageMagick-7.1.1-22/MagickCore/memory-private.h @@ -62,7 +62,8 @@ extern MagickPrivate MagickBooleanType extern MagickPrivate void ResetMaxMemoryRequest(void), - ResetVirtualAnonymousMemory(void); + ResetVirtualAnonymousMemory(void), + SetMaxMemoryRequest(const MagickSizeType); #if defined(__cplusplus) || defined(c_plusplus) } diff --git a/ImageMagick-7.1.1-21/MagickCore/memory.c b/ImageMagick-7.1.1-22/MagickCore/memory.c similarity index 98% rename from ImageMagick-7.1.1-21/MagickCore/memory.c rename to ImageMagick-7.1.1-22/MagickCore/memory.c index d8473b83..7302da57 100644 --- a/ImageMagick-7.1.1-21/MagickCore/memory.c +++ b/ImageMagick-7.1.1-22/MagickCore/memory.c @@ -1559,6 +1559,33 @@ MagickExport void SetMagickMemoryMethods( % % % % % % ++ S e t M a x M e m o r y R e q u e s t % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% SetMaxMemoryRequest() sets the max_memory_request value. +% +% The format of the ResetMaxMemoryRequest method is: +% +% void SetMaxMemoryRequest(const MagickSizeType limit) +% +% A description of each parameter follows: +% +% o limit: the maximum memory request limit. +% +*/ +MagickPrivate void SetMaxMemoryRequest(const MagickSizeType limit) +{ + max_memory_request=MagickMin(limit,GetMaxMemoryRequest()); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % % S h r e d M a g i c k M e m o r y % % % % % diff --git a/ImageMagick-7.1.1-21/MagickCore/memory_.h b/ImageMagick-7.1.1-22/MagickCore/memory_.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/memory_.h rename to ImageMagick-7.1.1-22/MagickCore/memory_.h diff --git a/ImageMagick-7.1.1-21/MagickCore/method-attribute.h b/ImageMagick-7.1.1-22/MagickCore/method-attribute.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/method-attribute.h rename to ImageMagick-7.1.1-22/MagickCore/method-attribute.h diff --git a/ImageMagick-7.1.1-21/MagickCore/methods.h b/ImageMagick-7.1.1-22/MagickCore/methods.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/methods.h rename to ImageMagick-7.1.1-22/MagickCore/methods.h diff --git a/ImageMagick-7.1.1-21/MagickCore/mime-private.h b/ImageMagick-7.1.1-22/MagickCore/mime-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/mime-private.h rename to ImageMagick-7.1.1-22/MagickCore/mime-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/mime.c b/ImageMagick-7.1.1-22/MagickCore/mime.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/mime.c rename to ImageMagick-7.1.1-22/MagickCore/mime.c diff --git a/ImageMagick-7.1.1-21/MagickCore/mime.h b/ImageMagick-7.1.1-22/MagickCore/mime.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/mime.h rename to ImageMagick-7.1.1-22/MagickCore/mime.h diff --git a/ImageMagick-7.1.1-21/MagickCore/module-private.h b/ImageMagick-7.1.1-22/MagickCore/module-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/module-private.h rename to ImageMagick-7.1.1-22/MagickCore/module-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/module.c b/ImageMagick-7.1.1-22/MagickCore/module.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/module.c rename to ImageMagick-7.1.1-22/MagickCore/module.c diff --git a/ImageMagick-7.1.1-21/MagickCore/module.h b/ImageMagick-7.1.1-22/MagickCore/module.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/module.h rename to ImageMagick-7.1.1-22/MagickCore/module.h diff --git a/ImageMagick-7.1.1-21/MagickCore/monitor-private.h b/ImageMagick-7.1.1-22/MagickCore/monitor-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/monitor-private.h rename to ImageMagick-7.1.1-22/MagickCore/monitor-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/monitor.c b/ImageMagick-7.1.1-22/MagickCore/monitor.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/monitor.c rename to ImageMagick-7.1.1-22/MagickCore/monitor.c diff --git a/ImageMagick-7.1.1-21/MagickCore/monitor.h b/ImageMagick-7.1.1-22/MagickCore/monitor.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/monitor.h rename to ImageMagick-7.1.1-22/MagickCore/monitor.h diff --git a/ImageMagick-7.1.1-21/MagickCore/montage.c b/ImageMagick-7.1.1-22/MagickCore/montage.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/montage.c rename to ImageMagick-7.1.1-22/MagickCore/montage.c diff --git a/ImageMagick-7.1.1-21/MagickCore/montage.h b/ImageMagick-7.1.1-22/MagickCore/montage.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/montage.h rename to ImageMagick-7.1.1-22/MagickCore/montage.h diff --git a/ImageMagick-7.1.1-21/MagickCore/morphology-private.h b/ImageMagick-7.1.1-22/MagickCore/morphology-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/morphology-private.h rename to ImageMagick-7.1.1-22/MagickCore/morphology-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/morphology.c b/ImageMagick-7.1.1-22/MagickCore/morphology.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/morphology.c rename to ImageMagick-7.1.1-22/MagickCore/morphology.c diff --git a/ImageMagick-7.1.1-21/MagickCore/morphology.h b/ImageMagick-7.1.1-22/MagickCore/morphology.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/morphology.h rename to ImageMagick-7.1.1-22/MagickCore/morphology.h diff --git a/ImageMagick-7.1.1-21/MagickCore/mutex.h b/ImageMagick-7.1.1-22/MagickCore/mutex.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/mutex.h rename to ImageMagick-7.1.1-22/MagickCore/mutex.h diff --git a/ImageMagick-7.1.1-21/MagickCore/nt-base-private.h b/ImageMagick-7.1.1-22/MagickCore/nt-base-private.h similarity index 98% rename from ImageMagick-7.1.1-21/MagickCore/nt-base-private.h rename to ImageMagick-7.1.1-22/MagickCore/nt-base-private.h index 98ac1bd8..9af1b920 100644 --- a/ImageMagick-7.1.1-21/MagickCore/nt-base-private.h +++ b/ImageMagick-7.1.1-22/MagickCore/nt-base-private.h @@ -83,6 +83,7 @@ static inline void *NTAcquireQuantumMemory(const size_t count, } extern MagickPrivate char + *NTGetEnvironmentValue(const char *), *NTGetLastError(void); #if !defined(MAGICKCORE_LTDL_DELEGATE) diff --git a/ImageMagick-7.1.1-21/MagickCore/nt-base.c b/ImageMagick-7.1.1-22/MagickCore/nt-base.c similarity index 97% rename from ImageMagick-7.1.1-21/MagickCore/nt-base.c rename to ImageMagick-7.1.1-22/MagickCore/nt-base.c index 6fe9af78..e5b64fdb 100644 --- a/ImageMagick-7.1.1-21/MagickCore/nt-base.c +++ b/ImageMagick-7.1.1-22/MagickCore/nt-base.c @@ -73,6 +73,7 @@ #if !defined(MAP_FAILED) #define MAP_FAILED ((void *)(LONG_PTR)-1) #endif +#define MaxWideByteExtent 100 /* Typedef declarations. @@ -83,8 +84,8 @@ is why we wrap the new/delete instance methods. From: http://www.ghostscript.com/doc/current/API.htm - "The Win32 DLL gsdll32.dll can be used by multiple programs simultaneously, - but only once within each process" + "The Win32 DLL gsdll32.dll can be used by multiple programs simultaneously, + but only once within each process" */ typedef struct _NTGhostInfo { @@ -198,13 +199,13 @@ static unsigned char *NTGetRegistryValue(HKEY root,const char *key,DWORD flags, status; wchar_t - wide_name[100]; + wide_name[MaxWideByteExtent]; value=(unsigned char *) NULL; status=RegOpenKeyExA(root,key,0,(KEY_READ | flags),®istry_key); if (status != ERROR_SUCCESS) return(value); - if (MultiByteToWideChar(CP_UTF8,0,name,-1,wide_name,100) == 0) + if (MultiByteToWideChar(CP_UTF8,0,name,-1,wide_name,MaxWideByteExtent) == 0) { RegCloseKey(registry_key); return(value); @@ -764,6 +765,57 @@ MagickPrivate MagickBooleanType NTGatherRandomData(const size_t length, % % % % % % +% N T G e t E n v i r o n m e n t V a l u e % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% NTGetEnvironmentValue() returns the environment string that matches the +% specified name. +% +% The format of the NTGetEnvironmentValue method is: +% +% char *GetEnvironmentValue(const char *name) +% +% A description of each parameter follows: +% +% o name: the environment name. +% +*/ +extern MagickPrivate char *NTGetEnvironmentValue(const char *name) +{ + char + *environment = (char *) NULL; + + DWORD + size; + + LPWSTR + wide; + + wchar_t + wide_name[MaxWideByteExtent]; + + if (MultiByteToWideChar(CP_UTF8,0,name,-1,wide_name,MaxWideByteExtent) == 0) + return(environment); + size=GetEnvironmentVariableW(wide_name,(LPWSTR) NULL,0); + if (size == 0) + return(environment); + wide=(LPWSTR) NTAcquireQuantumMemory((const size_t) size,sizeof(*wide)); + if (wide == (LPWSTR) NULL) + return(environment); + if (GetEnvironmentVariableW(wide_name,wide,size) != 0) + environment=create_utf8_string(wide); + wide=(LPWSTR) RelinquishMagickMemory(wide); + return(environment); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % % N T G e t E x e c u t i o n P a t h % % % % % diff --git a/ImageMagick-7.1.1-21/MagickCore/nt-base.h b/ImageMagick-7.1.1-22/MagickCore/nt-base.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/nt-base.h rename to ImageMagick-7.1.1-22/MagickCore/nt-base.h diff --git a/ImageMagick-7.1.1-21/MagickCore/nt-feature.c b/ImageMagick-7.1.1-22/MagickCore/nt-feature.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/nt-feature.c rename to ImageMagick-7.1.1-22/MagickCore/nt-feature.c diff --git a/ImageMagick-7.1.1-21/MagickCore/nt-feature.h b/ImageMagick-7.1.1-22/MagickCore/nt-feature.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/nt-feature.h rename to ImageMagick-7.1.1-22/MagickCore/nt-feature.h diff --git a/ImageMagick-7.1.1-21/MagickCore/opencl-private.h b/ImageMagick-7.1.1-22/MagickCore/opencl-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/opencl-private.h rename to ImageMagick-7.1.1-22/MagickCore/opencl-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/opencl.c b/ImageMagick-7.1.1-22/MagickCore/opencl.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/opencl.c rename to ImageMagick-7.1.1-22/MagickCore/opencl.c index cf4fc1b8..549b79da 100644 --- a/ImageMagick-7.1.1-21/MagickCore/opencl.c +++ b/ImageMagick-7.1.1-22/MagickCore/opencl.c @@ -2329,20 +2329,11 @@ static void LoadOpenCLDevices(MagickCLEnv clEnv) } for (i = 0; i < number_platforms; i++) { - char - *platform_name; - - number_devices=0; - platform_name=GetOpenCLPlatformString(platforms[i],CL_PLATFORM_NAME); - /* NVIDIA is disabled by default due to reported access violation */ - if (strncmp(platform_name,"NVIDIA",6) != 0) - { - number_devices=GetOpenCLDeviceCount(clEnv,platforms[i]); - clEnv->number_devices+=number_devices; - } - platform_name=(char *) RelinquishMagickMemory(platform_name); + number_devices=GetOpenCLDeviceCount(clEnv,platforms[i]); if (number_devices == 0) platforms[i]=(cl_platform_id) NULL; + else + clEnv->number_devices+=number_devices; } if (clEnv->number_devices == 0) { @@ -2445,9 +2436,6 @@ static void LoadOpenCLDevices(MagickCLEnv clEnv) MagickPrivate MagickBooleanType InitializeOpenCL(MagickCLEnv clEnv, ExceptionInfo *exception) { - size_t - i; - LockSemaphoreInfo(clEnv->lock); if (clEnv->initialized != MagickFalse) { @@ -2462,12 +2450,6 @@ MagickPrivate MagickBooleanType InitializeOpenCL(MagickCLEnv clEnv, AutoSelectOpenCLDevices(clEnv); } clEnv->initialized=MagickTrue; - /* NVIDIA is disabled by default due to reported access violation */ - for (i=0; i < (ssize_t) clEnv->number_devices; i++) - { - if (strncmp(clEnv->devices[i]->platform_name,"NVIDIA",6) == 0) - clEnv->devices[i]->enabled=MagickFalse; - } UnlockSemaphoreInfo(clEnv->lock); return(HasOpenCLDevices(clEnv,exception)); } diff --git a/ImageMagick-7.1.1-21/MagickCore/opencl.h b/ImageMagick-7.1.1-22/MagickCore/opencl.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/opencl.h rename to ImageMagick-7.1.1-22/MagickCore/opencl.h diff --git a/ImageMagick-7.1.1-21/MagickCore/option-private.h b/ImageMagick-7.1.1-22/MagickCore/option-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/option-private.h rename to ImageMagick-7.1.1-22/MagickCore/option-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/option.c b/ImageMagick-7.1.1-22/MagickCore/option.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/option.c rename to ImageMagick-7.1.1-22/MagickCore/option.c diff --git a/ImageMagick-7.1.1-21/MagickCore/option.h b/ImageMagick-7.1.1-22/MagickCore/option.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/option.h rename to ImageMagick-7.1.1-22/MagickCore/option.h diff --git a/ImageMagick-7.1.1-21/MagickCore/paint.c b/ImageMagick-7.1.1-22/MagickCore/paint.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/paint.c rename to ImageMagick-7.1.1-22/MagickCore/paint.c diff --git a/ImageMagick-7.1.1-21/MagickCore/paint.h b/ImageMagick-7.1.1-22/MagickCore/paint.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/paint.h rename to ImageMagick-7.1.1-22/MagickCore/paint.h diff --git a/ImageMagick-7.1.1-21/MagickCore/pixel-accessor.h b/ImageMagick-7.1.1-22/MagickCore/pixel-accessor.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/pixel-accessor.h rename to ImageMagick-7.1.1-22/MagickCore/pixel-accessor.h diff --git a/ImageMagick-7.1.1-21/MagickCore/pixel-private.h b/ImageMagick-7.1.1-22/MagickCore/pixel-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/pixel-private.h rename to ImageMagick-7.1.1-22/MagickCore/pixel-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/pixel.c b/ImageMagick-7.1.1-22/MagickCore/pixel.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/pixel.c rename to ImageMagick-7.1.1-22/MagickCore/pixel.c diff --git a/ImageMagick-7.1.1-21/MagickCore/pixel.h b/ImageMagick-7.1.1-22/MagickCore/pixel.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/pixel.h rename to ImageMagick-7.1.1-22/MagickCore/pixel.h diff --git a/ImageMagick-7.1.1-21/MagickCore/policy-private.h b/ImageMagick-7.1.1-22/MagickCore/policy-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/policy-private.h rename to ImageMagick-7.1.1-22/MagickCore/policy-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/policy.c b/ImageMagick-7.1.1-22/MagickCore/policy.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/policy.c rename to ImageMagick-7.1.1-22/MagickCore/policy.c index 6cff877a..b09290f7 100644 --- a/ImageMagick-7.1.1-21/MagickCore/policy.c +++ b/ImageMagick-7.1.1-22/MagickCore/policy.c @@ -1270,7 +1270,13 @@ MagickExport MagickBooleanType SetMagickSecurityPolicyValue( { if (LocaleCompare(name,"max-memory-request") == 0) { - ResetMaxMemoryRequest(); + MagickSizeType + limit; + + limit=MagickResourceInfinity; + if (LocaleCompare("unlimited",value) != 0) + limit=StringToMagickSizeType(value,100.0); + SetMaxMemoryRequest(limit); return(MagickTrue); } if (LocaleCompare(name,"memory-map") == 0) @@ -1282,7 +1288,11 @@ MagickExport MagickBooleanType SetMagickSecurityPolicyValue( } if (LocaleCompare(name,"precision") == 0) { - ResetMagickPrecision(); + int + limit; + + limit=StringToInteger(value); + SetMagickPrecision(limit); return(MagickTrue); } break; diff --git a/ImageMagick-7.1.1-21/MagickCore/policy.h b/ImageMagick-7.1.1-22/MagickCore/policy.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/policy.h rename to ImageMagick-7.1.1-22/MagickCore/policy.h diff --git a/ImageMagick-7.1.1-21/MagickCore/prepress.c b/ImageMagick-7.1.1-22/MagickCore/prepress.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/prepress.c rename to ImageMagick-7.1.1-22/MagickCore/prepress.c diff --git a/ImageMagick-7.1.1-21/MagickCore/prepress.h b/ImageMagick-7.1.1-22/MagickCore/prepress.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/prepress.h rename to ImageMagick-7.1.1-22/MagickCore/prepress.h diff --git a/ImageMagick-7.1.1-21/MagickCore/profile-private.h b/ImageMagick-7.1.1-22/MagickCore/profile-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/profile-private.h rename to ImageMagick-7.1.1-22/MagickCore/profile-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/profile.c b/ImageMagick-7.1.1-22/MagickCore/profile.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/profile.c rename to ImageMagick-7.1.1-22/MagickCore/profile.c index ab3c1472..f57c2b73 100644 --- a/ImageMagick-7.1.1-21/MagickCore/profile.c +++ b/ImageMagick-7.1.1-22/MagickCore/profile.c @@ -2496,8 +2496,8 @@ static MagickBooleanType GetXmpOffsets(const StringInfo *profile, return(MagickTrue); } -static void GetXmpNumeratorAndDenominator(double value,size_t *numerator, - size_t *denominator) +static void GetXmpNumeratorAndDenominator(double value, + unsigned long *numerator,unsigned long *denominator) { double df; @@ -2515,7 +2515,7 @@ static void GetXmpNumeratorAndDenominator(double value,size_t *numerator, else { (*denominator)++; - *numerator=(size_t) (value*(*denominator)); + *numerator=(unsigned long) (value*(*denominator)); } df=*numerator/(double)*denominator; } @@ -2527,17 +2527,19 @@ static void SyncXmpProfile(const Image *image,StringInfo *profile) value[MagickPathExtent]; size_t - denominator, end, - numerator, start; + unsigned long + denominator, + numerator; + *value='\0'; if (GetXmpOffsets(profile,"tiff:XResolution",&start,&end) != MagickFalse) { GetXmpNumeratorAndDenominator(image->resolution.x,&numerator, &denominator); - (void) FormatLocaleString(value,MagickPathExtent,"%zu/%zu",numerator, + (void) FormatLocaleString(value,MagickPathExtent,"%lu/%lu",numerator, denominator); ReplaceXmpValue(profile,start,end,value); } @@ -2548,8 +2550,8 @@ static void SyncXmpProfile(const Image *image,StringInfo *profile) { GetXmpNumeratorAndDenominator(image->resolution.y,&numerator, &denominator); - (void) FormatLocaleString(value,MagickPathExtent,"%zu/%zu",numerator, - denominator); + (void) FormatLocaleString(value,MagickPathExtent,"%lu/%lu", + numerator,denominator); } ReplaceXmpValue(profile,start,end,value); } diff --git a/ImageMagick-7.1.1-21/MagickCore/profile.h b/ImageMagick-7.1.1-22/MagickCore/profile.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/profile.h rename to ImageMagick-7.1.1-22/MagickCore/profile.h diff --git a/ImageMagick-7.1.1-21/MagickCore/property.c b/ImageMagick-7.1.1-22/MagickCore/property.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/property.c rename to ImageMagick-7.1.1-22/MagickCore/property.c index 939650f3..7fa34023 100644 --- a/ImageMagick-7.1.1-21/MagickCore/property.c +++ b/ImageMagick-7.1.1-22/MagickCore/property.c @@ -2280,8 +2280,7 @@ MagickExport const char *GetImageProperty(const Image *image, if (p != (const char *) NULL) return(p); } - if ((property == (const char *) NULL) || - (strchr(property,':') == (char *) NULL)) + if (strchr(property,':') == (char *) NULL) return(p); } switch (*property) diff --git a/ImageMagick-7.1.1-21/MagickCore/property.h b/ImageMagick-7.1.1-22/MagickCore/property.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/property.h rename to ImageMagick-7.1.1-22/MagickCore/property.h diff --git a/ImageMagick-7.1.1-21/MagickCore/quantize.c b/ImageMagick-7.1.1-22/MagickCore/quantize.c similarity index 94% rename from ImageMagick-7.1.1-21/MagickCore/quantize.c rename to ImageMagick-7.1.1-22/MagickCore/quantize.c index a4ebcd64..27d6efae 100644 --- a/ImageMagick-7.1.1-21/MagickCore/quantize.c +++ b/ImageMagick-7.1.1-22/MagickCore/quantize.c @@ -216,9 +216,9 @@ #endif #define ErrorQueueLength 16 #define ErrorRelativeWeight PerceptibleReciprocal(16) -#define MaxNodes 266817 +#define MaxQNodes 266817 #define MaxTreeDepth 8 -#define NodesInAList 1920 +#define QNodesInAList 1920 /* Typedef declarations. @@ -232,9 +232,9 @@ typedef struct _DoublePixelPacket alpha; } DoublePixelPacket; -typedef struct _NodeInfo +typedef struct _QNodeInfo { - struct _NodeInfo + struct _QNodeInfo *parent, *child[16]; @@ -251,20 +251,20 @@ typedef struct _NodeInfo color_number, id, level; -} NodeInfo; +} QNodeInfo; -typedef struct _Nodes +typedef struct _QNodes { - NodeInfo + QNodeInfo *nodes; - struct _Nodes + struct _QNodes *next; -} Nodes; +} QNodes; -typedef struct _CubeInfo +typedef struct _QCubeInfo { - NodeInfo + QNodeInfo *root; size_t @@ -290,10 +290,10 @@ typedef struct _CubeInfo free_nodes, color_number; - NodeInfo + QNodeInfo *next_node; - Nodes + QNodes *node_queue; MemoryInfo @@ -327,31 +327,31 @@ typedef struct _CubeInfo MagickSizeType span; -} CubeInfo; +} QCubeInfo; /* Method prototypes. */ -static CubeInfo - *GetCubeInfo(const QuantizeInfo *,const size_t,const size_t); +static QCubeInfo + *GetQCubeInfo(const QuantizeInfo *,const size_t,const size_t); -static NodeInfo - *GetNodeInfo(CubeInfo *,const size_t,const size_t,NodeInfo *); +static QNodeInfo + *GetQNodeInfo(QCubeInfo *,const size_t,const size_t,QNodeInfo *); static MagickBooleanType - AssignImageColors(Image *,CubeInfo *,ExceptionInfo *), - ClassifyImageColors(CubeInfo *,const Image *,ExceptionInfo *), - DitherImage(Image *,CubeInfo *,ExceptionInfo *), + AssignImageColors(Image *,QCubeInfo *,ExceptionInfo *), + ClassifyImageColors(QCubeInfo *,const Image *,ExceptionInfo *), + DitherImage(Image *,QCubeInfo *,ExceptionInfo *), SetGrayscaleImage(Image *,ExceptionInfo *), - SetImageColormap(Image *,CubeInfo *,ExceptionInfo *); + SetImageColormap(Image *,QCubeInfo *,ExceptionInfo *); static void - ClosestColor(const Image *,CubeInfo *,const NodeInfo *), - DefineImageColormap(Image *,CubeInfo *,NodeInfo *), - DestroyCubeInfo(CubeInfo *), - PruneLevel(CubeInfo *,const NodeInfo *), - PruneToCubeDepth(CubeInfo *,const NodeInfo *), - ReduceImageColors(const Image *,CubeInfo *); + ClosestColor(const Image *,QCubeInfo *,const QNodeInfo *), + DefineImageColormap(Image *,QCubeInfo *,QNodeInfo *), + DestroyQCubeInfo(QCubeInfo *), + PruneLevel(QCubeInfo *,const QNodeInfo *), + PruneToCubeDepth(QCubeInfo *,const QNodeInfo *), + ReduceImageColors(const Image *,QCubeInfo *); /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -428,7 +428,7 @@ MagickExport QuantizeInfo *AcquireQuantizeInfo(const ImageInfo *image_info) % % The format of the AssignImageColors() method is: % -% MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info) +% MagickBooleanType AssignImageColors(Image *image,QCubeInfo *cube_info) % % A description of each parameter follows. % @@ -439,7 +439,8 @@ MagickExport QuantizeInfo *AcquireQuantizeInfo(const ImageInfo *image_info) */ static inline void AssociateAlphaPixel(const Image *image, - const CubeInfo *cube_info,const Quantum *pixel,DoublePixelPacket *alpha_pixel) + const QCubeInfo *cube_info,const Quantum *pixel, + DoublePixelPacket *alpha_pixel) { double alpha; @@ -460,7 +461,7 @@ static inline void AssociateAlphaPixel(const Image *image, alpha_pixel->alpha=(double) GetPixelAlpha(image,pixel); } -static inline void AssociateAlphaPixelInfo(const CubeInfo *cube_info, +static inline void AssociateAlphaPixelInfo(const QCubeInfo *cube_info, const PixelInfo *pixel,DoublePixelPacket *alpha_pixel) { double @@ -482,7 +483,7 @@ static inline void AssociateAlphaPixelInfo(const CubeInfo *cube_info, alpha_pixel->alpha=(double) pixel->alpha; } -static inline size_t ColorToNodeId(const CubeInfo *cube_info, +static inline size_t ColorToQNodeId(const QCubeInfo *cube_info, const DoublePixelPacket *pixel,size_t index) { size_t @@ -497,7 +498,7 @@ static inline size_t ColorToNodeId(const CubeInfo *cube_info, return(id); } -static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info, +static MagickBooleanType AssignImageColors(Image *image,QCubeInfo *cube_info, ExceptionInfo *exception) { #define AssignImageTag "Assign/Image" @@ -540,7 +541,7 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info, #endif for (y=0; y < (ssize_t) image->rows; y++) { - CubeInfo + QCubeInfo cube; Quantum @@ -565,7 +566,7 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info, DoublePixelPacket pixel; - const NodeInfo + const QNodeInfo *node_info; ssize_t @@ -592,8 +593,8 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info, node_info=cube.root; for (index=MaxTreeDepth-1; (ssize_t) index > 0; index--) { - id=ColorToNodeId(&cube,&pixel,index); - if (node_info->child[id] == (NodeInfo *) NULL) + id=ColorToQNodeId(&cube,&pixel,index); + if (node_info->child[id] == (QNodeInfo *) NULL) break; node_info=node_info->child[id]; } @@ -726,7 +727,7 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info, % % The format of the ClassifyImageColors() method is: % -% MagickBooleanType ClassifyImageColors(CubeInfo *cube_info, +% MagickBooleanType ClassifyImageColors(QCubeInfo *cube_info, % const Image *image,ExceptionInfo *exception) % % A description of each parameter follows. @@ -737,7 +738,7 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info, % */ -static inline void SetAssociatedAlpha(const Image *image,CubeInfo *cube_info) +static inline void SetAssociatedAlpha(const Image *image,QCubeInfo *cube_info) { MagickBooleanType associate_alpha; @@ -751,7 +752,7 @@ static inline void SetAssociatedAlpha(const Image *image,CubeInfo *cube_info) cube_info->associate_alpha=associate_alpha; } -static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info, +static MagickBooleanType ClassifyImageColors(QCubeInfo *cube_info, const Image *image,ExceptionInfo *exception) { #define ClassifyImageTag "Classify/Image" @@ -771,7 +772,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info, MagickBooleanType proceed; - NodeInfo + QNodeInfo *node_info; size_t @@ -815,7 +816,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info, p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception); if (p == (const Quantum *) NULL) break; - if (cube_info->nodes > MaxNodes) + if (cube_info->nodes > MaxQNodes) { /* Prune one level if the color tree is too large. @@ -849,18 +850,18 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info, distance; bisect*=0.5; - id=ColorToNodeId(cube_info,&pixel,index); + id=ColorToQNodeId(cube_info,&pixel,index); mid.red+=(id & 1) != 0 ? bisect : -bisect; mid.green+=(id & 2) != 0 ? bisect : -bisect; mid.blue+=(id & 4) != 0 ? bisect : -bisect; mid.alpha+=(id & 8) != 0 ? bisect : -bisect; - if (node_info->child[id] == (NodeInfo *) NULL) + if (node_info->child[id] == (QNodeInfo *) NULL) { /* Set colors of new node to contain pixel. */ - node_info->child[id]=GetNodeInfo(cube_info,id,level,node_info); - if (node_info->child[id] == (NodeInfo *) NULL) + node_info->child[id]=GetQNodeInfo(cube_info,id,level,node_info); + if (node_info->child[id] == (QNodeInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), ResourceLimitError,"MemoryAllocationFailed","`%s'", @@ -927,7 +928,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info, p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception); if (p == (const Quantum *) NULL) break; - if (cube_info->nodes > MaxNodes) + if (cube_info->nodes > MaxQNodes) { /* Prune one level if the color tree is too large. @@ -961,18 +962,18 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info, distance; bisect*=0.5; - id=ColorToNodeId(cube_info,&pixel,index); + id=ColorToQNodeId(cube_info,&pixel,index); mid.red+=(id & 1) != 0 ? bisect : -bisect; mid.green+=(id & 2) != 0 ? bisect : -bisect; mid.blue+=(id & 4) != 0 ? bisect : -bisect; mid.alpha+=(id & 8) != 0 ? bisect : -bisect; - if (node_info->child[id] == (NodeInfo *) NULL) + if (node_info->child[id] == (QNodeInfo *) NULL) { /* Set colors of new node to contain pixel. */ - node_info->child[id]=GetNodeInfo(cube_info,id,level,node_info); - if (node_info->child[id] == (NodeInfo *) NULL) + node_info->child[id]=GetQNodeInfo(cube_info,id,level,node_info); + if (node_info->child[id] == (QNodeInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), ResourceLimitError,"MemoryAllocationFailed","%s", @@ -1090,8 +1091,8 @@ MagickExport QuantizeInfo *CloneQuantizeInfo(const QuantizeInfo *quantize_info) % % The format of the ClosestColor method is: % -% void ClosestColor(const Image *image,CubeInfo *cube_info, -% const NodeInfo *node_info) +% void ClosestColor(const Image *image,QCubeInfo *cube_info, +% const QNodeInfo *node_info) % % A description of each parameter follows. % @@ -1099,12 +1100,12 @@ MagickExport QuantizeInfo *CloneQuantizeInfo(const QuantizeInfo *quantize_info) % % o cube_info: A pointer to the Cube structure. % -% o node_info: the address of a structure of type NodeInfo which points to a +% o node_info: the address of a structure of type QNodeInfo which points to a % node in the color cube tree that is to be pruned. % */ -static void ClosestColor(const Image *image,CubeInfo *cube_info, - const NodeInfo *node_info) +static void ClosestColor(const Image *image,QCubeInfo *cube_info, + const QNodeInfo *node_info) { size_t number_children; @@ -1117,7 +1118,7 @@ static void ClosestColor(const Image *image,CubeInfo *cube_info, */ number_children=cube_info->associate_alpha == MagickFalse ? 8UL : 16UL; for (i=0; i < (ssize_t) number_children; i++) - if (node_info->child[i] != (NodeInfo *) NULL) + if (node_info->child[i] != (QNodeInfo *) NULL) ClosestColor(image,cube_info,node_info->child[i]); if (node_info->number_unique != 0) { @@ -1234,8 +1235,8 @@ MagickExport MagickBooleanType CompressImageColormap(Image *image, % % The format of the DefineImageColormap method is: % -% void DefineImageColormap(Image *image,CubeInfo *cube_info, -% NodeInfo *node_info) +% void DefineImageColormap(Image *image,QCubeInfo *cube_info, +% QNodeInfo *node_info) % % A description of each parameter follows. % @@ -1243,12 +1244,12 @@ MagickExport MagickBooleanType CompressImageColormap(Image *image, % % o cube_info: A pointer to the Cube structure. % -% o node_info: the address of a structure of type NodeInfo which points to a +% o node_info: the address of a structure of type QNodeInfo which points to a % node in the color cube tree that is to be pruned. % */ -static void DefineImageColormap(Image *image,CubeInfo *cube_info, - NodeInfo *node_info) +static void DefineImageColormap(Image *image,QCubeInfo *cube_info, + QNodeInfo *node_info) { size_t number_children; @@ -1261,7 +1262,7 @@ static void DefineImageColormap(Image *image,CubeInfo *cube_info, */ number_children=cube_info->associate_alpha == MagickFalse ? 8UL : 16UL; for (i=0; i < (ssize_t) number_children; i++) - if (node_info->child[i] != (NodeInfo *) NULL) + if (node_info->child[i] != (QNodeInfo *) NULL) DefineImageColormap(image,cube_info,node_info->child[i]); if (node_info->number_unique != 0) { @@ -1333,26 +1334,26 @@ static void DefineImageColormap(Image *image,CubeInfo *cube_info, % % % % % % -+ D e s t r o y C u b e I n f o % ++ D e s t r o y Q C u b e I n f o % % % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% DestroyCubeInfo() deallocates memory associated with an image. +% DestroyQCubeInfo() deallocates memory associated with an image. % -% The format of the DestroyCubeInfo method is: +% The format of the DestroyQCubeInfo method is: % -% DestroyCubeInfo(CubeInfo *cube_info) +% DestroyQCubeInfo(QCubeInfo *cube_info) % % A description of each parameter follows: % -% o cube_info: the address of a structure of type CubeInfo. +% o cube_info: the address of a structure of type QCubeInfo. % */ -static void DestroyCubeInfo(CubeInfo *cube_info) +static void DestroyQCubeInfo(QCubeInfo *cube_info) { - Nodes + QNodes *nodes; /* @@ -1361,16 +1362,16 @@ static void DestroyCubeInfo(CubeInfo *cube_info) do { nodes=cube_info->node_queue->next; - cube_info->node_queue->nodes=(NodeInfo *) RelinquishMagickMemory( + cube_info->node_queue->nodes=(QNodeInfo *) RelinquishMagickMemory( cube_info->node_queue->nodes); - cube_info->node_queue=(Nodes *) RelinquishMagickMemory( + cube_info->node_queue=(QNodes *) RelinquishMagickMemory( cube_info->node_queue); cube_info->node_queue=nodes; - } while (cube_info->node_queue != (Nodes *) NULL); + } while (cube_info->node_queue != (QNodes *) NULL); if (cube_info->memory_info != (MemoryInfo *) NULL) cube_info->memory_info=RelinquishVirtualMemory(cube_info->memory_info); cube_info->quantize_info=DestroyQuantizeInfo(cube_info->quantize_info); - cube_info=(CubeInfo *) RelinquishMagickMemory(cube_info); + cube_info=(QCubeInfo *) RelinquishMagickMemory(cube_info); } /* @@ -1425,7 +1426,7 @@ MagickExport QuantizeInfo *DestroyQuantizeInfo(QuantizeInfo *quantize_info) % % The format of the DitherImage method is: % -% MagickBooleanType DitherImage(Image *image,CubeInfo *cube_info, +% MagickBooleanType DitherImage(Image *image,QCubeInfo *cube_info, % ExceptionInfo *exception) % % A description of each parameter follows. @@ -1478,7 +1479,7 @@ static DoublePixelPacket **AcquirePixelTLS(const size_t count) return(pixels); } -static inline ssize_t CacheOffset(CubeInfo *cube_info, +static inline ssize_t CacheOffset(QCubeInfo *cube_info, const DoublePixelPacket *pixel) { #define RedShift(pixel) (((pixel) >> CacheShift) << (0*(8-CacheShift))) @@ -1497,7 +1498,7 @@ static inline ssize_t CacheOffset(CubeInfo *cube_info, return(offset); } -static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info, +static MagickBooleanType FloydSteinbergDither(Image *image,QCubeInfo *cube_info, ExceptionInfo *exception) { #define DitherImageTag "Dither/Image" @@ -1527,13 +1528,13 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info, const int id = GetOpenMPThreadId(); - CubeInfo - cube; - DoublePixelPacket *current, *previous; + QCubeInfo + cube; + Quantum *magick_restrict q; @@ -1611,7 +1612,7 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info, i=CacheOffset(&cube,&pixel); if (cube.cache[i] < 0) { - NodeInfo + QNodeInfo *node_info; size_t @@ -1623,8 +1624,8 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info, node_info=cube.root; for (index=MaxTreeDepth-1; (ssize_t) index > 0; index--) { - node_id=ColorToNodeId(&cube,&pixel,index); - if (node_info->child[node_id] == (NodeInfo *) NULL) + node_id=ColorToQNodeId(&cube,&pixel,index); + if (node_info->child[node_id] == (QNodeInfo *) NULL) break; node_info=node_info->child[node_id]; } @@ -1685,11 +1686,11 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info, } static MagickBooleanType RiemersmaDither(Image *image,CacheView *image_view, - CubeInfo *cube_info,const unsigned int direction,ExceptionInfo *exception) + QCubeInfo *cube_info,const unsigned int direction,ExceptionInfo *exception) { #define DitherImageTag "Dither/Image" - CubeInfo + QCubeInfo *p; DoublePixelPacket @@ -1739,7 +1740,7 @@ static MagickBooleanType RiemersmaDither(Image *image,CacheView *image_view, i=CacheOffset(cube_info,&pixel); if (p->cache[i] < 0) { - NodeInfo + QNodeInfo *node_info; size_t @@ -1751,8 +1752,8 @@ static MagickBooleanType RiemersmaDither(Image *image,CacheView *image_view, node_info=p->root; for (index=MaxTreeDepth-1; (ssize_t) index > 0; index--) { - id=ColorToNodeId(cube_info,&pixel,index); - if (node_info->child[id] == (NodeInfo *) NULL) + id=ColorToQNodeId(cube_info,&pixel,index); + if (node_info->child[id] == (QNodeInfo *) NULL) break; node_info=node_info->child[id]; } @@ -1808,7 +1809,7 @@ static MagickBooleanType RiemersmaDither(Image *image,CacheView *image_view, } static MagickBooleanType Riemersma(Image *image,CacheView *image_view, - CubeInfo *cube_info,const size_t level,const unsigned int direction, + QCubeInfo *cube_info,const size_t level,const unsigned int direction, ExceptionInfo *exception) { MagickBooleanType @@ -1974,7 +1975,7 @@ static MagickBooleanType Riemersma(Image *image,CacheView *image_view, return(status); } -static MagickBooleanType DitherImage(Image *image,CubeInfo *cube_info, +static MagickBooleanType DitherImage(Image *image,QCubeInfo *cube_info, ExceptionInfo *exception) { CacheView @@ -2022,17 +2023,17 @@ static MagickBooleanType DitherImage(Image *image,CubeInfo *cube_info, % % % % % % -+ G e t C u b e I n f o % ++ G e t Q C u b e I n f o % % % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% GetCubeInfo() initialize the Cube data structure. +% GetQCubeInfo() initialize the Cube data structure. % -% The format of the GetCubeInfo method is: +% The format of the GetQCubeInfo method is: % -% CubeInfo GetCubeInfo(const QuantizeInfo *quantize_info, +% QCubeInfo GetQCubeInfo(const QuantizeInfo *quantize_info, % const size_t depth,const size_t maximum_colors) % % A description of each parameter follows. @@ -2051,15 +2052,15 @@ static MagickBooleanType DitherImage(Image *image,CubeInfo *cube_info, % o maximum_colors: maximum colors. % */ -static CubeInfo *GetCubeInfo(const QuantizeInfo *quantize_info, +static QCubeInfo *GetQCubeInfo(const QuantizeInfo *quantize_info, const size_t depth,const size_t maximum_colors) { - CubeInfo - *cube_info; - double weight; + QCubeInfo + *cube_info; + size_t length; @@ -2069,9 +2070,9 @@ static CubeInfo *GetCubeInfo(const QuantizeInfo *quantize_info, /* Initialize tree to describe color cube_info. */ - cube_info=(CubeInfo *) AcquireMagickMemory(sizeof(*cube_info)); - if (cube_info == (CubeInfo *) NULL) - return((CubeInfo *) NULL); + cube_info=(QCubeInfo *) AcquireMagickMemory(sizeof(*cube_info)); + if (cube_info == (QCubeInfo *) NULL) + return((QCubeInfo *) NULL); (void) memset(cube_info,0,sizeof(*cube_info)); cube_info->depth=depth; if (cube_info->depth > MaxTreeDepth) @@ -2082,9 +2083,9 @@ static CubeInfo *GetCubeInfo(const QuantizeInfo *quantize_info, /* Initialize root node. */ - cube_info->root=GetNodeInfo(cube_info,0,0,(NodeInfo *) NULL); - if (cube_info->root == (NodeInfo *) NULL) - return((CubeInfo *) NULL); + cube_info->root=GetQNodeInfo(cube_info,0,0,(QNodeInfo *) NULL); + if (cube_info->root == (QNodeInfo *) NULL) + return((QCubeInfo *) NULL); cube_info->root->parent=cube_info->root; cube_info->quantize_info=CloneQuantizeInfo(quantize_info); if (cube_info->quantize_info->dither_method == NoDitherMethod) @@ -2095,7 +2096,7 @@ static CubeInfo *GetCubeInfo(const QuantizeInfo *quantize_info, length=(size_t) (1UL << (4*(8-CacheShift))); cube_info->memory_info=AcquireVirtualMemory(length,sizeof(*cube_info->cache)); if (cube_info->memory_info == (MemoryInfo *) NULL) - return((CubeInfo *) NULL); + return((QCubeInfo *) NULL); cube_info->cache=(ssize_t *) GetVirtualMemoryBlob(cube_info->memory_info); /* Initialize color cache. @@ -2125,48 +2126,48 @@ static CubeInfo *GetCubeInfo(const QuantizeInfo *quantize_info, % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% GetNodeInfo() allocates memory for a new node in the color cube tree and +% GetQNodeInfo() allocates memory for a new node in the color cube tree and % presets all fields to zero. % -% The format of the GetNodeInfo method is: +% The format of the GetQNodeInfo method is: % -% NodeInfo *GetNodeInfo(CubeInfo *cube_info,const size_t id, -% const size_t level,NodeInfo *parent) +% QNodeInfo *GetQNodeInfo(QCubeInfo *cube_info,const size_t id, +% const size_t level,QNodeInfo *parent) % % A description of each parameter follows. % -% o node: The GetNodeInfo method returns a pointer to a queue of nodes. +% o node: The GetQNodeInfo method returns a pointer to a queue of nodes. % % o id: Specifies the child number of the node. % % o level: Specifies the level in the storage_class the node resides. % */ -static NodeInfo *GetNodeInfo(CubeInfo *cube_info,const size_t id, - const size_t level,NodeInfo *parent) +static QNodeInfo *GetQNodeInfo(QCubeInfo *cube_info,const size_t id, + const size_t level,QNodeInfo *parent) { - NodeInfo + QNodeInfo *node_info; if (cube_info->free_nodes == 0) { - Nodes + QNodes *nodes; /* Allocate a new queue of nodes. */ - nodes=(Nodes *) AcquireMagickMemory(sizeof(*nodes)); - if (nodes == (Nodes *) NULL) - return((NodeInfo *) NULL); - nodes->nodes=(NodeInfo *) AcquireQuantumMemory(NodesInAList, + nodes=(QNodes *) AcquireMagickMemory(sizeof(*nodes)); + if (nodes == (QNodes *) NULL) + return((QNodeInfo *) NULL); + nodes->nodes=(QNodeInfo *) AcquireQuantumMemory(QNodesInAList, sizeof(*nodes->nodes)); - if (nodes->nodes == (NodeInfo *) NULL) - return((NodeInfo *) NULL); + if (nodes->nodes == (QNodeInfo *) NULL) + return((QNodeInfo *) NULL); nodes->next=cube_info->node_queue; cube_info->node_queue=nodes; cube_info->next_node=nodes->nodes; - cube_info->free_nodes=NodesInAList; + cube_info->free_nodes=QNodesInAList; } cube_info->nodes++; cube_info->free_nodes--; @@ -2526,7 +2527,7 @@ MagickExport MagickBooleanType KmeansImage(Image *image, colors=GetImageArtifact(image,"kmeans:seed-colors"); if (colors == (const char *) NULL) { - CubeInfo + QCubeInfo *cube_info; QuantizeInfo @@ -2545,8 +2546,8 @@ MagickExport MagickBooleanType KmeansImage(Image *image, n=(ssize_t) number_colors; for (depth=1; n != 0; depth++) n>>=2; - cube_info=GetCubeInfo(quantize_info,depth,number_colors); - if (cube_info == (CubeInfo *) NULL) + cube_info=GetQCubeInfo(quantize_info,depth,number_colors); + if (cube_info == (QCubeInfo *) NULL) { quantize_info=DestroyQuantizeInfo(quantize_info); ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", @@ -2559,7 +2560,7 @@ MagickExport MagickBooleanType KmeansImage(Image *image, ReduceImageColors(image,cube_info); status=SetImageColormap(image,cube_info,exception); } - DestroyCubeInfo(cube_info); + DestroyQCubeInfo(cube_info); quantize_info=DestroyQuantizeInfo(quantize_info); if (status == MagickFalse) return(status); @@ -2990,7 +2991,7 @@ MagickExport MagickBooleanType PosterizeImage(Image *image,const size_t levels, % % The format of the PruneSubtree method is: % -% PruneChild(CubeInfo *cube_info,const NodeInfo *node_info) +% PruneChild(QCubeInfo *cube_info,const QNodeInfo *node_info) % % A description of each parameter follows. % @@ -2999,9 +3000,9 @@ MagickExport MagickBooleanType PosterizeImage(Image *image,const size_t levels, % o node_info: pointer to node in color cube tree that is to be pruned. % */ -static void PruneChild(CubeInfo *cube_info,const NodeInfo *node_info) +static void PruneChild(QCubeInfo *cube_info,const QNodeInfo *node_info) { - NodeInfo + QNodeInfo *parent; size_t @@ -3015,7 +3016,7 @@ static void PruneChild(CubeInfo *cube_info,const NodeInfo *node_info) */ number_children=cube_info->associate_alpha == MagickFalse ? 8UL : 16UL; for (i=0; i < (ssize_t) number_children; i++) - if (node_info->child[i] != (NodeInfo *) NULL) + if (node_info->child[i] != (QNodeInfo *) NULL) PruneChild(cube_info,node_info->child[i]); if (cube_info->nodes > cube_info->maximum_colors) { @@ -3028,7 +3029,7 @@ static void PruneChild(CubeInfo *cube_info,const NodeInfo *node_info) parent->total_color.green+=node_info->total_color.green; parent->total_color.blue+=node_info->total_color.blue; parent->total_color.alpha+=node_info->total_color.alpha; - parent->child[node_info->id]=(NodeInfo *) NULL; + parent->child[node_info->id]=(QNodeInfo *) NULL; cube_info->nodes--; } } @@ -3049,7 +3050,7 @@ static void PruneChild(CubeInfo *cube_info,const NodeInfo *node_info) % % The format of the PruneLevel method is: % -% PruneLevel(CubeInfo *cube_info,const NodeInfo *node_info) +% PruneLevel(QCubeInfo *cube_info,const QNodeInfo *node_info) % % A description of each parameter follows. % @@ -3058,7 +3059,7 @@ static void PruneChild(CubeInfo *cube_info,const NodeInfo *node_info) % o node_info: pointer to node in color cube tree that is to be pruned. % */ -static void PruneLevel(CubeInfo *cube_info,const NodeInfo *node_info) +static void PruneLevel(QCubeInfo *cube_info,const QNodeInfo *node_info) { size_t number_children; @@ -3071,7 +3072,7 @@ static void PruneLevel(CubeInfo *cube_info,const NodeInfo *node_info) */ number_children=cube_info->associate_alpha == MagickFalse ? 8UL : 16UL; for (i=0; i < (ssize_t) number_children; i++) - if (node_info->child[i] != (NodeInfo *) NULL) + if (node_info->child[i] != (QNodeInfo *) NULL) PruneLevel(cube_info,node_info->child[i]); if (node_info->level == cube_info->depth) PruneChild(cube_info,node_info); @@ -3094,7 +3095,7 @@ static void PruneLevel(CubeInfo *cube_info,const NodeInfo *node_info) % % The format of the PruneToCubeDepth method is: % -% PruneToCubeDepth(CubeInfo *cube_info,const NodeInfo *node_info) +% PruneToCubeDepth(QCubeInfo *cube_info,const QNodeInfo *node_info) % % A description of each parameter follows. % @@ -3103,7 +3104,7 @@ static void PruneLevel(CubeInfo *cube_info,const NodeInfo *node_info) % o node_info: pointer to node in color cube tree that is to be pruned. % */ -static void PruneToCubeDepth(CubeInfo *cube_info,const NodeInfo *node_info) +static void PruneToCubeDepth(QCubeInfo *cube_info,const QNodeInfo *node_info) { size_t number_children; @@ -3116,7 +3117,7 @@ static void PruneToCubeDepth(CubeInfo *cube_info,const NodeInfo *node_info) */ number_children=cube_info->associate_alpha == MagickFalse ? 8UL : 16UL; for (i=0; i < (ssize_t) number_children; i++) - if (node_info->child[i] != (NodeInfo *) NULL) + if (node_info->child[i] != (QNodeInfo *) NULL) PruneToCubeDepth(cube_info,node_info->child[i]); if (node_info->level > cube_info->depth) PruneChild(cube_info,node_info); @@ -3155,7 +3156,7 @@ static void PruneToCubeDepth(CubeInfo *cube_info,const NodeInfo *node_info) MagickExport MagickBooleanType QuantizeImage(const QuantizeInfo *quantize_info, Image *image,ExceptionInfo *exception) { - CubeInfo + QCubeInfo *cube_info; ImageType @@ -3206,8 +3207,8 @@ MagickExport MagickBooleanType QuantizeImage(const QuantizeInfo *quantize_info, /* Initialize color cube. */ - cube_info=GetCubeInfo(quantize_info,depth,maximum_colors); - if (cube_info == (CubeInfo *) NULL) + cube_info=GetQCubeInfo(quantize_info,depth,maximum_colors); + if (cube_info == (QCubeInfo *) NULL) ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", image->filename); status=ClassifyImageColors(cube_info,image,exception); @@ -3220,7 +3221,7 @@ MagickExport MagickBooleanType QuantizeImage(const QuantizeInfo *quantize_info, ReduceImageColors(image,cube_info); status=AssignImageColors(image,cube_info,exception); } - DestroyCubeInfo(cube_info); + DestroyQCubeInfo(cube_info); return(status); } @@ -3257,9 +3258,6 @@ MagickExport MagickBooleanType QuantizeImage(const QuantizeInfo *quantize_info, MagickExport MagickBooleanType QuantizeImages(const QuantizeInfo *quantize_info, Image *images,ExceptionInfo *exception) { - CubeInfo - *cube_info; - Image *image; @@ -3270,6 +3268,9 @@ MagickExport MagickBooleanType QuantizeImages(const QuantizeInfo *quantize_info, MagickProgressMonitor progress_monitor; + QCubeInfo + *cube_info; + size_t depth, maximum_colors, @@ -3318,8 +3319,8 @@ MagickExport MagickBooleanType QuantizeImages(const QuantizeInfo *quantize_info, /* Initialize color cube. */ - cube_info=GetCubeInfo(quantize_info,depth,maximum_colors); - if (cube_info == (CubeInfo *) NULL) + cube_info=GetQCubeInfo(quantize_info,depth,maximum_colors); + if (cube_info == (QCubeInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), ResourceLimitError,"MemoryAllocationFailed","`%s'",images->filename); @@ -3364,7 +3365,7 @@ MagickExport MagickBooleanType QuantizeImages(const QuantizeInfo *quantize_info, image=GetNextImageInList(image); } } - DestroyCubeInfo(cube_info); + DestroyQCubeInfo(cube_info); return(status); } @@ -3386,8 +3387,8 @@ MagickExport MagickBooleanType QuantizeImages(const QuantizeInfo *quantize_info, % % The format of the QuantizeErrorFlatten method is: % -% size_t QuantizeErrorFlatten(const CubeInfo *cube_info, -% const NodeInfo *node_info,const ssize_t offset, +% size_t QuantizeErrorFlatten(const QCubeInfo *cube_info, +% const QNodeInfo *node_info,const ssize_t offset, % double *quantize_error) % % A description of each parameter follows. @@ -3401,8 +3402,8 @@ MagickExport MagickBooleanType QuantizeImages(const QuantizeInfo *quantize_info, % o quantize_error: the quantization error vector. % */ -static size_t QuantizeErrorFlatten(const CubeInfo *cube_info, - const NodeInfo *node_info,const ssize_t offset,double *quantize_error) +static size_t QuantizeErrorFlatten(const QCubeInfo *cube_info, + const QNodeInfo *node_info,const ssize_t offset,double *quantize_error) { size_t n, @@ -3417,7 +3418,7 @@ static size_t QuantizeErrorFlatten(const CubeInfo *cube_info, n=1; number_children=cube_info->associate_alpha == MagickFalse ? 8UL : 16UL; for (i=0; i < (ssize_t) number_children ; i++) - if (node_info->child[i] != (NodeInfo *) NULL) + if (node_info->child[i] != (QNodeInfo *) NULL) n+=QuantizeErrorFlatten(cube_info,node_info->child[i],offset+(ssize_t) n, quantize_error); return(n); @@ -3439,7 +3440,7 @@ static size_t QuantizeErrorFlatten(const CubeInfo *cube_info, % % The format of the Reduce method is: % -% Reduce(CubeInfo *cube_info,const NodeInfo *node_info) +% Reduce(QCubeInfo *cube_info,const QNodeInfo *node_info) % % A description of each parameter follows. % @@ -3448,7 +3449,7 @@ static size_t QuantizeErrorFlatten(const CubeInfo *cube_info, % o node_info: pointer to node in color cube tree that is to be pruned. % */ -static void Reduce(CubeInfo *cube_info,const NodeInfo *node_info) +static void Reduce(QCubeInfo *cube_info,const QNodeInfo *node_info) { size_t number_children; @@ -3461,7 +3462,7 @@ static void Reduce(CubeInfo *cube_info,const NodeInfo *node_info) */ number_children=cube_info->associate_alpha == MagickFalse ? 8UL : 16UL; for (i=0; i < (ssize_t) number_children; i++) - if (node_info->child[i] != (NodeInfo *) NULL) + if (node_info->child[i] != (QNodeInfo *) NULL) Reduce(cube_info,node_info->child[i]); if (node_info->quantize_error <= cube_info->pruning_threshold) PruneChild(cube_info,node_info); @@ -3522,7 +3523,7 @@ static void Reduce(CubeInfo *cube_info,const NodeInfo *node_info) % % The format of the ReduceImageColors method is: % -% ReduceImageColors(const Image *image,CubeInfo *cube_info) +% ReduceImageColors(const Image *image,QCubeInfo *cube_info) % % A description of each parameter follows. % @@ -3547,7 +3548,7 @@ static int QuantizeErrorCompare(const void *error_p,const void *error_q) return(-1); } -static void ReduceImageColors(const Image *image,CubeInfo *cube_info) +static void ReduceImageColors(const Image *image,QCubeInfo *cube_info) { #define ReduceImageTag "Reduce/Image" @@ -3630,7 +3631,7 @@ static void ReduceImageColors(const Image *image,CubeInfo *cube_info) MagickExport MagickBooleanType RemapImage(const QuantizeInfo *quantize_info, Image *image,const Image *remap_image,ExceptionInfo *exception) { - CubeInfo + QCubeInfo *cube_info; MagickBooleanType @@ -3647,9 +3648,9 @@ MagickExport MagickBooleanType RemapImage(const QuantizeInfo *quantize_info, assert(exception->signature == MagickCoreSignature); if (IsEventLogging() != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); - cube_info=GetCubeInfo(quantize_info,MaxTreeDepth, + cube_info=GetQCubeInfo(quantize_info,MaxTreeDepth, quantize_info->number_colors); - if (cube_info == (CubeInfo *) NULL) + if (cube_info == (QCubeInfo *) NULL) ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", image->filename); cube_info->quantize_info->colorspace=remap_image->colorspace; @@ -3662,7 +3663,7 @@ MagickExport MagickBooleanType RemapImage(const QuantizeInfo *quantize_info, cube_info->quantize_info->number_colors=cube_info->colors; status=AssignImageColors(image,cube_info,exception); } - DestroyCubeInfo(cube_info); + DestroyQCubeInfo(cube_info); return(status); } @@ -3699,15 +3700,15 @@ MagickExport MagickBooleanType RemapImage(const QuantizeInfo *quantize_info, MagickExport MagickBooleanType RemapImages(const QuantizeInfo *quantize_info, Image *images,const Image *remap_image,ExceptionInfo *exception) { - CubeInfo - *cube_info; - Image *image; MagickBooleanType status; + QCubeInfo + *cube_info; + assert(images != (Image *) NULL); assert(images->signature == MagickCoreSignature); assert(exception != (ExceptionInfo *) NULL); @@ -3726,9 +3727,9 @@ MagickExport MagickBooleanType RemapImages(const QuantizeInfo *quantize_info, /* Classify image colors from the reference image. */ - cube_info=GetCubeInfo(quantize_info,MaxTreeDepth, + cube_info=GetQCubeInfo(quantize_info,MaxTreeDepth, quantize_info->number_colors); - if (cube_info == (CubeInfo *) NULL) + if (cube_info == (QCubeInfo *) NULL) ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", image->filename); status=ClassifyImageColors(cube_info,remap_image,exception); @@ -3746,7 +3747,7 @@ MagickExport MagickBooleanType RemapImages(const QuantizeInfo *quantize_info, break; } } - DestroyCubeInfo(cube_info); + DestroyQCubeInfo(cube_info); return(status); } @@ -3981,7 +3982,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image, % % The format of the SetImageColormap method is: % -% MagickBooleanType SetImageColormap(Image *image,CubeInfo *cube_info, +% MagickBooleanType SetImageColormap(Image *image,QCubeInfo *cube_info, % ExceptionInfo *node_info) % % A description of each parameter follows. @@ -3994,7 +3995,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image, % */ -MagickBooleanType SetImageColormap(Image *image,CubeInfo *cube_info, +MagickBooleanType SetImageColormap(Image *image,QCubeInfo *cube_info, ExceptionInfo *exception) { size_t diff --git a/ImageMagick-7.1.1-21/MagickCore/quantize.h b/ImageMagick-7.1.1-22/MagickCore/quantize.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/quantize.h rename to ImageMagick-7.1.1-22/MagickCore/quantize.h diff --git a/ImageMagick-7.1.1-21/MagickCore/quantum-export.c b/ImageMagick-7.1.1-22/MagickCore/quantum-export.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/quantum-export.c rename to ImageMagick-7.1.1-22/MagickCore/quantum-export.c diff --git a/ImageMagick-7.1.1-21/MagickCore/quantum-import.c b/ImageMagick-7.1.1-22/MagickCore/quantum-import.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/quantum-import.c rename to ImageMagick-7.1.1-22/MagickCore/quantum-import.c diff --git a/ImageMagick-7.1.1-21/MagickCore/quantum-private.h b/ImageMagick-7.1.1-22/MagickCore/quantum-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/quantum-private.h rename to ImageMagick-7.1.1-22/MagickCore/quantum-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/quantum.c b/ImageMagick-7.1.1-22/MagickCore/quantum.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/quantum.c rename to ImageMagick-7.1.1-22/MagickCore/quantum.c diff --git a/ImageMagick-7.1.1-21/MagickCore/quantum.h b/ImageMagick-7.1.1-22/MagickCore/quantum.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/quantum.h rename to ImageMagick-7.1.1-22/MagickCore/quantum.h diff --git a/ImageMagick-7.1.1-21/MagickCore/random-private.h b/ImageMagick-7.1.1-22/MagickCore/random-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/random-private.h rename to ImageMagick-7.1.1-22/MagickCore/random-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/random.c b/ImageMagick-7.1.1-22/MagickCore/random.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/random.c rename to ImageMagick-7.1.1-22/MagickCore/random.c diff --git a/ImageMagick-7.1.1-21/MagickCore/random_.h b/ImageMagick-7.1.1-22/MagickCore/random_.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/random_.h rename to ImageMagick-7.1.1-22/MagickCore/random_.h diff --git a/ImageMagick-7.1.1-21/MagickCore/registry-private.h b/ImageMagick-7.1.1-22/MagickCore/registry-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/registry-private.h rename to ImageMagick-7.1.1-22/MagickCore/registry-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/registry.c b/ImageMagick-7.1.1-22/MagickCore/registry.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/registry.c rename to ImageMagick-7.1.1-22/MagickCore/registry.c diff --git a/ImageMagick-7.1.1-21/MagickCore/registry.h b/ImageMagick-7.1.1-22/MagickCore/registry.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/registry.h rename to ImageMagick-7.1.1-22/MagickCore/registry.h diff --git a/ImageMagick-7.1.1-21/MagickCore/resample-private.h b/ImageMagick-7.1.1-22/MagickCore/resample-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/resample-private.h rename to ImageMagick-7.1.1-22/MagickCore/resample-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/resample.c b/ImageMagick-7.1.1-22/MagickCore/resample.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/resample.c rename to ImageMagick-7.1.1-22/MagickCore/resample.c diff --git a/ImageMagick-7.1.1-21/MagickCore/resample.h b/ImageMagick-7.1.1-22/MagickCore/resample.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/resample.h rename to ImageMagick-7.1.1-22/MagickCore/resample.h diff --git a/ImageMagick-7.1.1-21/MagickCore/resize-private.h b/ImageMagick-7.1.1-22/MagickCore/resize-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/resize-private.h rename to ImageMagick-7.1.1-22/MagickCore/resize-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/resize.c b/ImageMagick-7.1.1-22/MagickCore/resize.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/resize.c rename to ImageMagick-7.1.1-22/MagickCore/resize.c diff --git a/ImageMagick-7.1.1-21/MagickCore/resize.h b/ImageMagick-7.1.1-22/MagickCore/resize.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/resize.h rename to ImageMagick-7.1.1-22/MagickCore/resize.h diff --git a/ImageMagick-7.1.1-21/MagickCore/resource-private.h b/ImageMagick-7.1.1-22/MagickCore/resource-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/resource-private.h rename to ImageMagick-7.1.1-22/MagickCore/resource-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/resource.c b/ImageMagick-7.1.1-22/MagickCore/resource.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/resource.c rename to ImageMagick-7.1.1-22/MagickCore/resource.c index 301370ae..4147915e 100644 --- a/ImageMagick-7.1.1-21/MagickCore/resource.c +++ b/ImageMagick-7.1.1-22/MagickCore/resource.c @@ -136,7 +136,7 @@ static ResourceInfo MagickULLConstant(768), /* file limit */ MagickULLConstant(1), /* thread limit */ MagickULLConstant(0), /* throttle limit */ - MagickResourceInfinity /* time limit */ + INT_MAX /* time limit */ }; static SemaphoreInfo @@ -971,7 +971,7 @@ MagickExport MagickBooleanType ListMagickResourceInfo(FILE *file, (void) FormatMagickSize(resource_info.disk_limit,MagickTrue,"B", MagickFormatExtent,disk_limit); (void) CopyMagickString(time_limit,"unlimited",MagickFormatExtent); - if (resource_info.time_limit != MagickResourceInfinity) + if (resource_info.time_limit != INT_MAX) FormatTimeToLive(resource_info.time_limit,time_limit); (void) FormatLocaleFile(file,"Resource limits:\n"); (void) FormatLocaleFile(file," Width: %s\n",width_limit); @@ -1333,7 +1333,7 @@ MagickPrivate MagickBooleanType ResourceComponentGenesis(void) limit,100.0)); limit=DestroyString(limit); } - (void) SetMagickResourceLimit(TimeResource,MagickResourceInfinity); + (void) SetMagickResourceLimit(TimeResource,INT_MAX); limit=GetEnvironmentValue("MAGICK_TIME_LIMIT"); if (limit != (char *) NULL) { diff --git a/ImageMagick-7.1.1-21/MagickCore/resource_.h b/ImageMagick-7.1.1-22/MagickCore/resource_.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/resource_.h rename to ImageMagick-7.1.1-22/MagickCore/resource_.h diff --git a/ImageMagick-7.1.1-21/MagickCore/segment.c b/ImageMagick-7.1.1-22/MagickCore/segment.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/segment.c rename to ImageMagick-7.1.1-22/MagickCore/segment.c diff --git a/ImageMagick-7.1.1-21/MagickCore/segment.h b/ImageMagick-7.1.1-22/MagickCore/segment.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/segment.h rename to ImageMagick-7.1.1-22/MagickCore/segment.h diff --git a/ImageMagick-7.1.1-21/MagickCore/semaphore-private.h b/ImageMagick-7.1.1-22/MagickCore/semaphore-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/semaphore-private.h rename to ImageMagick-7.1.1-22/MagickCore/semaphore-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/semaphore.c b/ImageMagick-7.1.1-22/MagickCore/semaphore.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/semaphore.c rename to ImageMagick-7.1.1-22/MagickCore/semaphore.c diff --git a/ImageMagick-7.1.1-21/MagickCore/semaphore.h b/ImageMagick-7.1.1-22/MagickCore/semaphore.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/semaphore.h rename to ImageMagick-7.1.1-22/MagickCore/semaphore.h diff --git a/ImageMagick-7.1.1-21/MagickCore/shear.c b/ImageMagick-7.1.1-22/MagickCore/shear.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/shear.c rename to ImageMagick-7.1.1-22/MagickCore/shear.c diff --git a/ImageMagick-7.1.1-21/MagickCore/shear.h b/ImageMagick-7.1.1-22/MagickCore/shear.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/shear.h rename to ImageMagick-7.1.1-22/MagickCore/shear.h diff --git a/ImageMagick-7.1.1-21/MagickCore/signature-private.h b/ImageMagick-7.1.1-22/MagickCore/signature-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/signature-private.h rename to ImageMagick-7.1.1-22/MagickCore/signature-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/signature.c b/ImageMagick-7.1.1-22/MagickCore/signature.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/signature.c rename to ImageMagick-7.1.1-22/MagickCore/signature.c diff --git a/ImageMagick-7.1.1-21/MagickCore/signature.h b/ImageMagick-7.1.1-22/MagickCore/signature.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/signature.h rename to ImageMagick-7.1.1-22/MagickCore/signature.h diff --git a/ImageMagick-7.1.1-21/MagickCore/splay-tree.c b/ImageMagick-7.1.1-22/MagickCore/splay-tree.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/splay-tree.c rename to ImageMagick-7.1.1-22/MagickCore/splay-tree.c diff --git a/ImageMagick-7.1.1-21/MagickCore/splay-tree.h b/ImageMagick-7.1.1-22/MagickCore/splay-tree.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/splay-tree.h rename to ImageMagick-7.1.1-22/MagickCore/splay-tree.h diff --git a/ImageMagick-7.1.1-21/MagickCore/static.c b/ImageMagick-7.1.1-22/MagickCore/static.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/static.c rename to ImageMagick-7.1.1-22/MagickCore/static.c diff --git a/ImageMagick-7.1.1-21/MagickCore/static.h b/ImageMagick-7.1.1-22/MagickCore/static.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/static.h rename to ImageMagick-7.1.1-22/MagickCore/static.h diff --git a/ImageMagick-7.1.1-21/MagickCore/statistic-private.h b/ImageMagick-7.1.1-22/MagickCore/statistic-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/statistic-private.h rename to ImageMagick-7.1.1-22/MagickCore/statistic-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/statistic.c b/ImageMagick-7.1.1-22/MagickCore/statistic.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/statistic.c rename to ImageMagick-7.1.1-22/MagickCore/statistic.c index 821ba4d5..2391394d 100644 --- a/ImageMagick-7.1.1-21/MagickCore/statistic.c +++ b/ImageMagick-7.1.1-22/MagickCore/statistic.c @@ -2660,6 +2660,7 @@ static void AddNodePixelList(PixelList *pixel_list,const size_t color) Determine where it belongs in the list. */ search=65536UL; + (void) memset(update,0,sizeof(update)); for (level=p->level; level >= 0; level--) { while (p->nodes[search].next[level] < color) diff --git a/ImageMagick-7.1.1-21/MagickCore/statistic.h b/ImageMagick-7.1.1-22/MagickCore/statistic.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/statistic.h rename to ImageMagick-7.1.1-22/MagickCore/statistic.h diff --git a/ImageMagick-7.1.1-21/MagickCore/stream-private.h b/ImageMagick-7.1.1-22/MagickCore/stream-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/stream-private.h rename to ImageMagick-7.1.1-22/MagickCore/stream-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/stream.c b/ImageMagick-7.1.1-22/MagickCore/stream.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/stream.c rename to ImageMagick-7.1.1-22/MagickCore/stream.c diff --git a/ImageMagick-7.1.1-21/MagickCore/stream.h b/ImageMagick-7.1.1-22/MagickCore/stream.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/stream.h rename to ImageMagick-7.1.1-22/MagickCore/stream.h diff --git a/ImageMagick-7.1.1-21/MagickCore/string-private.h b/ImageMagick-7.1.1-22/MagickCore/string-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/string-private.h rename to ImageMagick-7.1.1-22/MagickCore/string-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/string.c b/ImageMagick-7.1.1-22/MagickCore/string.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/string.c rename to ImageMagick-7.1.1-22/MagickCore/string.c index d5c9fa1f..02aeda2d 100644 --- a/ImageMagick-7.1.1-21/MagickCore/string.c +++ b/ImageMagick-7.1.1-22/MagickCore/string.c @@ -1159,6 +1159,9 @@ MagickExport ssize_t FormatMagickSize(const MagickSizeType size, */ MagickExport char *GetEnvironmentValue(const char *name) { +#if defined(MAGICKCORE_WINDOWS_SUPPORT) + return(NTGetEnvironmentValue(name)); +#else const char *environment; @@ -1166,6 +1169,7 @@ MagickExport char *GetEnvironmentValue(const char *name) if (environment == (const char *) NULL) return((char *) NULL); return(ConstantString(environment)); +#endif } /* diff --git a/ImageMagick-7.1.1-21/MagickCore/string_.h b/ImageMagick-7.1.1-22/MagickCore/string_.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/string_.h rename to ImageMagick-7.1.1-22/MagickCore/string_.h diff --git a/ImageMagick-7.1.1-21/MagickCore/studio.h b/ImageMagick-7.1.1-22/MagickCore/studio.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/studio.h rename to ImageMagick-7.1.1-22/MagickCore/studio.h diff --git a/ImageMagick-7.1.1-21/MagickCore/thread-private.h b/ImageMagick-7.1.1-22/MagickCore/thread-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/thread-private.h rename to ImageMagick-7.1.1-22/MagickCore/thread-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/thread.c b/ImageMagick-7.1.1-22/MagickCore/thread.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/thread.c rename to ImageMagick-7.1.1-22/MagickCore/thread.c diff --git a/ImageMagick-7.1.1-21/MagickCore/thread_.h b/ImageMagick-7.1.1-22/MagickCore/thread_.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/thread_.h rename to ImageMagick-7.1.1-22/MagickCore/thread_.h diff --git a/ImageMagick-7.1.1-21/MagickCore/threshold.c b/ImageMagick-7.1.1-22/MagickCore/threshold.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/threshold.c rename to ImageMagick-7.1.1-22/MagickCore/threshold.c diff --git a/ImageMagick-7.1.1-21/MagickCore/threshold.h b/ImageMagick-7.1.1-22/MagickCore/threshold.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/threshold.h rename to ImageMagick-7.1.1-22/MagickCore/threshold.h diff --git a/ImageMagick-7.1.1-21/MagickCore/timer-private.h b/ImageMagick-7.1.1-22/MagickCore/timer-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/timer-private.h rename to ImageMagick-7.1.1-22/MagickCore/timer-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/timer.c b/ImageMagick-7.1.1-22/MagickCore/timer.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/timer.c rename to ImageMagick-7.1.1-22/MagickCore/timer.c diff --git a/ImageMagick-7.1.1-21/MagickCore/timer.h b/ImageMagick-7.1.1-22/MagickCore/timer.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/timer.h rename to ImageMagick-7.1.1-22/MagickCore/timer.h diff --git a/ImageMagick-7.1.1-21/MagickCore/token-private.h b/ImageMagick-7.1.1-22/MagickCore/token-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/token-private.h rename to ImageMagick-7.1.1-22/MagickCore/token-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/token.c b/ImageMagick-7.1.1-22/MagickCore/token.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/token.c rename to ImageMagick-7.1.1-22/MagickCore/token.c diff --git a/ImageMagick-7.1.1-21/MagickCore/token.h b/ImageMagick-7.1.1-22/MagickCore/token.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/token.h rename to ImageMagick-7.1.1-22/MagickCore/token.h diff --git a/ImageMagick-7.1.1-21/MagickCore/transform-private.h b/ImageMagick-7.1.1-22/MagickCore/transform-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/transform-private.h rename to ImageMagick-7.1.1-22/MagickCore/transform-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/transform.c b/ImageMagick-7.1.1-22/MagickCore/transform.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/transform.c rename to ImageMagick-7.1.1-22/MagickCore/transform.c diff --git a/ImageMagick-7.1.1-21/MagickCore/transform.h b/ImageMagick-7.1.1-22/MagickCore/transform.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/transform.h rename to ImageMagick-7.1.1-22/MagickCore/transform.h diff --git a/ImageMagick-7.1.1-21/MagickCore/type-private.h b/ImageMagick-7.1.1-22/MagickCore/type-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/type-private.h rename to ImageMagick-7.1.1-22/MagickCore/type-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/type.c b/ImageMagick-7.1.1-22/MagickCore/type.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/type.c rename to ImageMagick-7.1.1-22/MagickCore/type.c diff --git a/ImageMagick-7.1.1-21/MagickCore/type.h b/ImageMagick-7.1.1-22/MagickCore/type.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/type.h rename to ImageMagick-7.1.1-22/MagickCore/type.h diff --git a/ImageMagick-7.1.1-21/MagickCore/utility-private.h b/ImageMagick-7.1.1-22/MagickCore/utility-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/utility-private.h rename to ImageMagick-7.1.1-22/MagickCore/utility-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/utility.c b/ImageMagick-7.1.1-22/MagickCore/utility.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/utility.c rename to ImageMagick-7.1.1-22/MagickCore/utility.c diff --git a/ImageMagick-7.1.1-21/MagickCore/utility.h b/ImageMagick-7.1.1-22/MagickCore/utility.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/utility.h rename to ImageMagick-7.1.1-22/MagickCore/utility.h diff --git a/ImageMagick-7.1.1-21/MagickCore/version-private.h b/ImageMagick-7.1.1-22/MagickCore/version-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/version-private.h rename to ImageMagick-7.1.1-22/MagickCore/version-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/version.c b/ImageMagick-7.1.1-22/MagickCore/version.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/version.c rename to ImageMagick-7.1.1-22/MagickCore/version.c diff --git a/ImageMagick-7.1.1-21/MagickCore/vision.c b/ImageMagick-7.1.1-22/MagickCore/vision.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/vision.c rename to ImageMagick-7.1.1-22/MagickCore/vision.c diff --git a/ImageMagick-7.1.1-21/MagickCore/vision.h b/ImageMagick-7.1.1-22/MagickCore/vision.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/vision.h rename to ImageMagick-7.1.1-22/MagickCore/vision.h diff --git a/ImageMagick-7.1.1-21/MagickCore/visual-effects.c b/ImageMagick-7.1.1-22/MagickCore/visual-effects.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickCore/visual-effects.c rename to ImageMagick-7.1.1-22/MagickCore/visual-effects.c index 159f2561..83b3ca20 100644 --- a/ImageMagick-7.1.1-21/MagickCore/visual-effects.c +++ b/ImageMagick-7.1.1-22/MagickCore/visual-effects.c @@ -53,6 +53,7 @@ #include "MagickCore/artifact.h" #include "MagickCore/attribute.h" #include "MagickCore/cache.h" +#include "MagickCore/cache-private.h" #include "MagickCore/cache-view.h" #include "MagickCore/channel.h" #include "MagickCore/color.h" @@ -1024,15 +1025,15 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount, #endif for (y=0; y < (ssize_t) canvas_image->rows; y++) { + const Quantum + *magick_restrict p; + double distance; PointInfo delta; - const Quantum - *magick_restrict p; - ssize_t x; @@ -1050,7 +1051,7 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount, status=MagickFalse; continue; } - delta.y=scale.y*(double) (y-center.y); + delta.y=scale.y*((double) y-center.y); for (x=0; x < (ssize_t) canvas_image->columns; x++) { ssize_t @@ -1059,7 +1060,7 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount, /* Determine if the pixel is within an ellipse. */ - delta.x=scale.x*(double) (x-center.x); + delta.x=scale.x*((double) x-center.x); distance=delta.x*delta.x+delta.y*delta.y; if (distance >= (radius*radius)) for (i=0; i < (ssize_t) GetPixelChannels(canvas_image); i++) @@ -1078,17 +1079,22 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount, double factor; + PointInfo + offset; + /* Implode the pixel. */ factor=1.0; if (distance > 0.0) - factor=pow(sin(MagickPI*sqrt((double) distance)* - PerceptibleReciprocal(radius)/2),-amount); - status=InterpolatePixelChannels(canvas_image,interpolate_view, - implode_image,method,(double) (factor*delta.x* - PerceptibleReciprocal(scale.x)+center.x),(double) (factor*delta.y* - PerceptibleReciprocal(scale.y)+center.y),q,exception); + factor=pow(sin(MagickPI*sqrt(distance)* + PerceptibleReciprocal(radius)/2.0),-amount); + offset.x=factor*delta.x*PerceptibleReciprocal(scale.x)+center.x; + offset.y=factor*delta.y*PerceptibleReciprocal(scale.y)+center.y; + if ((IsValidPixelOffset(offset.x,image->columns) != MagickFalse) && + (IsValidPixelOffset(offset.y,image->rows) != MagickFalse)) + status=InterpolatePixelChannels(canvas_image,interpolate_view, + implode_image,method,offset.x,offset.y,q,exception); if (status == MagickFalse) break; } diff --git a/ImageMagick-7.1.1-21/MagickCore/visual-effects.h b/ImageMagick-7.1.1-22/MagickCore/visual-effects.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/visual-effects.h rename to ImageMagick-7.1.1-22/MagickCore/visual-effects.h diff --git a/ImageMagick-7.1.1-21/MagickCore/vms.c b/ImageMagick-7.1.1-22/MagickCore/vms.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/vms.c rename to ImageMagick-7.1.1-22/MagickCore/vms.c diff --git a/ImageMagick-7.1.1-21/MagickCore/vms.h b/ImageMagick-7.1.1-22/MagickCore/vms.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/vms.h rename to ImageMagick-7.1.1-22/MagickCore/vms.h diff --git a/ImageMagick-7.1.1-21/MagickCore/widget-private.h b/ImageMagick-7.1.1-22/MagickCore/widget-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/widget-private.h rename to ImageMagick-7.1.1-22/MagickCore/widget-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/widget.c b/ImageMagick-7.1.1-22/MagickCore/widget.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/widget.c rename to ImageMagick-7.1.1-22/MagickCore/widget.c diff --git a/ImageMagick-7.1.1-21/MagickCore/widget.h b/ImageMagick-7.1.1-22/MagickCore/widget.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/widget.h rename to ImageMagick-7.1.1-22/MagickCore/widget.h diff --git a/ImageMagick-7.1.1-21/MagickCore/xml-tree-private.h b/ImageMagick-7.1.1-22/MagickCore/xml-tree-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/xml-tree-private.h rename to ImageMagick-7.1.1-22/MagickCore/xml-tree-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/xml-tree.c b/ImageMagick-7.1.1-22/MagickCore/xml-tree.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/xml-tree.c rename to ImageMagick-7.1.1-22/MagickCore/xml-tree.c diff --git a/ImageMagick-7.1.1-21/MagickCore/xml-tree.h b/ImageMagick-7.1.1-22/MagickCore/xml-tree.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/xml-tree.h rename to ImageMagick-7.1.1-22/MagickCore/xml-tree.h diff --git a/ImageMagick-7.1.1-21/MagickCore/xwindow-private.h b/ImageMagick-7.1.1-22/MagickCore/xwindow-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/xwindow-private.h rename to ImageMagick-7.1.1-22/MagickCore/xwindow-private.h diff --git a/ImageMagick-7.1.1-21/MagickCore/xwindow.c b/ImageMagick-7.1.1-22/MagickCore/xwindow.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/xwindow.c rename to ImageMagick-7.1.1-22/MagickCore/xwindow.c diff --git a/ImageMagick-7.1.1-21/MagickCore/xwindow.h b/ImageMagick-7.1.1-22/MagickCore/xwindow.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickCore/xwindow.h rename to ImageMagick-7.1.1-22/MagickCore/xwindow.h diff --git a/ImageMagick-7.1.1-21/MagickWand/MagickWand.h b/ImageMagick-7.1.1-22/MagickWand/MagickWand.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/MagickWand.h rename to ImageMagick-7.1.1-22/MagickWand/MagickWand.h diff --git a/ImageMagick-7.1.1-21/MagickWand/animate.c b/ImageMagick-7.1.1-22/MagickWand/animate.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/animate.c rename to ImageMagick-7.1.1-22/MagickWand/animate.c diff --git a/ImageMagick-7.1.1-21/MagickWand/animate.h b/ImageMagick-7.1.1-22/MagickWand/animate.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/animate.h rename to ImageMagick-7.1.1-22/MagickWand/animate.h diff --git a/ImageMagick-7.1.1-21/MagickWand/compare.c b/ImageMagick-7.1.1-22/MagickWand/compare.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/compare.c rename to ImageMagick-7.1.1-22/MagickWand/compare.c diff --git a/ImageMagick-7.1.1-21/MagickWand/compare.h b/ImageMagick-7.1.1-22/MagickWand/compare.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/compare.h rename to ImageMagick-7.1.1-22/MagickWand/compare.h diff --git a/ImageMagick-7.1.1-21/MagickWand/composite.c b/ImageMagick-7.1.1-22/MagickWand/composite.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/composite.c rename to ImageMagick-7.1.1-22/MagickWand/composite.c diff --git a/ImageMagick-7.1.1-21/MagickWand/composite.h b/ImageMagick-7.1.1-22/MagickWand/composite.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/composite.h rename to ImageMagick-7.1.1-22/MagickWand/composite.h diff --git a/ImageMagick-7.1.1-21/MagickWand/conjure.c b/ImageMagick-7.1.1-22/MagickWand/conjure.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/conjure.c rename to ImageMagick-7.1.1-22/MagickWand/conjure.c diff --git a/ImageMagick-7.1.1-21/MagickWand/conjure.h b/ImageMagick-7.1.1-22/MagickWand/conjure.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/conjure.h rename to ImageMagick-7.1.1-22/MagickWand/conjure.h diff --git a/ImageMagick-7.1.1-21/MagickWand/convert.c b/ImageMagick-7.1.1-22/MagickWand/convert.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/convert.c rename to ImageMagick-7.1.1-22/MagickWand/convert.c diff --git a/ImageMagick-7.1.1-21/MagickWand/convert.h b/ImageMagick-7.1.1-22/MagickWand/convert.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/convert.h rename to ImageMagick-7.1.1-22/MagickWand/convert.h diff --git a/ImageMagick-7.1.1-21/MagickWand/deprecate.c b/ImageMagick-7.1.1-22/MagickWand/deprecate.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/deprecate.c rename to ImageMagick-7.1.1-22/MagickWand/deprecate.c diff --git a/ImageMagick-7.1.1-21/MagickWand/deprecate.h b/ImageMagick-7.1.1-22/MagickWand/deprecate.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/deprecate.h rename to ImageMagick-7.1.1-22/MagickWand/deprecate.h diff --git a/ImageMagick-7.1.1-21/MagickWand/display.c b/ImageMagick-7.1.1-22/MagickWand/display.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/display.c rename to ImageMagick-7.1.1-22/MagickWand/display.c diff --git a/ImageMagick-7.1.1-21/MagickWand/display.h b/ImageMagick-7.1.1-22/MagickWand/display.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/display.h rename to ImageMagick-7.1.1-22/MagickWand/display.h diff --git a/ImageMagick-7.1.1-21/MagickWand/drawing-wand.c b/ImageMagick-7.1.1-22/MagickWand/drawing-wand.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/drawing-wand.c rename to ImageMagick-7.1.1-22/MagickWand/drawing-wand.c diff --git a/ImageMagick-7.1.1-21/MagickWand/drawing-wand.h b/ImageMagick-7.1.1-22/MagickWand/drawing-wand.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/drawing-wand.h rename to ImageMagick-7.1.1-22/MagickWand/drawing-wand.h diff --git a/ImageMagick-7.1.1-21/MagickWand/identify.c b/ImageMagick-7.1.1-22/MagickWand/identify.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/identify.c rename to ImageMagick-7.1.1-22/MagickWand/identify.c diff --git a/ImageMagick-7.1.1-21/MagickWand/identify.h b/ImageMagick-7.1.1-22/MagickWand/identify.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/identify.h rename to ImageMagick-7.1.1-22/MagickWand/identify.h diff --git a/ImageMagick-7.1.1-21/MagickWand/import.c b/ImageMagick-7.1.1-22/MagickWand/import.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/import.c rename to ImageMagick-7.1.1-22/MagickWand/import.c diff --git a/ImageMagick-7.1.1-21/MagickWand/import.h b/ImageMagick-7.1.1-22/MagickWand/import.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/import.h rename to ImageMagick-7.1.1-22/MagickWand/import.h diff --git a/ImageMagick-7.1.1-21/MagickWand/magick-cli.c b/ImageMagick-7.1.1-22/MagickWand/magick-cli.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/magick-cli.c rename to ImageMagick-7.1.1-22/MagickWand/magick-cli.c diff --git a/ImageMagick-7.1.1-21/MagickWand/magick-cli.h b/ImageMagick-7.1.1-22/MagickWand/magick-cli.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/magick-cli.h rename to ImageMagick-7.1.1-22/MagickWand/magick-cli.h diff --git a/ImageMagick-7.1.1-21/MagickWand/magick-image.c b/ImageMagick-7.1.1-22/MagickWand/magick-image.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/magick-image.c rename to ImageMagick-7.1.1-22/MagickWand/magick-image.c diff --git a/ImageMagick-7.1.1-21/MagickWand/magick-image.h b/ImageMagick-7.1.1-22/MagickWand/magick-image.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/magick-image.h rename to ImageMagick-7.1.1-22/MagickWand/magick-image.h diff --git a/ImageMagick-7.1.1-21/MagickWand/magick-property.c b/ImageMagick-7.1.1-22/MagickWand/magick-property.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/magick-property.c rename to ImageMagick-7.1.1-22/MagickWand/magick-property.c diff --git a/ImageMagick-7.1.1-21/MagickWand/magick-property.h b/ImageMagick-7.1.1-22/MagickWand/magick-property.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/magick-property.h rename to ImageMagick-7.1.1-22/MagickWand/magick-property.h diff --git a/ImageMagick-7.1.1-21/MagickWand/magick-wand-private.h b/ImageMagick-7.1.1-22/MagickWand/magick-wand-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/magick-wand-private.h rename to ImageMagick-7.1.1-22/MagickWand/magick-wand-private.h diff --git a/ImageMagick-7.1.1-21/MagickWand/magick-wand.c b/ImageMagick-7.1.1-22/MagickWand/magick-wand.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/magick-wand.c rename to ImageMagick-7.1.1-22/MagickWand/magick-wand.c diff --git a/ImageMagick-7.1.1-21/MagickWand/method-attribute.h b/ImageMagick-7.1.1-22/MagickWand/method-attribute.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/method-attribute.h rename to ImageMagick-7.1.1-22/MagickWand/method-attribute.h diff --git a/ImageMagick-7.1.1-21/MagickWand/mogrify-private.h b/ImageMagick-7.1.1-22/MagickWand/mogrify-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/mogrify-private.h rename to ImageMagick-7.1.1-22/MagickWand/mogrify-private.h diff --git a/ImageMagick-7.1.1-21/MagickWand/mogrify.c b/ImageMagick-7.1.1-22/MagickWand/mogrify.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/mogrify.c rename to ImageMagick-7.1.1-22/MagickWand/mogrify.c diff --git a/ImageMagick-7.1.1-21/MagickWand/mogrify.h b/ImageMagick-7.1.1-22/MagickWand/mogrify.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/mogrify.h rename to ImageMagick-7.1.1-22/MagickWand/mogrify.h diff --git a/ImageMagick-7.1.1-21/MagickWand/montage.c b/ImageMagick-7.1.1-22/MagickWand/montage.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/montage.c rename to ImageMagick-7.1.1-22/MagickWand/montage.c diff --git a/ImageMagick-7.1.1-21/MagickWand/montage.h b/ImageMagick-7.1.1-22/MagickWand/montage.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/montage.h rename to ImageMagick-7.1.1-22/MagickWand/montage.h diff --git a/ImageMagick-7.1.1-21/MagickWand/operation-private.h b/ImageMagick-7.1.1-22/MagickWand/operation-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/operation-private.h rename to ImageMagick-7.1.1-22/MagickWand/operation-private.h diff --git a/ImageMagick-7.1.1-21/MagickWand/operation.c b/ImageMagick-7.1.1-22/MagickWand/operation.c similarity index 99% rename from ImageMagick-7.1.1-21/MagickWand/operation.c rename to ImageMagick-7.1.1-22/MagickWand/operation.c index ebdf10b3..b7c786e4 100644 --- a/ImageMagick-7.1.1-21/MagickWand/operation.c +++ b/ImageMagick-7.1.1-22/MagickWand/operation.c @@ -2791,7 +2791,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, if (LocaleCompare("map",option+1) == 0) { CLIWandWarnReplaced("-remap"); - (void) CLISimpleOperatorImage(cli_wand,"-remap",NULL,NULL,exception); + (void) CLISimpleOperatorImage(cli_wand,"-remap",arg1,NULL,exception); break; } if (LocaleCompare("mask",option+1) == 0) diff --git a/ImageMagick-7.1.1-21/MagickWand/operation.h b/ImageMagick-7.1.1-22/MagickWand/operation.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/operation.h rename to ImageMagick-7.1.1-22/MagickWand/operation.h diff --git a/ImageMagick-7.1.1-21/MagickWand/pixel-iterator.c b/ImageMagick-7.1.1-22/MagickWand/pixel-iterator.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/pixel-iterator.c rename to ImageMagick-7.1.1-22/MagickWand/pixel-iterator.c diff --git a/ImageMagick-7.1.1-21/MagickWand/pixel-iterator.h b/ImageMagick-7.1.1-22/MagickWand/pixel-iterator.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/pixel-iterator.h rename to ImageMagick-7.1.1-22/MagickWand/pixel-iterator.h diff --git a/ImageMagick-7.1.1-21/MagickWand/pixel-wand-private.h b/ImageMagick-7.1.1-22/MagickWand/pixel-wand-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/pixel-wand-private.h rename to ImageMagick-7.1.1-22/MagickWand/pixel-wand-private.h diff --git a/ImageMagick-7.1.1-21/MagickWand/pixel-wand.c b/ImageMagick-7.1.1-22/MagickWand/pixel-wand.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/pixel-wand.c rename to ImageMagick-7.1.1-22/MagickWand/pixel-wand.c diff --git a/ImageMagick-7.1.1-21/MagickWand/pixel-wand.h b/ImageMagick-7.1.1-22/MagickWand/pixel-wand.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/pixel-wand.h rename to ImageMagick-7.1.1-22/MagickWand/pixel-wand.h diff --git a/ImageMagick-7.1.1-21/MagickWand/script-token.c b/ImageMagick-7.1.1-22/MagickWand/script-token.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/script-token.c rename to ImageMagick-7.1.1-22/MagickWand/script-token.c diff --git a/ImageMagick-7.1.1-21/MagickWand/script-token.h b/ImageMagick-7.1.1-22/MagickWand/script-token.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/script-token.h rename to ImageMagick-7.1.1-22/MagickWand/script-token.h diff --git a/ImageMagick-7.1.1-21/MagickWand/stream.c b/ImageMagick-7.1.1-22/MagickWand/stream.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/stream.c rename to ImageMagick-7.1.1-22/MagickWand/stream.c diff --git a/ImageMagick-7.1.1-21/MagickWand/stream.h b/ImageMagick-7.1.1-22/MagickWand/stream.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/stream.h rename to ImageMagick-7.1.1-22/MagickWand/stream.h diff --git a/ImageMagick-7.1.1-21/MagickWand/studio.h b/ImageMagick-7.1.1-22/MagickWand/studio.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/studio.h rename to ImageMagick-7.1.1-22/MagickWand/studio.h diff --git a/ImageMagick-7.1.1-21/MagickWand/wand-view.c b/ImageMagick-7.1.1-22/MagickWand/wand-view.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/wand-view.c rename to ImageMagick-7.1.1-22/MagickWand/wand-view.c diff --git a/ImageMagick-7.1.1-21/MagickWand/wand-view.h b/ImageMagick-7.1.1-22/MagickWand/wand-view.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/wand-view.h rename to ImageMagick-7.1.1-22/MagickWand/wand-view.h diff --git a/ImageMagick-7.1.1-21/MagickWand/wand.c b/ImageMagick-7.1.1-22/MagickWand/wand.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/wand.c rename to ImageMagick-7.1.1-22/MagickWand/wand.c diff --git a/ImageMagick-7.1.1-21/MagickWand/wand.h b/ImageMagick-7.1.1-22/MagickWand/wand.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/wand.h rename to ImageMagick-7.1.1-22/MagickWand/wand.h diff --git a/ImageMagick-7.1.1-21/MagickWand/wandcli-private.h b/ImageMagick-7.1.1-22/MagickWand/wandcli-private.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/wandcli-private.h rename to ImageMagick-7.1.1-22/MagickWand/wandcli-private.h diff --git a/ImageMagick-7.1.1-21/MagickWand/wandcli.c b/ImageMagick-7.1.1-22/MagickWand/wandcli.c similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/wandcli.c rename to ImageMagick-7.1.1-22/MagickWand/wandcli.c diff --git a/ImageMagick-7.1.1-21/MagickWand/wandcli.h b/ImageMagick-7.1.1-22/MagickWand/wandcli.h similarity index 100% rename from ImageMagick-7.1.1-21/MagickWand/wandcli.h rename to ImageMagick-7.1.1-22/MagickWand/wandcli.h diff --git a/ImageMagick-7.1.1-21/coders/aai.c b/ImageMagick-7.1.1-22/coders/aai.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/aai.c rename to ImageMagick-7.1.1-22/coders/aai.c index 2e3c6c54..58fd027f 100644 --- a/ImageMagick-7.1.1-21/coders/aai.c +++ b/ImageMagick-7.1.1-22/coders/aai.c @@ -234,7 +234,8 @@ static Image *ReadAAIImage(const ImageInfo *image_info,ExceptionInfo *exception) break; } } while ((width != 0UL) && (height != 0UL)); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -421,6 +422,7 @@ static MagickBooleanType WriteAAIImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/aai.h b/ImageMagick-7.1.1-22/coders/aai.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/aai.h rename to ImageMagick-7.1.1-22/coders/aai.h diff --git a/ImageMagick-7.1.1-21/coders/art.c b/ImageMagick-7.1.1-22/coders/art.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/art.c rename to ImageMagick-7.1.1-22/coders/art.c index f3e92d02..ad1ef150 100644 --- a/ImageMagick-7.1.1-21/coders/art.c +++ b/ImageMagick-7.1.1-22/coders/art.c @@ -188,7 +188,10 @@ static Image *ReadARTImage(const ImageInfo *image_info,ExceptionInfo *exception) if (EOFBlob(image) != MagickFalse) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -350,6 +353,7 @@ static MagickBooleanType WriteARTImage(const ImageInfo *image_info,Image *image, quantum_info=DestroyQuantumInfo(quantum_info); if (y < (ssize_t) image->rows) ThrowWriterException(CorruptImageError,"UnableToWriteImageData"); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } diff --git a/ImageMagick-7.1.1-21/coders/art.h b/ImageMagick-7.1.1-22/coders/art.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/art.h rename to ImageMagick-7.1.1-22/coders/art.h diff --git a/ImageMagick-7.1.1-21/coders/ashlar.c b/ImageMagick-7.1.1-22/coders/ashlar.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/ashlar.c rename to ImageMagick-7.1.1-22/coders/ashlar.c diff --git a/ImageMagick-7.1.1-21/coders/ashlar.h b/ImageMagick-7.1.1-22/coders/ashlar.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/ashlar.h rename to ImageMagick-7.1.1-22/coders/ashlar.h diff --git a/ImageMagick-7.1.1-21/coders/avs.c b/ImageMagick-7.1.1-22/coders/avs.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/avs.c rename to ImageMagick-7.1.1-22/coders/avs.c index 1f4306f3..cd80623e 100644 --- a/ImageMagick-7.1.1-21/coders/avs.c +++ b/ImageMagick-7.1.1-22/coders/avs.c @@ -233,7 +233,8 @@ static Image *ReadAVSImage(const ImageInfo *image_info,ExceptionInfo *exception) break; } } while ((width != 0UL) && (height != 0UL)); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -420,6 +421,7 @@ static MagickBooleanType WriteAVSImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/avs.h b/ImageMagick-7.1.1-22/coders/avs.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/avs.h rename to ImageMagick-7.1.1-22/coders/avs.h diff --git a/ImageMagick-7.1.1-21/coders/bayer.c b/ImageMagick-7.1.1-22/coders/bayer.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/bayer.c rename to ImageMagick-7.1.1-22/coders/bayer.c diff --git a/ImageMagick-7.1.1-21/coders/bayer.h b/ImageMagick-7.1.1-22/coders/bayer.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/bayer.h rename to ImageMagick-7.1.1-22/coders/bayer.h diff --git a/ImageMagick-7.1.1-21/coders/bgr.c b/ImageMagick-7.1.1-22/coders/bgr.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/bgr.c rename to ImageMagick-7.1.1-22/coders/bgr.c index 3b1d6bdf..33351f58 100644 --- a/ImageMagick-7.1.1-21/coders/bgr.c +++ b/ImageMagick-7.1.1-22/coders/bgr.c @@ -107,7 +107,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info,ExceptionInfo *exception) *image; MagickBooleanType - status; + status = MagickTrue; MagickOffsetType scene; @@ -719,7 +719,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) break; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("G",image->filename); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -790,7 +791,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) break; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("R",image->filename); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -863,7 +865,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info,ExceptionInfo *exception) } if (image->alpha_trait != UndefinedPixelTrait) { - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("A",image->filename); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -975,7 +978,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info,ExceptionInfo *exception) } while (count == (ssize_t) length); quantum_info=DestroyQuantumInfo(quantum_info); canvas_image=DestroyImage(canvas_image); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -1089,7 +1093,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image, ExceptionInfo *exception) { MagickBooleanType - status; + status = MagickTrue; MagickOffsetType scene; @@ -1359,7 +1363,8 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) break; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("G",image->filename); status=OpenBlob(image_info,image,scene == 0 ? WriteBinaryBlobMode : AppendBinaryBlobMode,exception); @@ -1385,7 +1390,8 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) break; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("R",image->filename); status=OpenBlob(image_info,image,scene == 0 ? WriteBinaryBlobMode : AppendBinaryBlobMode,exception); @@ -1414,7 +1420,8 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image, (void) CloseBlob(image); if (quantum_type == BGRAQuantum) { - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("A",image->filename); status=OpenBlob(image_info,image,scene == 0 ? WriteBinaryBlobMode : AppendBinaryBlobMode,exception); @@ -1461,6 +1468,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/bgr.h b/ImageMagick-7.1.1-22/coders/bgr.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/bgr.h rename to ImageMagick-7.1.1-22/coders/bgr.h diff --git a/ImageMagick-7.1.1-21/coders/bmp.c b/ImageMagick-7.1.1-22/coders/bmp.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/bmp.c rename to ImageMagick-7.1.1-22/coders/bmp.c index 454db652..53b84f45 100644 --- a/ImageMagick-7.1.1-21/coders/bmp.c +++ b/ImageMagick-7.1.1-22/coders/bmp.c @@ -211,15 +211,13 @@ static MagickBooleanType DecodeImage(Image *image,const size_t compression, ssize_t i, - x; + x, + y; unsigned char *p, *q; - ssize_t - y; - assert(image != (Image *) NULL); assert(image->signature == MagickCoreSignature); assert(pixels != (unsigned char *) NULL); @@ -640,6 +638,8 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); image=AcquireImage(image_info,exception); + image->columns=0; + image->rows=0; status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) { @@ -1694,7 +1694,8 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) break; } } while (IsBMP(magick,2) != MagickFalse); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -2656,6 +2657,7 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/bmp.h b/ImageMagick-7.1.1-22/coders/bmp.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/bmp.h rename to ImageMagick-7.1.1-22/coders/bmp.h diff --git a/ImageMagick-7.1.1-21/coders/braille.c b/ImageMagick-7.1.1-22/coders/braille.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/braille.c rename to ImageMagick-7.1.1-22/coders/braille.c index 57f65e03..8af2918c 100644 --- a/ImageMagick-7.1.1-21/coders/braille.c +++ b/ImageMagick-7.1.1-22/coders/braille.c @@ -373,6 +373,7 @@ static MagickBooleanType WriteBRAILLEImage(const ImageInfo *image_info, if (status == MagickFalse) break; } - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/braille.h b/ImageMagick-7.1.1-22/coders/braille.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/braille.h rename to ImageMagick-7.1.1-22/coders/braille.h diff --git a/ImageMagick-7.1.1-21/coders/bytebuffer-private.h b/ImageMagick-7.1.1-22/coders/bytebuffer-private.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/bytebuffer-private.h rename to ImageMagick-7.1.1-22/coders/bytebuffer-private.h diff --git a/ImageMagick-7.1.1-21/coders/cals.c b/ImageMagick-7.1.1-22/coders/cals.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/cals.c rename to ImageMagick-7.1.1-22/coders/cals.c index 2cf42ef2..c9a9e79e 100644 --- a/ImageMagick-7.1.1-21/coders/cals.c +++ b/ImageMagick-7.1.1-22/coders/cals.c @@ -575,7 +575,8 @@ static MagickBooleanType WriteCALSImage(const ImageInfo *image_info, if (WriteBlob(image,length,group4) != (ssize_t) length) status=MagickFalse; group4=(unsigned char *) RelinquishMagickMemory(group4); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } #endif diff --git a/ImageMagick-7.1.1-21/coders/cals.h b/ImageMagick-7.1.1-22/coders/cals.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/cals.h rename to ImageMagick-7.1.1-22/coders/cals.h diff --git a/ImageMagick-7.1.1-21/coders/caption.c b/ImageMagick-7.1.1-22/coders/caption.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/caption.c rename to ImageMagick-7.1.1-22/coders/caption.c diff --git a/ImageMagick-7.1.1-21/coders/caption.h b/ImageMagick-7.1.1-22/coders/caption.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/caption.h rename to ImageMagick-7.1.1-22/coders/caption.h diff --git a/ImageMagick-7.1.1-21/coders/cin.c b/ImageMagick-7.1.1-22/coders/cin.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/cin.c rename to ImageMagick-7.1.1-22/coders/cin.c index 1e409773..97a3f3ed 100644 --- a/ImageMagick-7.1.1-21/coders/cin.c +++ b/ImageMagick-7.1.1-22/coders/cin.c @@ -790,7 +790,10 @@ static Image *ReadCINImage(const ImageInfo *image_info,ExceptionInfo *exception) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); SetImageColorspace(image,LogColorspace,exception); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -1226,6 +1229,7 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image, break; } quantum_info=DestroyQuantumInfo(quantum_info); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } diff --git a/ImageMagick-7.1.1-21/coders/cin.h b/ImageMagick-7.1.1-22/coders/cin.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/cin.h rename to ImageMagick-7.1.1-22/coders/cin.h diff --git a/ImageMagick-7.1.1-21/coders/cip.c b/ImageMagick-7.1.1-22/coders/cip.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/cip.c rename to ImageMagick-7.1.1-22/coders/cip.c index d5ed31a5..1a3dcc7c 100644 --- a/ImageMagick-7.1.1-21/coders/cip.c +++ b/ImageMagick-7.1.1-22/coders/cip.c @@ -292,6 +292,7 @@ static MagickBooleanType WriteCIPImage(const ImageInfo *image_info,Image *image, } (void) WriteBlobString(image,"\n"); (void) WriteBlobString(image,"\n"); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/cip.h b/ImageMagick-7.1.1-22/coders/cip.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/cip.h rename to ImageMagick-7.1.1-22/coders/cip.h diff --git a/ImageMagick-7.1.1-21/coders/clip.c b/ImageMagick-7.1.1-22/coders/clip.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/clip.c rename to ImageMagick-7.1.1-22/coders/clip.c diff --git a/ImageMagick-7.1.1-21/coders/clip.h b/ImageMagick-7.1.1-22/coders/clip.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/clip.h rename to ImageMagick-7.1.1-22/coders/clip.h diff --git a/ImageMagick-7.1.1-21/coders/clipboard.c b/ImageMagick-7.1.1-22/coders/clipboard.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/clipboard.c rename to ImageMagick-7.1.1-22/coders/clipboard.c diff --git a/ImageMagick-7.1.1-21/coders/clipboard.h b/ImageMagick-7.1.1-22/coders/clipboard.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/clipboard.h rename to ImageMagick-7.1.1-22/coders/clipboard.h diff --git a/ImageMagick-7.1.1-21/coders/cmyk.c b/ImageMagick-7.1.1-22/coders/cmyk.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/cmyk.c rename to ImageMagick-7.1.1-22/coders/cmyk.c index 5d37601c..0479fb32 100644 --- a/ImageMagick-7.1.1-21/coders/cmyk.c +++ b/ImageMagick-7.1.1-22/coders/cmyk.c @@ -107,7 +107,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, *image; MagickBooleanType - status; + status = MagickTrue; MagickOffsetType scene; @@ -692,8 +692,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, if (DiscardBlobBytes(image,(MagickSizeType) image->offset) == MagickFalse) { status=MagickFalse; - ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", - image->filename); + ThrowFileException(exception,CorruptImageError, + "UnexpectedEndOfFile",image->filename); break; } length=GetQuantumExtent(canvas_image,quantum_info,CyanQuantum); @@ -761,7 +761,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, if (status == MagickFalse) break; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("M",image->filename); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -831,7 +832,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, if (status == MagickFalse) break; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("Y",image->filename); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -902,7 +904,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, if (status == MagickFalse) break; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("K",image->filename); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -975,7 +978,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, } if (image->alpha_trait != UndefinedPixelTrait) { - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("A",image->filename); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -1086,7 +1090,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, } while (count == (ssize_t) length); quantum_info=DestroyQuantumInfo(quantum_info); canvas_image=DestroyImage(canvas_image); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -1194,7 +1199,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, Image *image,ExceptionInfo *exception) { MagickBooleanType - status; + status = MagickTrue; MagickOffsetType scene; @@ -1485,7 +1490,8 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, if (status == MagickFalse) break; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("M",image->filename); status=OpenBlob(image_info,image,scene == 0 ? WriteBinaryBlobMode : AppendBinaryBlobMode,exception); @@ -1511,7 +1517,8 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, if (status == MagickFalse) break; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("Y",image->filename); status=OpenBlob(image_info,image,scene == 0 ? WriteBinaryBlobMode : AppendBinaryBlobMode,exception); @@ -1537,7 +1544,8 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, if (status == MagickFalse) break; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("K",image->filename); status=OpenBlob(image_info,image,scene == 0 ? WriteBinaryBlobMode : AppendBinaryBlobMode,exception); @@ -1565,7 +1573,8 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, } if (quantum_type == CMYKAQuantum) { - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("A",image->filename); status=OpenBlob(image_info,image,scene == 0 ? WriteBinaryBlobMode : AppendBinaryBlobMode,exception); @@ -1612,6 +1621,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/cmyk.h b/ImageMagick-7.1.1-22/coders/cmyk.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/cmyk.h rename to ImageMagick-7.1.1-22/coders/cmyk.h diff --git a/ImageMagick-7.1.1-21/coders/coders-list.h b/ImageMagick-7.1.1-22/coders/coders-list.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/coders-list.h rename to ImageMagick-7.1.1-22/coders/coders-list.h diff --git a/ImageMagick-7.1.1-21/coders/coders-private.h b/ImageMagick-7.1.1-22/coders/coders-private.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/coders-private.h rename to ImageMagick-7.1.1-22/coders/coders-private.h diff --git a/ImageMagick-7.1.1-21/coders/coders.h b/ImageMagick-7.1.1-22/coders/coders.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/coders.h rename to ImageMagick-7.1.1-22/coders/coders.h diff --git a/ImageMagick-7.1.1-21/coders/cube.c b/ImageMagick-7.1.1-22/coders/cube.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/cube.c rename to ImageMagick-7.1.1-22/coders/cube.c index 905445b7..eac6daa3 100644 --- a/ImageMagick-7.1.1-21/coders/cube.c +++ b/ImageMagick-7.1.1-22/coders/cube.c @@ -312,7 +312,8 @@ static Image *ReadCUBEImage(const ImageInfo *image_info, } } cube_info=RelinquishVirtualMemory(cube_info); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); if (image_info->scene != 0) diff --git a/ImageMagick-7.1.1-21/coders/cube.h b/ImageMagick-7.1.1-22/coders/cube.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/cube.h rename to ImageMagick-7.1.1-22/coders/cube.h diff --git a/ImageMagick-7.1.1-21/coders/cut.c b/ImageMagick-7.1.1-22/coders/cut.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/cut.c rename to ImageMagick-7.1.1-22/coders/cut.c index cd712aaf..ab502a6e 100644 --- a/ImageMagick-7.1.1-21/coders/cut.c +++ b/ImageMagick-7.1.1-22/coders/cut.c @@ -655,7 +655,10 @@ static Image *ReadCUTImage(const ImageInfo *image_info,ExceptionInfo *exception) if (EOFBlob(image) != MagickFalse) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } diff --git a/ImageMagick-7.1.1-21/coders/cut.h b/ImageMagick-7.1.1-22/coders/cut.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/cut.h rename to ImageMagick-7.1.1-22/coders/cut.h diff --git a/ImageMagick-7.1.1-21/coders/dcm.c b/ImageMagick-7.1.1-22/coders/dcm.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/dcm.c rename to ImageMagick-7.1.1-22/coders/dcm.c index 094f0e31..b138282c 100644 --- a/ImageMagick-7.1.1-21/coders/dcm.c +++ b/ImageMagick-7.1.1-22/coders/dcm.c @@ -4334,7 +4334,8 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) RelinquishDCMMemory(&info,&map,stream_info,stack,data); if (image == (Image *) NULL) return(image); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); diff --git a/ImageMagick-7.1.1-21/coders/dcm.h b/ImageMagick-7.1.1-22/coders/dcm.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/dcm.h rename to ImageMagick-7.1.1-22/coders/dcm.h diff --git a/ImageMagick-7.1.1-21/coders/dds.c b/ImageMagick-7.1.1-22/coders/dds.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/dds.c rename to ImageMagick-7.1.1-22/coders/dds.c index 01a09ac1..f3813542 100644 --- a/ImageMagick-7.1.1-21/coders/dds.c +++ b/ImageMagick-7.1.1-22/coders/dds.c @@ -2972,7 +2972,10 @@ static Image *ReadDDSImage(const ImageInfo *image_info,ExceptionInfo *exception) return(GetFirstImageInList(image)); } } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -4360,6 +4363,7 @@ static MagickBooleanType WriteDDSImage(const ImageInfo *image_info, if ((mipmaps > 0) && (WriteMipmaps(image,image_info,pixelFormat,compression, mipmaps,fromlist,clusterFit,weightByAlpha,exception) == MagickFalse)) return(MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/dds.h b/ImageMagick-7.1.1-22/coders/dds.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/dds.h rename to ImageMagick-7.1.1-22/coders/dds.h diff --git a/ImageMagick-7.1.1-21/coders/debug.c b/ImageMagick-7.1.1-22/coders/debug.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/debug.c rename to ImageMagick-7.1.1-22/coders/debug.c index 5666214a..094f74f0 100644 --- a/ImageMagick-7.1.1-21/coders/debug.c +++ b/ImageMagick-7.1.1-22/coders/debug.c @@ -263,6 +263,7 @@ static MagickBooleanType WriteDEBUGImage(const ImageInfo *image_info, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/debug.h b/ImageMagick-7.1.1-22/coders/debug.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/debug.h rename to ImageMagick-7.1.1-22/coders/debug.h diff --git a/ImageMagick-7.1.1-21/coders/dib.c b/ImageMagick-7.1.1-22/coders/dib.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/dib.c rename to ImageMagick-7.1.1-22/coders/dib.c index d91cbabc..12d92247 100644 --- a/ImageMagick-7.1.1-21/coders/dib.c +++ b/ImageMagick-7.1.1-22/coders/dib.c @@ -986,7 +986,10 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception) image=flipped_image; } } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -1418,6 +1421,7 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image, } (void) WriteBlob(image,dib_info.image_size,pixels); pixels=(unsigned char *) RelinquishMagickMemory(pixels); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/dib.h b/ImageMagick-7.1.1-22/coders/dib.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/dib.h rename to ImageMagick-7.1.1-22/coders/dib.h diff --git a/ImageMagick-7.1.1-21/coders/djvu.c b/ImageMagick-7.1.1-22/coders/djvu.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/djvu.c rename to ImageMagick-7.1.1-22/coders/djvu.c diff --git a/ImageMagick-7.1.1-21/coders/djvu.h b/ImageMagick-7.1.1-22/coders/djvu.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/djvu.h rename to ImageMagick-7.1.1-22/coders/djvu.h diff --git a/ImageMagick-7.1.1-21/coders/dmr.c b/ImageMagick-7.1.1-22/coders/dmr.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/dmr.c rename to ImageMagick-7.1.1-22/coders/dmr.c diff --git a/ImageMagick-7.1.1-21/coders/dmr.h b/ImageMagick-7.1.1-22/coders/dmr.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/dmr.h rename to ImageMagick-7.1.1-22/coders/dmr.h diff --git a/ImageMagick-7.1.1-21/coders/dng.c b/ImageMagick-7.1.1-22/coders/dng.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/dng.c rename to ImageMagick-7.1.1-22/coders/dng.c diff --git a/ImageMagick-7.1.1-21/coders/dng.h b/ImageMagick-7.1.1-22/coders/dng.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/dng.h rename to ImageMagick-7.1.1-22/coders/dng.h diff --git a/ImageMagick-7.1.1-21/coders/dot.c b/ImageMagick-7.1.1-22/coders/dot.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/dot.c rename to ImageMagick-7.1.1-22/coders/dot.c diff --git a/ImageMagick-7.1.1-21/coders/dot.h b/ImageMagick-7.1.1-22/coders/dot.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/dot.h rename to ImageMagick-7.1.1-22/coders/dot.h diff --git a/ImageMagick-7.1.1-21/coders/dps.c b/ImageMagick-7.1.1-22/coders/dps.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/dps.c rename to ImageMagick-7.1.1-22/coders/dps.c index f3d4da4a..37159558 100644 --- a/ImageMagick-7.1.1-21/coders/dps.c +++ b/ImageMagick-7.1.1-22/coders/dps.c @@ -523,7 +523,10 @@ static Image *ReadDPSImage(const ImageInfo *image_info,ExceptionInfo *exception) */ XFreeResources(display,visual_info,map_info,(XPixelInfo *) NULL, (XFontStruct *) NULL,&resource_info,(XWindowInfo *) NULL); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } #endif diff --git a/ImageMagick-7.1.1-21/coders/dps.h b/ImageMagick-7.1.1-22/coders/dps.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/dps.h rename to ImageMagick-7.1.1-22/coders/dps.h diff --git a/ImageMagick-7.1.1-21/coders/dpx.c b/ImageMagick-7.1.1-22/coders/dpx.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/dpx.c rename to ImageMagick-7.1.1-22/coders/dpx.c index 1b035a0c..2f3bc75d 100644 --- a/ImageMagick-7.1.1-21/coders/dpx.c +++ b/ImageMagick-7.1.1-22/coders/dpx.c @@ -1314,7 +1314,8 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) break; } } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -2070,6 +2071,7 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image, quantum_info=DestroyQuantumInfo(quantum_info); if (y < (ssize_t) image->rows) ThrowWriterException(CorruptImageError,"UnableToWriteImageData"); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } diff --git a/ImageMagick-7.1.1-21/coders/dpx.h b/ImageMagick-7.1.1-22/coders/dpx.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/dpx.h rename to ImageMagick-7.1.1-22/coders/dpx.h diff --git a/ImageMagick-7.1.1-21/coders/emf.c b/ImageMagick-7.1.1-22/coders/emf.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/emf.c rename to ImageMagick-7.1.1-22/coders/emf.c diff --git a/ImageMagick-7.1.1-21/coders/emf.h b/ImageMagick-7.1.1-22/coders/emf.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/emf.h rename to ImageMagick-7.1.1-22/coders/emf.h diff --git a/ImageMagick-7.1.1-21/coders/ept.c b/ImageMagick-7.1.1-22/coders/ept.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/ept.c rename to ImageMagick-7.1.1-22/coders/ept.c index 6d819798..13f53bd8 100644 --- a/ImageMagick-7.1.1-21/coders/ept.c +++ b/ImageMagick-7.1.1-22/coders/ept.c @@ -530,6 +530,7 @@ static MagickBooleanType WriteEPTImage(const ImageInfo *image_info,Image *image, ept_info.postscript=(unsigned char *) RelinquishMagickMemory( ept_info.postscript); ept_info.tiff=(unsigned char *) RelinquishMagickMemory(ept_info.tiff); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/ept.h b/ImageMagick-7.1.1-22/coders/ept.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/ept.h rename to ImageMagick-7.1.1-22/coders/ept.h diff --git a/ImageMagick-7.1.1-21/coders/exr.c b/ImageMagick-7.1.1-22/coders/exr.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/exr.c rename to ImageMagick-7.1.1-22/coders/exr.c index bf46541d..1355092a 100644 --- a/ImageMagick-7.1.1-21/coders/exr.c +++ b/ImageMagick-7.1.1-22/coders/exr.c @@ -330,7 +330,10 @@ static Image *ReadEXRImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) ImfCloseInputFile(file); if (status == MagickFalse) ThrowReaderException(CorruptImageError,"UnableToReadImageData"); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } #endif @@ -657,7 +660,8 @@ static MagickBooleanType WriteEXRImage(const ImageInfo *image_info,Image *image, (void) FileToImage(image,write_info->filename,exception); (void) RelinquishUniqueFileResource(write_info->filename); write_info=DestroyImageInfo(write_info); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } #endif diff --git a/ImageMagick-7.1.1-21/coders/exr.h b/ImageMagick-7.1.1-22/coders/exr.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/exr.h rename to ImageMagick-7.1.1-22/coders/exr.h diff --git a/ImageMagick-7.1.1-21/coders/farbfeld.c b/ImageMagick-7.1.1-22/coders/farbfeld.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/farbfeld.c rename to ImageMagick-7.1.1-22/coders/farbfeld.c index 16f05efe..873eb228 100644 --- a/ImageMagick-7.1.1-21/coders/farbfeld.c +++ b/ImageMagick-7.1.1-22/coders/farbfeld.c @@ -224,7 +224,10 @@ static Image *ReadFARBFELDImage(const ImageInfo *image_info, if (EOFBlob(image) != MagickFalse) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -388,6 +391,7 @@ static MagickBooleanType WriteFARBFELDImage(const ImageInfo *image_info, quantum_info=DestroyQuantumInfo(quantum_info); if (y < (ssize_t) image->rows) ThrowWriterException(CorruptImageError,"UnableToWriteImageData"); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } diff --git a/ImageMagick-7.1.1-21/coders/farbfeld.h b/ImageMagick-7.1.1-22/coders/farbfeld.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/farbfeld.h rename to ImageMagick-7.1.1-22/coders/farbfeld.h diff --git a/ImageMagick-7.1.1-21/coders/fax.c b/ImageMagick-7.1.1-22/coders/fax.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/fax.c rename to ImageMagick-7.1.1-22/coders/fax.c index efe802f7..b83bac5d 100644 --- a/ImageMagick-7.1.1-21/coders/fax.c +++ b/ImageMagick-7.1.1-22/coders/fax.c @@ -142,7 +142,10 @@ static Image* FaxReadG3(Image *image,ExceptionInfo *exception) if (EOFBlob(image) != MagickFalse) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -399,6 +402,7 @@ static MagickBooleanType WriteFAXImage(const ImageInfo *image_info,Image *image, break; } while (write_info->adjoin != MagickFalse); write_info=DestroyImageInfo(write_info); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } diff --git a/ImageMagick-7.1.1-21/coders/fax.h b/ImageMagick-7.1.1-22/coders/fax.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/fax.h rename to ImageMagick-7.1.1-22/coders/fax.h diff --git a/ImageMagick-7.1.1-21/coders/fits.c b/ImageMagick-7.1.1-22/coders/fits.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/fits.c rename to ImageMagick-7.1.1-22/coders/fits.c index f09207ec..4555c86b 100644 --- a/ImageMagick-7.1.1-21/coders/fits.c +++ b/ImageMagick-7.1.1-22/coders/fits.c @@ -294,6 +294,8 @@ static Image *ReadFITSImage(const ImageInfo *image_info, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); image=AcquireImage(image_info,exception); + image->columns=0; + image->rows=0; status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) { @@ -559,7 +561,8 @@ static Image *ReadFITSImage(const ImageInfo *image_info, if (status == MagickFalse) break; } while (1); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -909,6 +912,7 @@ static MagickBooleanType WriteFITSImage(const ImageInfo *image_info, break; } while (image_info->adjoin != MagickFalse); fits_info=DestroyString(fits_info); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/fits.h b/ImageMagick-7.1.1-22/coders/fits.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/fits.h rename to ImageMagick-7.1.1-22/coders/fits.h diff --git a/ImageMagick-7.1.1-21/coders/fl32.c b/ImageMagick-7.1.1-22/coders/fl32.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/fl32.c rename to ImageMagick-7.1.1-22/coders/fl32.c index b0e1bb05..6d71231a 100644 --- a/ImageMagick-7.1.1-21/coders/fl32.c +++ b/ImageMagick-7.1.1-22/coders/fl32.c @@ -267,7 +267,10 @@ static Image *ReadFL32Image(const ImageInfo *image_info, if (EOFBlob(image) != MagickFalse) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -468,6 +471,7 @@ static MagickBooleanType WriteFL32Image(const ImageInfo *image_info, quantum_info=DestroyQuantumInfo(quantum_info); if (y < (ssize_t) image->rows) ThrowWriterException(CorruptImageError,"UnableToWriteImageData"); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } diff --git a/ImageMagick-7.1.1-21/coders/fl32.h b/ImageMagick-7.1.1-22/coders/fl32.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/fl32.h rename to ImageMagick-7.1.1-22/coders/fl32.h diff --git a/ImageMagick-7.1.1-21/coders/flif.c b/ImageMagick-7.1.1-22/coders/flif.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/flif.c rename to ImageMagick-7.1.1-22/coders/flif.c diff --git a/ImageMagick-7.1.1-21/coders/flif.h b/ImageMagick-7.1.1-22/coders/flif.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/flif.h rename to ImageMagick-7.1.1-22/coders/flif.h diff --git a/ImageMagick-7.1.1-21/coders/fpx.c b/ImageMagick-7.1.1-22/coders/fpx.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/fpx.c rename to ImageMagick-7.1.1-22/coders/fpx.c diff --git a/ImageMagick-7.1.1-21/coders/fpx.h b/ImageMagick-7.1.1-22/coders/fpx.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/fpx.h rename to ImageMagick-7.1.1-22/coders/fpx.h diff --git a/ImageMagick-7.1.1-21/coders/ftxt.c b/ImageMagick-7.1.1-22/coders/ftxt.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/ftxt.c rename to ImageMagick-7.1.1-22/coders/ftxt.c index f50d95be..2f472d5e 100644 --- a/ImageMagick-7.1.1-21/coders/ftxt.c +++ b/ImageMagick-7.1.1-22/coders/ftxt.c @@ -736,7 +736,10 @@ static Image *ReadFTXTImage(const ImageInfo *image_info, (maxY >= (ssize_t) image->rows)) ThrowMagickException(exception,GetMagickModule(),CorruptImageWarning, "ImageBoundsExceeded","`%s'",image_info->filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -1058,6 +1061,7 @@ static MagickBooleanType WriteFTXTImage(const ImageInfo *image_info,Image *image break; scene++; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/ftxt.h b/ImageMagick-7.1.1-22/coders/ftxt.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/ftxt.h rename to ImageMagick-7.1.1-22/coders/ftxt.h diff --git a/ImageMagick-7.1.1-21/coders/ghostscript-private.h b/ImageMagick-7.1.1-22/coders/ghostscript-private.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/ghostscript-private.h rename to ImageMagick-7.1.1-22/coders/ghostscript-private.h diff --git a/ImageMagick-7.1.1-21/coders/gif.c b/ImageMagick-7.1.1-22/coders/gif.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/gif.c rename to ImageMagick-7.1.1-22/coders/gif.c index 51573f76..103ddf55 100644 --- a/ImageMagick-7.1.1-21/coders/gif.c +++ b/ImageMagick-7.1.1-22/coders/gif.c @@ -1402,7 +1402,8 @@ static Image *ReadGIFImage(const ImageInfo *image_info,ExceptionInfo *exception) global_colormap=(unsigned char *) RelinquishMagickMemory(global_colormap); if ((image->columns == 0) || (image->rows == 0)) ThrowReaderException(CorruptImageError,"NegativeOrZeroImageSize"); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -1944,6 +1945,7 @@ static MagickBooleanType WriteGIFImage(const ImageInfo *image_info,Image *image, global_colormap=(unsigned char *) RelinquishMagickMemory(global_colormap); colormap=(unsigned char *) RelinquishMagickMemory(colormap); write_info=DestroyImageInfo(write_info); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/gif.h b/ImageMagick-7.1.1-22/coders/gif.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/gif.h rename to ImageMagick-7.1.1-22/coders/gif.h diff --git a/ImageMagick-7.1.1-21/coders/gradient.c b/ImageMagick-7.1.1-22/coders/gradient.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/gradient.c rename to ImageMagick-7.1.1-22/coders/gradient.c diff --git a/ImageMagick-7.1.1-21/coders/gradient.h b/ImageMagick-7.1.1-22/coders/gradient.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/gradient.h rename to ImageMagick-7.1.1-22/coders/gradient.h diff --git a/ImageMagick-7.1.1-21/coders/gray.c b/ImageMagick-7.1.1-22/coders/gray.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/gray.c rename to ImageMagick-7.1.1-22/coders/gray.c index fc4f79ae..8f1989c0 100644 --- a/ImageMagick-7.1.1-21/coders/gray.c +++ b/ImageMagick-7.1.1-22/coders/gray.c @@ -108,7 +108,7 @@ static Image *ReadGRAYImage(const ImageInfo *image_info, *image; MagickBooleanType - status; + status = MagickTrue; MagickOffsetType scene; @@ -588,7 +588,8 @@ static Image *ReadGRAYImage(const ImageInfo *image_info, (void) CloseBlob(image); if (image->alpha_trait != UndefinedPixelTrait) { - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("A",image->filename); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -699,7 +700,8 @@ static Image *ReadGRAYImage(const ImageInfo *image_info, } while (count == (ssize_t) length); quantum_info=DestroyQuantumInfo(quantum_info); canvas_image=DestroyImage(canvas_image); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -805,7 +807,7 @@ static MagickBooleanType WriteGRAYImage(const ImageInfo *image_info, Image *image,ExceptionInfo *exception) { MagickBooleanType - status; + status = MagickTrue; MagickOffsetType scene; @@ -1022,7 +1024,8 @@ static MagickBooleanType WriteGRAYImage(const ImageInfo *image_info, (void) CloseBlob(image); if (quantum_type == GrayAlphaQuantum) { - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("A",image->filename); status=OpenBlob(image_info,image,scene == 0 ? WriteBinaryBlobMode : AppendBinaryBlobMode,exception); @@ -1069,6 +1072,7 @@ static MagickBooleanType WriteGRAYImage(const ImageInfo *image_info, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/gray.h b/ImageMagick-7.1.1-22/coders/gray.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/gray.h rename to ImageMagick-7.1.1-22/coders/gray.h diff --git a/ImageMagick-7.1.1-21/coders/hald.c b/ImageMagick-7.1.1-22/coders/hald.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/hald.c rename to ImageMagick-7.1.1-22/coders/hald.c index 86d72674..e4403b5e 100644 --- a/ImageMagick-7.1.1-21/coders/hald.c +++ b/ImageMagick-7.1.1-22/coders/hald.c @@ -184,7 +184,8 @@ static Image *ReadHALDImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) status=MagickFalse; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); if (image_info->scene != 0) diff --git a/ImageMagick-7.1.1-21/coders/hald.h b/ImageMagick-7.1.1-22/coders/hald.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/hald.h rename to ImageMagick-7.1.1-22/coders/hald.h diff --git a/ImageMagick-7.1.1-21/coders/hdr.c b/ImageMagick-7.1.1-22/coders/hdr.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/hdr.c rename to ImageMagick-7.1.1-22/coders/hdr.c index f9a46496..04582275 100644 --- a/ImageMagick-7.1.1-21/coders/hdr.c +++ b/ImageMagick-7.1.1-22/coders/hdr.c @@ -506,7 +506,10 @@ static Image *ReadHDRImage(const ImageInfo *image_info,ExceptionInfo *exception) if (EOFBlob(image) != MagickFalse) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -833,6 +836,7 @@ static MagickBooleanType WriteHDRImage(const ImageInfo *image_info,Image *image, break; } pixels=(unsigned char *) RelinquishMagickMemory(pixels); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/hdr.h b/ImageMagick-7.1.1-22/coders/hdr.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/hdr.h rename to ImageMagick-7.1.1-22/coders/hdr.h diff --git a/ImageMagick-7.1.1-21/coders/heic.c b/ImageMagick-7.1.1-22/coders/heic.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/heic.c rename to ImageMagick-7.1.1-22/coders/heic.c index e0833eda..4687e008 100644 --- a/ImageMagick-7.1.1-21/coders/heic.c +++ b/ImageMagick-7.1.1-22/coders/heic.c @@ -728,7 +728,7 @@ ModuleExport size_t RegisterHEICImage(void) #if defined(MAGICKCORE_HEIC_DELEGATE) #if LIBHEIF_NUMERIC_VERSION >= 0x010e0000 - heif_init(NULL); + heif_init((struct heif_init_params *) NULL); #endif #endif entry=AcquireMagickInfo("HEIC","HEIC","High Efficiency Image Format"); @@ -1372,7 +1372,8 @@ static MagickBooleanType WriteHEICImage(const ImageInfo *image_info, if (heif_image != (struct heif_image*) NULL) heif_image_release(heif_image); heif_context_free(heif_context); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } #endif diff --git a/ImageMagick-7.1.1-21/coders/heic.h b/ImageMagick-7.1.1-22/coders/heic.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/heic.h rename to ImageMagick-7.1.1-22/coders/heic.h diff --git a/ImageMagick-7.1.1-21/coders/histogram.c b/ImageMagick-7.1.1-22/coders/histogram.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/histogram.c rename to ImageMagick-7.1.1-22/coders/histogram.c diff --git a/ImageMagick-7.1.1-21/coders/histogram.h b/ImageMagick-7.1.1-22/coders/histogram.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/histogram.h rename to ImageMagick-7.1.1-22/coders/histogram.h diff --git a/ImageMagick-7.1.1-21/coders/hrz.c b/ImageMagick-7.1.1-22/coders/hrz.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/hrz.c rename to ImageMagick-7.1.1-22/coders/hrz.c index da384f27..5118afb3 100644 --- a/ImageMagick-7.1.1-21/coders/hrz.c +++ b/ImageMagick-7.1.1-22/coders/hrz.c @@ -179,7 +179,10 @@ static Image *ReadHRZImage(const ImageInfo *image_info,ExceptionInfo *exception) if (EOFBlob(image) != MagickFalse) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -347,6 +350,7 @@ static MagickBooleanType WriteHRZImage(const ImageInfo *image_info,Image *image, } pixels=(unsigned char *) RelinquishMagickMemory(pixels); hrz_image=DestroyImage(hrz_image); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/hrz.h b/ImageMagick-7.1.1-22/coders/hrz.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/hrz.h rename to ImageMagick-7.1.1-22/coders/hrz.h diff --git a/ImageMagick-7.1.1-21/coders/html.c b/ImageMagick-7.1.1-22/coders/html.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/html.c rename to ImageMagick-7.1.1-22/coders/html.c diff --git a/ImageMagick-7.1.1-21/coders/html.h b/ImageMagick-7.1.1-22/coders/html.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/html.h rename to ImageMagick-7.1.1-22/coders/html.h diff --git a/ImageMagick-7.1.1-21/coders/icon.c b/ImageMagick-7.1.1-22/coders/icon.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/icon.c rename to ImageMagick-7.1.1-22/coders/icon.c index 979cb2f0..88829989 100644 --- a/ImageMagick-7.1.1-21/coders/icon.c +++ b/ImageMagick-7.1.1-22/coders/icon.c @@ -260,7 +260,8 @@ static Image *Read1XImage(const ImageInfo *image_info,Image *image, } image=SyncNextImageInList(image); } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -1080,7 +1081,7 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info, return(MagickFalse); } write_info=CloneImageInfo(image_info); - (void) CopyMagickString(write_info->magick,"PNG",MagickPathExtent); + (void) CopyMagickString(write_info->magick,"PNG32",MagickPathExtent); length=0; /* Don't write any ancillary chunks except for gAMA. @@ -1089,8 +1090,8 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info, /* Only write PNG32 formatted PNG (32-bit RGBA), 8 bits per channel. */ - (void) SetImageArtifact(write_image,"png:format","png32"); - (void) SetImageArtifact(write_image,"png:color-type","6"); + (void) SetImageArtifact(write_image,"png:IHDR.color-type-orig","6"); + (void) SetImageArtifact(write_image,"png:IHDR.bit-depth-orig","8"); png=(unsigned char *) ImageToBlob(write_info,write_image,&length, exception); write_image=DestroyImageList(write_image); diff --git a/ImageMagick-7.1.1-21/coders/icon.h b/ImageMagick-7.1.1-22/coders/icon.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/icon.h rename to ImageMagick-7.1.1-22/coders/icon.h diff --git a/ImageMagick-7.1.1-21/coders/info.c b/ImageMagick-7.1.1-22/coders/info.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/info.c rename to ImageMagick-7.1.1-22/coders/info.c index 93c8ffbd..4442185a 100644 --- a/ImageMagick-7.1.1-21/coders/info.c +++ b/ImageMagick-7.1.1-22/coders/info.c @@ -215,6 +215,7 @@ static MagickBooleanType WriteINFOImage(const ImageInfo *image_info, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/info.h b/ImageMagick-7.1.1-22/coders/info.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/info.h rename to ImageMagick-7.1.1-22/coders/info.h diff --git a/ImageMagick-7.1.1-21/coders/inline.c b/ImageMagick-7.1.1-22/coders/inline.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/inline.c rename to ImageMagick-7.1.1-22/coders/inline.c index 3382c82c..c85f4ec4 100644 --- a/ImageMagick-7.1.1-21/coders/inline.c +++ b/ImageMagick-7.1.1-22/coders/inline.c @@ -350,6 +350,7 @@ static MagickBooleanType WriteINLINEImage(const ImageInfo *image_info, (void) WriteBlobString(image,message); (void) WriteBlobString(image,base64); base64=DestroyString(base64); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/inline.h b/ImageMagick-7.1.1-22/coders/inline.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/inline.h rename to ImageMagick-7.1.1-22/coders/inline.h diff --git a/ImageMagick-7.1.1-21/coders/ipl.c b/ImageMagick-7.1.1-22/coders/ipl.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/ipl.c rename to ImageMagick-7.1.1-22/coders/ipl.c diff --git a/ImageMagick-7.1.1-21/coders/ipl.h b/ImageMagick-7.1.1-22/coders/ipl.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/ipl.h rename to ImageMagick-7.1.1-22/coders/ipl.h diff --git a/ImageMagick-7.1.1-21/coders/jbig.c b/ImageMagick-7.1.1-22/coders/jbig.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/jbig.c rename to ImageMagick-7.1.1-22/coders/jbig.c index d9119b2e..4403b8d7 100644 --- a/ImageMagick-7.1.1-21/coders/jbig.c +++ b/ImageMagick-7.1.1-22/coders/jbig.c @@ -270,7 +270,10 @@ static Image *ReadJBIGImage(const ImageInfo *image_info, */ jbg_dec_free(&jbig_info); buffer=(unsigned char *) RelinquishMagickMemory(buffer); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } #endif @@ -562,7 +565,8 @@ static MagickBooleanType WriteJBIGImage(const ImageInfo *image_info, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } #endif diff --git a/ImageMagick-7.1.1-21/coders/jbig.h b/ImageMagick-7.1.1-22/coders/jbig.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/jbig.h rename to ImageMagick-7.1.1-22/coders/jbig.h diff --git a/ImageMagick-7.1.1-21/coders/jnx.c b/ImageMagick-7.1.1-22/coders/jnx.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/jnx.c rename to ImageMagick-7.1.1-22/coders/jnx.c index dabc02fa..da4d44b5 100644 --- a/ImageMagick-7.1.1-21/coders/jnx.c +++ b/ImageMagick-7.1.1-22/coders/jnx.c @@ -16,7 +16,7 @@ % July 2012 % % % % % -% Copyright @ 2012 ImageMagick Studio LLC, a non-profit organization % +% Copyright @ 1999 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may % @@ -153,6 +153,8 @@ static Image *ReadJNXImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s", image_info->filename); image=AcquireImage(image_info,exception); + image->columns=0; + image->rows=0; status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) { diff --git a/ImageMagick-7.1.1-21/coders/jnx.h b/ImageMagick-7.1.1-22/coders/jnx.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/jnx.h rename to ImageMagick-7.1.1-22/coders/jnx.h diff --git a/ImageMagick-7.1.1-21/coders/jp2.c b/ImageMagick-7.1.1-22/coders/jp2.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/jp2.c rename to ImageMagick-7.1.1-22/coders/jp2.c index 788573d8..556f88cc 100644 --- a/ImageMagick-7.1.1-21/coders/jp2.c +++ b/ImageMagick-7.1.1-22/coders/jp2.c @@ -579,12 +579,13 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception) } default: { - size_t - offset=MetaPixelChannels+i-3; + ssize_t + offset = MetaPixelChannels+i-3; if ((image->alpha_trait & BlendPixelTrait) != 0) offset--; - SetPixelChannel(image,(PixelChannel) offset,ClampToQuantum(pixel),q); + SetPixelChannel(image,(PixelChannel) offset,ClampToQuantum(pixel), + q); break; } } @@ -1211,7 +1212,8 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image, opj_destroy_codec(jp2_codec); opj_image_destroy(jp2_image); parameters=(opj_cparameters_t *) RelinquishMagickMemory(parameters); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } #endif diff --git a/ImageMagick-7.1.1-21/coders/jp2.h b/ImageMagick-7.1.1-22/coders/jp2.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/jp2.h rename to ImageMagick-7.1.1-22/coders/jp2.h diff --git a/ImageMagick-7.1.1-21/coders/jpeg.c b/ImageMagick-7.1.1-22/coders/jpeg.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/jpeg.c rename to ImageMagick-7.1.1-22/coders/jpeg.c index 08672fdf..a56d3453 100644 --- a/ImageMagick-7.1.1-21/coders/jpeg.c +++ b/ImageMagick-7.1.1-22/coders/jpeg.c @@ -1582,7 +1582,10 @@ static Image *ReadOneJPEGImage(const ImageInfo *image_info, JPEGDestroyDecompress(jpeg_info); client_info=(JPEGClientInfo *) RelinquishMagickMemory(client_info); memory_info=RelinquishVirtualMemory(memory_info); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -2690,13 +2693,26 @@ static MagickBooleanType WriteJPEGImage_(const ImageInfo *image_info, (void) AcquireUniqueFilename(jpeg_image->filename); jpeg_image->quality=minimum+(maximum-minimum+1)/2; status=WriteJPEGImage(extent_info,jpeg_image,exception); + (void) RelinquishUniqueFileResource(jpeg_image->filename); + if (status == MagickFalse) + continue; if (GetBlobSize(jpeg_image) <= extent) minimum=jpeg_image->quality+1; else maximum=jpeg_image->quality-1; + } + while (minimum > 2) + { + (void) AcquireUniqueFilename(jpeg_image->filename); + jpeg_image->quality=minimum--; + status=WriteJPEGImage(extent_info,jpeg_image,exception); (void) RelinquishUniqueFileResource(jpeg_image->filename); + if (status == MagickFalse) + continue; + if (GetBlobSize(jpeg_image) <= extent) + break; } - quality=(int) minimum-1; + quality=(int) minimum; jpeg_image=DestroyImage(jpeg_image); } extent_info=DestroyImageInfo(extent_info); @@ -3148,10 +3164,11 @@ static MagickBooleanType WriteJPEGImage_(const ImageInfo *image_info, jpeg_destroy_compress(jpeg_info); client_info=(JPEGClientInfo *) RelinquishMagickMemory(client_info); memory_info=RelinquishVirtualMemory(memory_info); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (jps_image != (Image *) NULL) jps_image=DestroyImage(jps_image); - return(MagickTrue); + return(status); } static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info, diff --git a/ImageMagick-7.1.1-21/coders/jpeg.h b/ImageMagick-7.1.1-22/coders/jpeg.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/jpeg.h rename to ImageMagick-7.1.1-22/coders/jpeg.h diff --git a/ImageMagick-7.1.1-21/coders/json.c b/ImageMagick-7.1.1-22/coders/json.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/json.c rename to ImageMagick-7.1.1-22/coders/json.c index a6fc4034..679475d0 100644 --- a/ImageMagick-7.1.1-21/coders/json.c +++ b/ImageMagick-7.1.1-22/coders/json.c @@ -1742,6 +1742,7 @@ static MagickBooleanType WriteJSONImage(const ImageInfo *image_info, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/json.h b/ImageMagick-7.1.1-22/coders/json.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/json.h rename to ImageMagick-7.1.1-22/coders/json.h diff --git a/ImageMagick-7.1.1-21/coders/jxl.c b/ImageMagick-7.1.1-22/coders/jxl.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/jxl.c rename to ImageMagick-7.1.1-22/coders/jxl.c index de85f879..a7f837f4 100644 --- a/ImageMagick-7.1.1-21/coders/jxl.c +++ b/ImageMagick-7.1.1-22/coders/jxl.c @@ -738,7 +738,10 @@ static Image *ReadJXLImage(const ImageInfo *image_info,ExceptionInfo *exception) JxlDecoderDestroy(jxl_info); if (jxl_status == JXL_DEC_ERROR) ThrowReaderException(CorruptImageError,"UnableToReadImageData"); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } #endif @@ -1192,7 +1195,8 @@ static MagickBooleanType WriteJXLImage(const ImageInfo *image_info,Image *image, JxlEncoderDestroy(jxl_info); if (jxl_status != JXL_ENC_SUCCESS) ThrowWriterException(CoderError,"UnableToWriteImageData"); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } #endif diff --git a/ImageMagick-7.1.1-21/coders/jxl.h b/ImageMagick-7.1.1-22/coders/jxl.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/jxl.h rename to ImageMagick-7.1.1-22/coders/jxl.h diff --git a/ImageMagick-7.1.1-21/coders/kernel.c b/ImageMagick-7.1.1-22/coders/kernel.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/kernel.c rename to ImageMagick-7.1.1-22/coders/kernel.c index 4531f817..b80116d9 100644 --- a/ImageMagick-7.1.1-21/coders/kernel.c +++ b/ImageMagick-7.1.1-22/coders/kernel.c @@ -224,6 +224,7 @@ static MagickBooleanType WriteKERNELImage(const ImageInfo *image_info, } } (void) WriteBlobString(image,"\n"); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/kernel.h b/ImageMagick-7.1.1-22/coders/kernel.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/kernel.h rename to ImageMagick-7.1.1-22/coders/kernel.h diff --git a/ImageMagick-7.1.1-21/coders/label.c b/ImageMagick-7.1.1-22/coders/label.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/label.c rename to ImageMagick-7.1.1-22/coders/label.c diff --git a/ImageMagick-7.1.1-21/coders/label.h b/ImageMagick-7.1.1-22/coders/label.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/label.h rename to ImageMagick-7.1.1-22/coders/label.h diff --git a/ImageMagick-7.1.1-21/coders/mac.c b/ImageMagick-7.1.1-22/coders/mac.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/mac.c rename to ImageMagick-7.1.1-22/coders/mac.c index 1c53b242..0d663330 100644 --- a/ImageMagick-7.1.1-21/coders/mac.c +++ b/ImageMagick-7.1.1-22/coders/mac.c @@ -253,7 +253,10 @@ static Image *ReadMACImage(const ImageInfo *image_info,ExceptionInfo *exception) } pixels=(unsigned char *) RelinquishMagickMemory(pixels); (void) SyncImage(image,exception); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } diff --git a/ImageMagick-7.1.1-21/coders/mac.h b/ImageMagick-7.1.1-22/coders/mac.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/mac.h rename to ImageMagick-7.1.1-22/coders/mac.h diff --git a/ImageMagick-7.1.1-21/coders/magick.c b/ImageMagick-7.1.1-22/coders/magick.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/magick.c rename to ImageMagick-7.1.1-22/coders/magick.c diff --git a/ImageMagick-7.1.1-21/coders/magick.h b/ImageMagick-7.1.1-22/coders/magick.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/magick.h rename to ImageMagick-7.1.1-22/coders/magick.h diff --git a/ImageMagick-7.1.1-21/coders/map.c b/ImageMagick-7.1.1-22/coders/map.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/map.c rename to ImageMagick-7.1.1-22/coders/map.c index 015efb71..29cefe96 100644 --- a/ImageMagick-7.1.1-21/coders/map.c +++ b/ImageMagick-7.1.1-22/coders/map.c @@ -248,7 +248,10 @@ static Image *ReadMAPImage(const ImageInfo *image_info,ExceptionInfo *exception) if (y < (ssize_t) image->rows) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -451,6 +454,7 @@ static MagickBooleanType WriteMAPImage(const ImageInfo *image_info,Image *image, (void) WriteBlob(image,(size_t) (q-pixels),pixels); } pixels=(unsigned char *) RelinquishMagickMemory(pixels); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } diff --git a/ImageMagick-7.1.1-21/coders/map.h b/ImageMagick-7.1.1-22/coders/map.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/map.h rename to ImageMagick-7.1.1-22/coders/map.h diff --git a/ImageMagick-7.1.1-21/coders/mask.c b/ImageMagick-7.1.1-22/coders/mask.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/mask.c rename to ImageMagick-7.1.1-22/coders/mask.c diff --git a/ImageMagick-7.1.1-21/coders/mask.h b/ImageMagick-7.1.1-22/coders/mask.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/mask.h rename to ImageMagick-7.1.1-22/coders/mask.h diff --git a/ImageMagick-7.1.1-21/coders/mat.c b/ImageMagick-7.1.1-22/coders/mat.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/mat.c rename to ImageMagick-7.1.1-22/coders/mat.c index cc50e923..24b7f5dd 100644 --- a/ImageMagick-7.1.1-21/coders/mat.c +++ b/ImageMagick-7.1.1-22/coders/mat.c @@ -583,6 +583,8 @@ ssize_t TotalSize = 0; if((clone_info->file=fopen(clone_info->filename,"rb"))==NULL) goto UnlinkFile; if( (image2 = AcquireImage(clone_info,exception))==NULL ) goto EraseFile; + image2->columns=0; + image2->rows=0; status = OpenBlob(clone_info,image2,ReadBinaryBlobMode,exception); if (status == MagickFalse) { @@ -837,7 +839,8 @@ static Image *ReadMATImageV4(const ImageInfo *image_info,Image *image, if (status == MagickFalse) break; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -1744,6 +1747,7 @@ static MagickBooleanType WriteMATImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } diff --git a/ImageMagick-7.1.1-21/coders/mat.h b/ImageMagick-7.1.1-22/coders/mat.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/mat.h rename to ImageMagick-7.1.1-22/coders/mat.h diff --git a/ImageMagick-7.1.1-21/coders/matte.c b/ImageMagick-7.1.1-22/coders/matte.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/matte.c rename to ImageMagick-7.1.1-22/coders/matte.c diff --git a/ImageMagick-7.1.1-21/coders/matte.h b/ImageMagick-7.1.1-22/coders/matte.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/matte.h rename to ImageMagick-7.1.1-22/coders/matte.h diff --git a/ImageMagick-7.1.1-21/coders/meta.c b/ImageMagick-7.1.1-22/coders/meta.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/meta.c rename to ImageMagick-7.1.1-22/coders/meta.c index a845363f..3d962b8f 100644 --- a/ImageMagick-7.1.1-21/coders/meta.c +++ b/ImageMagick-7.1.1-22/coders/meta.c @@ -1427,7 +1427,10 @@ static Image *ReadMETAImage(const ImageInfo *image_info, blob=(unsigned char *) RelinquishMagickMemory(blob); buff=DestroyImage(buff); } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } diff --git a/ImageMagick-7.1.1-21/coders/meta.h b/ImageMagick-7.1.1-22/coders/meta.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/meta.h rename to ImageMagick-7.1.1-22/coders/meta.h diff --git a/ImageMagick-7.1.1-21/coders/miff.c b/ImageMagick-7.1.1-22/coders/miff.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/miff.c rename to ImageMagick-7.1.1-22/coders/miff.c index 13611269..3d9d9254 100644 --- a/ImageMagick-7.1.1-21/coders/miff.c +++ b/ImageMagick-7.1.1-22/coders/miff.c @@ -40,6 +40,7 @@ Include declarations. */ #include "MagickCore/studio.h" +#include "MagickCore/artifact.h" #include "MagickCore/attribute.h" #include "MagickCore/blob.h" #include "MagickCore/blob-private.h" @@ -1756,7 +1757,8 @@ static Image *ReadMIFFImage(const ImageInfo *image_info, break; } } while (c != EOF && ((c == 'i') || (c == 'I'))); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -2132,8 +2134,12 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, } } else - if (image->depth < 16) - (void) DeleteImageProperty(image,"quantum:format"); + if ((quantum_info->format == FloatingPointQuantumFormat) && + (image->depth < 16)) + { + status=SetQuantumFormat(image,quantum_info,UnsignedQuantumFormat); + status=SetQuantumDepth(image,quantum_info,image->depth); + } compression=UndefinedCompression; if (image_info->compression != UndefinedCompression) compression=image_info->compression; @@ -2848,6 +2854,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } diff --git a/ImageMagick-7.1.1-21/coders/miff.h b/ImageMagick-7.1.1-22/coders/miff.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/miff.h rename to ImageMagick-7.1.1-22/coders/miff.h diff --git a/ImageMagick-7.1.1-21/coders/mono.c b/ImageMagick-7.1.1-22/coders/mono.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/mono.c rename to ImageMagick-7.1.1-22/coders/mono.c index 5f12a28b..3f215d13 100644 --- a/ImageMagick-7.1.1-21/coders/mono.c +++ b/ImageMagick-7.1.1-22/coders/mono.c @@ -189,7 +189,10 @@ static Image *ReadMONOImage(const ImageInfo *image_info, if (EOFBlob(image) != MagickFalse) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -355,6 +358,7 @@ static MagickBooleanType WriteMONOImage(const ImageInfo *image_info, if (status == MagickFalse) break; } - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/mono.h b/ImageMagick-7.1.1-22/coders/mono.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/mono.h rename to ImageMagick-7.1.1-22/coders/mono.h diff --git a/ImageMagick-7.1.1-21/coders/mpc.c b/ImageMagick-7.1.1-22/coders/mpc.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/mpc.c rename to ImageMagick-7.1.1-22/coders/mpc.c index df7f2c53..6df871ce 100644 --- a/ImageMagick-7.1.1-21/coders/mpc.c +++ b/ImageMagick-7.1.1-22/coders/mpc.c @@ -1035,7 +1035,8 @@ static Image *ReadMPCImage(const ImageInfo *image_info,ExceptionInfo *exception) break; } } while ((c != EOF) && ((c == 'i') || (c == 'I'))); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -1566,6 +1567,7 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image, } scene++; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } diff --git a/ImageMagick-7.1.1-21/coders/mpc.h b/ImageMagick-7.1.1-22/coders/mpc.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/mpc.h rename to ImageMagick-7.1.1-22/coders/mpc.h diff --git a/ImageMagick-7.1.1-21/coders/mpr.c b/ImageMagick-7.1.1-22/coders/mpr.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/mpr.c rename to ImageMagick-7.1.1-22/coders/mpr.c diff --git a/ImageMagick-7.1.1-21/coders/mpr.h b/ImageMagick-7.1.1-22/coders/mpr.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/mpr.h rename to ImageMagick-7.1.1-22/coders/mpr.h diff --git a/ImageMagick-7.1.1-21/coders/msl.c b/ImageMagick-7.1.1-22/coders/msl.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/msl.c rename to ImageMagick-7.1.1-22/coders/msl.c diff --git a/ImageMagick-7.1.1-21/coders/msl.h b/ImageMagick-7.1.1-22/coders/msl.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/msl.h rename to ImageMagick-7.1.1-22/coders/msl.h diff --git a/ImageMagick-7.1.1-21/coders/mtv.c b/ImageMagick-7.1.1-22/coders/mtv.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/mtv.c rename to ImageMagick-7.1.1-22/coders/mtv.c index 2a13d0cc..c1808f10 100644 --- a/ImageMagick-7.1.1-21/coders/mtv.c +++ b/ImageMagick-7.1.1-22/coders/mtv.c @@ -234,7 +234,8 @@ static Image *ReadMTVImage(const ImageInfo *image_info,ExceptionInfo *exception) break; } } while (count > 0); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -417,6 +418,7 @@ static MagickBooleanType WriteMTVImage(const ImageInfo *image_info,Image *image, break; scene++; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/mtv.h b/ImageMagick-7.1.1-22/coders/mtv.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/mtv.h rename to ImageMagick-7.1.1-22/coders/mtv.h diff --git a/ImageMagick-7.1.1-21/coders/mvg.c b/ImageMagick-7.1.1-22/coders/mvg.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/mvg.c rename to ImageMagick-7.1.1-22/coders/mvg.c index 12d021b4..7b2dc2ec 100644 --- a/ImageMagick-7.1.1-21/coders/mvg.c +++ b/ImageMagick-7.1.1-22/coders/mvg.c @@ -239,7 +239,10 @@ static Image *ReadMVGImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) DrawImage(image,draw_info,exception); (void) SetImageArtifact(image,"mvg:vector-graphics",draw_info->primitive); draw_info=DestroyDrawInfo(draw_info); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -358,6 +361,7 @@ static MagickBooleanType WriteMVGImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) return(status); (void) WriteBlob(image,strlen(value),(const unsigned char *) value); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/mvg.h b/ImageMagick-7.1.1-22/coders/mvg.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/mvg.h rename to ImageMagick-7.1.1-22/coders/mvg.h diff --git a/ImageMagick-7.1.1-21/coders/null.c b/ImageMagick-7.1.1-22/coders/null.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/null.c rename to ImageMagick-7.1.1-22/coders/null.c diff --git a/ImageMagick-7.1.1-21/coders/null.h b/ImageMagick-7.1.1-22/coders/null.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/null.h rename to ImageMagick-7.1.1-22/coders/null.h diff --git a/ImageMagick-7.1.1-21/coders/ora.c b/ImageMagick-7.1.1-22/coders/ora.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/ora.c rename to ImageMagick-7.1.1-22/coders/ora.c diff --git a/ImageMagick-7.1.1-21/coders/ora.h b/ImageMagick-7.1.1-22/coders/ora.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/ora.h rename to ImageMagick-7.1.1-22/coders/ora.h diff --git a/ImageMagick-7.1.1-21/coders/otb.c b/ImageMagick-7.1.1-22/coders/otb.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/otb.c rename to ImageMagick-7.1.1-22/coders/otb.c index 53d5fe57..6b16a52e 100644 --- a/ImageMagick-7.1.1-21/coders/otb.c +++ b/ImageMagick-7.1.1-22/coders/otb.c @@ -206,7 +206,10 @@ static Image *ReadOTBImage(const ImageInfo *image_info,ExceptionInfo *exception) if (EOFBlob(image) != MagickFalse) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -386,6 +389,7 @@ static MagickBooleanType WriteOTBImage(const ImageInfo *image_info,Image *image, break; } } - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/otb.h b/ImageMagick-7.1.1-22/coders/otb.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/otb.h rename to ImageMagick-7.1.1-22/coders/otb.h diff --git a/ImageMagick-7.1.1-21/coders/palm.c b/ImageMagick-7.1.1-22/coders/palm.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/palm.c rename to ImageMagick-7.1.1-22/coders/palm.c index fa6e3d98..064cc930 100644 --- a/ImageMagick-7.1.1-21/coders/palm.c +++ b/ImageMagick-7.1.1-22/coders/palm.c @@ -590,7 +590,8 @@ static Image *ReadPALMImage(const ImageInfo *image_info, break; } } while (nextDepthOffset != 0); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -1032,6 +1033,7 @@ static MagickBooleanType WritePALMImage(const ImageInfo *image_info, break; } while (image_info->adjoin != MagickFalse); quantize_info=DestroyQuantizeInfo(quantize_info); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/palm.h b/ImageMagick-7.1.1-22/coders/palm.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/palm.h rename to ImageMagick-7.1.1-22/coders/palm.h diff --git a/ImageMagick-7.1.1-21/coders/pango.c b/ImageMagick-7.1.1-22/coders/pango.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/pango.c rename to ImageMagick-7.1.1-22/coders/pango.c diff --git a/ImageMagick-7.1.1-21/coders/pango.h b/ImageMagick-7.1.1-22/coders/pango.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/pango.h rename to ImageMagick-7.1.1-22/coders/pango.h diff --git a/ImageMagick-7.1.1-21/coders/pattern.c b/ImageMagick-7.1.1-22/coders/pattern.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/pattern.c rename to ImageMagick-7.1.1-22/coders/pattern.c diff --git a/ImageMagick-7.1.1-21/coders/pattern.h b/ImageMagick-7.1.1-22/coders/pattern.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/pattern.h rename to ImageMagick-7.1.1-22/coders/pattern.h diff --git a/ImageMagick-7.1.1-21/coders/pcd.c b/ImageMagick-7.1.1-22/coders/pcd.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/pcd.c rename to ImageMagick-7.1.1-22/coders/pcd.c diff --git a/ImageMagick-7.1.1-21/coders/pcd.h b/ImageMagick-7.1.1-22/coders/pcd.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/pcd.h rename to ImageMagick-7.1.1-22/coders/pcd.h diff --git a/ImageMagick-7.1.1-21/coders/pcl.c b/ImageMagick-7.1.1-22/coders/pcl.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/pcl.c rename to ImageMagick-7.1.1-22/coders/pcl.c index 0189ab91..44cc507c 100644 --- a/ImageMagick-7.1.1-21/coders/pcl.c +++ b/ImageMagick-7.1.1-22/coders/pcl.c @@ -168,6 +168,9 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception) ImageInfo *read_info; + int + exit_code; + MagickBooleanType cmyk, status; @@ -295,8 +298,8 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception) /* Set PCL render geometry. */ - width=(size_t)CastDoubleToLong(floor(bounds.x2-bounds.x1+0.5)); - height=(size_t)CastDoubleToLong(floor(bounds.y2-bounds.y1+0.5)); + width=(size_t) CastDoubleToLong(floor(bounds.x2-bounds.x1+0.5)); + height=(size_t) CastDoubleToLong(floor(bounds.y2-bounds.y1+0.5)); if (width > page.width) page.width=width; if (height > page.height) @@ -363,8 +366,13 @@ static Image *ReadPCLImage(const ImageInfo *image_info,ExceptionInfo *exception) read_info->filename,input_filename); options=DestroyString(options); density=DestroyString(density); - status=ExternalDelegateCommand(MagickFalse,read_info->verbose,command, - (char *) NULL,exception) != 0 ? MagickTrue : MagickFalse; + exit_code=ExternalDelegateCommand(MagickFalse,read_info->verbose,command, + (char *) NULL,exception); + if (exit_code != 0) + { + read_info=DestroyImageInfo(read_info); + ThrowReaderException(DelegateError,"PCLDelegateFailed"); + } image=ReadImage(read_info,exception); (void) RelinquishUniqueFileResource(read_info->filename); (void) RelinquishUniqueFileResource(input_filename); @@ -994,6 +1002,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image, break; } while (image_info->adjoin != MagickFalse); (void) WriteBlobString(image,"\033E"); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/pcl.h b/ImageMagick-7.1.1-22/coders/pcl.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/pcl.h rename to ImageMagick-7.1.1-22/coders/pcl.h diff --git a/ImageMagick-7.1.1-21/coders/pcx.c b/ImageMagick-7.1.1-22/coders/pcx.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/pcx.c rename to ImageMagick-7.1.1-22/coders/pcx.c index b8ce7b06..96aa84c9 100644 --- a/ImageMagick-7.1.1-21/coders/pcx.c +++ b/ImageMagick-7.1.1-22/coders/pcx.c @@ -690,7 +690,8 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception) } if (page_table != (MagickOffsetType *) NULL) page_table=(MagickOffsetType *) RelinquishMagickMemory(page_table); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -1203,6 +1204,7 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image, "UnableToWriteFile","`%s': %s",image->filename,message); message=DestroyString(message); } - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/pcx.h b/ImageMagick-7.1.1-22/coders/pcx.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/pcx.h rename to ImageMagick-7.1.1-22/coders/pcx.h diff --git a/ImageMagick-7.1.1-21/coders/pdb.c b/ImageMagick-7.1.1-22/coders/pdb.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/pdb.c rename to ImageMagick-7.1.1-22/coders/pdb.c index 887a8704..9205eb10 100644 --- a/ImageMagick-7.1.1-21/coders/pdb.c +++ b/ImageMagick-7.1.1-22/coders/pdb.c @@ -630,7 +630,10 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) SetImageProperty(image,"comment",comment,exception); comment=DestroyString(comment); } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -1009,6 +1012,7 @@ static MagickBooleanType WritePDBImage(const ImageInfo *image_info,Image *image, runlength=(unsigned char *) RelinquishMagickMemory(runlength); if (comment != (const char *) NULL) (void) WriteBlobString(image,comment); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/pdb.h b/ImageMagick-7.1.1-22/coders/pdb.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/pdb.h rename to ImageMagick-7.1.1-22/coders/pdb.h diff --git a/ImageMagick-7.1.1-21/coders/pdf.c b/ImageMagick-7.1.1-22/coders/pdf.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/pdf.c rename to ImageMagick-7.1.1-22/coders/pdf.c index de39cf3f..d5c93986 100644 --- a/ImageMagick-7.1.1-21/coders/pdf.c +++ b/ImageMagick-7.1.1-22/coders/pdf.c @@ -3279,6 +3279,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image, (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,"%%EOF\n"); xref=(MagickOffsetType *) RelinquishMagickMemory(xref); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/pdf.h b/ImageMagick-7.1.1-22/coders/pdf.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/pdf.h rename to ImageMagick-7.1.1-22/coders/pdf.h diff --git a/ImageMagick-7.1.1-21/coders/pes.c b/ImageMagick-7.1.1-22/coders/pes.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/pes.c rename to ImageMagick-7.1.1-22/coders/pes.c diff --git a/ImageMagick-7.1.1-21/coders/pes.h b/ImageMagick-7.1.1-22/coders/pes.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/pes.h rename to ImageMagick-7.1.1-22/coders/pes.h diff --git a/ImageMagick-7.1.1-21/coders/pgx.c b/ImageMagick-7.1.1-22/coders/pgx.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/pgx.c rename to ImageMagick-7.1.1-22/coders/pgx.c index c5f2a2f1..65f5a86b 100644 --- a/ImageMagick-7.1.1-21/coders/pgx.c +++ b/ImageMagick-7.1.1-22/coders/pgx.c @@ -234,7 +234,10 @@ static Image *ReadPGXImage(const ImageInfo *image_info,ExceptionInfo *exception) if (EOFBlob(image) != MagickFalse) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -394,6 +397,7 @@ static MagickBooleanType WritePGXImage(const ImageInfo *image_info,Image *image, quantum_info=DestroyQuantumInfo(quantum_info); if (y < (ssize_t) image->rows) ThrowWriterException(CorruptImageError,"UnableToWriteImageData"); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } diff --git a/ImageMagick-7.1.1-21/coders/pgx.h b/ImageMagick-7.1.1-22/coders/pgx.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/pgx.h rename to ImageMagick-7.1.1-22/coders/pgx.h diff --git a/ImageMagick-7.1.1-21/coders/pict.c b/ImageMagick-7.1.1-22/coders/pict.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/pict.c rename to ImageMagick-7.1.1-22/coders/pict.c index c93e235b..374119d0 100644 --- a/ImageMagick-7.1.1-21/coders/pict.c +++ b/ImageMagick-7.1.1-22/coders/pict.c @@ -1544,7 +1544,10 @@ static Image *ReadPICTImage(const ImageInfo *image_info, continue; } } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -2101,6 +2104,7 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info, scanline=(unsigned char *) RelinquishMagickMemory(scanline); packed_scanline=(unsigned char *) RelinquishMagickMemory(packed_scanline); buffer=(unsigned char *) RelinquishMagickMemory(buffer); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/pict.h b/ImageMagick-7.1.1-22/coders/pict.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/pict.h rename to ImageMagick-7.1.1-22/coders/pict.h diff --git a/ImageMagick-7.1.1-21/coders/pix.c b/ImageMagick-7.1.1-22/coders/pix.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/pix.c rename to ImageMagick-7.1.1-22/coders/pix.c index e71b5253..8f561ec9 100644 --- a/ImageMagick-7.1.1-21/coders/pix.c +++ b/ImageMagick-7.1.1-22/coders/pix.c @@ -254,7 +254,8 @@ static Image *ReadPIXImage(const ImageInfo *image_info,ExceptionInfo *exception) break; } } while (status != MagickFalse); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); diff --git a/ImageMagick-7.1.1-21/coders/pix.h b/ImageMagick-7.1.1-22/coders/pix.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/pix.h rename to ImageMagick-7.1.1-22/coders/pix.h diff --git a/ImageMagick-7.1.1-21/coders/plasma.c b/ImageMagick-7.1.1-22/coders/plasma.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/plasma.c rename to ImageMagick-7.1.1-22/coders/plasma.c diff --git a/ImageMagick-7.1.1-21/coders/plasma.h b/ImageMagick-7.1.1-22/coders/plasma.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/plasma.h rename to ImageMagick-7.1.1-22/coders/plasma.h diff --git a/ImageMagick-7.1.1-21/coders/png.c b/ImageMagick-7.1.1-22/coders/png.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/png.c rename to ImageMagick-7.1.1-22/coders/png.c diff --git a/ImageMagick-7.1.1-21/coders/png.h b/ImageMagick-7.1.1-22/coders/png.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/png.h rename to ImageMagick-7.1.1-22/coders/png.h diff --git a/ImageMagick-7.1.1-21/coders/pnm.c b/ImageMagick-7.1.1-22/coders/pnm.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/pnm.c rename to ImageMagick-7.1.1-22/coders/pnm.c index 9404454d..430111f4 100644 --- a/ImageMagick-7.1.1-21/coders/pnm.c +++ b/ImageMagick-7.1.1-22/coders/pnm.c @@ -2799,6 +2799,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/pnm.h b/ImageMagick-7.1.1-22/coders/pnm.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/pnm.h rename to ImageMagick-7.1.1-22/coders/pnm.h diff --git a/ImageMagick-7.1.1-21/coders/ps.c b/ImageMagick-7.1.1-22/coders/ps.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/ps.c rename to ImageMagick-7.1.1-22/coders/ps.c index f1fce2a5..b69eaf35 100644 --- a/ImageMagick-7.1.1-21/coders/ps.c +++ b/ImageMagick-7.1.1-22/coders/ps.c @@ -2178,6 +2178,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image, (void) WriteBlobString(image,buffer); } (void) WriteBlobString(image,"%%EOF\n"); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/ps.h b/ImageMagick-7.1.1-22/coders/ps.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/ps.h rename to ImageMagick-7.1.1-22/coders/ps.h diff --git a/ImageMagick-7.1.1-21/coders/ps2.c b/ImageMagick-7.1.1-22/coders/ps2.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/ps2.c rename to ImageMagick-7.1.1-22/coders/ps2.c index e97c6b0a..9f6be3bb 100644 --- a/ImageMagick-7.1.1-21/coders/ps2.c +++ b/ImageMagick-7.1.1-22/coders/ps2.c @@ -1120,6 +1120,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image, (void) WriteBlobString(image,buffer); } (void) WriteBlobString(image,"%%EOF\n"); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/ps2.h b/ImageMagick-7.1.1-22/coders/ps2.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/ps2.h rename to ImageMagick-7.1.1-22/coders/ps2.h diff --git a/ImageMagick-7.1.1-21/coders/ps3.c b/ImageMagick-7.1.1-22/coders/ps3.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/ps3.c rename to ImageMagick-7.1.1-22/coders/ps3.c index ae4a32da..f3391a3d 100644 --- a/ImageMagick-7.1.1-21/coders/ps3.c +++ b/ImageMagick-7.1.1-22/coders/ps3.c @@ -1611,6 +1611,7 @@ static MagickBooleanType WritePS3Image(const ImageInfo *image_info,Image *image, (void) WriteBlobString(image,buffer); } (void) WriteBlobString(image,"%%EOF\n"); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/ps3.h b/ImageMagick-7.1.1-22/coders/ps3.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/ps3.h rename to ImageMagick-7.1.1-22/coders/ps3.h diff --git a/ImageMagick-7.1.1-21/coders/psd-private.h b/ImageMagick-7.1.1-22/coders/psd-private.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/psd-private.h rename to ImageMagick-7.1.1-22/coders/psd-private.h diff --git a/ImageMagick-7.1.1-21/coders/psd.c b/ImageMagick-7.1.1-22/coders/psd.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/psd.c rename to ImageMagick-7.1.1-22/coders/psd.c index 317e796e..ee7b0e67 100644 --- a/ImageMagick-7.1.1-21/coders/psd.c +++ b/ImageMagick-7.1.1-22/coders/psd.c @@ -2701,7 +2701,10 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception) } profile=DestroyStringInfo(profile); } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -4020,6 +4023,7 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info, status=MagickFalse; image->compression=compression; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } diff --git a/ImageMagick-7.1.1-21/coders/psd.h b/ImageMagick-7.1.1-22/coders/psd.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/psd.h rename to ImageMagick-7.1.1-22/coders/psd.h diff --git a/ImageMagick-7.1.1-21/coders/pwp.c b/ImageMagick-7.1.1-22/coders/pwp.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/pwp.c rename to ImageMagick-7.1.1-22/coders/pwp.c diff --git a/ImageMagick-7.1.1-21/coders/pwp.h b/ImageMagick-7.1.1-22/coders/pwp.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/pwp.h rename to ImageMagick-7.1.1-22/coders/pwp.h diff --git a/ImageMagick-7.1.1-21/coders/qoi.c b/ImageMagick-7.1.1-22/coders/qoi.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/qoi.c rename to ImageMagick-7.1.1-22/coders/qoi.c index a77d5494..051165ea 100644 --- a/ImageMagick-7.1.1-21/coders/qoi.c +++ b/ImageMagick-7.1.1-22/coders/qoi.c @@ -334,7 +334,8 @@ static Image *ReadQOIImage(const ImageInfo *image_info,ExceptionInfo *exception) if (EOFBlob(image) != MagickFalse) ThrowFileException(exception,CorruptImageError, "UnexpectedEndOfFile",image->filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -600,6 +601,7 @@ static MagickBooleanType WriteQOIImage(const ImageInfo *image_info,Image *image, for (i=0; i < 7; i++) (void) WriteBlobByte(image,0x00); (void) WriteBlobByte(image,0x01); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/qoi.h b/ImageMagick-7.1.1-22/coders/qoi.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/qoi.h rename to ImageMagick-7.1.1-22/coders/qoi.h diff --git a/ImageMagick-7.1.1-21/coders/raw.c b/ImageMagick-7.1.1-22/coders/raw.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/raw.c rename to ImageMagick-7.1.1-22/coders/raw.c index c660c7ec..a8a50bae 100644 --- a/ImageMagick-7.1.1-21/coders/raw.c +++ b/ImageMagick-7.1.1-22/coders/raw.c @@ -289,7 +289,8 @@ static Image *ReadRAWImage(const ImageInfo *image_info,ExceptionInfo *exception) } while (count == (ssize_t) length); quantum_info=DestroyQuantumInfo(quantum_info); canvas_image=DestroyImage(canvas_image); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -603,6 +604,7 @@ static MagickBooleanType WriteRAWImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/raw.h b/ImageMagick-7.1.1-22/coders/raw.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/raw.h rename to ImageMagick-7.1.1-22/coders/raw.h diff --git a/ImageMagick-7.1.1-21/coders/rgb.c b/ImageMagick-7.1.1-22/coders/rgb.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/rgb.c rename to ImageMagick-7.1.1-22/coders/rgb.c index 70b3ff92..c21b3b8f 100644 --- a/ImageMagick-7.1.1-21/coders/rgb.c +++ b/ImageMagick-7.1.1-22/coders/rgb.c @@ -107,7 +107,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) *image; MagickBooleanType - status; + status = MagickTrue; MagickOffsetType scene; @@ -710,7 +710,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) break; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("G",image->filename); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -780,7 +781,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) break; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("B",image->filename); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -852,7 +854,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) } if (image->alpha_trait != UndefinedPixelTrait) { - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("A",image->filename); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -962,7 +965,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) } while (count == (ssize_t) length); quantum_info=DestroyQuantumInfo(quantum_info); canvas_image=DestroyImage(canvas_image); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -1198,7 +1202,8 @@ static Image *ReadRGB565Image(const ImageInfo *image_info, } while (count == (ssize_t) length); quantum_info=DestroyQuantumInfo(quantum_info); canvas_image=DestroyImage(canvas_image); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -1320,7 +1325,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, Image *image,ExceptionInfo *exception) { MagickBooleanType - status; + status = MagickTrue; MagickOffsetType scene; @@ -1595,7 +1600,8 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, if (status == MagickFalse) break; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("G",image->filename); status=OpenBlob(image_info,image,scene == 0 ? WriteBinaryBlobMode : AppendBinaryBlobMode,exception); @@ -1621,7 +1627,8 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, if (status == MagickFalse) break; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("B",image->filename); status=OpenBlob(image_info,image,scene == 0 ? WriteBinaryBlobMode : AppendBinaryBlobMode,exception); @@ -1649,7 +1656,8 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, } if (quantum_type == RGBAQuantum) { - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("A",image->filename); status=OpenBlob(image_info,image,scene == 0 ? WriteBinaryBlobMode : AppendBinaryBlobMode,exception); @@ -1696,6 +1704,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/rgb.h b/ImageMagick-7.1.1-22/coders/rgb.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/rgb.h rename to ImageMagick-7.1.1-22/coders/rgb.h diff --git a/ImageMagick-7.1.1-21/coders/rgf.c b/ImageMagick-7.1.1-22/coders/rgf.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/rgf.c rename to ImageMagick-7.1.1-22/coders/rgf.c index 1cda08b0..a3261924 100644 --- a/ImageMagick-7.1.1-21/coders/rgf.c +++ b/ImageMagick-7.1.1-22/coders/rgf.c @@ -215,7 +215,10 @@ static Image *ReadRGFImage(const ImageInfo *image_info,ExceptionInfo *exception) } data=(unsigned char *) RelinquishMagickMemory(data); (void) SyncImage(image,exception); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -390,6 +393,7 @@ static MagickBooleanType WriteRGFImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) break; } - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/rgf.h b/ImageMagick-7.1.1-22/coders/rgf.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/rgf.h rename to ImageMagick-7.1.1-22/coders/rgf.h diff --git a/ImageMagick-7.1.1-21/coders/rla.c b/ImageMagick-7.1.1-22/coders/rla.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/rla.c rename to ImageMagick-7.1.1-22/coders/rla.c index 82e21db0..23214077 100644 --- a/ImageMagick-7.1.1-21/coders/rla.c +++ b/ImageMagick-7.1.1-22/coders/rla.c @@ -412,7 +412,10 @@ static Image *ReadRLAImage(const ImageInfo *image_info,ExceptionInfo *exception) if (EOFBlob(image) != MagickFalse) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } diff --git a/ImageMagick-7.1.1-21/coders/rla.h b/ImageMagick-7.1.1-22/coders/rla.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/rla.h rename to ImageMagick-7.1.1-22/coders/rla.h diff --git a/ImageMagick-7.1.1-21/coders/rle.c b/ImageMagick-7.1.1-22/coders/rle.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/rle.c rename to ImageMagick-7.1.1-22/coders/rle.c index 1866088d..2d390de5 100644 --- a/ImageMagick-7.1.1-21/coders/rle.c +++ b/ImageMagick-7.1.1-22/coders/rle.c @@ -340,8 +340,7 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) */ number_planes_filled=(number_planes % 2 == 0) ? number_planes : number_planes+1; - if ((number_pixels*number_planes_filled) != (size_t) (number_pixels* - number_planes_filled)) + if (((MagickSizeType) number_pixels*number_planes_filled) != (size_t) (number_pixels*number_planes_filled)) ThrowRLEException(ResourceLimitError,"MemoryAllocationFailed"); pixel_info=AcquireVirtualMemory(image->columns,image->rows* MagickMax(number_planes_filled,4)*sizeof(*pixels)); @@ -706,7 +705,8 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) } while ((count != 0) && (memcmp(magick,"\122\314",2) == 0)); if (colormap != (unsigned char *) NULL) colormap=(unsigned char *) RelinquishMagickMemory(colormap); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); diff --git a/ImageMagick-7.1.1-21/coders/rle.h b/ImageMagick-7.1.1-22/coders/rle.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/rle.h rename to ImageMagick-7.1.1-22/coders/rle.h diff --git a/ImageMagick-7.1.1-21/coders/scr.c b/ImageMagick-7.1.1-22/coders/scr.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/scr.c rename to ImageMagick-7.1.1-22/coders/scr.c index 5f3a8c5e..6976389a 100644 --- a/ImageMagick-7.1.1-21/coders/scr.c +++ b/ImageMagick-7.1.1-22/coders/scr.c @@ -245,7 +245,10 @@ static Image *ReadSCRImage(const ImageInfo *image_info,ExceptionInfo *exception) } } } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } diff --git a/ImageMagick-7.1.1-21/coders/scr.h b/ImageMagick-7.1.1-22/coders/scr.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/scr.h rename to ImageMagick-7.1.1-22/coders/scr.h diff --git a/ImageMagick-7.1.1-21/coders/screenshot.c b/ImageMagick-7.1.1-22/coders/screenshot.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/screenshot.c rename to ImageMagick-7.1.1-22/coders/screenshot.c diff --git a/ImageMagick-7.1.1-21/coders/screenshot.h b/ImageMagick-7.1.1-22/coders/screenshot.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/screenshot.h rename to ImageMagick-7.1.1-22/coders/screenshot.h diff --git a/ImageMagick-7.1.1-21/coders/sct.c b/ImageMagick-7.1.1-22/coders/sct.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/sct.c rename to ImageMagick-7.1.1-22/coders/sct.c index e447a1b2..c780071f 100644 --- a/ImageMagick-7.1.1-21/coders/sct.c +++ b/ImageMagick-7.1.1-22/coders/sct.c @@ -295,7 +295,10 @@ static Image *ReadSCTImage(const ImageInfo *image_info,ExceptionInfo *exception) if (EOFBlob(image) != MagickFalse) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } diff --git a/ImageMagick-7.1.1-21/coders/sct.h b/ImageMagick-7.1.1-22/coders/sct.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/sct.h rename to ImageMagick-7.1.1-22/coders/sct.h diff --git a/ImageMagick-7.1.1-21/coders/sfw.c b/ImageMagick-7.1.1-22/coders/sfw.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/sfw.c rename to ImageMagick-7.1.1-22/coders/sfw.c index 89a2774e..e51a5cc6 100644 --- a/ImageMagick-7.1.1-21/coders/sfw.c +++ b/ImageMagick-7.1.1-22/coders/sfw.c @@ -284,7 +284,7 @@ static Image *ReadSFWImage(const ImageInfo *image_info,ExceptionInfo *exception) Translate remaining markers. */ offset=header+2; - offset+=(((unsigned int) offset[2]) << 8)+offset[3]+2; + offset+=(((size_t) offset[2]) << 8)+(size_t) offset[3]+2; for ( ; ; ) { if ((offset+4) > (buffer+count-1)) @@ -295,7 +295,7 @@ static Image *ReadSFWImage(const ImageInfo *image_info,ExceptionInfo *exception) TranslateSFWMarker(offset); if (offset[1] == 0xda) break; - offset+=(((unsigned int) offset[2]) << 8)+offset[3]+2; + offset+=(((size_t) offset[2]) << 8)+(size_t) offset[3]+2; } offset--; data=SFWScan(offset,buffer+count-1,(const unsigned char *) "\377\311",2); diff --git a/ImageMagick-7.1.1-21/coders/sfw.h b/ImageMagick-7.1.1-22/coders/sfw.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/sfw.h rename to ImageMagick-7.1.1-22/coders/sfw.h diff --git a/ImageMagick-7.1.1-21/coders/sgi.c b/ImageMagick-7.1.1-22/coders/sgi.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/sgi.c rename to ImageMagick-7.1.1-22/coders/sgi.c index 226034ef..b9d6fbdb 100644 --- a/ImageMagick-7.1.1-21/coders/sgi.c +++ b/ImageMagick-7.1.1-22/coders/sgi.c @@ -752,7 +752,8 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception) break; } } while (iris_info.magic == 0x01DA); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -1189,6 +1190,7 @@ static MagickBooleanType WriteSGIImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/sgi.h b/ImageMagick-7.1.1-22/coders/sgi.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/sgi.h rename to ImageMagick-7.1.1-22/coders/sgi.h diff --git a/ImageMagick-7.1.1-21/coders/sixel.c b/ImageMagick-7.1.1-22/coders/sixel.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/sixel.c rename to ImageMagick-7.1.1-22/coders/sixel.c index b30a0dc2..0accba2e 100644 --- a/ImageMagick-7.1.1-21/coders/sixel.c +++ b/ImageMagick-7.1.1-22/coders/sixel.c @@ -1182,7 +1182,10 @@ static Image *ReadSIXELImage(const ImageInfo *image_info, */ sixel_pixels=(sixel_pixel_t *) RelinquishMagickMemory(sixel_pixels); sixel_palette=(unsigned char *) RelinquishMagickMemory(sixel_palette); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -1414,6 +1417,7 @@ static MagickBooleanType WriteSIXELImage(const ImageInfo *image_info, sixel_palette,image->colors,-1,output); sixel_pixels=(sixel_pixel_t *) RelinquishMagickMemory(sixel_pixels); output=(sixel_output_t *) RelinquishMagickMemory(output); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } diff --git a/ImageMagick-7.1.1-21/coders/sixel.h b/ImageMagick-7.1.1-22/coders/sixel.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/sixel.h rename to ImageMagick-7.1.1-22/coders/sixel.h diff --git a/ImageMagick-7.1.1-21/coders/stegano.c b/ImageMagick-7.1.1-22/coders/stegano.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/stegano.c rename to ImageMagick-7.1.1-22/coders/stegano.c diff --git a/ImageMagick-7.1.1-21/coders/stegano.h b/ImageMagick-7.1.1-22/coders/stegano.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/stegano.h rename to ImageMagick-7.1.1-22/coders/stegano.h diff --git a/ImageMagick-7.1.1-21/coders/strimg.c b/ImageMagick-7.1.1-22/coders/strimg.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/strimg.c rename to ImageMagick-7.1.1-22/coders/strimg.c index a0a1e2e7..4cbe1838 100644 --- a/ImageMagick-7.1.1-21/coders/strimg.c +++ b/ImageMagick-7.1.1-22/coders/strimg.c @@ -165,7 +165,10 @@ static Image *ReadSTRIMGImage(const ImageInfo *image_info, (void) CloseBlob(image); return(DestroyImageList(image)); } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -328,6 +331,7 @@ static MagickBooleanType WriteSTRIMGImage(const ImageInfo *image_info, quantum_info=DestroyQuantumInfo(quantum_info); if (y < (ssize_t) image->rows) ThrowWriterException(CorruptImageError,"UnableToWriteImageData"); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } diff --git a/ImageMagick-7.1.1-21/coders/strimg.h b/ImageMagick-7.1.1-22/coders/strimg.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/strimg.h rename to ImageMagick-7.1.1-22/coders/strimg.h diff --git a/ImageMagick-7.1.1-21/coders/sun.c b/ImageMagick-7.1.1-22/coders/sun.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/sun.c rename to ImageMagick-7.1.1-22/coders/sun.c index c44dee3e..39b6c8e2 100644 --- a/ImageMagick-7.1.1-21/coders/sun.c +++ b/ImageMagick-7.1.1-22/coders/sun.c @@ -657,7 +657,8 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception) break; } } while (sun_info.magic == 0x59a66a95); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -1035,6 +1036,7 @@ static MagickBooleanType WriteSUNImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/sun.h b/ImageMagick-7.1.1-22/coders/sun.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/sun.h rename to ImageMagick-7.1.1-22/coders/sun.h diff --git a/ImageMagick-7.1.1-21/coders/svg.c b/ImageMagick-7.1.1-22/coders/svg.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/svg.c rename to ImageMagick-7.1.1-22/coders/svg.c index 6b581f75..7c478212 100644 --- a/ImageMagick-7.1.1-21/coders/svg.c +++ b/ImageMagick-7.1.1-22/coders/svg.c @@ -3972,6 +3972,9 @@ static MagickBooleanType IsPoint(const char *point) static MagickBooleanType TraceSVGImage(Image *image,ExceptionInfo *exception) { + MagickBooleanType + status = MagickTrue; + #if defined(MAGICKCORE_AUTOTRACE_DELEGATE) { at_bitmap @@ -4053,9 +4056,6 @@ static MagickBooleanType TraceSVGImage(Image *image,ExceptionInfo *exception) ImageInfo *image_info; - MagickBooleanType - status; - size_t blob_length, encode_length; @@ -4132,8 +4132,9 @@ static MagickBooleanType TraceSVGImage(Image *image,ExceptionInfo *exception) (void) WriteBlobString(image,"\n"); } #endif - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, @@ -5276,6 +5277,7 @@ static MagickBooleanType WriteSVGImage(const ImageInfo *image_info,Image *image, token=DestroyString(token); if (primitive_info != (PrimitiveInfo *) NULL) primitive_info=(PrimitiveInfo *) RelinquishMagickMemory(primitive_info); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } diff --git a/ImageMagick-7.1.1-21/coders/svg.h b/ImageMagick-7.1.1-22/coders/svg.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/svg.h rename to ImageMagick-7.1.1-22/coders/svg.h diff --git a/ImageMagick-7.1.1-21/coders/tga.c b/ImageMagick-7.1.1-22/coders/tga.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/tga.c rename to ImageMagick-7.1.1-22/coders/tga.c index 57e58dc9..c80bcbd5 100644 --- a/ImageMagick-7.1.1-21/coders/tga.c +++ b/ImageMagick-7.1.1-22/coders/tga.c @@ -648,7 +648,10 @@ static Image *ReadTGAImage(const ImageInfo *image_info,ExceptionInfo *exception) image->alpha_trait=UndefinedPixelTrait; } } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -1108,6 +1111,7 @@ static MagickBooleanType WriteTGAImage(const ImageInfo *image_info,Image *image, WriteBlobString(image,"TRUEVISION-XFILE."); WriteBlobByte(image,0); } - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/tga.h b/ImageMagick-7.1.1-22/coders/tga.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/tga.h rename to ImageMagick-7.1.1-22/coders/tga.h diff --git a/ImageMagick-7.1.1-21/coders/thumbnail.c b/ImageMagick-7.1.1-22/coders/thumbnail.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/thumbnail.c rename to ImageMagick-7.1.1-22/coders/thumbnail.c diff --git a/ImageMagick-7.1.1-21/coders/thumbnail.h b/ImageMagick-7.1.1-22/coders/thumbnail.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/thumbnail.h rename to ImageMagick-7.1.1-22/coders/thumbnail.h diff --git a/ImageMagick-7.1.1-21/coders/tiff.c b/ImageMagick-7.1.1-22/coders/tiff.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/tiff.c rename to ImageMagick-7.1.1-22/coders/tiff.c index 91c28079..3864da07 100644 --- a/ImageMagick-7.1.1-21/coders/tiff.c +++ b/ImageMagick-7.1.1-22/coders/tiff.c @@ -2730,7 +2730,8 @@ static MagickBooleanType WriteGROUP4Image(const ImageInfo *image_info, huffman_image=DestroyImage(huffman_image); (void) fclose(file); (void) RelinquishUniqueFileResource(filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } #endif @@ -3676,8 +3677,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, photometric=PHOTOMETRIC_RGB; (void) TIFFSetField(tiff,TIFFTAG_SAMPLESPERPIXEL,3); if ((image_info->type != TrueColorType) && - (image_info->type != TrueColorAlphaType) && - (image->number_meta_channels == 0)) + (image_info->type != TrueColorAlphaType)) { if ((image_info->type != PaletteType) && (IdentifyImageCoderGray(image,exception) != MagickFalse)) @@ -4328,6 +4328,8 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, if (status == MagickFalse) break; } while (adjoin != MagickFalse); + if (TIFFFlush(tiff) != 1) + status=MagickFalse; TIFFClose(tiff); return(status); } diff --git a/ImageMagick-7.1.1-21/coders/tiff.h b/ImageMagick-7.1.1-22/coders/tiff.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/tiff.h rename to ImageMagick-7.1.1-22/coders/tiff.h diff --git a/ImageMagick-7.1.1-21/coders/tile.c b/ImageMagick-7.1.1-22/coders/tile.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/tile.c rename to ImageMagick-7.1.1-22/coders/tile.c diff --git a/ImageMagick-7.1.1-21/coders/tile.h b/ImageMagick-7.1.1-22/coders/tile.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/tile.h rename to ImageMagick-7.1.1-22/coders/tile.h diff --git a/ImageMagick-7.1.1-21/coders/tim.c b/ImageMagick-7.1.1-22/coders/tim.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/tim.c rename to ImageMagick-7.1.1-22/coders/tim.c index 7eead9db..e4a44984 100644 --- a/ImageMagick-7.1.1-21/coders/tim.c +++ b/ImageMagick-7.1.1-22/coders/tim.c @@ -429,7 +429,8 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception) break; } } while (tim_info.id == 0x00000010); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); diff --git a/ImageMagick-7.1.1-21/coders/tim.h b/ImageMagick-7.1.1-22/coders/tim.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/tim.h rename to ImageMagick-7.1.1-22/coders/tim.h diff --git a/ImageMagick-7.1.1-21/coders/tim2.c b/ImageMagick-7.1.1-22/coders/tim2.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/tim2.c rename to ImageMagick-7.1.1-22/coders/tim2.c index 3486df83..b6f992b7 100644 --- a/ImageMagick-7.1.1-21/coders/tim2.c +++ b/ImageMagick-7.1.1-22/coders/tim2.c @@ -772,7 +772,8 @@ static Image *ReadTIM2Image(const ImageInfo *image_info, break; } } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); diff --git a/ImageMagick-7.1.1-21/coders/tim2.h b/ImageMagick-7.1.1-22/coders/tim2.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/tim2.h rename to ImageMagick-7.1.1-22/coders/tim2.h diff --git a/ImageMagick-7.1.1-21/coders/ttf.c b/ImageMagick-7.1.1-22/coders/ttf.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/ttf.c rename to ImageMagick-7.1.1-22/coders/ttf.c index a4be28cc..3c74be7c 100644 --- a/ImageMagick-7.1.1-21/coders/ttf.c +++ b/ImageMagick-7.1.1-22/coders/ttf.c @@ -292,7 +292,10 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception) */ (void) RelinquishUniqueFileResource(draw_info->font); draw_info=DestroyDrawInfo(draw_info); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } #endif /* MAGICKCORE_FREETYPE_DELEGATE */ diff --git a/ImageMagick-7.1.1-21/coders/ttf.h b/ImageMagick-7.1.1-22/coders/ttf.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/ttf.h rename to ImageMagick-7.1.1-22/coders/ttf.h diff --git a/ImageMagick-7.1.1-21/coders/txt.c b/ImageMagick-7.1.1-22/coders/txt.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/txt.c rename to ImageMagick-7.1.1-22/coders/txt.c index c22e083a..a6a3e52b 100644 --- a/ImageMagick-7.1.1-21/coders/txt.c +++ b/ImageMagick-7.1.1-22/coders/txt.c @@ -348,7 +348,8 @@ static Image *ReadTEXTImage(const ImageInfo *image_info, if (texture != (Image *) NULL) texture=DestroyImageList(texture); draw_info=DestroyDrawInfo(draw_info); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -799,6 +800,7 @@ static MagickBooleanType WriteTXTImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/txt.h b/ImageMagick-7.1.1-22/coders/txt.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/txt.h rename to ImageMagick-7.1.1-22/coders/txt.h diff --git a/ImageMagick-7.1.1-21/coders/uil.c b/ImageMagick-7.1.1-22/coders/uil.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/uil.c rename to ImageMagick-7.1.1-22/coders/uil.c index fe6a0dad..83ff0332 100644 --- a/ImageMagick-7.1.1-21/coders/uil.c +++ b/ImageMagick-7.1.1-22/coders/uil.c @@ -373,6 +373,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image, break; } symbol=DestroyString(symbol); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/uil.h b/ImageMagick-7.1.1-22/coders/uil.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/uil.h rename to ImageMagick-7.1.1-22/coders/uil.h diff --git a/ImageMagick-7.1.1-21/coders/url.c b/ImageMagick-7.1.1-22/coders/url.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/url.c rename to ImageMagick-7.1.1-22/coders/url.c diff --git a/ImageMagick-7.1.1-21/coders/url.h b/ImageMagick-7.1.1-22/coders/url.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/url.h rename to ImageMagick-7.1.1-22/coders/url.h diff --git a/ImageMagick-7.1.1-21/coders/uyvy.c b/ImageMagick-7.1.1-22/coders/uyvy.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/uyvy.c rename to ImageMagick-7.1.1-22/coders/uyvy.c index 92b7f80e..199c0f31 100644 --- a/ImageMagick-7.1.1-21/coders/uyvy.c +++ b/ImageMagick-7.1.1-22/coders/uyvy.c @@ -183,7 +183,10 @@ static Image *ReadUYVYImage(const ImageInfo *image_info, if (EOFBlob(image) != MagickFalse) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -362,6 +365,7 @@ static MagickBooleanType WriteUYVYImage(const ImageInfo *image_info, break; } uyvy_image=DestroyImage(uyvy_image); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/uyvy.h b/ImageMagick-7.1.1-22/coders/uyvy.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/uyvy.h rename to ImageMagick-7.1.1-22/coders/uyvy.h diff --git a/ImageMagick-7.1.1-21/coders/vicar.c b/ImageMagick-7.1.1-22/coders/vicar.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/vicar.c rename to ImageMagick-7.1.1-22/coders/vicar.c index 66a64f98..714087e4 100644 --- a/ImageMagick-7.1.1-21/coders/vicar.c +++ b/ImageMagick-7.1.1-22/coders/vicar.c @@ -420,7 +420,10 @@ static Image *ReadVICARImage(const ImageInfo *image_info, if (EOFBlob(image) != MagickFalse) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -596,6 +599,7 @@ static MagickBooleanType WriteVICARImage(const ImageInfo *image_info, break; } quantum_info=DestroyQuantumInfo(quantum_info); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/vicar.h b/ImageMagick-7.1.1-22/coders/vicar.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/vicar.h rename to ImageMagick-7.1.1-22/coders/vicar.h diff --git a/ImageMagick-7.1.1-21/coders/vid.c b/ImageMagick-7.1.1-22/coders/vid.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/vid.c rename to ImageMagick-7.1.1-22/coders/vid.c diff --git a/ImageMagick-7.1.1-21/coders/vid.h b/ImageMagick-7.1.1-22/coders/vid.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/vid.h rename to ImageMagick-7.1.1-22/coders/vid.h diff --git a/ImageMagick-7.1.1-21/coders/video.c b/ImageMagick-7.1.1-22/coders/video.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/video.c rename to ImageMagick-7.1.1-22/coders/video.c diff --git a/ImageMagick-7.1.1-21/coders/video.h b/ImageMagick-7.1.1-22/coders/video.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/video.h rename to ImageMagick-7.1.1-22/coders/video.h diff --git a/ImageMagick-7.1.1-21/coders/viff.c b/ImageMagick-7.1.1-22/coders/viff.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/viff.c rename to ImageMagick-7.1.1-22/coders/viff.c index d4174921..f8dc66d0 100644 --- a/ImageMagick-7.1.1-21/coders/viff.c +++ b/ImageMagick-7.1.1-22/coders/viff.c @@ -773,7 +773,8 @@ static Image *ReadVIFFImage(const ImageInfo *image_info, break; } } while ((count != 0) && (viff_info.identifier == 0xab)); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -1253,6 +1254,7 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/viff.h b/ImageMagick-7.1.1-22/coders/viff.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/viff.h rename to ImageMagick-7.1.1-22/coders/viff.h diff --git a/ImageMagick-7.1.1-21/coders/vips.c b/ImageMagick-7.1.1-22/coders/vips.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/vips.c rename to ImageMagick-7.1.1-22/coders/vips.c index f48f68d8..c24e6985 100644 --- a/ImageMagick-7.1.1-21/coders/vips.c +++ b/ImageMagick-7.1.1-22/coders/vips.c @@ -519,7 +519,8 @@ static Image *ReadVIPSImage(const ImageInfo *image_info, SetImageProperty(image,"vips:metadata",metadata,exception); metadata=(char *) RelinquishMagickMemory(metadata); } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return((Image *) NULL); return(image); @@ -764,6 +765,7 @@ static MagickBooleanType WriteVIPSImage(const ImageInfo *image_info, metadata=GetImageProperty(image,"vips:metadata",exception); if (metadata != (const char*) NULL) WriteBlobString(image,metadata); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } diff --git a/ImageMagick-7.1.1-21/coders/vips.h b/ImageMagick-7.1.1-22/coders/vips.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/vips.h rename to ImageMagick-7.1.1-22/coders/vips.h diff --git a/ImageMagick-7.1.1-21/coders/wbmp.c b/ImageMagick-7.1.1-22/coders/wbmp.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/wbmp.c rename to ImageMagick-7.1.1-22/coders/wbmp.c index 4e192689..0fc19670 100644 --- a/ImageMagick-7.1.1-21/coders/wbmp.c +++ b/ImageMagick-7.1.1-22/coders/wbmp.c @@ -222,7 +222,10 @@ static Image *ReadWBMPImage(const ImageInfo *image_info, if (EOFBlob(image) != MagickFalse) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -418,6 +421,7 @@ static MagickBooleanType WriteWBMPImage(const ImageInfo *image_info, if (status == MagickFalse) break; } - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/wbmp.h b/ImageMagick-7.1.1-22/coders/wbmp.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/wbmp.h rename to ImageMagick-7.1.1-22/coders/wbmp.h diff --git a/ImageMagick-7.1.1-21/coders/webp.c b/ImageMagick-7.1.1-22/coders/webp.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/webp.c rename to ImageMagick-7.1.1-22/coders/webp.c index 3a156e7c..0472e0c5 100644 --- a/ImageMagick-7.1.1-21/coders/webp.c +++ b/ImageMagick-7.1.1-22/coders/webp.c @@ -1228,7 +1228,8 @@ static MagickBooleanType WriteWEBPImage(const ImageInfo *image_info, (void) WriteBlob(image,writer.size,writer.mem); WebPMemoryWriterClear(&writer); #endif - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } #endif diff --git a/ImageMagick-7.1.1-21/coders/webp.h b/ImageMagick-7.1.1-22/coders/webp.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/webp.h rename to ImageMagick-7.1.1-22/coders/webp.h diff --git a/ImageMagick-7.1.1-21/coders/wmf.c b/ImageMagick-7.1.1-22/coders/wmf.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/wmf.c rename to ImageMagick-7.1.1-22/coders/wmf.c diff --git a/ImageMagick-7.1.1-21/coders/wmf.h b/ImageMagick-7.1.1-22/coders/wmf.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/wmf.h rename to ImageMagick-7.1.1-22/coders/wmf.h diff --git a/ImageMagick-7.1.1-21/coders/wpg.c b/ImageMagick-7.1.1-22/coders/wpg.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/wpg.c rename to ImageMagick-7.1.1-22/coders/wpg.c index 74198522..d8f83bce 100644 --- a/ImageMagick-7.1.1-21/coders/wpg.c +++ b/ImageMagick-7.1.1-22/coders/wpg.c @@ -1091,6 +1091,8 @@ static Image *ReadWPGImage(const ImageInfo *image_info,ExceptionInfo *exception) assert(exception->signature == MagickCoreSignature); one=1; image=AcquireImage(image_info,exception); + image->columns=0; + image->rows=0; image->depth=8; status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -1981,6 +1983,7 @@ static MagickBooleanType WriteWPGImage(const ImageInfo *image_info,Image *image, (void) WriteBlobLSBShort(image,offset & 0xffff); if (y < (ssize_t) image->rows) ThrowWriterException(CorruptImageError,"UnableToWriteImageData"); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; return(status); } diff --git a/ImageMagick-7.1.1-21/coders/wpg.h b/ImageMagick-7.1.1-22/coders/wpg.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/wpg.h rename to ImageMagick-7.1.1-22/coders/wpg.h diff --git a/ImageMagick-7.1.1-21/coders/x.c b/ImageMagick-7.1.1-22/coders/x.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/x.c rename to ImageMagick-7.1.1-22/coders/x.c diff --git a/ImageMagick-7.1.1-21/coders/x.h b/ImageMagick-7.1.1-22/coders/x.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/x.h rename to ImageMagick-7.1.1-22/coders/x.h diff --git a/ImageMagick-7.1.1-21/coders/xbm.c b/ImageMagick-7.1.1-22/coders/xbm.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/xbm.c rename to ImageMagick-7.1.1-22/coders/xbm.c index 64fbc1a4..9e6fcd2f 100644 --- a/ImageMagick-7.1.1-21/coders/xbm.c +++ b/ImageMagick-7.1.1-22/coders/xbm.c @@ -410,7 +410,10 @@ static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception) } data=(unsigned char *) RelinquishMagickMemory(data); (void) SyncImage(image,exception); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -627,6 +630,7 @@ static MagickBooleanType WriteXBMImage(const ImageInfo *image_info,Image *image, } (void) CopyMagickString(buffer,"};\n",MagickPathExtent); (void) WriteBlob(image,strlen(buffer),(unsigned char *) buffer); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/xbm.h b/ImageMagick-7.1.1-22/coders/xbm.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/xbm.h rename to ImageMagick-7.1.1-22/coders/xbm.h diff --git a/ImageMagick-7.1.1-21/coders/xc.c b/ImageMagick-7.1.1-22/coders/xc.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/xc.c rename to ImageMagick-7.1.1-22/coders/xc.c diff --git a/ImageMagick-7.1.1-21/coders/xc.h b/ImageMagick-7.1.1-22/coders/xc.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/xc.h rename to ImageMagick-7.1.1-22/coders/xc.h diff --git a/ImageMagick-7.1.1-21/coders/xcf.c b/ImageMagick-7.1.1-22/coders/xcf.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/xcf.c rename to ImageMagick-7.1.1-22/coders/xcf.c diff --git a/ImageMagick-7.1.1-21/coders/xcf.h b/ImageMagick-7.1.1-22/coders/xcf.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/xcf.h rename to ImageMagick-7.1.1-22/coders/xcf.h diff --git a/ImageMagick-7.1.1-21/coders/xpm.c b/ImageMagick-7.1.1-22/coders/xpm.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/xpm.c rename to ImageMagick-7.1.1-22/coders/xpm.c index 57a45d04..d22f7321 100644 --- a/ImageMagick-7.1.1-21/coders/xpm.c +++ b/ImageMagick-7.1.1-22/coders/xpm.c @@ -521,7 +521,10 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception) */ xpm_buffer=DestroyString(xpm_buffer); xpm_colors=DestroySplayTree(xpm_colors); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } @@ -908,8 +911,9 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info, } picon=DestroyImage(picon); (void) WriteBlobString(image,"};\n"); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } /* diff --git a/ImageMagick-7.1.1-21/coders/xpm.h b/ImageMagick-7.1.1-22/coders/xpm.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/xpm.h rename to ImageMagick-7.1.1-22/coders/xpm.h diff --git a/ImageMagick-7.1.1-21/coders/xps.c b/ImageMagick-7.1.1-22/coders/xps.c similarity index 100% rename from ImageMagick-7.1.1-21/coders/xps.c rename to ImageMagick-7.1.1-22/coders/xps.c diff --git a/ImageMagick-7.1.1-21/coders/xps.h b/ImageMagick-7.1.1-22/coders/xps.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/xps.h rename to ImageMagick-7.1.1-22/coders/xps.h diff --git a/ImageMagick-7.1.1-21/coders/xwd.c b/ImageMagick-7.1.1-22/coders/xwd.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/xwd.c rename to ImageMagick-7.1.1-22/coders/xwd.c index 73ba4ce2..5261a815 100644 --- a/ImageMagick-7.1.1-21/coders/xwd.c +++ b/ImageMagick-7.1.1-22/coders/xwd.c @@ -653,7 +653,10 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception) if (EOFBlob(image) != MagickFalse) ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile", image->filename); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + if (status == MagickFalse) + return(DestroyImageList(image)); return(GetFirstImageInList(image)); } #endif diff --git a/ImageMagick-7.1.1-21/coders/xwd.h b/ImageMagick-7.1.1-22/coders/xwd.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/xwd.h rename to ImageMagick-7.1.1-22/coders/xwd.h diff --git a/ImageMagick-7.1.1-21/coders/yaml.c b/ImageMagick-7.1.1-22/coders/yaml.c similarity index 99% rename from ImageMagick-7.1.1-21/coders/yaml.c rename to ImageMagick-7.1.1-22/coders/yaml.c index c8b8eb7e..c65cdfcc 100644 --- a/ImageMagick-7.1.1-21/coders/yaml.c +++ b/ImageMagick-7.1.1-22/coders/yaml.c @@ -1728,6 +1728,7 @@ static MagickBooleanType WriteYAMLImage(const ImageInfo *image_info, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/yaml.h b/ImageMagick-7.1.1-22/coders/yaml.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/yaml.h rename to ImageMagick-7.1.1-22/coders/yaml.h diff --git a/ImageMagick-7.1.1-21/coders/ycbcr.c b/ImageMagick-7.1.1-22/coders/ycbcr.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/ycbcr.c rename to ImageMagick-7.1.1-22/coders/ycbcr.c index e7bbcee4..9e646d63 100644 --- a/ImageMagick-7.1.1-21/coders/ycbcr.c +++ b/ImageMagick-7.1.1-22/coders/ycbcr.c @@ -701,7 +701,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, if (status == MagickFalse) break; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("Cb",image->filename); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -771,7 +772,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, if (status == MagickFalse) break; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("Cr",image->filename); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -844,6 +846,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, if (image->alpha_trait != UndefinedPixelTrait) { (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("A",image->filename); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -953,7 +957,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, } while (count == (ssize_t) length); quantum_info=DestroyQuantumInfo(quantum_info); canvas_image=DestroyImage(canvas_image); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -1062,7 +1067,7 @@ static MagickBooleanType WriteYCBCRImage(const ImageInfo *image_info, *p; MagickBooleanType - status; + status = MagickTrue; MagickOffsetType scene; @@ -1302,7 +1307,8 @@ static MagickBooleanType WriteYCBCRImage(const ImageInfo *image_info, if (status == MagickFalse) break; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("Cb",image->filename); status=OpenBlob(image_info,image,scene == 0 ? WriteBinaryBlobMode : AppendBinaryBlobMode,exception); @@ -1325,7 +1331,8 @@ static MagickBooleanType WriteYCBCRImage(const ImageInfo *image_info, if (status == MagickFalse) break; } - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("Cr",image->filename); status=OpenBlob(image_info,image,scene == 0 ? WriteBinaryBlobMode : AppendBinaryBlobMode,exception); @@ -1350,7 +1357,8 @@ static MagickBooleanType WriteYCBCRImage(const ImageInfo *image_info, } if (quantum_type == RGBAQuantum) { - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("A",image->filename); status=OpenBlob(image_info,image,scene == 0 ? WriteBinaryBlobMode : AppendBinaryBlobMode,exception); @@ -1394,6 +1402,7 @@ static MagickBooleanType WriteYCBCRImage(const ImageInfo *image_info, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/ycbcr.h b/ImageMagick-7.1.1-22/coders/ycbcr.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/ycbcr.h rename to ImageMagick-7.1.1-22/coders/ycbcr.h diff --git a/ImageMagick-7.1.1-21/coders/yuv.c b/ImageMagick-7.1.1-22/coders/yuv.c similarity index 98% rename from ImageMagick-7.1.1-21/coders/yuv.c rename to ImageMagick-7.1.1-22/coders/yuv.c index 6343f799..e1557210 100644 --- a/ImageMagick-7.1.1-21/coders/yuv.c +++ b/ImageMagick-7.1.1-22/coders/yuv.c @@ -351,7 +351,8 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception) } if (interlace == PartitionInterlace) { - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("U",image->filename); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -398,7 +399,8 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception) } if (interlace == PartitionInterlace) { - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("V",image->filename); status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -513,7 +515,8 @@ static Image *ReadYUVImage(const ImageInfo *image_info,ExceptionInfo *exception) } } while (count != 0); scanline=(unsigned char *) RelinquishMagickMemory(scanline); - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; if (status == MagickFalse) return(DestroyImageList(image)); return(GetFirstImageInList(image)); @@ -702,7 +705,8 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image, Sample image to an even width and height, if necessary. */ image->depth=(size_t) (quantum == 1 ? 8 : 16); - width=image->columns+(image->columns & (unsigned int) (horizontal_factor-1)); + width=image->columns+(image->columns & (unsigned int) (horizontal_factor + -1)); height=image->rows+(image->rows & (unsigned int) (vertical_factor-1)); yuv_image=ResizeImage(image,width,height,TriangleFilter,exception); if (yuv_image == (Image *) NULL) @@ -815,7 +819,8 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image, */ if (interlace == PartitionInterlace) { - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("U",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) @@ -849,7 +854,8 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image, */ if (interlace == PartitionInterlace) { - (void) CloseBlob(image); + if (CloseBlob(image) == MagickFalse) + break; AppendImageFormat("V",image->filename); status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) @@ -890,6 +896,7 @@ static MagickBooleanType WriteYUVImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) break; } while (image_info->adjoin != MagickFalse); - (void) CloseBlob(image); - return(MagickTrue); + if (CloseBlob(image) == MagickFalse) + status=MagickFalse; + return(status); } diff --git a/ImageMagick-7.1.1-21/coders/yuv.h b/ImageMagick-7.1.1-22/coders/yuv.h similarity index 100% rename from ImageMagick-7.1.1-21/coders/yuv.h rename to ImageMagick-7.1.1-22/coders/yuv.h diff --git a/ImageMagick-7.1.1-21/configs/arm64/MagickCore/magick-baseconfig.h b/ImageMagick-7.1.1-22/configs/arm64/MagickCore/magick-baseconfig.h similarity index 99% rename from ImageMagick-7.1.1-21/configs/arm64/MagickCore/magick-baseconfig.h rename to ImageMagick-7.1.1-22/configs/arm64/MagickCore/magick-baseconfig.h index f7345b31..8eaa7bcb 100644 --- a/ImageMagick-7.1.1-21/configs/arm64/MagickCore/magick-baseconfig.h +++ b/ImageMagick-7.1.1-22/configs/arm64/MagickCore/magick-baseconfig.h @@ -1203,7 +1203,7 @@ /* Define to the full name and version of this package. */ #ifndef MAGICKCORE_PACKAGE_STRING -#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.1.1-21" +#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.1.1-22" #endif /* Define to the one symbol short name of this package. */ @@ -1218,7 +1218,7 @@ /* Define to the version of this package. */ #ifndef MAGICKCORE_PACKAGE_VERSION -#define MAGICKCORE_PACKAGE_VERSION "7.1.1-21" +#define MAGICKCORE_PACKAGE_VERSION "7.1.1-22" #endif /* Define if you have PANGOCAIRO library */ @@ -1435,7 +1435,7 @@ /* Version number of package */ #ifndef MAGICKCORE_VERSION -#define MAGICKCORE_VERSION "7.1.1-21" +#define MAGICKCORE_VERSION "7.1.1-22" #endif /* Define if you have WEBPMUX library */ diff --git a/ImageMagick-7.1.1-21/configs/arm64/MagickCore/version.h b/ImageMagick-7.1.1-22/configs/arm64/MagickCore/version.h similarity index 96% rename from ImageMagick-7.1.1-21/configs/arm64/MagickCore/version.h rename to ImageMagick-7.1.1-22/configs/arm64/MagickCore/version.h index 58c4faaa..d3ca3d8e 100644 --- a/ImageMagick-7.1.1-21/configs/arm64/MagickCore/version.h +++ b/ImageMagick-7.1.1-22/configs/arm64/MagickCore/version.h @@ -30,16 +30,16 @@ extern "C" { #define MagickLibVersion 0x711 #define MagickLibVersionText "7.1.1" #define MagickLibVersionNumber 10,0,1 -#define MagickLibAddendum "'-21" +#define MagickLibAddendum "'-22" #define MagickLibInterface 10 #define MagickLibMinInterface 10 #define MagickPlatform "aarch64" #define MagickppLibVersionText "7.1.1" #define MagickppLibVersionNumber 5:0:0 -#define MagickppLibAddendum "'-21" +#define MagickppLibAddendum "'-22" #define MagickppLibInterface 5 #define MagickppLibMinInterface 5 -#define MagickReleaseDate "2023-10-21" +#define MagickReleaseDate "2023-12-02" #define MagickAuthoritativeLicense \ "https://imagemagick.org/script/license.php" #define MagickAuthoritativeURL "https://imagemagick.org" diff --git a/ImageMagick-7.1.1-21/filters/analyze.c b/ImageMagick-7.1.1-22/filters/analyze.c similarity index 100% rename from ImageMagick-7.1.1-21/filters/analyze.c rename to ImageMagick-7.1.1-22/filters/analyze.c diff --git a/ImageMagick-7.1.1-21/utilities/magick.c b/ImageMagick-7.1.1-22/utilities/magick.c similarity index 100% rename from ImageMagick-7.1.1-21/utilities/magick.c rename to ImageMagick-7.1.1-22/utilities/magick.c diff --git a/README.md b/README.md index f1b1cf38..4f978887 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# Android ImageMagick 7.1.1-21 +# Android ImageMagick 7.1.1-22 [![Build](https://github.com/MolotovCherry/Android-ImageMagick7/actions/workflows/build.yml/badge.svg?event=push)](https://github.com/MolotovCherry/Android-ImageMagick7/actions/workflows/build.yml) [![CodeQL](https://github.com/MolotovCherry/Android-ImageMagick7/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/MolotovCherry/Android-ImageMagick7/actions/workflows/codeql-analysis.yml) ![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/MolotovCherry/Android-ImageMagick7?style=plastic)