fz_pixmap revamp: add stride and make alpha optional

fz_pixmaps now have an explicit stride value. By default no change
from before, but code all copes with extra gaps at the end of the
line.

The alpha data in fz_pixmaps is no longer compulsory.

mudraw: use rgb not rgba (ppmraw), cmyk not cmyka (pkmraw).

Update halftone code to not expect alpha plane.

Update PNG writing to cope with alpha less input.

Also hide repeated params within the png output context.

ARM code needs updating.

2 files changed, 4 insertions, 4 deletions

diff --git a/docs/mutool/examples/draw-device.js b/docs/mutool/examples/draw-device.js
index 140fb54b..21a7a65a 100644
--- a/docs/mutool/examples/draw-device.js
+++ b/docs/mutool/examples/draw-device.js
@@ -4,7 +4,7 @@ var font = new Font("Times-Roman");
 var image = new Image("example.png");
 var path, text;
 
-var pixmap = new Pixmap(DeviceRGB, [0,0,500,600]);
+var pixmap = new Pixmap(DeviceRGB, [0,0,500,600], false);
 pixmap.clear(255);
 var device = new DrawDevice(pixmap);
 var transform = [2,0,0,2,0,0]
diff --git a/docs/mutool/run.html b/docs/mutool/run.html
index c9ab103e..e82a68bd 100644
--- a/docs/mutool/run.html
+++ b/docs/mutool/run.html
@@ -219,7 +219,7 @@ A pixmap also has a location (x, y) in addition to its size; so that they can ea
 tiles of a page.
 
 <dl>
-<dt>new Pixmap(colorspace, bounds)
+<dt>new Pixmap(colorspace, bounds, alpha)
 <dd>Create a new pixmap. The pixel data is <b>not</b> initialized; and will contain garbage.
 <dt>Pixmap#clear(value)
 <dd>Clear the pixels to the specifed value. Pass 255 for white, or undefined for transparent.
@@ -269,8 +269,8 @@ will keep all the graphics required in memory, so will increase the amount of me
 <dd>Create an empty display list.
 <dt>DisplayList#run(device, transform)
 <dd>Play back the recorded device calls onto the device.
-<dt>DisplayList#toPixmap(transform, colorspace, solid)
-<dd>Render display list to a pixmap. If solid is true, it will render to a white background, otherwise transparent.
+<dt>DisplayList#toPixmap(transform, colorspace, alpha)
+<dd>Render display list to a pixmap. If alpha is true, it will render to a transparent background, otherwise white.
 </dl>
 
 <dl>