Merge branch '8.9'

ChangeLog

@@ -18,6 +18,7 @@
 - fix a deadlock with --vips-leak [DarthSim]
 - better gifload behaviour for DISPOSAL_UNSPECIFIED [DarthSim]
 - ban ppm max_value < 0 
+- add fuzz corpus to dist
 
 20/6/19 started 8.9.1
 - don't use the new source loaders for new_from_file or new_from_buffer, it

doc/How-it-opens-files.xml

@@ -16,7 +16,7 @@
 <para>
   This page tries to explain what the different strategies are and when each is used. If you are running into unexpected memory, disc or CPU use, this might be helpful. <literal>vips_image_new_from_file()</literal> has the official documentation.
 </para>
-<refsect3 id="direct-access">
+<section xml:id="direct-access">
   <title>Direct access</title>
   <para>
     This is the fastest and simplest one. The file is mapped directly into the process’s address space and can be read with ordinary pointer access. Small files are completely mapped; large files are mapped in a series of small windows that are shared and which scroll about as pixels are read. Files which are accessed like this can be read by many threads at once, making them especially quick. They also interact well with the computer’s operating system: your OS will use spare memory to cache recently used chunks of the file.
@@ -25,10 +25,10 @@
     For this to be possible, the file format needs to be a simple dump of a memory array. libvips supports direct access for vips, 8-bit binary ppm/pbm/pnm, analyse and raw.
   </para>
   <para>
-    libvips has a special direct write mode where pixels can be written directly to the file image. This is used for the <ulink url="libvips-draw.html">draw operators</ulink>.
+    libvips has a special direct write mode where pixels can be written directly to the file image. This is used for the <link xlink:href="libvips-draw.html">draw operators</link>.
   </para>
-</refsect3>
-<refsect3 id="random-access-via-load-library">
+</section>
+<section xml:id="random-access-via-load-library">
   <title>Random access via load library</title>
   <para>
     Some image file formats have libraries which allow true random access to image pixels. For example, libtiff lets you read any tile out of a tiled tiff image very quickly. Because the libraries allow true random access, libvips can simply hook the image load library up to the input of the operation pipeline.
@@ -39,8 +39,8 @@
   <para>
     libvips can load tiled tiff, tiled OpenEXR, FITS and OpenSlide images in this manner.
   </para>
-</refsect3>
-<refsect3 id="full-decompression">
+</section>
+<section xml:id="full-decompression">
   <title>Full decompression</title>
   <para>
     Many image load libraries do not support random access. In order to use images of this type as inputs to pipelines, libvips has to convert them to a random access format first.
@@ -54,8 +54,8 @@
   <para>
     This is the slowest and most memory-hungry way to read files, but it’s unavoidable for many file formats. Unless you can use the next one!
   </para>
-</refsect3>
-<refsect3 id="sequential-access">
+</section>
+<section xml:id="sequential-access">
   <title>Sequential access</title>
   <para>
     This a fairly recent addition to libvips and is a hybrid of the previous two.
@@ -90,7 +90,7 @@ $ vips shrink fred.png jim.png 10 10
   <para>
     This is done automatically in command-line operation. In programs, you need to set <literal>access</literal> to #VIPS_ACCESS_SEQUENTIAL in calls to functions like vips_image_new_from_file().
   </para>
-</refsect3>
+</section>
 
 
 </refentry>

doc/Using-vipsthumbnail.xml

@@ -21,7 +21,7 @@ $filename = "image.jpg";
 $image = Vips\Image::thumbnail($filename, 200, ["height" => 200]);
 $image->writeToFile("my-thumbnail.jpg");
 </programlisting>
-<refsect3 id="libvips-options">
+<section xml:id="libvips-options">
   <title>libvips options</title>
   <para>
     <literal>vipsthumbnail</literal> supports the usual range of vips command-line options. A few of them are useful:
@@ -38,8 +38,8 @@ $image-&gt;writeToFile(&quot;my-thumbnail.jpg&quot;);
   <para>
     <literal>--vips-info</literal> shows a higher level view of the operations that <literal>vipsthumbnail</literal> is running. 
   </para>
-</refsect3>
-<refsect3 id="looping">
+</section>
+<section xml:id="looping">
   <title>Looping</title>
   <para>
     <literal>vipsthumbnail</literal> can process many images in one command. For example:
@@ -56,8 +56,8 @@ $ vipsthumbnail *.jpg
   <programlisting>
 $ parallel vipsthumbnail ::: *.jpg
 </programlisting>
-</refsect3>
-<refsect3 id="thumbnail-size">
+</section>
+<section xml:id="thumbnail-size">
   <title>Thumbnail size</title>
   <para>
     You can set the bounding box of the generated thumbnail with the <literal>--size</literal> option. For example:
@@ -80,8 +80,8 @@ $ vipsthumbnail shark.jpg --size 200x
   <para>
     You can append <literal>!</literal> to force a resize to the exact target size, breaking the aspect ratio.
   </para>
