diff --git a/debian/changelog b/debian/changelog index 1cc2f807e5917d502ce87a66177dbf388d553ae4..f9a4ded2c38ff264c578920b297795002cf13d01 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +imagemagick (6.9.13.25-ok1) nile; urgency=medium + + Initial release for 6.9.13.25 + + -- tangtingting Thu, 26 Jun 2025 15:43:48 +0800 + imagemagick (8:6.9.12.98+dfsg1-ok1) nile; urgency=medium * Build for openKylin. diff --git a/debian/patches/0001-Fix-br-tag.patch b/debian/patches/0001-Fix-br-tag.patch new file mode 100644 index 0000000000000000000000000000000000000000..caab93ad4f423be5895228140910fb0a18226575 --- /dev/null +++ b/debian/patches/0001-Fix-br-tag.patch @@ -0,0 +1,907 @@ +From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= +Date: Fri, 2 Feb 2018 22:14:03 +0100 +Subject: Fix br tag + +find . -path './.git' -prune -o -type 'f' -name '*.html' -exec sed -i 's,
,
,g' {} \; + +Forwarded: Yes, https://github.com/ImageMagick/ImageMagick/issues/304 +--- + www/api/Image++.html | 268 +++++++++++++++++++++++++-------------------------- + 1 file changed, 134 insertions(+), 134 deletions(-) + +diff --git a/www/api/Image++.html b/www/api/Image++.html +index 2101cc4..cdf4f52 100644 +--- a/www/api/Image++.html ++++ b/www/api/Image++.html +@@ -235,7 +235,7 @@ has been placed within a Blob, it may be read into a Magick++ Image via + a constructor or read() + . Likewise, a Magick++ image may be written to a Blob via write() . +-

An example of using Image to write to a Blob follows:
++

An example of using Image to write to a Blob follows:
+

+ 
+ #include  
+@@ -257,7 +257,7 @@ int main(int argc,char **argv)
+   return 0; 
+ }
+
+-


++


+ likewise, to read an image from a Blob, you could use one of the + following examples:

+