-</refsect3>
-<refsect3 id="cropping">
+</section>
+<section xml:id="cropping">
   <title>Cropping</title>
   <para>
     <literal>vipsthumbnail</literal> normally shrinks images to fit within the box set by <literal>--size</literal>. You can use the <literal>--smartcrop</literal> option to crop to fill the box instead. Excess pixels are trimmed away using the strategy you set. For example:
@@ -92,30 +92,28 @@ $ vipsthumbnail owl.jpg --smartcrop attention -s 128
   <para>
     Where <literal>owl.jpg</literal> is an off-centre composition:
   </para>
-  <figure>
-    <mediaobject>
+  <para>
+    <inlinemediaobject>
       <imageobject>
         <imagedata fileref="owl.jpg" />
       </imageobject>
-      <textobject><phrase></phrase></textobject>
-    </mediaobject>
-  </figure>
+    </inlinemediaobject>
+  </para>
   <para>
     Gives this result:
   </para>
-  <figure>
-    <mediaobject>
+  <para>
+    <inlinemediaobject>
       <imageobject>
         <imagedata fileref="tn_owl.jpg" />
       </imageobject>
-      <textobject><phrase></phrase></textobject>
-    </mediaobject>
-  </figure>
+    </inlinemediaobject>
+  </para>
   <para>
     First it shrinks the image to get the vertical axis to 128 pixels, then crops down to 128 pixels across using the <literal>attention</literal> strategy. This one searches the image for features which might catch a human eye, see <literal>vips_smartcrop()</literal> for details.
   </para>
-</refsect3>
-<refsect3 id="linear-light">
+</section>
+<section xml:id="linear-light">
   <title>Linear light</title>
   <para>
     Shrinking images involves combining many pixels into one. Arithmetic averaging really ought to be in terms of the number of photons, but (for historical reasons) the values stored in image files are usually related to the voltage that should be applied to the electron gun in a CRT display.
@@ -142,8 +140,8 @@ real    0m4.660s
 user    0m4.640s
 sys 0m0.016s
 </programlisting>
-</refsect3>
-<refsect3 id="output-directory">
+</section>
+<section xml:id="output-directory">
   <title>Output directory</title>
   <para>
     You set the thumbnail write parameters with the <literal>-o</literal> option. This is a pattern which the input filename is pasted into to produce the output filename. For example:
@@ -172,8 +170,8 @@ $ vipsthumbnail fred.jpg ../jim.tif -o mythumbs/tn_%s.jpg
   <para>
     Now both input files will have thumbnails written to a subdirectory of their current directory.
   </para>
-</refsect3>
-<refsect3 id="output-format-and-options">
+</section>
+<section xml:id="output-format-and-options">
   <title>Output format and options</title>
   <para>
     You can use <literal>-o</literal> to specify the thumbnail image format too. For example: 
@@ -247,8 +245,8 @@ $ vipsthumbnail 42-32157534.jpg -o x.jpg[optimize_coding,strip]
 $ ls -l x.jpg
 -rw-r–r– 1 john john 3600 Nov 12 21:27 x.jpg
 </programlisting>
-</refsect3>
-<refsect3 id="colour-management">
+</section>
+<section xml:id="colour-management">
   <title>Colour management</title>
   <para>
     <literal>vipsthumbnail</literal> will optionally put images through LittleCMS for you. You can use this to move all thumbnails to the same colour space. All web browsers assume that images without an ICC profile are in sRGB colourspace, so if you move your thumbnails to sRGB, you can strip all the embedded profiles. This can save several kb per thumbnail.
@@ -265,12 +263,15 @@ $ ls -l tn_shark.jpg
     Now encode with sRGB and delete any embedded profile:
   </para>
   <programlisting>
-$ vipsthumbnail shark.jpg --eprofile /usr/share/color/icc/sRGB.icc --delete
+$ vipsthumbnail shark.jpg --eprofile srgb --delete
 $ ls -l tn_shark.jpg 
 -rw-r–r– 1 john john 4229 Nov  9 14:33 tn_shark.jpg
 </programlisting>
   <para>
-    It’ll look identical to a user, but be almost half the size.
+    (You can use the filename of any RGB profile. The magic string <literal>srgb</literal> selects a high-quality sRGB profile that’s built into libvips.)
+  </para>
+  <para>
+    <literal>tn_shark.jpg</literal> will look identical to a user, but it’s almost half the size.
   </para>
   <para>
     You can also specify a fallback input profile to use if the image has no embedded one. This can often happen with CMYK images, producing an error message like:
@@ -284,28 +285,13 @@ vips_colourspace: no known route from 'cmyk' to 'srgb'
     If you supply a CMYK profile, it will be able to convert the image, for example:
   </para>
   <programlisting>
-$ vipsthumbnail kgdev.jpg --iprofile /usr/share/color/icc/colord/FOGRA28L_webcoated.icc 
+$ vipsthumbnail kgdev.jpg --iprofile cmyk 
 </programlisting>
   <para>
-    I’ve had good results with this profile:
+    (As before, the magic string <literal>cmyk</literal> selects a high-quality CMYK profile that’s built into libvips, but you can use any CMYK profile you like.)
   </para>
-  <para>
-    https://github.com/libvips/nip2/blob/master/share/nip2/data/cmyk.icm
-  </para>
-  <para>
-    It makes nice-looking images from most CMYK files, and is completely free.
-  </para>
-</refsect3>
-<refsect3 id="auto-rotate">
-  <title>Auto-rotate</title>
-  <para>
-    Many JPEG files have a hint set in the header giving the image orientation. If you strip out the metadata, this hint will be lost, and the image will appear to be rotated.
-  </para>
-  <para>
-    If you use the <literal>--rotate</literal> option, <literal>vipsthumbnail</literal> examines the image header and if there’s an orientation tag, applies and removes it.
-  </para>
-</refsect3>
-<refsect3 id="final-suggestion">
+</section>
+<section xml:id="final-suggestion">
   <title>Final suggestion</title>
   <para>
     Putting all this together, I suggest this as a sensible set of options:
@@ -314,10 +300,9 @@ $ vipsthumbnail kgdev.jpg --iprofile /usr/share/color/icc/colord/FOGRA28L_webcoa
 $ vipsthumbnail fred.jpg \
     --size 128 \
     -o tn_%s.jpg[optimize_coding,strip] \
-    --eprofile /usr/share/color/icc/sRGB.icc \
-    --rotate
+    --eprofile srgb
 </programlisting>
-</refsect3>
+</section>
 
 
 </refentry>

fuzz/Makefile.am

@@ -25,4 +25,6 @@ libstandaloneengine_a_SOURCES = StandaloneFuzzTargetMain.c
 check_PROGRAMS = $(FUZZPROGS)
 noinst_LIBRARIES = $(FUZZLIBS)
 
-EXTRA_DIST = $(TESTS)
+EXTRA_DIST = \
+	$(TESTS) \
+	common_fuzzer_corpus

fuzz/common_fuzzer_corpus/x-ascii.ppm

@@ -1,15 +0,0 @@
-P2
-#vips2ppm - Fri Aug 23 12:48:07 2019
-
-10 10
-255
-96 101 113 118 124 130 136 141 147 150 
-81 87 98 101 107 112 117 123 130 135 
-73 78 85 90 95 99 103 110 118 124 
-46 51 60 67 73 81 87 94 103 109 
-34 35 40 48 60 69 77 81 85 88 
-28 26 31 36 45 54 59 64 69 72 
-32 31 41 39 39 40 45 52 61 66 
-38 38 47 42 38 36 38 43 49 53 
-37 38 39 39 37 37 37 36 34 32 
-36 36 38 36 35 34 35 32 28 25 

fuzz/common_fuzzer_corpus/x.csv

@@ -1,10 +0,0 @@
-96	101	113	118	124	130	136	141	147	150
-81	87	98	101	107	112	117	123	130	135
-73	78	85	90	95	99	103	110	118	124
-46	51	60	67	73	81	87	94	103	109
-34	35	40	48	60	69	77	81	85	88
-28	26	31	36	45	54	59	64	69	72
-32	31	41	39	39	40	45	52	61	66
-38	38	47	42	38	36	38	43	49	53
-37	38	39	39	37	37	37	36	34	32
-36	36	38	36	35	34	35	32	28	25

fuzz/common_fuzzer_corpus/x.mat

@@ -1,11 +0,0 @@
-10 10 
-96 101 113 118 124 130 136 141 147 150 
-81 87 98 101 107 112 117 123 130 135 
-73 78 85 90 95 99 103 110 118 124 
-46 51 60 67 73 81 87 94 103 109 
-34 35 40 48 60 69 77 81 85 88 
-28 26 31 36 45 54 59 64 69 72 
-32 31 41 39 39 40 45 52 61 66 
-38 38 47 42 38 36 38 43 49 53 
-37 38 39 39 37 37 37 36 34 32 
-36 36 38 36 35 34 35 32 28 25 

fuzz/common_fuzzer_corpus/x.ppm

@@ -1,6 +0,0 @@
-P5
-#vips2ppm - Fri Aug 23 12:47:38 2019
-
-10 10
-255
-`eqv|‚ˆ<E2809A>“–QWbekpu{‚‡INUZ_cgnv|.3<CIQW^gm"#(0<EMQUX$-6;@EH )''(-4=B&&/*&$&+15%&''%%%$" $$&$#"# 

fuzz/common_fuzzer_corpus/x3.ppm

@@ -1,6 +0,0 @@
-P6
-#vips2ppm - Fri Aug 23 12:47:50 2019
-
-10 10
-255
-g[ilaoxm{{s€<73>yˆ†<E280A0>Œ…—<E280A6>‹œ•<C593>¤˜”¥\K[`Rai]klaophwtm}yr„wŒ„•‰…–TBRYHX^P_aUcf[kh_plcvrjzr‰€y‹:(6=-:E7DJ>LQDUWL]\SfcZolbzri|.(/)3#.9+8E7FM@QSHYVM`ZQf]Tg' %*$- *6(5=1?C6HG;OL@VOCW,!)!3$+2",0#-1#05(9</AE8LJ=Q1"%/#%7+/3&-/"+- */!04&7:+>>/B.""/##0$&/#'.!(.!*. --.+.)-," ,"!/##-!#,&+'-*+*'(#%