[ Entry condition for the following examples +@@ -286,9 +286,9 @@ image.read( blob); +

+ Image may be constructed in a number of ways. It may be constructed + from a file, a URL, or an encoded image (e.g. JPEG) contained in an +-in-memory BLOB . The available Image +-constructors are shown in the following table:
+-
++in-memory BLOB . The available Image ++constructors are shown in the following table:
++
+ +
    + +@@ -349,11 +349,11 @@ const + string &magick_ + + +- + + + + +- ++ + + +diff --git a/www/api/magick++-classes.html b/www/api/magick++-classes.html +index c5311af..2dd4eda 100644 +--- a/www/api/magick++-classes.html ++++ b/www/api/magick++-classes.html +@@ -167,7 +167,7 @@ containers of image frames. + + + +- ++ + + +diff --git a/www/command-line-options.html b/www/command-line-options.html +index befc68f..767a1fa 100644 +--- a/www/command-line-options.html ++++ b/www/command-line-options.html +@@ -523,7 +523,7 @@ href="command-line-options.html#auto-orient" >-auto-orient operator will do + + + +-

    The computed threshold is returned as the auto-threshold:verbose image property. To instead print to your device, use -define auto-threshold:verbose=true.

    ++

    The computed threshold is returned as the auto-threshold:threshold image property. To instead print to your device, use -define auto-threshold:threshold=true.

    + +
    +

    -average

    +@@ -922,9 +922,9 @@ abbreviated as a concatenation of the letters 'R', 'G' + '2' equals Blue or Yellow
    + '3' equals Black
    + '4' equals Alpha or Opacity
    +-'5' equals Index

    ++'5' equals Index
    + +- ++

    +

    For example, to only select the Red and Blue channels + you can use any of the following:

    +

      +@@ -3474,7 +3474,7 @@ magick! for an image titled bird.miff.

      + to annotate an image with text.

      + +

      The rotate primitive rotates subsequent shape primitives and +-text primitives about the origin of the main image.:/p> ++text primitives about the origin of the main image.

      + +

        -draw "rotate 45 text 10,10 'Works like magick!'"

      + +@@ -8158,7 +8158,7 @@ href="command-line-options.html#stretch">-stretch, and -white-balance +
    +

    Applies white balancing to an image according to a grayworld assumption in the LAB colorspace.

    +-

    Use -define white-balance:vibrance=value{%} to change the color vibrance of the a & b channels.

    ++

    Use -define white-balance:vibrance=value{%} to change the color vibrance of the a & b channels.

    + +
    +

    -white-point x,y

    +diff --git a/www/defines.html b/www/defines.html +index 128c95a..89068a5 100644 +--- a/www/defines.html ++++ b/www/defines.html +@@ -126,11 +126,11 @@ use:

    + +
    Image Constructors
    const size_t width_,
    +- const size_t height_,
    +- std::string map_,
    +- const +-StorageType type_,
    ++     		const size_t width_,
    ++ const size_t height_,
    ++ std::string map_,
    ++ const ++StorageType type_,
    + const void *pixels_    		Construct a new Image based on an array of + image pixels. The pixel data must be in scanline order top-to-bottom. +@@ -363,7 +363,7 @@ are [0..MaxRGB]. For example, to create a 640x480 image from + unsigned red-green-blue character data, use +

    Image image( 640, 480, "RGB", + 0, pixels );

    +-

    The parameters are as follows:
    ++

    The parameters are as follows:
    + + + +@@ -419,7 +419,7 @@ image.addNoise(GaussianNoise); + image.write("myImage.tiff"); + + adds gaussian noise to the image file "myImage.tiff". +-

    The operations supported by Image are shown in the following table:
    ++

    The operations supported by Image are shown in the following table:
    + +

      + +@@ -431,11 +431,11 @@ adds gaussian noise to the image file "myImage.tiff". + + + + + + +@@ -459,27 +459,27 @@ noiseType_ + + + + + + + + + + + + +@@ -528,10 +528,10 @@ deviation of the Laplacian, in pixels. + + + + + + +- + + + +@@ -710,7 +710,7 @@ kernel to apply. +
      display
      + + +- + + + + + + + + + + + + + + +- +- + + +@@ -987,10 +987,10 @@ specify a header string to print above the image. + + + + + + + + + + + + +@@ -1105,17 +1105,17 @@ change). + + + + + + + +@@ -1185,10 +1185,10 @@ valid after calling ping. + + + + + + + +@@ -1277,7 +1277,7 @@ require the pixels to be normalized [0..1]. The other types are + unsigned red-green-blue character data, use +

      image.read( 640, 480, "RGB", CharPixel, + pixels );

      +-

      The parameters are as follows:
      ++

      The parameters are as follows:
      + +

      Image Image Manipulation Methods
      +
      adaptiveThreshold
      ++ size="-1">adaptiveThreshold
      +
      +       		size_t width, size_t +-height, size_t offset = 0
      ++height, size_t offset = 0
      +       		Apply adaptive thresholding to + the image. Adaptive thresholding is useful if the ideal threshold level +@@ -446,7 +446,7 @@ across the image. Adaptive thresholding works by evaluating the mean + and using the mean as the thresholding value. In order to remove + residual noise from the background, the threshold may be adjusted by + subtracting a constant offset (default zero) from the mean to +-compute the threshold.
      ++compute the threshold.
      +
      addNoiseChannel
      ++ name="addNoiseChannel">addNoiseChannel
      +       		const ChannelType +-channel_, const NoiseType noiseType_
      ++channel_, const NoiseType noiseType_
      +       		Add noise to an image + channel with the specified noise type. The channel_ parameter specifies the + channel to add noise to. The noiseType_ parameter +-specifies the type of noise.
      ++specifies the type of noise.
      +
      affineTransform
      ++ name="affineTransform">affineTransform
      +       		const DrawableAffine +-&affine
      ++&affine
      +       		Transform image by +-specified affine (or free transform) matrix.
      ++specified affine (or free transform) matrix.
      +
      blurChannel
      ++ name="blurChannel">blurChannel
      +       		const ChannelType +-channel_, const double radius_ = 0.0, const double sigma_ = 1.0
      ++channel_, const double radius_ = 0.0, const double sigma_ = 1.0
      +       		Blur an image + channel. The channel_ +@@ -619,9 +619,9 @@ width, height, or other image attributes by embedding +
      compare
      ++ name="compare"> compare
      +       		const Image &reference_
      ++       		const Image &reference_
      +       		Compare current image with + another image. Sets meanErrorPerPixel +@@ -630,7 +630,7 @@ another image. Sets meanErrorPerPixel
      ++matte differ from the current image.
      +
      voidDisplay image on screen.
      ++       		Display image on screen.
      + Caution: if + an image format is is not compatible with the display visual (e.g. + JPEG on a colormapped display) then the original image will be +@@ -813,7 +813,7 @@ vertical direction)
      +
      floodFill- +-
      ++
      + Color
      +       		ssize_t x_, ssize_t y_, const
      +
      floodFill- +-
      ++
      + Texture
      +       		ssize_t x_, ssize_t y_, const +@@ -933,10 +933,10 @@ specified by 'sigma_'.
      gaussianBlurChannel
      ++ name="gaussianBlurChannel">gaussianBlurChannel
      +       		const ChannelType +-channel_, const double radius_ = 0.0, const double sigma_ = 1.0
      ++channel_, const double radius_ = 0.0, const double sigma_ = 1.0
      +       		Gaussian blur + an image channel. The
      haldClut
      ++ name="haldClut"> haldClut
      +       		const Image &reference_
      ++       		const Image &reference_
      +       		apply a Hald color lookup table to the image.
      ++       		apply a Hald color lookup table to the image.
      +
      level
      ++ name="level">level
      +       		const double black_point, +-const double white_point, const double mid_point=1.0
      ++const double white_point, const double mid_point=1.0
      +       		Level image. Adjust the + levels of the image by scaling the colors falling between specified +@@ -1002,16 +1002,16 @@ specifies a gamma correction to apply to the image. White point + specifies the lightest color in the image. Colors brighter than + the white point are set to the maximum quantum value. The black and + white point have the valid range 0 to MaxRGB while mid (gamma) has a +-useful range of 0 to ten.
      ++useful range of 0 to ten.
      +
      levelChannel
      ++ name="levelChannel">levelChannel
      +       		const ChannelType + channel, const double black_point, const double white_point, const +-double mid_point=1.0
      ++double mid_point=1.0
      +       		Level image channel. + Adjust the levels of the image channel by scaling the values falling +@@ -1023,7 +1023,7 @@ specifies a gamma correction to apply to the image. White point + specifies the lightest color in the image. Colors brighter than the + white point are set to the maximum quantum value. The black and white + point have the valid range 0 to MaxRGB while mid (gamma) has a useful +-range of 0 to ten.
      ++range of 0 to ten.
      +
      motionBlur
      ++ name="motionBlur">motionBlur
      +       		const double radius_, +-const double sigma_, const double angle_
      ++const double sigma_, const double angle_
      +       		Motion blur image with + specified blur factor. The radius_ parameter specifies the radius of + the Gaussian, in pixels, not counting the center pixel. The + sigma_ parameter specifies the standard deviation of the Laplacian, in + pixels. The angle_ parameter specifies the angle the object appears to +-be coming from (zero degrees is from the right).
      ++be coming from (zero degrees is from the right).
      +
      process
      ++ name="process">process
      +       		std::string name_, +-const ssize_t argc_, char **argv_
      ++const ssize_t argc_, char **argv_
      +       		Execute the named + process module, passing any arguments via an argument vector, with +@@ -1196,7 +1196,7 @@ argc_ + specifying the number of arguments in the vector, and argv_ passing the + address of an array of null-terminated C strings which constitute the + argument vector. An exception is thrown if the requested process module +-does not exist, fails to load, or fails during execution.
      ++does not exist, fails to load, or fails during execution.
      +
      + +@@ -1322,10 +1322,10 @@ values and type_ parameters. + + + + + + + + + + + + +@@ -1385,7 +1385,7 @@ number of degrees. + +- + +
      shade
      + + + + + + + + + + + + + + + + + href="http://www.imagemagick.org/Magick++/Blob.html"> BLOB stored in blob_. The magick_ + parameter specifies the image format to write (defaults to magick ). The depth_ parameter species the image +-depth (defaults to depth ).
      ++depth (defaults to depth ).
      + Caution: if + an image format is selected which is capable of supporting fewer + colors than the original image or quantization has been requested, the +@@ -1669,7 +1669,7 @@ want to extract scanline 1 of a 640x480 image as character data in + red-green-blue order: +

      image.write(0,0,640,1,"RGB",0,pixels); +

      +-

      The parameters are as follows:
      ++

      The parameters are as follows:
      + +

      randomThreshold
      ++ name="randomThreshold">randomThreshold
      +       		const Geometry +-&thresholds_
      ++&thresholds_
      +       		Random threshold the + image. Changes the value of individual pixels based on the intensity of +@@ -1334,19 +1334,19 @@ low-contrast, two color image. The thresholds_ argument is a + geometry containing LOWxHIGH thresholds. If the string contains + 2x2, 3x3, or 4x4, then an ordered dither of order 2, 3, or 4 will be + performed instead. This is a very fast alternative to 'quantize' based +-dithering.
      ++dithering.
      +
      randomThresholdChannel
      ++ name="randomThresholdChannel">randomThresholdChannel
      +       		const Geometry +-&thresholds_, const ChannelType channel_
      ++&thresholds_, const ChannelType channel_
      +       		Random threshold an + image channel. Similar to randomThreshold() +-but restricted to the specified channel.
      ++but restricted to the specified channel.
      +
      +
      segment
      +       		double clusterThreshold_ = 1.0,
      ++       		double clusterThreshold_ = 1.0,
      + double smoothingThreshold_ = 1.5      		Segment (coalesce similar image components) + by analyzing the histograms of the color components and identifying +@@ -1405,7 +1405,7 @@ second derivative. The default is 1.5.double azimuth_ = 30, double elevation_ = 30, +-
      ++
      + bool colorShading_ = false      		Shade image using distant light source. + Specify azimuth_ and elevation_ as the +@@ -1435,10 +1435,10 @@ standard deviation of the Laplacian, in pixels.
      sharpenChannel
      ++ name="sharpenChannel">sharpenChannel
      +       		const ChannelType +-channel_, const double radius_ = 0.0, const double sigma_ = 1.0
      ++channel_, const double radius_ = 0.0, const double sigma_ = 1.0
      +       		Sharpen pixel + quantums in an image channel The
      unsharpmaskChannel
      ++ name="unsharpmaskChannel">unsharpmaskChannel
      +       		const ChannelType + channel_, const double radius_, const double sigma_, const double +-amount_, const double threshold_
      ++amount_, const double threshold_
      +       		Sharpen an image + channel using the unsharp mask algorithm. The const string &imageSpec_Write image to a file using filename imageSpec_ +-.
      ++.
      + Caution: if + an image format is selected which is capable of supporting fewer + colors than the original image or quantization has been requested, the +@@ -1643,7 +1643,7 @@ original if this is a problem.
      + +@@ -1747,7 +1747,7 @@ image.density(Geometry(150,150)); // could also use image.density("150x150") + image.write(filename) + + The supported image attributes and the method arguments required to +-obtain them are shown in the following table:
      ++obtain them are shown in the following table:
      + +
        + +@@ -1790,7 +1790,7 @@ and Postscript or TrueType fonts. Enabled by default. + + + +@@ -1804,7 +1804,7 @@ sequence of GIF images within Netscape. + + + +@@ -1815,12 +1815,12 @@ sequence of GIF images within Netscape. + + + +- + + +@@ -1829,13 +1829,13 @@ image attribute. Any number of named attributes may be attached to the + image. For example, the image comment is a named image attribute with + the name "comment". EXIF tags are attached to the image as named + attributes. Use the syntax "EXIF:<tag>" to request an EXIF tag +-similar to "EXIF:DateTime".
        ++similar to "EXIF:DateTime".
        + + + + + +@@ -1847,7 +1847,7 @@ similar to "EXIF:DateTime".
        + + + +@@ -1926,16 +1926,16 @@ shared by all Image objects. + + + + + + + + + + + +@@ -1967,7 +1967,7 @@ y=0.06) + + + +@@ -1979,7 +1979,7 @@ y=0.6) + + + +@@ -1991,7 +1991,7 @@ y=0.33) + + + +@@ -2051,14 +2051,14 @@ are close to the target color in RGB space. + + + +- +- +- + + + +@@ -2117,7 +2117,7 @@ composition is implicitly used (such as for image flattening). + + + + + + +- + + + + + + +- + + + + + +@@ -2371,14 +2371,14 @@ color difference. + + +- + + +@@ -2403,7 +2403,7 @@ International Color Consortium for the format of ICC color profiles.< + + + + + + +@@ -2490,16 +2490,16 @@ to true and the image has just been quantized. + + + + + + + + + +@@ -2523,7 +2523,7 @@ using this method.
        + + + +@@ -2535,7 +2535,7 @@ Only valid for montage images. + + + +@@ -2548,7 +2548,7 @@ is set to true and the image has just been quantized. + + + +@@ -2560,18 +2560,18 @@ is set to true and the image has just been quantized. + + + + +- ++ + + + + +@@ -2582,7 +2582,7 @@ turning the right way up.
        + + + + + +@@ -2625,19 +2625,19 @@ image (such as for a scene in an animation)

        + + + +- +- + + + + +@@ -2652,7 +2652,7 @@ profile. Valid names include "*", + + + +@@ -2666,7 +2666,7 @@ option will have any duplicate or unused colors removed. + + + + + + +@@ -2702,7 +2702,7 @@ be set for this option to take effect. + + + +@@ -2716,7 +2716,7 @@ may be used to manually adjust the tree depth. + + + + + + + + + +- +- +- + + + +@@ -3040,7 +3040,7 @@ modified, the Image's modifyImage() metho + should be invoked to reduce the reference count on the underlying image + to one. If this is not done, then it is possible for a previous + generation of the image to be modified due to the use of reference +-counting when copying or constructing an Image.
        ++counting when copying or constructing an Image.
        +

        +

        Depending on the capabilities of the operating system, and the + relationship of the window to the image, the pixel cache may be a copy +@@ -3076,7 +3076,7 @@ image.syncPixels(); + image.write("horse.png"); + +

        +-

        The image cache supports the following methods:
        ++

        The image cache supports the following methods:
        + +

          Image Attributes
          +
          animation- +-
          ++
          + Delay
          +           		size_t (0 to 65535)
          +
          animation- +-
          ++
          + Iterations
          +           		size_t
          attribute
          ++ name="attribute">attribute
          +           		string
          ++           		string
          +           		const +-std::string name_
          ++std::string name_
          +           		const + std::string name_, const std::string value_
          +
          background- +-
          ++
          + Color
          +           		Color
          +
          background- +-
          ++
          + Texture
          +           		string
          channelDepth
          ++ name="channelDepth">channelDepth
          +           		size_t +-
          ++
          +           		const +-ChannelType channel_
          ++ChannelType channel_
          +           		const ChannelType +-channel_, const size_t depth_
          ++channel_, const size_t depth_
          +           		Channel modulus depth. + The channel modulus depth represents the minimum number of bits +@@ -1949,13 +1949,13 @@ not altered. There is no attribute associated with the modulus depth so + the current modulus depth is obtained by inspecting the pixels. As a + result, the depth returned may be less than the most recently set + channel depth. Subsequent image processing may result in increasing the +-channel depth.
          ++channel depth.
          +
          +
          chroma- +-
          ++
          + BluePrimary
          +           		double x & y
          +
          chroma- +-
          ++
          + GreenPrimary
          +           		double x & y
          +
          chroma- +-
          ++
          + RedPrimary
          +           		double x & y
          +
          chroma- +-
          ++
          + WhitePoint
          +           		double x & y
          +-
          colorMapSize
          ++
          colorMapSize
          +
          +
          		size_t
          ++           		size_t
          +           		void
          ++           		void
          +           		size_t entries_
          ++           		size_t entries_
          +           		Number of entries in the + colormap. Setting the colormap size may extend or truncate the +@@ -2067,7 +2067,7 @@ The maximum number of supported entries is specified by the MaxColormapSize
          ++ensure that the image colormap indexes reference valid colormap entries.
          +
          +
          compress- +-
          ++
          + Type
          +           		CompressionType +@@ -2141,16 +2141,16 @@ from ImageMagick as it executes.
          defineValue
          ++ name="defineValue">defineValue
          +           		string
          ++           		string
          +           		const std::string +-&magick_, const std::string &key_
          ++&magick_, const std::string &key_
          +           		const std::string + &magick_, const std::string &key_, const std::string +-&value_
          ++&value_
          +           		Set or obtain a + definition string to applied when encoding or decoding the specified +@@ -2159,20 +2159,20 @@ is designated by the magick_ + argument, the format-specific key is designated by key_, and the associated value is + specified by value_. See the +-defineSet() method if the key must be removed entirely.
          ++defineSet() method if the key must be removed entirely.
          +
          defineSet
          ++ name="defineSet">defineSet
          +           		bool
          ++           		bool
          +           		const std::string +-&magick_, const std::string &key_
          ++&magick_, const std::string &key_
          +           		const std::string +-&magick_, const std::string &key_, bool flag_
          ++&magick_, const std::string &key_, bool flag_
          +           		Set or obtain a + definition flag to applied when encoding or decoding the specified +@@ -2183,7 +2183,7 @@ creates a value-less define with that format and key. Passing the flag_ + value 'false' removes any existing matching definition. The method + returns 'true' if a matching key exists, and 'false' if no matching key +-exists.
          ++exists.
          +
          +
          gifDispose- +-
          ++
          + Method
          +           		size_t
          +- { 0 = Disposal not specified,
          +- 1 = Do not dispose of graphic,
          ++           		size_t
          ++ { 0 = Disposal not specified,
          ++ 1 = Do not dispose of graphic,
          + 3 = Overwrite graphic with background color, +-
          ++
          + 4 = Overwrite graphic with previous graphic. }          		voidsize_t disposeMethod_
          +
          interlace- +-
          ++
          + Type
          +           		InterlaceType +@@ -2478,7 +2478,7 @@ an opaque one.
          +
          meanError- +-
          ++
          + PerPixel
          +           		double
          modulusDepth
          ++ size="-1">modulusDepth
          +           		size_t +-
          ++
          +           		void
          ++ size="-1">void
          +           		size_t +-depth_
          ++depth_
          +           		Image + modulus depth (minimum number of bits required to support +@@ -2508,7 +2508,7 @@ depth may be decreased by supplying a value which is less than the + current value, updating the pixels (reducing accuracy) to the new + depth. + The pixel modulus depth can not be increased over the current value +-using this method.
          ++using this method.
          +
          +
          montage- +-
          ++
          + Geometry
          +           		Geometry
          +
          normalized- +-
          ++
          + MaxError
          +           		double
          +
          normalized- +-
          ++
          + MeanError
          +           		double
          orientation
          ++ name="orientation">orientation
          +           		OrientationTypevoid
          ++ href="https://www.imagemagick.org/Magick++/Enumerations.html#OrientationType">OrientationType          		void
          +           		OrientationType + orientation_Image orientation. + Supported by some file formats such as DPX and TIFF. Useful for +-turning the right way up.
          ++turning the right way up.
          +
          void The number of runlength-encoded packets in +-
          ++
          + the image
          +-
          profile
          ++
          profile
          +
          +
          		Blob
          ++           		Blob
          +           		const std::string name_
          ++           		const std::string name_
          +           		const std::string name_, const Blob +-&colorProfile_
          ++&colorProfile_
          +           		Get/set/remove a named + profile. Valid names include "*", +-"8BIM", "ICM", "IPTC", or a user/format-defined profile name.
          ++"8BIM", "ICM", "IPTC", or a user/format-defined profile name.
          +
          +
          quantize- +-
          ++
          + Colors
          +           		size_t
          +
          quantize- +-
          ++
          + ColorSpace
          +           		ColorspaceType +@@ -2683,7 +2683,7 @@ results when color reducing an image.
          +
          quantize- +-
          ++
          + Dither
          +           		bool
          +
          quantize- +-
          ++
          + TreeDepth
          +           		size_t
          +
          rendering- +-
          ++
          + Intent
          +           		RenderingIntent +@@ -2729,7 +2729,7 @@ render_
          +
          resolution- +-
          ++
          + Units
          +           		ResolutionType +@@ -2908,14 +2908,14 @@ stroke (outlines).
          +-
          textEncoding
          ++
          textEncoding
          +
          +
          		string
          ++           		string
          +           		void
          ++           		void
          +           		const std::string &encoding_
          ++           		const std::string &encoding_
          +           		Specify the code set to use for text + annotations. The only character encoding which may be specified at +@@ -2923,7 +2923,7 @@ this time is "UTF-8" for representing Unicode as a + sequence of bytes. Specify an empty string to use the default ASCII + encoding. Successful text annotation using Unicode may require fonts +-designed to support Unicode.
          ++designed to support Unicode.
          +
          + diff --git a/debian/patches/0002-Fix-api-Image-.html.patch b/debian/patches/0002-Fix-api-Image-.html.patch new file mode 100644 index 0000000000000000000000000000000000000000..f4b43e490f4feb54465f57b5272e2995b51854ef --- /dev/null +++ b/debian/patches/0002-Fix-api-Image-.html.patch @@ -0,0 +1,79 @@ +From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= +Date: Wed, 14 Dec 2016 15:18:12 +0100 +Subject: Fix api/Image++.html + +Forwarded: Yes, https://github.com/ImageMagick/ImageMagick/issues/304 +--- + www/api/Image++.html | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +diff --git a/www/api/Image++.html b/www/api/Image++.html +index cdf4f52..70acc18 100644 +--- a/www/api/Image++.html ++++ b/www/api/Image++.html +@@ -147,7 +147,7 @@ int main(int argc,char **argv) + // Write the image to a file + image.write( "x.gif" ); + } +- catch( Exception &error_ ) ++ catch( Exception &error_ ) + { + cout << "Caught exception: " << error_.what() << endl; + return 1; +@@ -171,8 +171,8 @@ following: +
        • Write the third image to a file.
          • + + 
          +-#include  
+-#include  
++#include <Magick++.h> 
++#include <iostream> 
+ using namespace std; 
+ using namespace Magick; 
+ int main(int argc,char **argv) 
+@@ -195,7 +195,7 @@ and the image data is never copied.
+ a 100 by 100 pixel white image with a red pixel in the center and
+ writes it to a file: 
          
+ 
          +-#include  
++#include <Magick++.h> 
+ using namespace std; 
+ using namespace Magick; 
+ int main(int argc,char **argv) 
+@@ -214,7 +214,6 @@ image.quantizeColorSpace( GRAYColorspace );
+ image.quantizeColors( 256 ); 
+ image.quantize( );
+ 
          
+-
          
+ 
          or, more simply: 
          
+ 
          +  image.type( GrayscaleType );
+@@ -238,7 +237,7 @@ a constructor or 
+-#include  
++#include <Magick++.h> 
+ using namespace std; 
+ using namespace Magick; 
+ int main(int argc,char **argv) 
+@@ -250,7 +249,7 @@ int main(int argc,char **argv)
+   // Write to BLOB in JPEG format 
+   Blob blob; 
+   image.magick( "JPEG" ) // Set JPEG output format 
+-  image.write( &blob );
++  image.write( &blob );
+ 
+   [ Use BLOB data (in JPEG format) here ]
+ 
+@@ -784,8 +783,8 @@ background color.
+     
+
          + +- ++
          extent
          ++           + + + diff --git a/debian/patches/0003-Fix-www-api-mophologie.html.patch b/debian/patches/0003-Fix-www-api-mophologie.html.patch new file mode 100644 index 0000000000000000000000000000000000000000..4b3367bbc38cccf815cd400b6eddecee5c3add40 --- /dev/null +++ b/debian/patches/0003-Fix-www-api-mophologie.html.patch @@ -0,0 +1,31 @@ +From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= +Date: Wed, 14 Dec 2016 15:23:11 +0100 +Subject: Fix www/api/mophologie.html + +Forwarded: Yes, https://github.com/ImageMagick/ImageMagick/issues/304 +--- + www/api/morphology.html | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/www/api/morphology.html b/www/api/morphology.html +index 1ea7f7f..1bd389c 100644 +--- a/www/api/morphology.html ++++ b/www/api/morphology.html +@@ -333,7 +333,7 @@ + 
                 "-set option:convolve:scale {geometry}" setting.
+
          + +-

          ++

          + +

          ScaleKernelInfo

          + +@@ -433,7 +433,7 @@ + 
                 the given kernel.
+
          + +-

          ++

          + +

          ZeroKernelNans

          + diff --git a/debian/patches/0004-Fix-www-command-line-options.html.patch b/debian/patches/0004-Fix-www-command-line-options.html.patch new file mode 100644 index 0000000000000000000000000000000000000000..991dc9b7c1fd0c58fb19eb80c3758dcf405a00f2 --- /dev/null +++ b/debian/patches/0004-Fix-www-command-line-options.html.patch @@ -0,0 +1,740 @@ +From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= +Date: Wed, 14 Dec 2016 15:26:15 +0100 +Subject: Fix www/command-line-options.html + +Forwarded: Yes, https://github.com/ImageMagick/ImageMagick/issues/304 +--- + www/command-line-options.html | 720 +++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 719 insertions(+), 1 deletion(-) + +diff --git a/www/command-line-options.html b/www/command-line-options.html +index 626e9ca..befc68f 100644 +--- a/www/command-line-options.html ++++ b/www/command-line-options.html +@@ -1887,7 +1887,725 @@ is case-dependent.

          + +

          Such settings are global in scope, and affect all images and operations.

          + +-

          See ImageMagick Defines for a list of recognized defines. For example:

          ++

          The following definitions are just some of the artifacts that are ++available:

          ++ ++
          Image Cache Methods
          +-
          extent
          		const Geometry &geometry_const Geometry &geometry_extends the image as defined by the geometry, gravity, and image background color.
          ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
          auto-threshold:verbosereturn derived threshold as the auto-threshold:threshold image property.
          bmp3:alpha=true|falseinclude any alpha channel when writing in the BMP image format.
          bmp:format=value valid values are bmp2, bmp3, ++ and bmp4. This option can be useful when the ++ method of prepending "BMP2:" to the output filename is inconvenient or ++ is not available, such as when using the mogrify utility.
          bmp:subtype=RGB555|RGB565|ARGB4444|ARGB1555BMP channel depth subtypes. Only support in BMP (BMP4). BMP3 and BMP2 do not ++ contain header fields to support these options.
          colorspace:auto-grayscale=on|offprevent automatic conversion to grayscale inside coders that support ++ grayscale. This should be accompanied by -type truecolor. PNG and TIF do ++ not need this define. With PNG, just use PNG24:image. With TIF, just use ++ -type truecolor. JPG and PSD will need this define.
          complex:snr=valueSet the divide SNR constant-complex
          compose:args=argumentsSets certain compose argument values when using convert ... -compose ... ++ -composite. See Image Composition
          compose:clamp=on|offset each pixel whose value is below zero to zero and any the pixel whose value is above the quantum range to the quantum range (e.g. 65535) otherwise the pixel value remains unchanged. Define supported in ImageMagick 6.9.1-3 and above.
          compose:outside-overlay=true|falseSome -compose methods can modify the 'destination' image outside the overlay area. It is disabled by default.
          connected-components:area-threshold=valueMerges any region with area smaller than value into its surrounding region or largest neighbor.
          connected-components:keep=list-of-idsComma and/or hyphenated list of id values to keep in the output. Supported in Imagemagick 6.9.3-0.
          connected-components:mean-color=trueChanges the output image from id values to mean color values. Supported in Imagemagick 6.9.2-8.
          connected-components:remove=list-of-idsComma and/or hyphenated list of id values to remove from the output. Supported in Imagemagick 6.9.2-9.
          connected-components:verbose=trueLists id, bounding box, centroid, area, mean color for each region.
          convolve:scale={kernel_scale}[!^] [,{origin_addition}] [%]Defines the kernel scaling. The special flag ! automatically scales to ++ full dynamic range. The ! flag can be used in combination with a factor or ++ percent. The factor or percent is then applied after the automatic scaling. ++ An example is 50%!. This produces a result 50% darker than full dynamic ++ range scaling. The ^ flag assures the kernel is 'zero-summing', for ++ example when some values are positive and some are negative as in edge ++ detection kernels. The origin addition adds that value to the center ++ pixel of the kernel. This produces an effect that is like adding the image ++ that many times to the result of the filtered image. The typical value ++ is 1 so that the original image is added to the result of the convolution. ++ The default is 0.
          convolve:showKernel=1Outputs (to 'standard error') all the information about a specified -morphology convolve kernel.
          dcm:display-range=resetSets the display range to the minimum and maximum pixel values for the ++ DCM image format.
          dds:cluster-fit=true|falseEnables the dds cluster-fit.
          dds:compression=dxt1|dxt5|noneSets the dds compression.
          dds:mipmaps=valueSets the dds number of mipmaps.
          dds:weight-by-alpha=true|falseEnables the dds alpha weighting.
          deskew:auto-crop=trueauto crop the image after deskewing.
          delegate:bimodal=trueSpecifies direct conversion from Postscript to PDF.
          distort:scale=valueSets the output scaling factor for use with -distort
          distort:viewport=WxH+X+YSets the viewport for use with -distort
          dither:diffusion-amount=X%Sets the amount of diffusion to use with Floyd-Steinberg diffusion
          dot:layout-engine=valueSpecifies the layout engine for the DOT image format (e.g. ++ neato).
          exr:color-type=valueSpecifies the color type for the EXR format: RGB, RGBA, YC, YCA, Y, YA, R, G, B, A).
          filter:option=valueSet a filter option for use with -resize. ++ See -filter for details.
          fourier:normalize=inverseSets the location for the FFT/IFT normalization as use by ++ +-fft and +-ift. The default is ++ forward.
          h:format=valueSet the image encoding format use when writing a C-style header. ++ format can be any output format supported by ImageMagick ++ except for h and magick. If this ++ option is omitted, the default is GIF for PseudoClass ++ images and PNM for DirectClass images. ++
          hough-lines:accumulator=trueReturns the accumulator image in addition to the lines image
          icon:auto-resizeAutomatically stores multiple sizes when writing an ico image ++ (requires a 256x256 input image).
          identify:locate=minimum|maximumLocates the coordinates of one or more image minimum or maximum
          identify:limit=numberLocates the coordinates for the number of minima or maxima specified
          jp2:layer-number=valueSets the maximum number of quality layers to decode. Same for JPT, JC2, ++ and J2K
          jp2:number-resolutions=valueSets the number of resolutions to encode.Same for JPT, JC2, and J2K
          jp2:progression-order=valuechoose from LRCP, RLCP, RPCL, PCRL or CPRL. Same for JPT, JC2, and ++ J2K
          jp2:quality=value,value...Sets the quality layer PSNR, given in dB. The order is from left to ++ right in ascending order. The default is a single lossless quality layer. ++ Same for JPT, JC2, and J2K
          jp2:rate=valueSpecify the compression factor to use while writing JPEG-2000 files. The compression factor is the reciprocal of the compression ratio. The valid ++ range is 0.0 to 1.0, with 1.0 indicating lossless compression. If defined, ++ this value overrides the -quality setting. A quality setting of 75 ++ results in a rate value of 0.06641. Same for JPT, JC2, and J2K
          jp2:reduce-factor=valueSets the number of highest resolution levels to be discarded.Same for ++ JPT, JC2, and J2K
          jpeg:block-smoothing=on|off
          jpeg:colors=valueSet the desired number of colors and let the JPEG encoder do the ++ quantizing.
          jpeg:dct-method=valueChoose from default, fastest, ++ float, ifast, and islow.
          jpeg:extent=valueRestrict the maximum JPEG file size, for example -define ++ jpeg:extent=400KB. The JPEG encoder will search for the highest ++ compression quality level that results in an output file that does not ++ exceed the value. The -quality option also will be respected ++ starting with version 6.9.2-5. Between 6.9.1-0 and 6.9.2-4, add -quality ++ 100 in order for the jpeg:extent to work properly. Prior to 6.9.1-0, the ++ -quality setting was ignored.
          jpeg:fancy-upsampling=on|off
          jpeg:optimize-coding=on|off
          jpeg:q-table=table
          jpeg:sampling-factor=sampling-factor-string
          jpeg:size=geometrySet the size hint of a JPEG image, for ++ example, -define jpeg:size=128x128. ++ It is most useful for increasing performance and reducing the memory ++ requirements when reducing the size of a large JPEG image.
          json:featuresincludes features in verbose information
          json:limit
          json:locate
          json:momentsincludes image moments in verbose information
          magick:format=valueSet the image encoding format use when writing a C-style header. ++ This is the same as "h:format=format" described above.
          mng:need-cacheoffturn playback caching off for streaming MNG.
          morphology:compose=compose-methodSpecifies how to merge results generated by multiple-morphology kernel. The default is none. One ++ typical value is 'lighten' as used, for example, with the sobel edge ++ kernels.
          morphology:showKernel=1Outputs (to 'standard error') all the information about a generated -morphology kernel.
          pcl:fit-to-page=true
          pdf:fit-page=geometry geometry specifies the scaling dimensions for resizing when the PDF is ++ being read. The geometry is either WxH{%} or page size. No offsets are ++ allowed. (introduced in IM 6.8.8-8)
          pdf:fit-to-page=true
          pdf:use-cropbox=true
          pdf:use-trimbox=true
          pdf:stop-on-error=true
          pdf:pdf:page-direction=right-to-left
          png:bit-depth=value
          png:color-type=valuedesired bit-depth and color-type for PNG output. You can force the PNG encoder to use a different bit-depth and color-type than it would have ++ normally selected, but only if this does not cause any loss of image ++ quality. Any attempt to reduce image quality is treated as an error and no ++ PNG file is written. E.g., if you have a 1-bit black-and-white image, you ++ can use these "defines" to cause it to be written as an 8-bit grayscale, ++ indexed, or even a 64-bit RGBA. But if you have a 16-million color image, ++ you cannot force it to be written as a grayscale or indexed PNG. If you ++ wish to do this, you must use the appropriate -depth, ++ -colors, or -type directives to ++ reduce the image quality prior to using the PNG encoder. Note that in ++ indexed PNG files, "bit-depth" refers to the number of bits per index, ++ which can be 1, 2, 4, or 8. In such files, the color samples always have ++ 8-bit depth.
          png:compression-filter=value valid values are 0 through 9. 0-4 are the corresponding PNG filters, ++ 5 means adaptive filtering except for images with a colormap, 6 means ++ adaptive filtering for all images, 7 means MNG "loco" compression, 8 means ++ Z_RLE strategy with adaptive filtering, and 9 means Z_RLE strategy with no ++ filtering.
          png:compression-level=value valid values are 0 through 9, with 0 providing the least but fastest ++ compression and 9 usually providing the best and always the slowest.
          png:compression-strategy=value valid values are 0 through 4, meaning default, filtered, huffman_only, ++ rle, and fixed ZLIB compression strategy. If you are using an old zlib ++ that does not support Z_RLE (before 1.2.0) or Z_FIXED (before 1.2.2.2), ++ values 3 and 4, respectively, will use the zlib default strategy ++ instead.
          png:format=value valid values are png8, png24, ++ png32, png48, ++ png64, and png00. ++ This property can be useful for specifying ++ the specific PNG format to be used, when the usual method of prepending the ++ format name to the output filename is inconvenient, such as when writing ++ a PNG-encoded ICO file or when using mogrify. ++ Value = png8 reduces the number of colors to 256, ++ only one of which may be fully transparent, if necessary. The other ++ values do not force any reduction of quality; it is an error to request ++ a format that cannot represent the image data without loss (except that ++ it is allowed to reduce the bit-depth from 16 to 8 for all formats). ++ Value = png24 and png48 ++ allow transparency, only if a single color is fully transparent and that ++ color does not also appear in an opaque pixel; such transparency is ++ written in a PNG tRNS chunk. ++ Value = png00 causes the image to inherit its ++ color-type and bit-depth from the input image, if the input was also ++ a PNG.
          png:exclude-chunk=value
          png:include-chunk=valueancillary chunks to be excluded from or included in PNG output. ++ ++

          The value can be the name of a PNG chunk-type such ++ as bKGD, a comma-separated list of chunk-names ++ (which can include the word date, the word ++ all, or the word none). ++ Although PNG chunk-names are case-dependent, you can use all lowercase ++ names if you prefer.

          ++ ++

          The "include-chunk" and "exclude-chunk" lists only affect the behavior ++ of the PNG encoder and have no effect on the PNG decoder.

          ++ ++

          As a special case, if the sRGB chunk is excluded and ++ the gAMA chunk is included, the gAMA chunk will ++ only be written if gamma is not 1/2.2, since most decoders assume ++ sRGB and gamma=1/2.2 when no colorspace information is included in ++ the PNG file. Because the list is processed from left to right, you ++ can achieve this with a single define:

          ++ ++
          -define png:include-chunk=none,gAMA
++
          ++ ++

          As a special case, if the sRGB chunk is not excluded and ++ the PNG encoder recognizes that the image contains the sRGB ICC profile, ++ the PNG encoder will write the sRGB chunk instead of the ++ entire ICC profile. To force the PNG encoder to write the sRGB ++ profile as an iCCP chunk in the output PNG instead of the ++ sRGB chunk, exclude the sRGB chunk.

          ++ ++

          The critical PNG chunks IHDR, PLTE, ++ IDAT, and IEND cannot be excluded. Any such ++ entries appearing in the list will be ignored.

          ++ ++

          If the ancillary PNG tRNS chunk is excluded and the ++ image has transparency, the PNG colortype is forced to be 4 or 6 ++ (GRAY_ALPHA or RGBA). If the image is not transparent, then the ++ tRNS chunk isn't written anyhow, and there is no effect ++ on the PNG colortype of the output image.

          ++ ++

          The -strip option does the equivalent of the ++ following for PNG output:

          ++ ++
          -define png:exclude-chunk=EXIF,iCCP,iTXt,sRGB,tEXt,zCCP,zTXt,date
++
          ++ ++

          The default behavior is to include all known PNG ancillary chunks ++ plus ImageMagick's private vpAg ("virtual page") chunk, ++ and to exclude all PNG chunks that are unknown to ImageMagick, ++ regardless of their PNG "copy-safe" status as described in the ++ PNG specification.

          ++ ++

          Any chunk names that are not known to ImageMagick are ignored ++ if they appear in either the "include-chunk" or "exclude-chunk" list. ++ The ancillary chunks currently known to ImageMagick are ++ bKGD, cHRM, gAMA, iCCP, ++ oFFs, pHYs, sRGB, tEXt, ++ tRNS, vpAg, and zTXt.

          ++ ++

          You can also put date in the list to include or exclude ++ the "Date:create" and "Date:modify" text chunks that ImageMagick normally ++ inserts in the output PNG.

          png:ignore-crc[=true]When you know your image has no CRC or ADLER32 errors, this can speed up ++ decoding. It is also helpful in debugging bug reports from "fuzzers"
          png:preserve-colormap[=true]Use the existing image->colormap. Normally the PNG encoder will ++ try to optimize the palette, eliminating unused entries and putting ++ the transparent colors first. If this flag is set, that behavior ++ is suppressed.
          png:preserve-iCCP[=true]By default, the PNG decoder and encoder examine any ICC profile ++ that is present, either from an iCCP chunk in the PNG ++ input or supplied via an option, and if the profile is recognized ++ to be the sRGB profile, converts it to the sRGB chunk. ++ You can use -define png:preserve-iCCP to prevent ++ this from happening; in such cases the iCCP chunk ++ will be read or written and no sRGB chunk will be ++ written. There are some ICC profiles that claim to be sRGB but ++ have various errors that cause them to be rejected by libpng16; such ++ profiles are recognized anyhow and converted to the sRGB ++ chunk, but are rejected if the -define png:preserve-iCCP ++ is present. Note that not all "sRGB" ICC profiles are recognized ++ yet; we will add them to the list as we encounter them.
          png:swap-bytes[=true]The PNG specification requires that any multi-byte integers be stored in network byte order (MSB-LSB endian). This option allows you to ++ fix any invalid PNG files that have 16-bit samples stored incorrectly ++ in little-endian order (LSB-MSB). The "-define png:swap-bytes" option ++ must appear before the input filename on the commandline. The swapping ++ is done during the libpng decoding operation.
          profile:skip=name1,name2,...Skip the named profile[s] when reading the image. Use skip="*" to ++ skip all named profiles in the image. Many named profiles exist, ++ including ICC, EXIF, APP1, IPTC, XMP, and others.
          ps:imagemaskIf the ps:imagemask flag is defined, the PS3 and EPS3 coders will ++ create Postscript files that render bilevel images with the Postscript ++ imagemask operator instead of the image operator.
          psd:additional-info=all|selectiveThis option should only be used when converting from a PSD file to another PSD file. This should be placed after the image is read. The two options are 'all' and 'selective'. The 'selective' option will preserve all additional information that is not related to the geometry of the image. The 'all' option should only be used when the geometry of the image has not been changed. This option is helpful when transferring non-simple layers, such as adjustment layers from the input PSD file to the output PSD file. If this option is not used, the additional information will not be preserved. This define is available as of Imagemagick version 6.9.5-8. ++
          psd:alpha-unblend=offDisables new automatic un-blending of transparency with the base image ++ for the flattened layer 0 before adding the alpha channel to the output ++ image. This define must be placed before the input psd image. (Available ++ as of IM 6.9.2.5). The automatic un-blending is new to IM 6.9.2.5 and ++ prevents the transparency from being applied twice in the output ++ image. This option should be set before reading the image.
          psd:preserve-opacity-mask=trueThis option should only be used when converting from a PSD file to another PSD file. It will preserve the opacity mask of a layer and add it back to the layer when the image is saved. Setting this to 'true' will enable this feature. This define is available as of Imagemagick version 6.9.5-10. ++
          preserve-timestamp={True, False}Preserve file timestamp (mogrify only).
          q-table=quantization-table.xmlCustom JPEG quantization tables.
          quantum:format=typeSet the type to floating-point to specify a floating-point ++ format for raw files (e.g. GRAY:) or for MIFF and TIFF images in HDRI mode ++ to preserve negative values. If -depth 16 is ++ included, the result is a single precision floating point format. ++ If -depth 32 is included, the result is ++ double precision floating point format. For signed pixel data, use -define quantum:format=signed.
          quantum:polarity=photometric-interpretationSet the photometric-interpretation of an image (typically for TIFF ++ image file format) to either min-is-black (default) or ++ min-is-white.
          sample:offset=geometryLocation of the sampling point within the sub-region being sampled, ++ expressed as percentages (see -sample).
          showKernel=1Outputs (to 'standard error') all the information about a generated -morphology kernel.
          stream:buffer-size=valueSet the stream buffer size. Select 0 for unbuffered I/O.
          tiff:alpha=associated|unassociated|unspecifiedSpecify the alpha extra samples as associated, unassociated or ++ unspecified
          tiff:endian=msb|lsb
          tiff:exif-properties=trueEnables reading the EXIF properties.
          tiff:fill-order=msb|lsb
          tiff:ignore-layers=trueIgnores the photoshop layers.
          tiff:ignore-tags=comma-separate-list-of-tag-IDsAllows one or more tag ID values to be ignored.
          tiff:predictor=[1, 2 or 3]A mathematical operator that is applied to the image data before an encoding scheme is applied. The general idea is that subsequent pixels of an image resemble each other. Thus, substracting the information from a pixel that is already contained in previous one is likely to reduce its information density considerably and aid subsequent compression. 1 = No prediction scheme used before coding. 2 = Horizontal differencing. 3 = Floating point horizontal differencing.
          tiff:rows-per-strip=valueSets the number of rows per strip
          tiff:tile-geometry=WxHSets the tile size for pyramid tiffs. Requires the suffix ++ PTIF: before the outputname
          type:features=string
          type:hinting=off
          txt:compliance=cssThe first argument of a hsl() color is integer, not percentage
          x:screen=trueObtains the image from the root window
          x:silent=trueTurns off the beep when importing an image
          ++ ++

          For example, to create a postscript file that will render only the black ++pixels of a bilevel image, use:

          + +

            convert bilevel.tif -define ps:imagemask eps3:stencil.ps +

          diff --git a/debian/patches/0005-Use-modern-idiom-for-autoconf.patch b/debian/patches/0005-Use-modern-idiom-for-autoconf.patch new file mode 100644 index 0000000000000000000000000000000000000000..bca14bbef86e75866107e1e1996c056872a8afa1 --- /dev/null +++ b/debian/patches/0005-Use-modern-idiom-for-autoconf.patch @@ -0,0 +1,38 @@ +From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= +Date: Tue, 15 Sep 2015 22:01:13 +0200 +Subject: Use modern idiom for autoconf + +Forwarded: yes, https://github.com/ImageMagick/ImageMagick/issues/305 +--- + configure.ac | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a3879a9..df82b55 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -207,9 +207,9 @@ AC_SUBST([SBIN_DIR]) + eval "eval LIBEXEC_DIR=$libexecdir" + AC_SUBST([LIBEXEC_DIR]) + eval "eval DATA_DIR=$datadir" +-AC_SUBST([DATA_DIR]) +-eval "eval DOC_DIR=$datadir/doc" +-AC_SUBST([DOC_DIR]) ++AC_SUBST(DATA_DIR) ++eval "eval DOC_DIR=$docdir" ++AC_SUBST(DOC_DIR) + eval "eval SYSCONF_DIR=$sysconfdir" + AC_SUBST([SYSCONF_DIR]) + eval "eval SHAREDSTATE_DIR=$sharedstatedir" +@@ -3047,9 +3047,8 @@ AC_SUBST([FILTER_PATH]) + + # + # Path to ImageMagick documentation files +-DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${MAGICK_MAJOR_VERSION}" +-DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}" +-DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/" ++DOCUMENTATION_PATH="${DOC_DIR}" ++DEFINE_DOCUMENTATION_PATH="${DOC_DIR}" + case "${build_os}" in + mingw* ) + DEFINE_DOCUMENTATION_PATH=`$WinPathScript "$DEFINE_DOCUMENTATION_PATH" 1` diff --git a/debian/patches/0006-Allow-distribution-to-custumize-the-html-pointer-to-.patch b/debian/patches/0006-Allow-distribution-to-custumize-the-html-pointer-to-.patch new file mode 100644 index 0000000000000000000000000000000000000000..0315774088be5426d9d6e6cdf0452b91a893a17c --- /dev/null +++ b/debian/patches/0006-Allow-distribution-to-custumize-the-html-pointer-to-.patch @@ -0,0 +1,199 @@ +From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= +Date: Fri, 2 Feb 2018 22:17:26 +0100 +Subject: Allow distribution to custumize the html pointer to documentation + +Allow to say on debian system you might install the imagemagick-doc package + +Forwarded: yes, https://github.com/ImageMagick/ImageMagick/issues/305 +Bug-debian: https://bugs.debian.org/727739 +--- + configure.ac | 12 ++++++++++++ + utilities/conjure.1.in | 4 ++-- + utilities/convert.1.in | 5 +++-- + utilities/display.1.in | 4 ++-- + utilities/identify.1.in | 4 ++-- + utilities/import.1.in | 4 ++-- + utilities/mogrify.1.in | 4 ++-- + utilities/montage.1.in | 5 +++-- + utilities/stream.1.in | 5 +++-- + 9 files changed, 31 insertions(+), 16 deletions(-) + +diff --git a/configure.ac b/configure.ac +index df82b55..a7838b0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3057,6 +3057,18 @@ esac + AC_DEFINE_UNQUOTED([DOCUMENTATION_PATH],["$DEFINE_DOCUMENTATION_PATH"],[Directory where ImageMagick documents live.]) + AC_SUBST([DOCUMENTATION_PATH]) + ++ ++# ++# Add distribution specific string for documentation ++AC_ARG_WITH([extra-doc-dir], ++ [AC_HELP_STRING([--with-extra-doc-dir=""], ++ [extra documentation dir could be overriden by distribution, for instance by " (you may install the imagemagick-doc package)"])], ++ [extra_doc_dir="$withval"], ++ [extra_doc_dir=""]) ++AC_DEFINE_UNQUOTED(EXTRA_DOC_DIR,"$EXTRA_DOC_DIR",[Extra documentation dir could be overriden by distribution, for instance by " (you may install th imagemagick-doc package)"]) ++AC_SUBST(EXTRA_DOC_DIR,$extra_doc_dir) ++ ++ + # + # Enable/Disable documentation + AC_ARG_ENABLE([docs], +diff --git a/utilities/conjure.1.in b/utilities/conjure.1.in +index 9e0abb5..bb1dfba 100644 +--- a/utilities/conjure.1.in ++++ b/utilities/conjure.1.in +@@ -7,7 +7,7 @@ conjure \- interprets and executes scripts written in the Magick Scripting Langu + .SH OVERVIEW + The \fBconjure\fP program is a member of the ImageMagick(1) suite of tools. Use it to process a Magick Scripting Language (MSL) script. The Magick scripting language (MSL) will primarily benefit those that want to accomplish custom image processing tasks but do not wish to program, or those that do not have access to a Perl interpreter or a compiler. + +-For more information about the conjure command, point your browser to file://@DOCUMENTATION_PATH@/www/conjure.html or https://imagemagick.org/script/conjure.php. ++For more information about the conjure command, point your browser to file://@DOCUMENTATION_PATH@/www/conjure.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/conjure.php. + .SH DESCRIPTION + Image Settings: + \-monitor monitor progress +@@ -31,4 +31,4 @@ ImageMagick(1) + + .SH COPYRIGHT + +-\fBCopyright (C) 1999 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html or https://imagemagick.org/script/license.php\fP ++\fBCopyright (C) 1999-2021 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/license.php\fP +diff --git a/utilities/convert.1.in b/utilities/convert.1.in +index 41b7b63..d4f40f0 100644 +--- a/utilities/convert.1.in ++++ b/utilities/convert.1.in +@@ -7,7 +7,7 @@ convert \- convert between image formats as well as resize an image, blur, crop, + .SH OVERVIEW + The \fBconvert\fP program is a member of the ImageMagick(1) suite of tools. Use it to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. + +-For more information about the convert command, point your browser to file://@DOCUMENTATION_PATH@/www/convert.html or https://imagemagick.org/script/convert.php. ++For more information about the convert command, point your browser to file://@DOCUMENTATION_PATH@/www/convert.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/convert.php. + .SH DESCRIPTION + Image Settings: + \-adjoin join images into a single multi-image file +@@ -320,4 +320,5 @@ By default, the image format of `file' is determined by its magic number. To sp + ImageMagick(1) + + .SH COPYRIGHT +-\fBCopyright (C) 1999 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html or https://imagemagick.org/script/license.php\fP ++ ++\fBCopyright (C) 1999-2021 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/license.php\fP +diff --git a/utilities/display.1.in b/utilities/display.1.in +index 052b5a8..3c7c976 100644 +--- a/utilities/display.1.in ++++ b/utilities/display.1.in +@@ -7,7 +7,7 @@ display \- displays an image or image sequence on any X server. + .SH OVERVIEW + The \fBdisplay\fP program is a member of the ImageMagick(1) suite of tools. Use it to display an image or image sequence on any X server. + +-For more information about the display command, point your browser to file://@DOCUMENTATION_PATH@/www/display.html or https://imagemagick.org/script/display.php. ++For more information about the display command, point your browser to file://@DOCUMENTATION_PATH@/www/display.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/display.php. + .SH DESCRIPTION + Image Settings: + \-alpha option on, activate, off, deactivate, set, opaque, copy +@@ -136,4 +136,4 @@ ImageMagick(1) + + .SH COPYRIGHT + +-\fBCopyright (C) 1999 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html or https://imagemagick.org/script/license.php\fP ++\fBCopyright (C) 1999-2021 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/license.php\fP +diff --git a/utilities/identify.1.in b/utilities/identify.1.in +index dc08c22..a8ed0bd 100644 +--- a/utilities/identify.1.in ++++ b/utilities/identify.1.in +@@ -7,7 +7,7 @@ identify \- describes the format and characteristics of one or more image files. + .SH OVERVIEW + The \fBidentify\fP program is a member of the ImageMagick(1) suite of tools. It describes the format and characteristics of one or more image files. It also reports if an image is incomplete or corrupt. The information returned includes the image number, the file name, the width and height of the image, whether the image is colormapped or not, the number of colors in the image (by default off use \fI-define unique=true\fP option), the number of bytes in the image, the format of the image (JPEG, PNM, etc.), and finally the number of seconds it took to read and process the image. Many more attributes are available with the verbose option. + +-For more information about the identify command, point your browser to file://@DOCUMENTATION_PATH@/www/identify.html or https://imagemagick.org/script/identify.php. ++For more information about the identify command, point your browser to file://@DOCUMENTATION_PATH@/www/identify.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/identify.php. + .SH DESCRIPTION + Image Settings: + \-alpha option on, activate, off, deactivate, set, opaque, copy +@@ -78,4 +78,4 @@ ImageMagick(1) + + .SH COPYRIGHT + +-\fBCopyright (C) 1999 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html or https://imagemagick.org/script/license.php\fP ++\fBCopyright (C) 1999-2021 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/license.php\fP +\ No newline at end of file +diff --git a/utilities/import.1.in b/utilities/import.1.in +index 3c8e687..2f2a49b 100644 +--- a/utilities/import.1.in ++++ b/utilities/import.1.in +@@ -7,7 +7,7 @@ import \- saves any visible window on an X server and outputs it as an image fil + .SH OVERVIEW + The \fBimport\fP program is a member of the ImageMagick(1) suite of tools. Use it to capture some or all of an X server screen and save the image to a file. + +-For more information about the import command, point your browser to file://@DOCUMENTATION_PATH@/www/import.html or https://imagemagick.org/script/import.php. ++For more information about the import command, point your browser to file://@DOCUMENTATION_PATH@/www/import.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/import.php. + .SH DESCRIPTION + Image Settings: + \-adjoin join images into a single multi-image file +@@ -96,4 +96,4 @@ ImageMagick(1) + + .SH COPYRIGHT + +-\fBCopyright (C) 1999 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html or https://imagemagick.org/script/license.php\fP ++\fBCopyright (C) 1999-2021 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/license.php\fP +diff --git a/utilities/mogrify.1.in b/utilities/mogrify.1.in +index 53c8dba..f141c79 100644 +--- a/utilities/mogrify.1.in ++++ b/utilities/mogrify.1.in +@@ -7,7 +7,7 @@ mogrify \- resize an image, blur, crop, despeckle, dither, draw on, flip, join, + .SH OVERVIEW + The \fBmogrify\fP program is a member of the ImageMagick(1) suite of tools. Use it to resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. This tool is similar to convert(1) except the original image file is overwritten with any changes you request. + +-For more information about the mogrify command, point your browser to file://@DOCUMENTATION_PATH@/www/mogrify.html or https://imagemagick.org/script/mogrify.php. ++For more information about the mogrify command, point your browser to file://@DOCUMENTATION_PATH@/www/mogrify.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/mogrify.php. + .SH DESCRIPTION + Image Settings: + \-adjoin join images into a single multi-image file +@@ -324,4 +324,4 @@ ImageMagick(1) + + .SH COPYRIGHT + +-\fBCopyright (C) 1999 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html or https://imagemagick.org/script/license.php\fP ++\fBCopyright (C) 1999-2021 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/license.php\fP +diff --git a/utilities/montage.1.in b/utilities/montage.1.in +index 942d0f3..4fc4153 100644 +--- a/utilities/montage.1.in ++++ b/utilities/montage.1.in +@@ -7,7 +7,7 @@ montage \- create a composite image by combining several separate images. The im + .SH OVERVIEW + The \fBmontage\fP program is a member of the ImageMagick(1) suite of tools. Use it to create a composite image by combining several separate images. The images are tiled on the composite image optionally adorned with a border, frame, image name, and more. + +-For more information about the montage command, point your browser to file://@DOCUMENTATION_PATH@/www/montage.html or https://imagemagick.org/script/montage.php. ++For more information about the montage command, point your browser to file://@DOCUMENTATION_PATH@/www/montage.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/montage.php. + .SH DESCRIPTION + Image Settings: + \-adjoin join images into a single multi-image file +@@ -145,4 +145,5 @@ ImageMagick(1) + + .SH COPYRIGHT + +-\fBCopyright (C) 1999 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html or https://imagemagick.org/script/license.php\fP ++\fBCopyright (C) 1999-2021 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/license.php\fP ++ +diff --git a/utilities/stream.1.in b/utilities/stream.1.in +index ae33dfa..628b9ce 100644 +--- a/utilities/stream.1.in ++++ b/utilities/stream.1.in +@@ -7,7 +7,7 @@ stream \- a lightweight tool to stream one or more pixel components of the image + .SH OVERVIEW + \fBStream\fP is a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats. It writes the pixel components as they are read from the input image a row at a time making \fBstream\fP desirable when working with large images or when you require raw pixel components. + +-For more information about the stream command, point your browser to file://@DOCUMENTATION_PATH@/www/stream.html or https://imagemagick.org/script/stream.php. ++For more information about the stream command, point your browser to file://@DOCUMENTATION_PATH@/www/stream.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/stream.php. + .SH DESCRIPTION + Image Settings: + \-authenticate value decrypt image with this password +@@ -56,4 +56,5 @@ ImageMagick(1) + + .SH COPYRIGHT + +-\fBCopyright (C) 1999 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html or https://imagemagick.org/script/license.php\fP ++\fBCopyright (C) 1999-2021 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/license.php\fP ++ diff --git a/debian/patches/0008-Fix-remaining-error-in-html-files.patch b/debian/patches/0008-Fix-remaining-error-in-html-files.patch new file mode 100644 index 0000000000000000000000000000000000000000..cc6a7f9f20639966962cbea3548e8b8214540acf --- /dev/null +++ b/debian/patches/0008-Fix-remaining-error-in-html-files.patch @@ -0,0 +1,67 @@ +From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= +Date: Sat, 18 Mar 2017 15:47:28 +0100 +Subject: Fix remaining error in html files + +--- + www/changelog.html | 10 +++++++--- + www/download.html | 5 ++++- + www/index.html | 1 - + 3 files changed, 11 insertions(+), 5 deletions(-) + +diff --git a/www/changelog.html b/www/changelog.html +index 4ed95bf..e43db98 100644 +--- a/www/changelog.html ++++ b/www/changelog.html +@@ -72,6 +72,10 @@ + + + ++
          ++ ++ ++
          + + +
          +@@ -1437,10 +1441,10 @@ +
          2016-08-27 6.9.5-8 Dirk Lemstra <dirk@lem.....org>
          +
        • Added define 'psd:additional-info' to preserve the additional information in a PSD file.
          • +
          2016-08-15 6.9.5-8 Cristy <quetzlzacatenango@image...>
          +-
        • Prevent buffer overflow in BMP & SGI coders (bug report from
          pwchen&rayzhong of tencent).
          ++
        • Prevent buffer overflow in BMP & SGI coders (bug report from pwchen&rayzhong of tencent).
          • +
        • Fix MSVG regression (reference https://github.com/ImageMagick/ImageMagick/issues/252).
          • +-
        • Prevent buffer overflow and other problems in SIXEL, PDB, MAP, TIFF, and
          CALS coders (bug report from Donghai Zhu).
          +-
        • 2016-08-14 6.9.5-7 Cristy <quetzlzacatenango@image...>
          ++
        • Prevent buffer overflow and other problems in SIXEL, PDB, MAP, TIFF, and CALS coders (bug report from Donghai Zhu).
          • ++
          2016-08-14 6.9.5-7 Cristy <quetzlzacatenango@image...>
          +
        • Release ImageMagick version 6.9.5-7, GIT revision 10993:7d2fd25:20160814.
          • +
          2016-08-14 6.9.5-7 Cristy <quetzlzacatenango@image...>
          +
        • Eliminate compiler warning.
          • +diff --git a/www/download.html b/www/download.html +index bc03b25..68ae336 100644 +--- a/www/download.html ++++ b/www/download.html +@@ -69,7 +69,10 @@ wnload."> + + +
          +- ++
          ++ ++ ++
          + + +
          +diff --git a/www/index.html b/www/index.html +index 2e0a869..9218fb5 100644 +--- a/www/index.html ++++ b/www/index.html +@@ -294,7 +294,6 @@ + Copyright © 1999 ImageMagick Studio LLC +
          + +- + + + diff --git a/debian/patches/0009-Improve-man-page-to-use-version-information-and-quan.patch b/debian/patches/0009-Improve-man-page-to-use-version-information-and-quan.patch new file mode 100644 index 0000000000000000000000000000000000000000..286aa3322d70b078056bfd309c7247a94d42e9a0 --- /dev/null +++ b/debian/patches/0009-Improve-man-page-to-use-version-information-and-quan.patch @@ -0,0 +1,373 @@ +From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= +Date: Tue, 21 Mar 2017 12:15:08 +0100 +Subject: Improve man page to use version information and quantum + +Use ls *.in |sed 's,[.]1.in,,g' |xargs -n1 sh -c 'sed -i "s,$1(1),$1-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1),g" *.in' sedtest +use ls *.in |sed 's,[.]1.in,,g' |xargs -n1 sh -c 'sed -i "s,fB$1,fB$1-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@,g" *.in' sedtest +use ls *.in |sed 's,[.]1.in,,g' |xargs -n1 sh -c 'sed -i "s,.TH $1,.TH $1-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@,g" *.in' sedtest +Forwarded: no +--- + configure.ac | 5 ++++- + utilities/ImageMagick.1.in | 6 +++--- + utilities/animate.1.in | 8 ++++---- + utilities/compare.1.in | 8 ++++---- + utilities/composite.1.in | 8 ++++---- + utilities/conjure.1.in | 8 ++++---- + utilities/convert.1.in | 8 ++++---- + utilities/display.1.in | 8 ++++---- + utilities/identify.1.in | 8 ++++---- + utilities/import.1.in | 8 ++++---- + utilities/mogrify.1.in | 10 +++++----- + utilities/montage.1.in | 8 ++++---- + utilities/stream.1.in | 8 ++++---- + 13 files changed, 52 insertions(+), 49 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a7838b0..233a11b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -791,7 +791,10 @@ MAGICK_ABI_SUFFIX="Q${QUANTUM_DEPTH}" + if test "$enable_hdri" = 'yes'; then + MAGICK_ABI_SUFFIX="Q${QUANTUM_DEPTH}${MAGICK_HDRI}" + fi +-AC_SUBST([MAGICK_ABI_SUFFIX]) ++ ++AC_SUBST(MAGICK_ABI_SUFFIX) ++MAGICK_ABI_SUFFIX_LC=`echo "$MAGICK_ABI_SUFFIX" | sed 's/./\L&/g'` ++AC_SUBST(MAGICK_ABI_SUFFIX_LC) + + # Set pixel cache threshold + AC_ARG_WITH([cache], +diff --git a/utilities/ImageMagick.1.in b/utilities/ImageMagick.1.in +index d64ee07..3f749fb 100644 +--- a/utilities/ImageMagick.1.in ++++ b/utilities/ImageMagick.1.in +@@ -1,8 +1,8 @@ +-.TH ImageMagick 1 "Date: 2009/01/10 01:00:00" "ImageMagick" ++.TH ImageMagick-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@ 1 "Date: 2009/01/10 01:00:00" "ImageMagick" + .SH NAME + ImageMagick \- is a free software suite for the creation, modification and display of bitmap images. + .SH SYNOPSIS +-\fBconvert\fP \fIinput-file\fP [\fIoptions\fP] \fIoutput-file\fP ++\fBconvert-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP \fIinput-file\fP [\fIoptions\fP] \fIoutput-file\fP + .SH OVERVIEW + + Use ImageMagick\[rg] to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 200) including PNG, JPEG, GIF, HEIC, TIFF, DPX, EXR, WebP, Postscript, PDF, and SVG. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and B\\['e]zier curves. +@@ -77,7 +77,7 @@ interprets and executes scripts written in the Magick Scripting Language (MSL). + .PP + For more information about the ImageMagick, point your browser to file://@DOCUMENTATION_PATH@/index.html@EXTRA_DOC_DIR@ or https://imagemagick.org/. + .SH SEE ALSO +-convert(1), compare(1), composite(1), conjure(1), identify(1), import(1), montage(1), display(1), animate(1), import(1), Magick++-config(1), MagickCore-config(1), MagickWand-config(1) ++convert-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1), identify-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1), composite-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1), montage-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1), compare-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1), display-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1), animate-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1), import-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1), conjure-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1), quantize(5), miff(4) + + .SH COPYRIGHT + \fBCopyright (C) 1999 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html@EXTRA_DOC_DIR@ or https://imagemagick.org/script/license.php\fP +diff --git a/utilities/animate.1.in b/utilities/animate.1.in +index 0822c31..868e9c8 100644 +--- a/utilities/animate.1.in ++++ b/utilities/animate.1.in +@@ -1,11 +1,11 @@ +-.TH animate 1 "Date: 2009/01/10 01:00:00" "ImageMagick" ++.TH animate-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@ 1 "Date: 2009/01/10 01:00:00" "ImageMagick" + .SH NAME + animate \- animates an image or image sequence on any X server. + .SH SYNOPSIS + .TP +-\fBanimate\fP [\fIoptions\fP] \fIinput-file\fP ++\fBanimate-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP [\fIoptions\fP] \fIinput-file\fP + .SH OVERVIEW +-The \fBanimate\fP program is a member of the ImageMagick(1) suite of tools. Use it to animate an image or image sequence on any X server. ++The \fBanimate-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP program is a member of the ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) suite of tools. Use it to animate an image or image sequence on any X server. + + For more information about the animate command, point your browser to file://@DOCUMENTATION_PATH@/www/animate.html@EXTRA_DOC_DIR@ or https://imagemagick.org/script/animate.php. + .SH DESCRIPTION +@@ -94,7 +94,7 @@ By default, the image format of `file' is determined by its magic number. To sp + Buttons: + 1 press to map or unmap the Command widget + .SH SEE ALSO +-ImageMagick(1) ++ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/compare.1.in b/utilities/compare.1.in +index eddf748..5eb9224 100644 +--- a/utilities/compare.1.in ++++ b/utilities/compare.1.in +@@ -1,11 +1,11 @@ +-.TH compare 1 "Date: 2009/01/10 01:00:00" "ImageMagick" ++.TH compare-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@ 1 "Date: 2009/01/10 01:00:00" "ImageMagick" + .SH NAME + compare \- mathematically and visually annotate the difference between an image and its reconstruction. + .SH SYNOPSIS + .TP +-\fBcompare\fP \fIinput-file\fP \fIinput-file\fP [\fIoptions\fP] \fIoutput-file\fP ++\fBcompare-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP \fIinput-file\fP \fIinput-file\fP [\fIoptions\fP] \fIoutput-file\fP + .SH OVERVIEW +-The \fBcompare\fP program is a member of the ImageMagick(1) suite of tools. Use it to mathematically and visually annotate the difference between an image and its reconstruction. ++The \fBcompare-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP program is a member of the ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) suite of tools. Use it to mathematically and visually annotate the difference between an image and its reconstruction. + + For more information about the compare command, point your browser to file://@DOCUMENTATION_PATH@/www/compare.html@EXTRA_DOC_DIR@ or https://imagemagick.org/script/compare.php. + .SH DESCRIPTION +@@ -96,7 +96,7 @@ Two images are considered similar if their difference according to the specified + + The compare program returns 2 on error, 0 if the images are similar, or a value between 0 and 1 if they are not similar. + .SH SEE ALSO +-ImageMagick(1) ++ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/composite.1.in b/utilities/composite.1.in +index 478687a..2adb2bc 100644 +--- a/utilities/composite.1.in ++++ b/utilities/composite.1.in +@@ -1,11 +1,11 @@ +-.TH composite 1 "Date: 2009/01/10 01:00:00" "ImageMagick" ++.TH composite-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@ 1 "Date: 2009/01/10 01:00:00" "ImageMagick" + .SH NAME + composite \- overlaps one image over another. + .SH SYNOPSIS + .TP +-\fBcomposite\fP \fB[\fP \fIoptions\fP \fB... ]\fP \fIchange-file base-file\fP \fB[\fP \fImask-file\fP \fB]\fP \fIoutput-image\fP ++\fBcomposite-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP \fB[\fP \fIoptions\fP \fB... ]\fP \fIchange-file base-file\fP \fB[\fP \fImask-file\fP \fB]\fP \fIoutput-image\fP + .SH OVERVIEW +-The \fBcomposite\fP program is a member of the ImageMagick(1) suite of tools. Use it to overlap one image over another. ++The \fBcomposite-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP program is a member of the ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) suite of tools. Use it to overlap one image over another. + + For more information about the composite command, point your browser to file://@DOCUMENTATION_PATH@/www/composite.html@EXTRA_DOC_DIR@ or https://imagemagick.org/script/composite.php. + .SH DESCRIPTION +@@ -109,7 +109,7 @@ Miscellaneous Options: + + By default, the image format of `file' is determined by its magic number. To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps). Specify 'file' as '-' for standard input or output. + .SH SEE ALSO +-ImageMagick(1) ++ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/conjure.1.in b/utilities/conjure.1.in +index bb1dfba..66604db 100644 +--- a/utilities/conjure.1.in ++++ b/utilities/conjure.1.in +@@ -1,11 +1,11 @@ +-.TH conjure 1 "Date: 2009/01/10 01:00:00" "ImageMagick" ++.TH conjure-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@ 1 "Date: 2009/01/10 01:00:00" "ImageMagick" + .SH NAME + conjure \- interprets and executes scripts written in the Magick Scripting Language (MSL). + .SH SYNOPSIS + .TP +-\fBconjure\fP [\fIoptions\fP] \fIscript.msl\fP ++\fBconjure-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP [\fIoptions\fP] \fIscript.msl\fP + .SH OVERVIEW +-The \fBconjure\fP program is a member of the ImageMagick(1) suite of tools. Use it to process a Magick Scripting Language (MSL) script. The Magick scripting language (MSL) will primarily benefit those that want to accomplish custom image processing tasks but do not wish to program, or those that do not have access to a Perl interpreter or a compiler. ++The \fBconjure-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP program is a member of the ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) suite of tools. Use it to process a Magick Scripting Language (MSL) script. The Magick scripting language (MSL) will primarily benefit those that want to accomplish custom image processing tasks but do not wish to program, or those that do not have access to a Perl interpreter or a compiler. + + For more information about the conjure command, point your browser to file://@DOCUMENTATION_PATH@/www/conjure.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/conjure.php. + .SH DESCRIPTION +@@ -27,7 +27,7 @@ In addition, define any key value pairs required by your script. For example, + + conjure \-size 100x100 \-color blue \-foo bar script.msl + .SH SEE ALSO +-ImageMagick(1) ++ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/convert.1.in b/utilities/convert.1.in +index d4f40f0..99da109 100644 +--- a/utilities/convert.1.in ++++ b/utilities/convert.1.in +@@ -1,11 +1,11 @@ +-.TH convert 1 "Date: 2009/01/10 01:00:00" "ImageMagick" ++.TH convert-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@ 1 "Date: 2009/01/10 01:00:00" "ImageMagick" + .SH NAME + convert \- convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. + .SH SYNOPSIS + .TP +-\fBconvert\fP [\fIinput-option\fP] \fIinput-file\fP [\fIoutput-option\fP] \fIoutput-file\fP ++\fBconvert-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP [\fIinput-option\fP] \fIinput-file\fP [\fIoutput-option\fP] \fIoutput-file\fP + .SH OVERVIEW +-The \fBconvert\fP program is a member of the ImageMagick(1) suite of tools. Use it to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. ++The \fBconvert-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP program is a member of the ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) suite of tools. Use it to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. + + For more information about the convert command, point your browser to file://@DOCUMENTATION_PATH@/www/convert.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/convert.php. + .SH DESCRIPTION +@@ -317,7 +317,7 @@ Use any setting or operator as an \fIoutput-option\fP. Only a limited number of + + By default, the image format of `file' is determined by its magic number. To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps). Specify 'file' as '-' for standard input or output. + .SH SEE ALSO +-ImageMagick(1) ++ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/display.1.in b/utilities/display.1.in +index 3c7c976..cd9fe07 100644 +--- a/utilities/display.1.in ++++ b/utilities/display.1.in +@@ -1,11 +1,11 @@ +-.TH display 1 "Date: 2009/01/10 01:00:00" "ImageMagick" ++.TH display-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@ 1 "Date: 2009/01/10 01:00:00" "ImageMagick" + .SH NAME + display \- displays an image or image sequence on any X server. + .SH SYNOPSIS + .TP +-\fBdisplay\fP [\fIoptions\fP] \fIinput-file\fP ++\fBdisplay-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP [\fIoptions\fP] \fIinput-file\fP + .SH OVERVIEW +-The \fBdisplay\fP program is a member of the ImageMagick(1) suite of tools. Use it to display an image or image sequence on any X server. ++The \fBdisplay-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP program is a member of the ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) suite of tools. Use it to display an image or image sequence on any X server. + + For more information about the display command, point your browser to file://@DOCUMENTATION_PATH@/www/display.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/display.php. + .SH DESCRIPTION +@@ -132,7 +132,7 @@ The display program defaults to the X screen resolution. To display vector form + + display -density 72 drawing.svg + .SH SEE ALSO +-ImageMagick(1) ++ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/identify.1.in b/utilities/identify.1.in +index a8ed0bd..8b102d0 100644 +--- a/utilities/identify.1.in ++++ b/utilities/identify.1.in +@@ -1,11 +1,11 @@ +-.TH identify 1 "Date: 2009/01/10 01:00:00" "ImageMagick" ++.TH identify-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@ 1 "Date: 2009/01/10 01:00:00" "ImageMagick" + .SH NAME + identify \- describes the format and characteristics of one or more image files. + .SH SYNOPSIS + .TP +-\fBidentify\fP [\fIoptions\fP] \fIinput-file\fP ++\fBidentify-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP [\fIoptions\fP] \fIinput-file\fP + .SH OVERVIEW +-The \fBidentify\fP program is a member of the ImageMagick(1) suite of tools. It describes the format and characteristics of one or more image files. It also reports if an image is incomplete or corrupt. The information returned includes the image number, the file name, the width and height of the image, whether the image is colormapped or not, the number of colors in the image (by default off use \fI-define unique=true\fP option), the number of bytes in the image, the format of the image (JPEG, PNM, etc.), and finally the number of seconds it took to read and process the image. Many more attributes are available with the verbose option. ++The \fBidentify-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP program is a member of the ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) suite of tools. It describes the format and characteristics of one or more image files. It also reports if an image is incomplete or corrupt. The information returned includes the image number, the file name, the width and height of the image, whether the image is colormapped or not, the number of colors in the image (by default off use \fI-define unique=true\fP option), the number of bytes in the image, the format of the image (JPEG, PNM, etc.), and finally the number of seconds it took to read and process the image. Many more attributes are available with the verbose option. + + For more information about the identify command, point your browser to file://@DOCUMENTATION_PATH@/www/identify.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/identify.php. + .SH DESCRIPTION +@@ -74,7 +74,7 @@ By default, the image format of `file' is determined by its magic number. To sp + Although some options appear to modify the file to be identified, the identify command is strictly \fBread only\fP. For instance, the crop option crops the in-memory image and then describes the result. + + .SH SEE ALSO +-ImageMagick(1) ++ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/import.1.in b/utilities/import.1.in +index 2f2a49b..4293f51 100644 +--- a/utilities/import.1.in ++++ b/utilities/import.1.in +@@ -1,11 +1,11 @@ +-.TH import 1 "Date: 2009/01/10 01:00:00" "ImageMagick" ++.TH import-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@ 1 "Date: 2009/01/10 01:00:00" "ImageMagick" + .SH NAME + import \- saves any visible window on an X server and outputs it as an image file. You can capture a single window, the entire screen, or any rectangular portion of the screen. + .SH SYNOPSIS + .TP +-\fBimport\fP [\fIoptions\fP] \fIoutput-file\fP ++\fBimport-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP [\fIoptions\fP] \fIoutput-file\fP + .SH OVERVIEW +-The \fBimport\fP program is a member of the ImageMagick(1) suite of tools. Use it to capture some or all of an X server screen and save the image to a file. ++The \fBimport-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP program is a member of the ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) suite of tools. Use it to capture some or all of an X server screen and save the image to a file. + + For more information about the import command, point your browser to file://@DOCUMENTATION_PATH@/www/import.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/import.php. + .SH DESCRIPTION +@@ -92,7 +92,7 @@ Miscellaneous Options: + + By default, 'file' is written in the Postscript image format. To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps). Specify 'file' as '-' for standard input or output. + .SH SEE ALSO +-ImageMagick(1) ++ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/mogrify.1.in b/utilities/mogrify.1.in +index f141c79..f957639 100644 +--- a/utilities/mogrify.1.in ++++ b/utilities/mogrify.1.in +@@ -1,11 +1,11 @@ +-.TH mogrify 1 "Date: 2009/01/10 01:00:00" "ImageMagick" ++.TH mogrify-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@ 1 "Date: 2009/01/10 01:00:00" "ImageMagick" + .SH NAME +-mogrify \- resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. Mogrify overwrites the original image file, whereas, convert(1) writes to a different image file. ++mogrify \- resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. Mogrify overwrites the original image file, whereas, convert-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) writes to a different image file. + .SH SYNOPSIS + .TP +-\fBmogrify\fP [\fIoptions\fP] \fIinput-file\fP ++\fBmogrify-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP [\fIoptions\fP] \fIinput-file\fP + .SH OVERVIEW +-The \fBmogrify\fP program is a member of the ImageMagick(1) suite of tools. Use it to resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. This tool is similar to convert(1) except the original image file is overwritten with any changes you request. ++The \fBmogrify-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP program is a member of the ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) suite of tools. Use it to resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. This tool is similar to convert-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) except the original image file is overwritten with any changes you request. + + For more information about the mogrify command, point your browser to file://@DOCUMENTATION_PATH@/www/mogrify.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/mogrify.php. + .SH DESCRIPTION +@@ -320,7 +320,7 @@ Miscellaneous Options: + + By default, the image format of `file' is determined by its magic number. To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps). Specify 'file' as '-' for standard input or output. + .SH SEE ALSO +-ImageMagick(1) ++ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/montage.1.in b/utilities/montage.1.in +index 4fc4153..a93efd8 100644 +--- a/utilities/montage.1.in ++++ b/utilities/montage.1.in +@@ -1,11 +1,11 @@ +-.TH montage 1 "Date: 2009/01/10 01:00:00" "ImageMagick" ++.TH montage-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@ 1 "Date: 2009/01/10 01:00:00" "ImageMagick" + .SH NAME + montage \- create a composite image by combining several separate images. The images are tiled on the composite image optionally adorned with a border, frame, image name, and more. + .SH SYNOPSIS + .TP +-\fBmontage\fP \fIinput-file[s]\fP [\fIoptions\fP] \fIoutput-file\fP ++\fBmontage-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP \fIinput-file[s]\fP [\fIoptions\fP] \fIoutput-file\fP + .SH OVERVIEW +-The \fBmontage\fP program is a member of the ImageMagick(1) suite of tools. Use it to create a composite image by combining several separate images. The images are tiled on the composite image optionally adorned with a border, frame, image name, and more. ++The \fBmontage-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP program is a member of the ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) suite of tools. Use it to create a composite image by combining several separate images. The images are tiled on the composite image optionally adorned with a border, frame, image name, and more. + + For more information about the montage command, point your browser to file://@DOCUMENTATION_PATH@/www/montage.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/montage.php. + .SH DESCRIPTION +@@ -141,7 +141,7 @@ In addition to those listed above, you can specify these standard X resources as + + By default, the image format of `file' is determined by its magic number. To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps). Specify 'file' as '-' for standard input or output. + .SH SEE ALSO +-ImageMagick(1) ++ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/stream.1.in b/utilities/stream.1.in +index 628b9ce..ba04530 100644 +--- a/utilities/stream.1.in ++++ b/utilities/stream.1.in +@@ -1,11 +1,11 @@ +-.TH stream 1 "Date: 2009/01/10 01:00:00" "ImageMagick" ++.TH stream-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@ 1 "Date: 2009/01/10 01:00:00" "ImageMagick" + .SH NAME + stream \- a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats. + .SH SYNOPSIS + .TP +-\fBstream\fP [\fIoptions\fP] \fIinput-file\fP \fIoutput-file\fP ++\fBstream-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP [\fIoptions\fP] \fIinput-file\fP \fIoutput-file\fP + .SH OVERVIEW +-\fBStream\fP is a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats. It writes the pixel components as they are read from the input image a row at a time making \fBstream\fP desirable when working with large images or when you require raw pixel components. ++\fBStream\fP is a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats. It writes the pixel components as they are read from the input image a row at a time making \fBstream-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@\fP desirable when working with large images or when you require raw pixel components. + + For more information about the stream command, point your browser to file://@DOCUMENTATION_PATH@/www/stream.html@EXTRA_DOC_DIR@ or https://www.imagemagick.org/script/stream.php. + .SH DESCRIPTION +@@ -52,7 +52,7 @@ Miscellaneous Options: + + By default, the image format of `file' is determined by its magic number. To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps). Specify 'file' as '-' for standard input or output. + .SH SEE ALSO +-ImageMagick(1) ++ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + diff --git a/debian/patches/0010-Fix-changelog-tag-mismatch.patch b/debian/patches/0010-Fix-changelog-tag-mismatch.patch new file mode 100644 index 0000000000000000000000000000000000000000..9e46bc3b1a5733a9f9cbb921c3f2e772f4c52a2c --- /dev/null +++ b/debian/patches/0010-Fix-changelog-tag-mismatch.patch @@ -0,0 +1,22 @@ +From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= +Date: Sun, 4 Jun 2017 13:40:37 +0200 +Subject: Fix changelog tag mismatch + +Forwarded: no +--- + www/changelog.html | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/www/changelog.html b/www/changelog.html +index e43db98..330357c 100644 +--- a/www/changelog.html ++++ b/www/changelog.html +@@ -1281,7 +1281,7 @@ +
          2017-05-26 6.9.8-7 Cristy <quetzlzacatenango@image...>
          +
        • Release ImageMagick version 6.9.8-7, GIT revision 11598:07d1dee:20170526.
          • +
          2017-05-23 6.9.8-7 Cristy <quetzlzacatenango@image...>
          +-
        • Improper allocation of memory for IM instances without threads (reference
          https://github.com/ImageMagick/ImageMagick/issues/497).
          ++
        • Improper allocation of memory for IM instances without threads (reference https://github.com/ImageMagick/ImageMagick/issues/497).
          • +
        • Delete corrupt image from list (reference https://github.com/ImageMagick/ImageMagick/issues/500).
          • +
          2017-05-19 6.9.8-6 Cristy <quetzlzacatenango@image...>
          +
        • Release ImageMagick version 6.9.8-6, GIT revision 11590:7ce2d38:20170519.
          • diff --git a/debian/patches/0011-Fix-html-error-in-api-Image-.html.patch b/debian/patches/0011-Fix-html-error-in-api-Image-.html.patch new file mode 100644 index 0000000000000000000000000000000000000000..2f2de16d3801b2e6e9b232a8c684bb441b2b11f1 --- /dev/null +++ b/debian/patches/0011-Fix-html-error-in-api-Image-.html.patch @@ -0,0 +1,62 @@ +From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= +Date: Fri, 11 Aug 2017 10:13:21 +0200 +Subject: Fix html error in api/Image++.html + +Forwarded: Yes +--- + www/api/Image++.html | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/www/api/Image++.html b/www/api/Image++.html +index 70acc18..550daba 100644 +--- a/www/api/Image++.html ++++ b/www/api/Image++.html +@@ -66,8 +66,8 @@ + + + +-
          +- ++ ++ + +
          + +@@ -3053,7 +3053,7 @@ supports copying the pixels in the cache to a foreign pixel + representation according to the format specified by QuantumTypes.

          +

          The pixel region is effectively a small image in which the pixels + may be accessed, addressed, and updated, as shown in the following +-example: ++example:

          + 
          + 
          
+ Image image("cow.png"); 
+@@ -3074,7 +3074,6 @@ image.syncPixels();
+   // Save updated image to file.
+ image.write("horse.png");
+
          +-

          +

          The image cache supports the following methods:
          + +

            +@@ -3214,7 +3213,6 @@ the region set by a preceding getPixels or getConstPixels call. +

            + + +- + +
            +

            Security • +@@ -3237,8 +3235,8 @@ the region set by a preceding getPixels or getConstPixels call. +

            + + +- +- ++ ++ + + +- +\ No newline at end of file ++ diff --git a/debian/patches/0012-Fix-www-escape.html.patch b/debian/patches/0012-Fix-www-escape.html.patch new file mode 100644 index 0000000000000000000000000000000000000000..df13bc8ac27bdc6751263127e33ee9bbcd84e78e --- /dev/null +++ b/debian/patches/0012-Fix-www-escape.html.patch @@ -0,0 +1,21 @@ +From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= +Date: Fri, 11 Aug 2017 10:14:36 +0200 +Subject: Fix www/escape.html + +Forwarded: Yes +--- + www/escape.html | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/www/escape.html b/www/escape.html +index 42af8df..ed91664 100644 +--- a/www/escape.html ++++ b/www/escape.html +@@ -833,6 +833,7 @@ information contained in the file:

            +

            Select dataset and record from the following:

            + + 
            ++  
+   Envelope Record
+   1:00  Model Version
+   1:05  Destination
diff --git a/debian/patches/0013-Fix-www-magick-script.html.patch b/debian/patches/0013-Fix-www-magick-script.html.patch
new file mode 100644
index 0000000000000000000000000000000000000000..80b0e91758be7fcbbb742750db1c38d31129040e
--- /dev/null
+++ b/debian/patches/0013-Fix-www-magick-script.html.patch
@@ -0,0 +1,21 @@
+From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= 
+Date: Fri, 11 Aug 2017 10:15:37 +0200
+Subject: Fix www/magick-script.html
+
+Forwarded: Yes
+---
+ www/magick-script.html | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/www/magick-script.html b/www/magick-script.html
+index 6e5f31f..2d1df30 100644
+--- a/www/magick-script.html
++++ b/www/magick-script.html
+@@ -91,6 +91,7 @@
+ 
            Here is an example script:
            
+ 
+ 
            ++
+     #!/bin/env magick-script
+     -size 100x100 xc:red ( rose: -rotate -90 ) +append  -write show:
+ 
            
diff --git a/debian/patches/0014-Fix-www-support.html.patch b/debian/patches/0014-Fix-www-support.html.patch
new file mode 100644
index 0000000000000000000000000000000000000000..2977713899180a5d25c3a812c9c11f56771887d8
--- /dev/null
+++ b/debian/patches/0014-Fix-www-support.html.patch
@@ -0,0 +1,18 @@
+From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= 
+Date: Fri, 11 Aug 2017 10:20:20 +0200
+Subject: Fix www/support.html
+
+Forwarded: Yes
+---
+ www/support.html | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/www/support.html b/www/support.html
+index 5fa77e1..09a5736 100644
+--- a/www/support.html
++++ b/www/support.html
+@@ -179,3 +179,4 @@
+   
+   
+ 
++
diff --git a/debian/patches/0015-Fix-instead-of-lt-and-input-form.patch b/debian/patches/0015-Fix-instead-of-lt-and-input-form.patch
new file mode 100644
index 0000000000000000000000000000000000000000..c967a00a1351e8c3fc2b81d24d73bdd6ea189ffd
--- /dev/null
+++ b/debian/patches/0015-Fix-instead-of-lt-and-input-form.patch
@@ -0,0 +1,266 @@
+From: =?utf-8?q?Bastien_ROUCARI=C3=88S?= 
+Date: Sat, 3 Feb 2018 23:38:58 +0100
+Subject: Fix < instead of < and input form
+
+Forwarded: Yes
+---
+ www/advanced-unix-installation.html    | 12 ++++++++----
+ www/advanced-windows-installation.html |  5 ++++-
+ www/animate.html                       |  5 ++++-
+ www/api/magick++-classes.html          |  5 ++---
+ www/api/magick-deprecate.html          |  5 ++---
+ www/color-management.html              |  2 +-
+ www/command-line-processing.html       |  7 +++++++
+ www/compare.html                       |  2 +-
+ www/gradient.html                      |  2 +-
+ www/identify.html                      |  4 ----
+ www/magick-script.html                 |  7 +++----
+ www/magick.html                        |  9 ++++-----
+ www/perl-magick.html                   |  2 +-
+ www/security-policy.html               |  3 ++-
+ 14 files changed, 40 insertions(+), 30 deletions(-)
+
+diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html
+index 4e74f5e..131b206 100644
+--- a/www/advanced-unix-installation.html
++++ b/www/advanced-unix-installation.html
+@@ -71,7 +71,10 @@
+         
+       
+     
+-  
++    
            
++      
++      
++    
+   
+ 
+   
            
+@@ -653,7 +656,8 @@ no encode delegate for this image format
+   
+ 
+   
+-  
+-  
++  
++
+ 
+-
+\ No newline at end of file
++
+diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html
+index 76edff8..a63d83c 100644
+--- a/www/advanced-windows-installation.html
++++ b/www/advanced-windows-installation.html
+@@ -68,7 +68,10 @@
+         
+       
+     
            
+-  
++    
            
++      
++      
++    
+   
+ 
+   
            
+diff --git a/www/animate.html b/www/animate.html
+index 96df41e..8a0c680 100644
+--- a/www/animate.html
++++ b/www/animate.html
+@@ -68,7 +68,10 @@
+         
+       
+     
            
+-  
++    
            
++      
++      
++    
+   
+ 
+   
            
+diff --git a/www/api/magick++-classes.html b/www/api/magick++-classes.html
+index 8623cdb..c5311af 100644
+--- a/www/api/magick++-classes.html
++++ b/www/api/magick++-classes.html
+@@ -167,8 +167,7 @@ containers of image frames.
+   
+ 
+   
+-  
+-  
++  
+-  
++  
+-  
++  
+-  
++      
++    
++  
            
++
++  
            
++    
            
++
            
++
++
            ImageMagick includes a number of ready-made interfaces. This makes it possible to modify or create images automagically and dynamically utilizing your favorite development platform.
            
++
++
            
++  
            Ada
            
++
++
            G2F implements an Ada 95 binding to a subset of the low-level MagickCore library.
            
++
++  
            C
            
++
++
            Use MagickWand to convert, compose, and edit images from the C language.  There is also the low-level MagickCore library for wizard-level developers.
            
++
++  
            Ch
            
++
++
            ChMagick is a Ch binding to the MagickCore and MagickWand API.  Ch is an embeddable C/C++ interpreter for cross-platform scripting.
            
++
++  
            COM+
            
++
++
            Use ImageMagickObject to convert, compose, and edit images from a Windows COM+ compatible component.
            
++
++  
            C++
            
++
++
            Magick++ provides an object-oriented C++ interface to ImageMagick.  See A Gentle Introduction to Magick++ for an introductory tutorial to Magick++.  We include the source if you want to correct, enhance, or expand the tutorial.
            
++
++  
            GO
            
++  
            GoImagick is a set of Go bindings to ImageMagick's MagickWand and MagickCore C APIs.
            
++
++  
            Java
            
++
++
            JMagick provides an object-oriented Java interface to ImageMagick.  Im4java is a pure-java interface to the ImageMagick command-line.
            
++
++  
            Julia
            
++
++
            JuliaIO provides an object-oriented Julia interface to ImageMagick.
            
++
++  
            LabVIEW
            
++
++
            LVOOP ImageMagick is an object-oriented LabVIEW interface to ImageMagick.
            
++
++  
            Lisp
            
++
++
            CL-Magick provides a Common Lisp interface to the ImageMagick library.
            
++
++  
            Lua
            
++
++
            Lua bindings to ImageMagick for LuaJIT using FFI.
            
++
++  
            Neko
            
++
++
            NMagick is a port of the ImageMagick library to the haXe and Neko platforms. It provides image manipulation capabilities to both web and desktop applications using Neko.
            
++
++  
            .NET
            
++
++
            Use Magick.NET to convert, compose, and edit images from Windows .NET.
            
++
++
            ImageMagickApp is a .NET application written in C# that utilizes the ImageMagick command line to allow conversion of multiple image formats to different formats.
            
++
++  
            Pascal
            
++
++
            PascalMagick a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.
            
++
++  
            Perl
            
++
++
            Use PerlMagick to convert, compose, and edit images from the Perl language.
            
++
++  
            PHP
            
++
++
            MagickWand for PHP a native PHP-extension to the ImageMagick MagickWand API.
            
++
++
            IMagick is a native PHP extension to create and modify images using the ImageMagick API.  Documentation for the extension is available here.
            
++
++
            phMagick is a wrapper class for ImageMagick, wrapping the most common web image manipulation actions in easy to use functions, but allowing full access to ImageMagick's power by issuing system calls to it's command-line programs.
            
++
++
++  
            Python
            
++
++
++
            Wand is a ctypes-based ImagedMagick binding library for Python.
            
++
            PythonMagick is an object-oriented Python interface to ImageMagick.
            
++
            PythonMagickWand is an object-oriented Python interface to MagickWand based on ctypes.
            
++
            Scilab Image Processing toolbox utilizes ImageMagick to do imaging tasks such as filtering, blurring, edge detection, thresholding, histogram manipulation, segmentation, mathematical morphology, color image processing, etc..
            
++
++  
            REALbasic
            
++
++
            The MBS Realbasic ImageMagick is a plugin that utilizes the power of ImageMagick from within the RealBasic environment.
            
++
++  
            Ruby
            
++
++
            RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries.  Get started with RMagick by perusing the documentation.
            
++
++
            MagickWand for Ruby is an interface between the Ruby programming language and the MagickWand image processing libraries.  Get started with MagickWand for PHP by perusing the documentation.
            
++
++
            MiniMagick is a Ruby wrapper for ImageMagick command line. MiniMagick gives you convenient access to all the command line options ImageMagick supports.
            
++
++
            QuickMagick is a gem for easily accessing ImageMagick command line tools from Ruby programs.
            
++
++  
            Rust
            
++
++
            RustWand is a MagickWand bindings for the Rust language.
            
++
++
            Tcl/Tk
            
++
++
            TclMagick a native Tcl-extension to the ImageMagick MagickWand API.
            
++
++  
            XML RPC
            
++
++
            RemoteMagick is an XML-RPC web service that creates image thumbnails.
            
++
            
++
            
++    
            
++  
            
++  
++
++  
++  
++  
++
++
+diff --git a/www/binary-releases.html b/www/binary-releases.html
+new file mode 100644
+index 0000000..b6e959a
+--- /dev/null
++++ b/www/binary-releases.html
+@@ -0,0 +1,495 @@
++
++
++
++
++
++
++
++  
++  
++  Install from Binary Distribution @ ImageMagick
++  
++  
++  
++  
++  
++  
++  
++  
++  
++  
++  
++  
++  
++  
++  
++  
++  
++  
++  
++
++
++  
            
++  
++  
            
++       
++    
++  
            
++  
            
++  
            
++    
            
++
            
++
            Unix Binary Release • Mac OS X Binary Release • iOS Binary Release • Windows Binary Release
            
++
++
            You can install ImageMagick from source.  However, if you don't have a proper development environment or if you're anxious to get started, download a ready-to-run Unix or Windows executable.  Before you download, you may want to review recent changes to the ImageMagick distribution.
            
++
++
            Unix Binary Release
            
++
++
            These are the Unix variations that we support.  If your system is not on the list, try installing from source. Although ImageMagick runs fine on a single core computer, it automagically runs in parallel on dual and quad-core systems reducing run times considerably.
            
++
++
            
++
            ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
            VersionHTTPFTPDescription
            ImageMagick-6.9.9-45.x86_64.rpmdownloaddownloadRedhat / CentOS 7.1 x86_64 RPM
            ImageMagick-libs-6.9.9-45.x86_64.rpmdownloaddownloadRedhat / CentOS 7.1 x86_64 RPM
            ImageMagick RPM'sdownloaddownloadDevelopment, Perl, C++, and documentation RPM's.
            ImageMagick-i386-pc-solaris2.11.tar.gzdownloaddownloadSolaris Sparc 2.11
            ImageMagick-i686-pc-cygwin.tar.gzdownloaddownloadCygwin
            ImageMagick-i686-pc-mingw32.tar.gzdownloaddownloadMinGW
            ++ ++

            Verify its message digest.

            ++ ++

            ImageMagick RPM's are self-installing. Simply type the following command and you're ready to start using ImageMagick:

            ++ ++
            $ rpm -Uvh ImageMagick-6.9.9-45.x86_64.rpm
            ++

            You'll need to install the requisite libraries:

            ++ ++
            $ rpm -Uvh ImageMagick-libs-6.9.9-45.x86_64.rpm
            ++

            For other systems, create (or choose) a directory to install the package into and change to that directory, for example:

            ++ ++
            ++cd $HOME
++
            ++ ++

            Next, extract the contents of the package. For example:

            ++ ++
            ++tar xvzf ImageMagick.tar.gz
++
            ++ ++

            Set the MAGICK_HOME environment variable to the path where you extracted the ImageMagick files. For example:

            ++ ++
            $ export MAGICK_HOME="$HOME/ImageMagick-6.9.9"
            ++

            If the bin subdirectory of the extracted package is not already in your executable search path, add it to your PATH environment variable. For example:

            ++ ++
            ++export PATH="$MAGICK_HOME/bin:$PATH
++
            ++ ++ ++

            On Linux and Solaris machines add $MAGICK_HOME/lib to the LD_LIBRARY_PATH environment variable:

            ++ ++
            ++LD_LIBRARY_PATH="${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}$MAGICK_HOME/lib
++export LD_LIBRARY_PATH
++
            ++ ++

            Finally, to verify ImageMagick is working properly, type the following on the command line:

            ++ ++
            ++convert logo: logo.gif
++identify logo.gif
++display logo.gif
++
            ++ ++

            Congratulations, you have a working ImageMagick distribution under Unix or Linux and you are ready to use ImageMagick to convert, compose, or edit your images or perhaps you'll want to use one of the Application Program Interfaces for C, C++, Perl, and others.

            ++ ++

            Mac OS X Binary Release

            ++ ++

            We recommend MacPorts which custom builds ImageMagick in your environment (some users prefer Homebrew). Download MacPorts and type:

            ++ ++
            ++sudo port install ImageMagick
++
            ++ ++

            The port command downloads ImageMagick and many of its delegate libraries (e.g. JPEG, PNG, Freetype, etc.) and configures, builds, and installs ImageMagick automagically. Alternatively, you can download the ImageMagick Mac OS X distribution we provide:

            ++ ++
            ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
            VersionHTTPFTPDescription
            ImageMagick-x86_64-apple-darwin15.6.0.tar.gzdownloaddownloadMac OS X El Capitan
            ++ ++

            Verify its message digest.

            ++ ++

            Create (or choose) a directory to install the package into and change to that directory, for example:

            ++ ++
            ++cd $HOME
++
            ++ ++

            Next, extract the contents of the package. For example:

            ++ ++
            ++tar xvzf ImageMagick-x86_64-apple-darwin15.2.0.tar.gz
++
            ++ ++

            Set the MAGICK_HOME environment variable to the path where you extracted the ImageMagick files. For example:

            ++ ++
            $ export MAGICK_HOME="$HOME/ImageMagick-6.9.9"
            ++

            If the bin subdirectory of the extracted package is not already in your executable search path, add it to your PATH environment variable. For example:

            ++ ++
            ++export PATH="$MAGICK_HOME/bin:$PATH"
++
            ++ ++ ++

            Set the DYLD_LIBRARY_PATH environment variable:

            ++ ++
            ++export DYLD_LIBRARY_PATH="$MAGICK_HOME/lib/"
++
            ++ ++

            Finally, to verify ImageMagick is working properly, type the following on the command line:

            ++ ++
            ++convert logo: logo.gif
++identify logo.gif
++display logo.gif
++
            ++ ++

            Note, the display program requires the X11 server available on your Mac OS X installation DVD. Once that is installed, you will also need to export DISPLAY=:0.

            ++ ++

            The best way to deal with all the exports is to put them at the end of your .profile file

            ++ ++

            Congratulations, you have a working ImageMagick distribution under Mac OS X and you are ready to use ImageMagick to convert, compose, or edit your images or perhaps you'll want to use one of the Application Program Interfaces for C, C++, Perl, and others.

            ++ ++

            iOS Binary Release

            ++ ++

            ~Claudio provides iOS builds of ImageMagick.

            ++ ++

            Download iOS Distribution

            ++ ++

            You can download the iOS distribution directly from ImageMagick's repository.

            ++ ++

            There are always 2 packages for the compiled ImageMagick:

            ++ ++
              ++
            • iOSMagick-VERSION-libs.zip
              • ++
            • iOSMagick-VERSION.zip
              • ++
            ++ ++

            The first one includes headers and compiled libraries that have been used to compile ImageMagick. Most users would need this one.

            ++ ++

            ImageMagick compiling script for iOS OS and iOS Simulator

            ++ ++

            To run the script:

            ++
            ++./imagemagick_compile.sh VERSION
++
            ++

            where VERSION is the version of ImageMagick you want to compile (i.e.: 6.9.9-45, svn, ...)

            ++ ++

            This script compiles ImageMagick as a static library to be included in iOS projects and adds support for

            ++
              ++
            • png
              • ++
            • jpeg
              • ++
            • tiff
              • ++
            ++ ++

            Upon successful compilation a folder called IMPORT_ME is created on your ~/Desktop. You can import it into your XCode project.

            ++ ++
            XCode project settings
            ++ ++

            After including everything into XCode please also make sure to have these settings (Build tab of the project information):

            ++
              ++
            • Other Linker Flags: -lMagickCore-Q16 -lMagickWand-Q16 -ljpeg -lpng -lbz2 -lz
              • ++
            • Header Search Paths: $(SRCROOT) - make it Recursive
              • ++
            • Library Search Paths: $(SRCROOT) - make it Recursive
              • ++
            ++ ++

            On the lower left click on the small-wheel and select: Add User-Defined Setting

            ++
              ++
            • Key: OTHER_CFLAGS
              • ++
            • Value: -Dmacintosh=1
              • ++
            ++ ++
            Sample project
            ++ ++

            A sample project is available for download. It is not updated too often, but it does give an idea of all the settings and some ways to play around with ImageMagick in an iOS application.

            ++ ++

            Windows Binary Release

            ++ ++

            ImageMagick runs on Windows 10 (x86 & x64), Windows 8 (x86 & x64), Windows 7 (x86 & x64), Windows Server 2012, Windows XP (x86) with Service Pack 3, Windows Vista (x86 & x64) with Service Pack 2, Windows Server 2003 (x86 & x64) with Service Pack 2 (verify MSXML6 is present), Windows Server 2003 R2 (x86 & x64), Windows Server 2008 (x86 & x64) with Service Pack 2, and Windows Server 2008 R2 (x64).

            ++ ++

            The amount of memory can be an important factor, especially if you intend to work on large images. A minimum of 512 MB of RAM is recommended, but the more RAM the better. Although ImageMagick runs well on a single core computer, it automagically runs in parallel on multi-core systems reducing run times considerably.

            ++ ++

            The Windows version of ImageMagick is self-installing. Simply click on the appropriate version below and it will launch itself and ask you a few installation questions. Versions with Q8 in the name are 8 bits-per-pixel component (e.g. 8-bit red, 8-bit green, etc.), whereas, Q16 in the filename are 16 bits-per-pixel component. A Q16 version permits you to read or write 16-bit images without losing precision but requires twice as much resources as the Q8 version. Versions with dll in the filename include ImageMagick libraries as dynamic link libraries. Unless you have a Windows 32-bit OS, we recommend this version of ImageMagick for 64-bit Windows:

            ++ ++
            ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
            VersionHTTPFTPDescription
            ImageMagick-6.9.9-45-Q16-x64-dll.exedownloaddownloadWin64 dynamic at 16 bits-per-pixel component
            ++ ++

            Or choose from these alternate Windows binary distributions:

            ++ ++
            ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++
            VersionHTTPFTPDescription
            ImageMagick-6.9.9-45-Q16-x64-static.exedownloaddownloadWin64 static at 16 bits-per-pixel component
            ImageMagick-6.9.9-45-Q8-x64-dll.exedownloaddownloadWin64 dynamic at 8 bits-per-pixel component
            ImageMagick-6.9.9-45-Q8-x64-static.exedownloaddownloadWin64 static at 8 bits-per-pixel component
            ImageMagick-6.9.9-45-Q16-HDRI-x64-dll.exedownloaddownloadWin64 dynamic at 16 bits-per-pixel component with high dynamic-range imaging enabled
            ImageMagick-6.9.9-45-Q16-HDRI-x64-static.exedownloaddownloadWin64 static at 16 bits-per-pixel component with high dynamic-range imaging enabled
            ImageMagick-6.9.9-45-Q16-x86-dll.exedownloaddownloadWin32 dynamic at 16 bits-per-pixel component
            ImageMagick-6.9.9-45-Q16-x86-static.exedownloaddownloadWin32 static at 16 bits-per-pixel component
            ImageMagick-6.9.9-45-Q8-x86-dll.exedownloaddownloadWin32 dynamic at 8 bits-per-pixel component
            ImageMagick-6.9.9-45-Q8-x86-static.exedownloaddownloadWin32 static at 8 bits-per-pixel component
            ImageMagick-6.9.9-45-Q16-HDRI-x86-dll.exedownloaddownloadWin32 dynamic at 16 bits-per-pixel component with high dynamic-range imaging enabled
            ImageMagick-6.9.9-45-Q16-HDRI-x86-static.exedownloaddownloadWin32 static at 16 bits-per-pixel component with high dynamic-range imaging enabled
            ImageMagick-6.9.9-45-portable-Q16-x86.zipdownloaddownloadPortable Win32 static at 16 bits-per-pixel component. Just copy to your host and run (no installer, no Windows registry entries).
            ImageMagick-6.9.9-45-portable-Q16-x64.zipdownloaddownloadPortable Win64 static at 16 bits-per-pixel component. Just copy to your host and run (no installer, no Windows registry entries).
            ++ ++

            Verify its message digest.

            ++ ++

            To verify ImageMagick is working properly, type the following in an Command Prompt window:

            ++ ++
            ++convert logo: logo.gif
++identify logo.gif
++imdisplay logo.gif
++
            ++ ++

            If you have any problems, you likely need vcomp120.dll. To install it, download Visual C++ 2013 Redistributable Package.

            ++ ++

            Note, use a double quote (") rather than a single quote (') for the ImageMagick command line under Windows:

            ++ ++
            ++convert "e:/myimages/image.png" "e:/myimages/image.jpg"
++
            ++

            Use two double quotes for VBScript scripts:

            ++
            ++Set objShell = wscript.createobject("wscript.shell")
++objShell.Exec("convert ""e:/myimages/image.png"" ""e:/myimages/image.jpg""")
++
            ++ ++

            Congratulations, you have a working ImageMagick distribution under Windows and you are ready to use ImageMagick to convert, compose, or edit your images or perhaps you'll want to use one of the Application Program Interfaces for C, C++, Perl, and others.

            ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --git a/debian/patches/0017-Fix-end-tags.patch b/debian/patches/0017-Fix-end-tags.patch new file mode 100644 index 0000000000000000000000000000000000000000..616993272da5d56e3186a1760101dccdf55640b7 --- /dev/null +++ b/debian/patches/0017-Fix-end-tags.patch @@ -0,0 +1,22 @@ +From: =?utf-8?q?Bastien_Roucari=C3=A8s?= +Date: Mon, 30 Jul 2018 14:50:23 +0200 +Subject: Fix end tags + +Forwarded: yes +--- + www/advanced-windows-installation.html | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html +index a63d83c..628d89a 100644 +--- a/www/advanced-windows-installation.html ++++ b/www/advanced-windows-installation.html +@@ -102,7 +102,7 @@ +
          + +

          Install Visual Studio dependencies

          +-

          To build ImageMagick with Visual Studio the following components should be installed:To build ImageMagick with Visual Studio the following components should be installed:

          : + +
            +
          • Desktop development with C++ (workload)
            • diff --git a/debian/patches/0018-Fix-a-few-html-error.patch b/debian/patches/0018-Fix-a-few-html-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..e8cee134fdbcc273b37dd18a3f23ff3d21fe7bd8 --- /dev/null +++ b/debian/patches/0018-Fix-a-few-html-error.patch @@ -0,0 +1,45 @@ +From: =?utf-8?q?Bastien_Roucari=C3=A8s?= +Date: Sun, 26 Jul 2020 22:26:36 +0200 +Subject: Fix a few html error + +Forwarded: yes +--- + www/binary-releases.html | 1 - + www/changelog.html | 5 +++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/www/binary-releases.html b/www/binary-releases.html +index b6e959a..49a8f2a 100644 +--- a/www/binary-releases.html ++++ b/www/binary-releases.html +@@ -65,7 +65,6 @@ + + + +- + +
            + 2019-10-27 6.9.10-70 Cristy <quetzlzacatenango@image...> +
          • Release ImageMagick version 6.9.10-70, GIT revision 14970:4200095:20191027.
            • +
            2019-10-27 6.9.10-70 Cristy <quetzlzacatenango@image...>
            +-
          • Fixed numerous issues posted to GitHub (reference https://github.com/ImageMagick/ImageMagick/issues).
            2019-10-27 6.9.10-70 Cristy <quetzlzacatenango@image...>
            ++
          • Fixed numerous issues posted to GitHub (reference https://github.com/ImageMagick/ImageMagick/issues).
            • ++
            2019-10-27 6.9.10-70 Cristy <quetzlzacatenango@image...>
            +
          • Release ImageMagick version 6.9.10-70, GIT revision 14970:4200095:20191027.
            • +
            2019-10-27 6.9.10-70 Cristy <quetzlzacatenango@image...>
            +
          • Fixed numerous issues posted to GitHub (reference https://github.com/ImageMagick/ImageMagick/issues).
            • +@@ -1011,7 +1012,7 @@ +
          • Release ImageMagick version 6.9.10-1, GIT revision 13595:dafb03062:20180616.
            • +
            2018-06-16 6.9.10-1 Cristy <quetzlzacatenango@image...>
            +
          • Fixed numerous use of uninitialized values, integer overflow, memory exceeded, and timeouts (credit to OSS Fuzz).
            • +-
          • Fixed an issue with stroke and label: (reference
            • ++
          • Fixed an issue with stroke and label
            • +
            2018-06-12 6.9.10-0 Cristy <quetzlzacatenango@image...>
            +
          • Release ImageMagick version 6.9.10-0, GIT revision 13585:82d7dbe0b:20180612.
            • +
            2018-06-11 6.9.10-0 Cristy <quetzlzacatenango@image...>
            diff --git a/debian/patches/0019-Fix-a-typo-in-manpage.patch b/debian/patches/0019-Fix-a-typo-in-manpage.patch new file mode 100644 index 0000000000000000000000000000000000000000..17bcf2590bcca1340f64e3753ec0a1f39e5bc34d --- /dev/null +++ b/debian/patches/0019-Fix-a-typo-in-manpage.patch @@ -0,0 +1,162 @@ +From: =?utf-8?q?Bastien_Roucari=C3=A8s?= +Date: Mon, 27 Jul 2020 10:44:26 +0200 +Subject: Fix a typo in manpage + +debian-bug: 953279 +--- + utilities/animate.1.in | 2 +- + utilities/compare.1.in | 2 +- + utilities/composite.1.in | 2 +- + utilities/conjure.1.in | 2 +- + utilities/convert.1.in | 2 +- + utilities/display.1.in | 2 +- + utilities/identify.1.in | 2 +- + utilities/import.1.in | 2 +- + utilities/mogrify.1.in | 2 +- + utilities/montage.1.in | 2 +- + utilities/stream.1.in | 2 +- + 11 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/utilities/animate.1.in b/utilities/animate.1.in +index 868e9c8..efe0af4 100644 +--- a/utilities/animate.1.in ++++ b/utilities/animate.1.in +@@ -94,7 +94,7 @@ By default, the image format of `file' is determined by its magic number. To sp + Buttons: + 1 press to map or unmap the Command widget + .SH SEE ALSO +-ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) ++ImageMagick-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/compare.1.in b/utilities/compare.1.in +index 5eb9224..9b1fe54 100644 +--- a/utilities/compare.1.in ++++ b/utilities/compare.1.in +@@ -96,7 +96,7 @@ Two images are considered similar if their difference according to the specified + + The compare program returns 2 on error, 0 if the images are similar, or a value between 0 and 1 if they are not similar. + .SH SEE ALSO +-ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) ++ImageMagick-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/composite.1.in b/utilities/composite.1.in +index 2adb2bc..4330866 100644 +--- a/utilities/composite.1.in ++++ b/utilities/composite.1.in +@@ -109,7 +109,7 @@ Miscellaneous Options: + + By default, the image format of `file' is determined by its magic number. To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps). Specify 'file' as '-' for standard input or output. + .SH SEE ALSO +-ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) ++ImageMagick-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/conjure.1.in b/utilities/conjure.1.in +index 66604db..ec1714b 100644 +--- a/utilities/conjure.1.in ++++ b/utilities/conjure.1.in +@@ -27,7 +27,7 @@ In addition, define any key value pairs required by your script. For example, + + conjure \-size 100x100 \-color blue \-foo bar script.msl + .SH SEE ALSO +-ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) ++ImageMagick-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/convert.1.in b/utilities/convert.1.in +index 99da109..1234707 100644 +--- a/utilities/convert.1.in ++++ b/utilities/convert.1.in +@@ -317,7 +317,7 @@ Use any setting or operator as an \fIoutput-option\fP. Only a limited number of + + By default, the image format of `file' is determined by its magic number. To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps). Specify 'file' as '-' for standard input or output. + .SH SEE ALSO +-ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) ++ImageMagick-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/display.1.in b/utilities/display.1.in +index cd9fe07..3e5f29e 100644 +--- a/utilities/display.1.in ++++ b/utilities/display.1.in +@@ -132,7 +132,7 @@ The display program defaults to the X screen resolution. To display vector form + + display -density 72 drawing.svg + .SH SEE ALSO +-ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) ++ImageMagick-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/identify.1.in b/utilities/identify.1.in +index 8b102d0..ed2d54c 100644 +--- a/utilities/identify.1.in ++++ b/utilities/identify.1.in +@@ -74,7 +74,7 @@ By default, the image format of `file' is determined by its magic number. To sp + Although some options appear to modify the file to be identified, the identify command is strictly \fBread only\fP. For instance, the crop option crops the in-memory image and then describes the result. + + .SH SEE ALSO +-ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) ++ImageMagick-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/import.1.in b/utilities/import.1.in +index 4293f51..688b31d 100644 +--- a/utilities/import.1.in ++++ b/utilities/import.1.in +@@ -92,7 +92,7 @@ Miscellaneous Options: + + By default, 'file' is written in the Postscript image format. To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps). Specify 'file' as '-' for standard input or output. + .SH SEE ALSO +-ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) ++ImageMagick-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/mogrify.1.in b/utilities/mogrify.1.in +index f957639..3f67116 100644 +--- a/utilities/mogrify.1.in ++++ b/utilities/mogrify.1.in +@@ -320,7 +320,7 @@ Miscellaneous Options: + + By default, the image format of `file' is determined by its magic number. To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps). Specify 'file' as '-' for standard input or output. + .SH SEE ALSO +-ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) ++ImageMagick-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/montage.1.in b/utilities/montage.1.in +index a93efd8..3eef5ae 100644 +--- a/utilities/montage.1.in ++++ b/utilities/montage.1.in +@@ -141,7 +141,7 @@ In addition to those listed above, you can specify these standard X resources as + + By default, the image format of `file' is determined by its magic number. To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps). Specify 'file' as '-' for standard input or output. + .SH SEE ALSO +-ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) ++ImageMagick-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + +diff --git a/utilities/stream.1.in b/utilities/stream.1.in +index ba04530..d161731 100644 +--- a/utilities/stream.1.in ++++ b/utilities/stream.1.in +@@ -52,7 +52,7 @@ Miscellaneous Options: + + By default, the image format of `file' is determined by its magic number. To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps). Specify 'file' as '-' for standard input or output. + .SH SEE ALSO +-ImageMagick-ims@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) ++ImageMagick-im@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX_LC@(1) + + .SH COPYRIGHT + diff --git a/debian/patches/0020-Finalize-fixing-error-in-html.patch b/debian/patches/0020-Finalize-fixing-error-in-html.patch new file mode 100644 index 0000000000000000000000000000000000000000..7c452497bf6f72148c28dd007f898963ccfddfa6 --- /dev/null +++ b/debian/patches/0020-Finalize-fixing-error-in-html.patch @@ -0,0 +1,680 @@ +From: =?utf-8?q?Bastien_Roucari=C3=A8s?= +Date: Mon, 11 Jan 2021 22:42:36 +0000 +Subject: Finalize fixing error in html + +Forwarded: no +--- + www/advanced-unix-installation.html | 3 +- + www/api.html | 2 +- + www/api/Image++.html | 2 +- + www/api/magick++-classes.html | 2 +- + www/api/magick-deprecate.html | 2 +- + www/architecture.html | 258 +++++++++++++++--------------------- + www/binary-releases.html | 2 +- + www/command-line-options.html | 10 +- + www/defines.html | 32 ++--- + www/download.html | 2 +- + www/escape.html | 1 + + www/formats.html | 7 - + www/magick-script.html | 2 +- + www/magick.html | 2 +- + www/support.html | 2 +- + www/webp.html | 1 + + 16 files changed, 138 insertions(+), 192 deletions(-) + +diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html +index 131b206..94d6829 100644 +--- a/www/advanced-unix-installation.html ++++ b/www/advanced-unix-installation.html +@@ -656,8 +656,7 @@ no encode delegate for this image format + + + +- ++ ++ + + +diff --git a/www/api/Image++.html b/www/api/Image++.html +index 550daba..674cacc 100644 +--- a/www/api/Image++.html ++++ b/www/api/Image++.html +@@ -3235,7 +3235,7 @@ the region set by a preceding getPixels or getConstPixels call.
          + +- ++ + + + +- ++ + + + +@@ -357,7 +357,7 @@ use:

          + + + + +@@ -697,19 +697,19 @@ use:

          + + + +- ++ + + + +- ++ + + + +- ++ + + + +- ++ + + + +@@ -1056,7 +1056,7 @@ use:

          + + + +- ++ + + + + + +- ++ + + + +- ++ + + + +- ++ + + + +@@ -1330,7 +1330,7 @@ use:

          + Supported in Imagemagick 6.9.2-5. + + +- ++ + + + + +- ++ + + + +- ++ + + + +- ++ + + + +- ++ + + + +diff --git a/www/download.html b/www/download.html +index 68ae336..863fcc4 100644 +--- a/www/download.html ++++ b/www/download.html +@@ -216,7 +216,7 @@ display logo.gif + + + +- ++ +
          Command-line DefinesCommand-line Defines

          filter:blur=factorScale the X axis of the filter (and its window). Use > 1.0 for blurry +- or < 1.0 for sharp. This should only be used with Gaussian and ++ or < 1.0 for sharp. This should only be used with Gaussian and + Gaussian-like filters simple filters, or you may not get the + expected results.

          IMAGE FORMATSIMAGE FORMATS

          png:exclude-chunk=value
          png:include-chunk=valueancillary chunks to be excluded from or included in PNG output. +@@ -1283,15 +1283,15 @@ use:

          +

          PSEUDO-IMAGE FORMATSPSEUDO-IMAGE FORMATS
          gradient:direction=valueSpecify the direction of the linear gradient towards + the top/bottom/left/right or diagonal corners. The choices are: +@@ -1457,19 +1457,19 @@ use:

          +

          Identify DefinesIdentify Defines

          ImageMagick-x86_64-apple-darwin20.1.0.tar.gzmacOS High Sierra
        + +

        Verify its message digest.

        +diff --git a/www/escape.html b/www/escape.html +index ed91664..99a6ebd 100644 +--- a/www/escape.html ++++ b/www/escape.html +@@ -323,6 +323,7 @@ filename, type, width, height.

        + + %N + number of images in current image sequence, reported once per image sequence ++ + + %O + page (canvas) offset ( = %X%Y ) +diff --git a/www/formats.html b/www/formats.html +index c681765..4785939 100644 +--- a/www/formats.html ++++ b/www/formats.html +@@ -193,13 +193,6 @@ the supported image formats.

        + + + +- +- AVIF +- RW +- Format derived from the keyframes of AV1 video +- +- +- + + AVS + RW +diff --git a/www/magick-script.html b/www/magick-script.html +index 0af7d92..eeea1f8 100644 +--- a/www/magick-script.html ++++ b/www/magick-script.html +@@ -1318,6 +1318,6 @@ transparent, extract, background, or shape the alpha channel + + + +- + + +- +\ No newline at end of file diff --git a/debian/patches/0027-Fix-doctype-to-DOCTYPE.patch b/debian/patches/0027-Fix-doctype-to-DOCTYPE.patch new file mode 100644 index 0000000000000000000000000000000000000000..7920d3dfd710dd1372e3d991f8d02db1509968fd --- /dev/null +++ b/debian/patches/0027-Fix-doctype-to-DOCTYPE.patch @@ -0,0 +1,890 @@ +From: =?utf-8?q?Bastien_Roucari=C3=A8s?= +Date: Sun, 18 Jun 2023 19:24:41 +0000 +Subject: Fix !doctype to !DOCTYPE + +Forwarded: not-needed +--- + www/advanced-linux-installation.html | 2 +- + www/advanced-unix-installation.html | 2 +- + www/advanced-windows-installation.html | 2 +- + www/animate.html | 2 +- + www/architecture.html | 2 +- + www/changelog.html | 2 +- + www/cipher.html | 2 +- + www/cite.html | 2 +- + www/color-management.html | 2 +- + www/color.html | 2 +- + www/command-line-options.html | 2 +- + www/command-line-processing.html | 2 +- + www/command-line-tools.html | 2 +- + www/compare.html | 2 +- + www/compose.html | 2 +- + www/composite.html | 2 +- + www/conjure.html | 2 +- + www/connected-components.html | 2 +- + www/contact.html | 2 +- + www/convert.html | 2 +- + www/defines.html | 2 +- + www/develop.html | 2 +- + www/display.html | 2 +- + www/distribute-pixel-cache.html | 2 +- + www/download.html | 2 +- + www/escape.html | 2 +- + www/examples.html | 2 +- + www/exception.html | 2 +- + www/export.html | 2 +- + www/formats.html | 2 +- + www/fx.html | 2 +- + www/gradient.html | 2 +- + www/high-dynamic-range.html | 2 +- + www/history.html | 2 +- + www/identify.html | 2 +- + www/import.html | 2 +- + www/index.html | 2 +- + www/install-source.html | 2 +- + www/jp2.html | 2 +- + www/license.html | 2 +- + www/links.html | 2 +- + www/magick++.html | 2 +- + www/magick-core.html | 2 +- + www/magick-vector-graphics.html | 2 +- + www/magick-wand.html | 2 +- + www/miff.html | 2 +- + www/mirror.html | 2 +- + www/mogrify.html | 2 +- + www/montage.html | 2 +- + www/motion-picture.html | 2 +- + www/news.html | 2 +- + www/opencl.html | 2 +- + www/openmp.html | 2 +- + www/perl-magick.html | 2 +- + www/porting.html | 2 +- + www/quantize.html | 2 +- + www/resources.html | 2 +- + www/search.html | 2 +- + www/security-policy.html | 2 +- + www/sitemap.html | 2 +- + www/stream.html | 2 +- + www/support.html | 2 +- + www/webp.html | 2 +- + 63 files changed, 63 insertions(+), 63 deletions(-) + +diff --git a/www/advanced-linux-installation.html b/www/advanced-linux-installation.html +index 5d3b296..c971308 100644 +--- a/www/advanced-linux-installation.html ++++ b/www/advanced-linux-installation.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html +index 94d6829..c418716 100644 +--- a/www/advanced-unix-installation.html ++++ b/www/advanced-unix-installation.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html +index 628d89a..7c6eed8 100644 +--- a/www/advanced-windows-installation.html ++++ b/www/advanced-windows-installation.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/animate.html b/www/animate.html +index 8a0c680..c5c986c 100644 +--- a/www/animate.html ++++ b/www/animate.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/architecture.html b/www/architecture.html +index ab45e25..4a2b626 100644 +--- a/www/architecture.html ++++ b/www/architecture.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/changelog.html b/www/changelog.html +index 98d9a6e..4898c52 100644 +--- a/www/changelog.html ++++ b/www/changelog.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/cipher.html b/www/cipher.html +index d34f9dc..9b9901a 100644 +--- a/www/cipher.html ++++ b/www/cipher.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/cite.html b/www/cite.html +index 40ab373..6ebf50d 100644 +--- a/www/cite.html ++++ b/www/cite.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/color-management.html b/www/color-management.html +index 4cf0478..05016dc 100644 +--- a/www/color-management.html ++++ b/www/color-management.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/color.html b/www/color.html +index 84ebe18..b187566 100644 +--- a/www/color.html ++++ b/www/color.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/command-line-options.html b/www/command-line-options.html +index 767a1fa..4561b99 100644 +--- a/www/command-line-options.html ++++ b/www/command-line-options.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/command-line-processing.html b/www/command-line-processing.html +index 4ed0887..0647fdd 100644 +--- a/www/command-line-processing.html ++++ b/www/command-line-processing.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/command-line-tools.html b/www/command-line-tools.html +index 109b5d2..3b9b06c 100644 +--- a/www/command-line-tools.html ++++ b/www/command-line-tools.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/compare.html b/www/compare.html +index c11a39e..06b4878 100644 +--- a/www/compare.html ++++ b/www/compare.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/compose.html b/www/compose.html +index 838c740..75bba53 100644 +--- a/www/compose.html ++++ b/www/compose.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/composite.html b/www/composite.html +index c3d7c83..4d10348 100644 +--- a/www/composite.html ++++ b/www/composite.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/conjure.html b/www/conjure.html +index 4fc3329..f26046f 100644 +--- a/www/conjure.html ++++ b/www/conjure.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/connected-components.html b/www/connected-components.html +index d4256b5..1c155cc 100644 +--- a/www/connected-components.html ++++ b/www/connected-components.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/contact.html b/www/contact.html +index 953c326..a02f8a2 100644 +--- a/www/contact.html ++++ b/www/contact.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/convert.html b/www/convert.html +index d9a79f7..73e789a 100644 +--- a/www/convert.html ++++ b/www/convert.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/defines.html b/www/defines.html +index 89068a5..81b01bd 100644 +--- a/www/defines.html ++++ b/www/defines.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/develop.html b/www/develop.html +index 1291bd3..3c5909e 100644 +--- a/www/develop.html ++++ b/www/develop.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/display.html b/www/display.html +index cb05085..8bc5f9d 100644 +--- a/www/display.html ++++ b/www/display.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/distribute-pixel-cache.html b/www/distribute-pixel-cache.html +index 04865a8..2d5dc1f 100644 +--- a/www/distribute-pixel-cache.html ++++ b/www/distribute-pixel-cache.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/download.html b/www/download.html +index 863fcc4..f5a8a52 100644 +--- a/www/download.html ++++ b/www/download.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/escape.html b/www/escape.html +index 99a6ebd..08af630 100644 +--- a/www/escape.html ++++ b/www/escape.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/examples.html b/www/examples.html +index f7f0375..fbba2bd 100644 +--- a/www/examples.html ++++ b/www/examples.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/exception.html b/www/exception.html +index d7fc46d..957e36d 100644 +--- a/www/exception.html ++++ b/www/exception.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/export.html b/www/export.html +index 33db1f2..ae95d3d 100644 +--- a/www/export.html ++++ b/www/export.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/formats.html b/www/formats.html +index 4785939..4711b16 100644 +--- a/www/formats.html ++++ b/www/formats.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/fx.html b/www/fx.html +index 8bb59c8..c9a961d 100644 +--- a/www/fx.html ++++ b/www/fx.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/gradient.html b/www/gradient.html +index e33c4b6..eb34ad3 100644 +--- a/www/gradient.html ++++ b/www/gradient.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/high-dynamic-range.html b/www/high-dynamic-range.html +index 7508875..9f9c6a3 100644 +--- a/www/high-dynamic-range.html ++++ b/www/high-dynamic-range.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/history.html b/www/history.html +index 50e619a..8dcaadb 100644 +--- a/www/history.html ++++ b/www/history.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/identify.html b/www/identify.html +index 1655ae0..62c9669 100644 +--- a/www/identify.html ++++ b/www/identify.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/import.html b/www/import.html +index 244dec8..c74e019 100644 +--- a/www/import.html ++++ b/www/import.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/index.html b/www/index.html +index f798359..0d355c5 100644 +--- a/www/index.html ++++ b/www/index.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/install-source.html b/www/install-source.html +index 992fb85..3749167 100644 +--- a/www/install-source.html ++++ b/www/install-source.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/jp2.html b/www/jp2.html +index ecf3b2f..23c957f 100644 +--- a/www/jp2.html ++++ b/www/jp2.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/license.html b/www/license.html +index 732bd4b..c7b3136 100644 +--- a/www/license.html ++++ b/www/license.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/links.html b/www/links.html +index a8965f9..0746dd4 100644 +--- a/www/links.html ++++ b/www/links.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/magick++.html b/www/magick++.html +index 563e44f..38127e5 100644 +--- a/www/magick++.html ++++ b/www/magick++.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/magick-core.html b/www/magick-core.html +index 28a7d9c..d8ba08c 100644 +--- a/www/magick-core.html ++++ b/www/magick-core.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/magick-vector-graphics.html b/www/magick-vector-graphics.html +index e9270bc..02a8464 100644 +--- a/www/magick-vector-graphics.html ++++ b/www/magick-vector-graphics.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/magick-wand.html b/www/magick-wand.html +index 1faf241..00d6486 100644 +--- a/www/magick-wand.html ++++ b/www/magick-wand.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/miff.html b/www/miff.html +index d0280ad..c623a2e 100644 +--- a/www/miff.html ++++ b/www/miff.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/mirror.html b/www/mirror.html +index d8991d0..36b67da 100644 +--- a/www/mirror.html ++++ b/www/mirror.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/mogrify.html b/www/mogrify.html +index 74bc3ee..b08cfde 100644 +--- a/www/mogrify.html ++++ b/www/mogrify.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/montage.html b/www/montage.html +index aa0d331..c7d83cd 100644 +--- a/www/montage.html ++++ b/www/montage.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/motion-picture.html b/www/motion-picture.html +index c2ecf6e..685e9e5 100644 +--- a/www/motion-picture.html ++++ b/www/motion-picture.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/news.html b/www/news.html +index b0c9a6a..8ddc7e4 100644 +--- a/www/news.html ++++ b/www/news.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/opencl.html b/www/opencl.html +index adcd8d6..a90354f 100644 +--- a/www/opencl.html ++++ b/www/opencl.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/openmp.html b/www/openmp.html +index 072af1c..41c19c5 100644 +--- a/www/openmp.html ++++ b/www/openmp.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/perl-magick.html b/www/perl-magick.html +index c26b65b..50fdf81 100644 +--- a/www/perl-magick.html ++++ b/www/perl-magick.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/porting.html b/www/porting.html +index 6b57714..e9c4f22 100644 +--- a/www/porting.html ++++ b/www/porting.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/quantize.html b/www/quantize.html +index 4cbd8bb..bf99702 100644 +--- a/www/quantize.html ++++ b/www/quantize.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/resources.html b/www/resources.html +index a98ce30..9956ae6 100644 +--- a/www/resources.html ++++ b/www/resources.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/search.html b/www/search.html +index f43a427..9d9ce73 100644 +--- a/www/search.html ++++ b/www/search.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/security-policy.html b/www/security-policy.html +index 04dfac8..d19a6d0 100644 +--- a/www/security-policy.html ++++ b/www/security-policy.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/sitemap.html b/www/sitemap.html +index 531125c..147c65d 100644 +--- a/www/sitemap.html ++++ b/www/sitemap.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/stream.html b/www/stream.html +index 41cfc24..77be653 100644 +--- a/www/stream.html ++++ b/www/stream.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/support.html b/www/support.html +index 1466ec4..275fbe0 100644 +--- a/www/support.html ++++ b/www/support.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +diff --git a/www/webp.html b/www/webp.html +index 432dc91..540af3e 100644 +--- a/www/webp.html ++++ b/www/webp.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + diff --git a/debian/patches/0028-Fix-html-error-in-6.9.12.98-dfsg1.patch b/debian/patches/0028-Fix-html-error-in-6.9.12.98-dfsg1.patch new file mode 100644 index 0000000000000000000000000000000000000000..75deed806142346545d3197d494c9c3a7987e384 --- /dev/null +++ b/debian/patches/0028-Fix-html-error-in-6.9.12.98-dfsg1.patch @@ -0,0 +1,55 @@ +From: =?utf-8?q?Bastien_Roucari=C3=A8s?= +Date: Tue, 10 Oct 2023 15:12:31 +0000 +Subject: Fix html error in 6.9.12.98+dfsg1 + +Forwarded: not-needed +--- + www/changelog.html | 2 +- + www/security-policy.html | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/www/changelog.html b/www/changelog.html +index f46fdd8..51f2dbd 100644 +--- a/www/changelog.html ++++ b/www/changelog.html +@@ -636,7 +636,7 @@ +
        2020-01-07 6.9.10-85 Cristy <quetzlzacatenango@image...>
        +
      • Support Fx do() iterator.
        • +
      • `magick -size 100x100 xc:black black.pnm` no longer creates a white image (reference https://github.com/ImageMagick/ImageMagick/issues/1817).
        • +-
      • setjmp/longjmp in jpeg.c no longer trigger undefind behavior (reference https://imagemagick.org/discourse-server/////////viewtopic.html?f=3&t=37379). ++
      • setjmp/longjmp in jpeg.c no longer trigger undefind behavior (reference https://imagemagick.org/discourse-server/////////viewtopic.html?f=3&t=37379).
        • +
      • Permit compositing in the CMYK colorspace (reference https://imagemagick.org/discourse-server/////////viewtopic.html?f=3&t=37368).
        • +
        2020-01-04 6.9.10-84 Cristy <quetzlzacatenango@image...>
        +
      • Release ImageMagick version 6.9.10-84, GIT revision 15212:a45335c:20200104.
        • +diff --git a/www/security-policy.html b/www/security-policy.html +index 2fc2352..5158da8 100644 +--- a/www/security-policy.html ++++ b/www/security-policy.html +@@ -101,15 +101,15 @@ + +

        Keep in mind that what is considered reasonable for one environment may not be suitable for another. For example, you may have ImageMagick sandboxed in a secure environment, while someone else may use it to process images on a publicly accessible website. Or, ImageMagick may be running on a host with a lot of memory, while another instance is running on a device with limited resources. In the case of the host with large memory, it may make sense to allow large image processing, but not on the device with limited resources. If you are using ImageMagick on a public website, you may want to increase security by disabling certain coders such as MVG or HTTPS.

        + +-

        To help you get started, as of version 6.9.12-94, ImageMagick provides security polices that you can select when installing ImageMagick. Choose from: ++

        To help you get started, as of version 6.9.12-94, ImageMagick provides security polices that you can select when installing ImageMagick.

        Choose from: + +
          +
          open
          +
          The default policy for ImageMagick installations is the open security policy. This policy is designed for usage in secure settings like those protected by firewalls or within Docker containers. Within this framework, ImageMagick enjoys broad access to resources and functionalities. This policy provides convenient and adaptable options for image manipulation. However, it's important to note that it might present security vulnerabilities in less regulated conditions. Thus, organizations should thoroughly assess the appropriateness of the open policy according to their particular use case and security prerequisites.
          +
          limited
          +-
          The primary objective of the limited security policy is to find a middle ground between convenience and security. This policy involves the deactivation of potentially hazardous functionalities, like specific coders such as SVG or HTTP. Furthermore, it establishes several constraints on the utilization of resources like memory, storage, and processing duration, all of which are adjustable. This policy proves advantageous in situations where there's a need to mitigate the potential threat of handling possibly malicious or demanding images, all while retaining essential capabilities for prevalent image formats. ++
          The primary objective of the limited security policy is to find a middle ground between convenience and security. This policy involves the deactivation of potentially hazardous functionalities, like specific coders such as SVG or HTTP. Furthermore, it establishes several constraints on the utilization of resources like memory, storage, and processing duration, all of which are adjustable. This policy proves advantageous in situations where there's a need to mitigate the potential threat of handling possibly malicious or demanding images, all while retaining essential capabilities for prevalent image formats.
          +
          secure
          +-
          This stringent security policy prioritizes the implementation of rigorous controls and restricted resource utilization to establish a profoundly secure setting while employing ImageMagick. It deactivates conceivably hazardous functionalities, including specific coders like SVG or HTTP. The policy promotes the tailoring of security measures to harmonize with the requirements of the local environment and the guidelines of the organization. This protocol encompasses explicit particulars like limitations on memory consumption, sanctioned pathways for reading and writing, confines on image sequences, the utmost permissible duration of workflows, allocation of disk space intended for image data, and even an undisclosed passphrase for remote connections. By adopting this robust policy, entities can elevate their overall security stance and alleviate potential vulnerabilities. ++
          This stringent security policy prioritizes the implementation of rigorous controls and restricted resource utilization to establish a profoundly secure setting while employing ImageMagick. It deactivates conceivably hazardous functionalities, including specific coders like SVG or HTTP. The policy promotes the tailoring of security measures to harmonize with the requirements of the local environment and the guidelines of the organization. This protocol encompasses explicit particulars like limitations on memory consumption, sanctioned pathways for reading and writing, confines on image sequences, the utmost permissible duration of workflows, allocation of disk space intended for image data, and even an undisclosed passphrase for remote connections. By adopting this robust policy, entities can elevate their overall security stance and alleviate potential vulnerabilities.
          +
          websafe
          +
          This security protocol designed for web-safe usage focuses on situations where ImageMagick is applied in publicly accessible contexts, like websites. It deactivates the capability to read from or write to any image formats other than web-safe formats like GIF, JPEG, and PNG. Additionally, this policy prohibits the execution of image filters and indirect reads, thereby thwarting potential security breaches. By implementing these limitations, the web-safe policy fortifies the safeguarding of systems accessible to the public, reducing the risk of exploiting ImageMagick's capabilities for potential attacks.
          +
        +@@ -362,7 +362,7 @@ Path: [built-in] + +

        If you spot a vulnerability in ImageMagick, first determine if the vulnerability can be mitigated by the security policy. ImageMagick, by default, is open. Use the security policy to add constraints to meet the requirements of your local security governance. If you feel confident that the security policy does not address the vulnerability, post the vulnerability as a security advisory. Most vulnerabilities are reviewed and resolved within 48 hours.

        + +-

        There are several ways to keep ImageMagick safer:

        ++

        There are several ways to keep ImageMagick safer:

        +
          +
        1. Use web-safe image formats: Limiting ImageMagick to only reading or writing web-safe image formats like GIF, JPEG, and PNG can help increase security.
          2. + diff --git a/debian/patches/0028-Fix-remaining-http-error.patch b/debian/patches/0028-Fix-remaining-http-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..748e00cc858835581f138950c8d0f8b577295a22 --- /dev/null +++ b/debian/patches/0028-Fix-remaining-http-error.patch @@ -0,0 +1,2006 @@ +From: =?utf-8?q?Bastien_Roucari=C3=A8s?= +Date: Sun, 18 Jun 2023 20:02:26 +0000 +Subject: Fix remaining http error + +forwarded: not-needed +--- + index.html | 4 +- + www/advanced-linux-installation.html | 2 +- + www/advanced-unix-installation.html | 3 +- + www/advanced-windows-installation.html | 3 +- + www/animate.html | 3 +- + www/architecture.html | 12 +- + www/changelog.html | 10 +- + www/cipher.html | 2 +- + www/cite.html | 8 +- + www/color-management.html | 2 +- + www/color.html | 2 +- + www/command-line-options.html | 217 ++++++++++++++++----------------- + www/command-line-processing.html | 8 +- + www/command-line-tools.html | 2 +- + www/compare.html | 2 +- + www/compose.html | 2 +- + www/composite.html | 2 +- + www/conjure.html | 2 +- + www/connected-components.html | 2 +- + www/contact.html | 2 +- + www/convert.html | 2 +- + www/defines.html | 2 +- + www/develop.html | 2 +- + www/display.html | 2 +- + www/distribute-pixel-cache.html | 2 +- + www/download.html | 7 +- + www/escape.html | 2 +- + www/examples.html | 2 +- + www/exception.html | 2 +- + www/export.html | 2 +- + www/formats.html | 2 +- + www/fx.html | 2 +- + www/gradient.html | 2 +- + www/high-dynamic-range.html | 2 +- + www/history.html | 2 +- + www/identify.html | 2 +- + www/import.html | 2 +- + www/install-source.html | 2 +- + www/jp2.html | 2 +- + www/license.html | 2 +- + www/links.html | 2 +- + www/magick++.html | 2 +- + www/magick-core.html | 2 +- + www/magick-vector-graphics.html | 2 +- + www/magick-wand.html | 4 +- + www/miff.html | 2 +- + www/mirror.html | 2 +- + www/mogrify.html | 2 +- + www/montage.html | 2 +- + www/motion-picture.html | 2 +- + www/news.html | 2 +- + www/opencl.html | 2 +- + www/openmp.html | 2 +- + www/perl-magick.html | 2 +- + www/porting.html | 2 +- + www/quantize.html | 2 +- + www/resources.html | 2 +- + www/search.html | 3 +- + www/security-policy.html | 2 +- + www/sitemap.html | 2 +- + www/stream.html | 2 +- + www/support.html | 4 +- + www/webp.html | 2 +- + 63 files changed, 195 insertions(+), 191 deletions(-) + +diff --git a/index.html b/index.html +index 6956fc0..37c3d9d 100644 +--- a/index.html ++++ b/index.html +@@ -2,7 +2,7 @@ + + + +- ++ + + + +@@ -64,7 +64,7 @@ + + +
          +- ++ + +
          + +diff --git a/www/advanced-linux-installation.html b/www/advanced-linux-installation.html +index c971308..4d64dbb 100644 +--- a/www/advanced-linux-installation.html ++++ b/www/advanced-linux-installation.html +@@ -64,7 +64,7 @@ + + +
          +- ++ + +
          + +diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html +index c418716..40d27c4 100644 +--- a/www/advanced-unix-installation.html ++++ b/www/advanced-unix-installation.html +@@ -67,7 +67,7 @@ + + +
          +- ++ + +
          + +@@ -75,6 +75,7 @@ + + + ++ + + +
          +diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html +index 7c6eed8..4980a86 100644 +--- a/www/advanced-windows-installation.html ++++ b/www/advanced-windows-installation.html +@@ -64,7 +64,7 @@ + + +
          +- ++ + +
          +
          +@@ -72,6 +72,7 @@ + + + ++ + + +
          +diff --git a/www/animate.html b/www/animate.html +index c5c986c..b7cac63 100644 +--- a/www/animate.html ++++ b/www/animate.html +@@ -64,7 +64,7 @@ + + +
          +- ++ + +
          +
          +@@ -72,6 +72,7 @@ + + + ++ + + +
          +diff --git a/www/architecture.html b/www/architecture.html +index 4a2b626..2abe646 100644 +--- a/www/architecture.html ++++ b/www/architecture.html +@@ -64,7 +64,7 @@ + + +
          +- ++ + +
          +
          +@@ -322,7 +322,7 @@ Resource limits: + Thread: 12 + Throttle: 0 + Time: unlimited +- ++ + +

          You can set these limits either as a security policy (see policy.xml), with an environment variable, with the -limit command line option, or with the SetMagickResourceLimit() MagickCore API method. As an example, our online web interface to ImageMagick, MagickStudio, includes these policy limits to help prevent a denial-of-service:

          + 
          <?xml version="1.0" encoding="UTF-8"?>
+@@ -454,7 +454,7 @@ Resource limits:
+   destroy LOGO[0]
+ 2016-12-17T13:33:42-05:00 0:00.050 0.100u 7.0.0 Cache convert: cache.c/DestroyPixelCache/1275/Cache
+   destroy LOGO[0]
+-
          ++ +

          This command utilizes a pixel cache in memory. The logo consumed 4.688MiB and after it was sharpened, 3.516MiB.

          + + +@@ -775,7 +775,7 @@ Performance[9]: 10i 4.484ips 0.798e 12.860u 0:02.230 + Performance[10]: 10i 4.274ips 0.790e 14.830u 0:02.340 + Performance[11]: 10i 4.348ips 0.793e 16.500u 0:02.300 + Performance[12]: 10i 4.525ips 0.799e 18.320u 0:02.210 +- ++ +

          The sweet spot for this example is 6 threads. This makes sense since there are 6 physical cores. The other 6 are hyperthreads. It appears that sharpening does not benefit from hyperthreading.

          +

          In certain cases, it might be optimal to set the number of threads to 1 or to disable OpenMP completely with the MAGICK_THREAD_LIMIT environment variable, -limit command line option, or the policy.xml configuration file.

          + +@@ -785,7 +785,7 @@ Performance[12]: 10i 4.525ips 0.799e 18.320u 0:02.210 +

          First verify that your version of ImageMagick includes support for the OpenCL feature:

          + 
          -> identify -version
+ Features: DPC Cipher Modules OpenCL OpenMP(4.5)
+-
          ++ + +

          If so, run this command to realize a significant speed-up for image convolution:

          + 
          convert image.png -convolve '-1, -1, -1, -1, 9, -1, -1, -1, -1' convolve.png
+@@ -1287,7 +1287,7 @@ display logo.mgk
+ #include <math.h>
+ #include "magick/studio.h"
+ #include "magick/MagickCore.h"
+-
++
+ /*
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ %                                                                             %
+diff --git a/www/changelog.html b/www/changelog.html
+index 4898c52..f46fdd8 100644
+--- a/www/changelog.html
++++ b/www/changelog.html
+@@ -67,7 +67,7 @@
+         
+       
+       
          
+-        
++        
+         
+       
          
+     
+@@ -173,7 +173,8 @@
+   
        2.  Release ImageMagick version 6.9.12-25 GIT revision 16849:2c96ab5d0:20211010
          3. 
+ 
          2021-10-03  6.9.12-25  <quetzlzacatenango@image...>
          
+   
        3.  improved algorithm for automatic calculation of pointsize for caption and    labels.
          4. 
+-  
        4.  support -auto-orient option in the identify utlity.  
          2021-10-03  6.9.12-24  <quetzlzacatenango@image...>
          
++  
        5.  support -auto-orient option in the identify utlity.
          6. 
++  
          2021-10-03  6.9.12-24  <quetzlzacatenango@image...>
          
+   
        6.  Release ImageMagick version 6.9.12-24 GIT revision 16842:f6fdd0321:20211003
          7. 
+ 
          2021-10-03  6.9.12-24  Dirk Lemstra <dirk@lem.....org>
          
+   
        7.  improved algorithm for automatic calculation of word breaks and pointsize    for caption and labels.
          8. 
+@@ -635,13 +636,14 @@
+ 
          2020-01-07  6.9.10-85 Cristy  <quetzlzacatenango@image...>
          
+   
        8.  Support Fx do() iterator.
          9. 
+   
        9.  `magick -size 100x100 xc:black black.pnm` no longer creates a white image    (reference https://github.com/ImageMagick/ImageMagick/issues/1817).
          10. 
+-  
        10.  setjmp/longjmp in jpeg.c no longer trigger undefind behavior (reference
          		https://imagemagick.org/discourse-server/////////viewtopic.html?f=3&t=37379).
          
++  
        11.  setjmp/longjmp in jpeg.c no longer trigger undefind behavior (reference	https://imagemagick.org/discourse-server/////////viewtopic.html?f=3&t=37379).
+   
        12.  Permit compositing in the CMYK colorspace (reference    https://imagemagick.org/discourse-server/////////viewtopic.html?f=3&t=37368).
          13. 
+ 
          2020-01-04  6.9.10-84 Cristy  <quetzlzacatenango@image...>
          
+   
        13.  Release ImageMagick version 6.9.10-84, GIT revision 15212:a45335c:20200104.
          14. 
+ 
          2020-01-01  6.9.10-84 Cristy  <quetzlzacatenango@image...>
          
+   
        14.  Support extended Fx assignment operators (e.g. *=, /=, ++, --, etc.)
          15. 
+-  
        15.  Support Fx for() iterator.
          	* Optimize Fx performance.
          
++  
        16.  Support Fx for() iterator.
          17. 
++  
          	* Optimize Fx performance.
          
+   
        17. 	* Ensure circle.rb renders the same for IMv6 and IMv7 (reference    https://github.com/rmagick/rmagick/issues/905).
          18. 
+ 
          2019-12-30  6.9.10-83 Cristy  <quetzlzacatenango@image...>
          
+   
        18.  Release ImageMagick version 6.9.10-83, GIT revision 15184:9f64323:20191230.
          19. 
+diff --git a/www/cipher.html b/www/cipher.html
+index 9b9901a..5698a56 100644
+--- a/www/cipher.html
++++ b/www/cipher.html
+@@ -64,7 +64,7 @@
+         
+       
+       
          
+-        
++        
+         
+       
          
+     
+diff --git a/www/cite.html b/www/cite.html
+index 6ebf50d..a3095d7 100644
+--- a/www/cite.html
++++ b/www/cite.html
+@@ -64,7 +64,7 @@
+         
+       
+       
          
+-        
++        
+         
+       
          
+     
+@@ -98,7 +98,7 @@
+ 
          1. ImageMagick Studio LLC. ImageMagick [Internet]. 2023. Available from: https://imagemagick.org
          
+ 
+ 
          Citation in Harvard style
          
+-
          ImageMagick Studio LLC, 2023. ImageMagick, Available at: https://imagemagick.org.
          
++
          ImageMagick Studio LLC, 2023. ImageMagick, Available at: https://imagemagick.org.
          
+ 
          Citation in Bibtex format
          
+ 
          @software{imagemagick,
+   author = {{ImageMagick Studio LLC}},
+@@ -107,8 +107,10 @@
+   version = {7.0.10},
+   date = {2023-01-04},
+ }
          
++
+   
+-  
++  
++  
+