Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev

29 files changed, 46056 insertions, 69 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index ff8845fc98..3d1ce6c672 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -14650,6 +14650,10 @@ sha256=47b749b20717df24393c83adcce9a3a10f0690517c18da8d0a1ddcb410a0ac1d
 md5=61abd9bf1435e37def0956248a03832c
 sha256=afcedda15bde2395dec31a82a243871a0540ea2e13e7a14d15846ad0c1f09a7b
 
+[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.27/libsoup-2.27.4.tar.bz2]
+md5=c9b676621f1b89245ec5cec0c67198b7
+sha256=4d67aa8d2d3c719b67bde58ca3b8a94aa1d172bc242672401d7f3d22685065b9
+
 [http://ftp.gnome.org/pub/GNOME/sources/libsoup-2.4/2.4/libsoup-2.4.1.tar.bz2]
 md5=d0fc91ccb9da401e9e40d2f4612bdac9
 sha256=774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index faa8c4d2a8..d747b6ebc9 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -136,7 +136,7 @@ SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-mickeydbus ?= "f894801916cc4d0e912e4553490dc215276c52a9"
 SRCREV_pn-mickeyterm ?= "f894801916cc4d0e912e4553490dc215276c52a9"
-SRCREV_pn-midori ?= "3179a538a947cbd7612cac346e3e0c7c3d0e03cd"
+SRCREV_pn-midori ?= "400139644371c0b675723f9a986ddab4445a8794"
 SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
 SRCREV_pn-mokoko ?= "127"
@@ -254,7 +254,7 @@ SRCREV_pn-usbpath-native ?= "3172"
 SRCREV-pn-vala-dbus-binding-tool-native ?= "55a6bc5dd032731d89c238d274b2898ef02d12f8"
 SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
 SRCREV_pn-vala-native ?= "6cf030120cd7f6a76a5d766d7420aea847e02cfd"
-SRCREV_pn-webkit-gtk ?= "44532"
+SRCREV_pn-webkit-gtk ?= "45825"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-wmiconfig ?= "4522"
diff --git a/conf/machine/stamp9g20evb.conf b/conf/machine/stamp9g20evb.conf
new file mode 100644
index 0000000000..7310d8adc8
--- /dev/null
+++ b/conf/machine/stamp9g20evb.conf
@@ -0,0 +1,26 @@
+#@TYPE: Machine
+#@Name: taskit Stamp9G20 Evaluation Board
+#@DESCRIPTION: Machine configuration for the Stamp9G20 Evaluation Board
+#@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_VERSION_linux = "2.6.29"
+
+KERNEL_IMAGETYPE = "uImage"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 ext2 vfat usbhost usbgadget"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n --pad; \
+			sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 -e 0x20000 -n --pad; \
+			mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2"
+
+require conf/machine/include/tune-arm926ejs.inc
+
diff --git a/recipes/gnome/libsoup-2.4_2.27.4.bb b/recipes/gnome/libsoup-2.4_2.27.4.bb
new file mode 100644
index 0000000000..ae503065c0
--- /dev/null
+++ b/recipes/gnome/libsoup-2.4_2.27.4.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "An HTTP library implementation in C"
+SECTION = "x11/gnome/libs"
+LICENSE = "GPL"
+DEPENDS = "libproxy glib-2.0 gnutls libxml2 sqlite3"
+
+inherit gnome
+
+SRC_URI = "${GNOME_MIRROR}/libsoup/${@gnome_verdir("${PV}")}/libsoup-${PV}.tar.bz2"
+S = "${WORKDIR}/libsoup-${PV}"
+
+do_stage() {
+	autotools_stage_all
+}
+
+PACKAGES =+ "libsoup-gnome"
+FILES_libsoup-gnome = "${libdir}/libsoup-gnome*.so.*"
+FILES_${PN} = "${libdir}/libsoup-2*.so.*"
+FILES_${PN}-dev = "${includedir}/ ${libdir}/"
+FILES_${PN}-doc = "${datadir}/"
diff --git a/recipes/gs/gs/0001_svn_snapshot.patch b/recipes/gs/gs/0001_svn_snapshot.patch
new file mode 100644
index 0000000000..4650b11e73
--- /dev/null
+++ b/recipes/gs/gs/0001_svn_snapshot.patch
@@ -0,0 +1,24362 @@
+Description: /jbig2dec changes r9437 → r9781 (release 8.64 → 2009-06-08)
+             - subdirs /jasper, /libpng and /jbig2dec skipped
+             - version bump skipped
+             - some $Id$ changes suppressed or fuzzy
+Author: Jonas Smedegaard <dr@jones.dk>
+diff --git a/Resource/Init/gs_init.ps b/Resource/Init/gs_init.ps
+--- a/Resource/Init/gs_init.ps
++++ b/Resource/Init/gs_init.ps
+@@ -209,7 +209,7 @@ currentdict /DEVICE known not
+ 	% during initialization.
+   /MaxDictStack 500
+   /MaxExecStack 5000
+-  /MaxOpStack 65414
++  /MaxOpStack 100000
+   .dicttomark .setuserparams
+ } if
+ 
+diff --git a/Resource/Init/gs_pdfwr.ps b/Resource/Init/gs_pdfwr.ps
+--- a/Resource/Init/gs_pdfwr.ps
++++ b/Resource/Init/gs_pdfwr.ps
+@@ -665,18 +665,28 @@ currentdict /.pdf_hook_DSC_Creator undef
+   /MonoImageResolution { }
+ 		% Font embedding parameters
+   /AlwaysEmbed
+-   { dup length 0 gt
+-      { dup 0 get false eq
++   { dup length 0 gt 
++      { dup 0 get type /booleantype eq } { false } ifelse
++      { dup 0 get
++         { dup length 1 sub 1 exch getinterval
++         }
+          { dup length 1 sub 1 exch getinterval exch pop /~AlwaysEmbed exch
+-         } if
+-      } if
++         } ifelse
++       }
++      { exch pop /.AlwaysEmbed exch
++      } ifelse
+    }
+   /NeverEmbed
+-   { dup length 0 gt
+-      { dup 0 get false eq
+-         { dup length 1 sub 1 exch getinterval exch pop /~NeverEmbed exch
+-         } if
+-      } if
++  { dup length 0 gt 
++     { dup 0 get type /booleantype eq } { false } ifelse
++     { dup 0 get
++        { dup length 1 sub 1 exch getinterval
++        }
++        { dup length 1 sub 1 exch getinterval exch pop /~NeverEmbed exch
++        } ifelse
++     }
++     { exch pop /.NeverEmbed exch
++     } ifelse
+    }
+   /CannotEmbedFontPolicy { }
+   /EmbedAllFonts { }
+diff --git a/Resource/Init/gs_res.ps b/Resource/Init/gs_res.ps
+--- a/Resource/Init/gs_res.ps
++++ b/Resource/Init/gs_res.ps
+@@ -349,6 +349,15 @@ ne {
+ } if
+ pop pop
+ 
++pssystemparams dup /GenericResourceDir get exch /GenericResourcePathSep get
++(Init) exch (gs_init.ps) concatstrings concatstrings concatstrings 
++status {
++  pop pop pop pop
++} {
++  (\n*** Warning: GenericResourceDir doesn't point to a valid resource directory.) =
++  (               the -sGenericResourceDir=... option can be used to set this.\n) =
++} ifelse
++
+ % Define the generic algorithm for computing resource file names.
+ /.rfnstring 8192 string def
+ /.genericrfn		% <key> <scratch> <prefix> .genericrfn <filename>
+diff --git a/Resource/Init/gs_setpd.ps b/Resource/Init/gs_setpd.ps
+--- a/Resource/Init/gs_setpd.ps
++++ b/Resource/Init/gs_setpd.ps
+@@ -171,13 +171,8 @@ level2dict begin
+   % the default policy to "7" (impose) to avoid numerous problems with
+   % printing within CUPS...
+   %
+-  NOMEDIAATTRS {
+-    /PolicyNotFound 7
+-    /PageSize 7
+-  } {
+-    /PolicyNotFound 1
+-    /PageSize 0
+-  } ifelse
++  /PageSize NOMEDIAATTRS { 7 } { 0 } ifelse
++  /PolicyNotFound 1
+   /PolicyReport {
+     dup /.LockSafetyParams known {
+ 	% Only possible error is invalidaccess
+@@ -810,20 +805,17 @@ SETPDDEBUG { (Installing.) = pstack flush } if
+ 		% NB: This shoud be the only use of the .setuseciecolor
+ 		%     operator anywhere.
+ 		%
+-		% If UseCIEColor is transitioned to false, set some
+-		% color space other than /DeviceGray, to insure that
+-		% initgraphics will actually perform a setcolorspace
++		% Set some color space other than /DeviceGray, to insure 
++		% that initgraphics will actually perform a setcolorspace
+ 		% operation (there is an optimization in setcolorspace
+ 		% that does nothing if the operand and current color
+-		% spaces are the same, and UseCIEColor is false).
++		% spaces are the same)
+ 
+     /.setuseciecolor where
+       {
+         pop 1 index /UseCIEColor .knownget
+           {
+-            dup .setuseciecolor not
+-              { /DeviceRGB setcolorspace }
+-            if
++            .setuseciecolor /DeviceRGB setcolorspace
+           }
+         if
+       }
+diff --git a/Resource/Init/gs_statd.ps b/Resource/Init/gs_statd.ps
+--- a/Resource/Init/gs_statd.ps
++++ b/Resource/Init/gs_statd.ps
+@@ -109,6 +109,8 @@ STRICT { (%END SIZES) .skipeof } if
+  /halfletter {396 612 //.setpagesize exec} bind def
+ 	% minimum of a4 and letter (a4 width, letter length)
+  /pa4 {595 792 //.setpagesize exec} bind def
++	% Japanese postcard size, 100mm x 148mm
++ /hagaki {283 420 //.setpagesize exec} bind def
+ % /tabloid {792 1224 //.setpagesize exec} bind def  % 11x17 portrait
+ % /csheet {1224 1584 //.setpagesize exec} bind def % ANSI C 17x22
+ % /dsheet {1584 2448 //.setpagesize exec} bind def % ANSI D 22x34
+@@ -134,7 +136,7 @@ STRICT { (%END SIZES) .skipeof } if
+    /flsa /flse /halfletter
+    /isob0 /isob1 /isob2 /isob3 /isob4 /isob5 /isob6
+    /jisb0 /jisb1 /jisb2 /jisb3 /jisb4 /jisb5 /jisb6
+-   /pa4
++   /pa4 /hagaki
+ %END SIZES
+  ] cvlit readonly def
+ 
+diff --git a/Resource/Init/gs_ttf.ps b/Resource/Init/gs_ttf.ps
+--- a/Resource/Init/gs_ttf.ps
++++ b/Resource/Init/gs_ttf.ps
+@@ -827,7 +827,8 @@ end readonly def                % .loadttfontdict
+     } if
+     /ttc_offset 0 def
+   } ifelse
+-  /tables f offsets 4 getu16 16 mul string readstring pop def
++        % Peek because table counter may be incorrect.
++  /tables f offsets 4 getu16 16 mul string .peekstring pop def
+   /tabdict tables length 16 idiv dict def
+ 	% tabs = tables we want to keep, sorted by file position.
+   /tabs [ 0 16 tables length 1 sub {
+@@ -868,7 +869,7 @@ mark
+ % Read data.  Updates offsets, tabs; stores data in tabdict.
+ /.readttdata {
+   /file_table_pos 10 dict def
+-  /fpos offsets length tables length add ttc_offset add def
++  /fpos offsets length ttc_offset add def
+   /sfpos offsets length tabs length 16 mul add def
+   offsets 4 tabs length putu16
+   tabs {
+diff --git a/Resource/Init/gs_typ32.ps b/Resource/Init/gs_typ32.ps
+--- a/Resource/Init/gs_typ32.ps
++++ b/Resource/Init/gs_typ32.ps
+@@ -37,7 +37,8 @@ systemdict /.makeglyph32 .undef
+ 		% Define a string large enough to hold the metrics,
+ 		% an uncompressed bitmap (worst case = 5x expansion),
+ 		% and the 2 RTC codes (3 bytes).
+-    dup length 4 index length 5 mul add 10 add string
++    dup length 4 index length 5 mul add 10 add
++    65535 .min string
+ 		% Stack: metrics bitmap cid font metstr buffer
+     dup 0 3 index putinterval
+     dup 2 index length 1 index length 1 index sub getinterval
+diff --git a/Resource/Init/opdfread.ps b/Resource/Init/opdfread.ps
+--- a/Resource/Init/opdfread.ps
++++ b/Resource/Init/opdfread.ps
+@@ -152,6 +152,7 @@ end % A dictionary for local binding
+ /TTFDEBUG DefaultSwitch
+ /RotatePages DefaultSwitch
+ /FitPages DefaultSwitch
++/CenterPages DefaultSwitch
+ /SetPageSize DefaultSwitch
+ 
+ /error  %  mark <object> .... error -
+@@ -167,10 +168,16 @@ end % A dictionary for local binding
+ } bind def
+ 
+ //SetPageSize {
+-  //RotatePages //FitPages or {
+-    mark (/RotatePages, /FitPages are not allowed with /SetPageSize) //error exec
++  //RotatePages //FitPages or //CenterPages or{
++    mark (/RotatePages, /FitPages and CenterPages are not allowed with /SetPageSize) //error exec
+   } if
+-} if
++} 
++{
++  //FitPages //CenterPages and {
++    mark (CenterPages is not allowed with /FitPages) //error exec
++  } if
++}
++ifelse
+ 
+ % ===================== Utilities =========================================
+ 
+@@ -851,23 +858,43 @@ currentdict end readonly def
+   } {
+     false
+   } ifelse
+-  { //FitPages {
+-      1 index 5 index div 1 index 7 index div           % bw bh px0 py0 pw ph sx sy
+-      2 copy gt {
+-        exch
++  { //CenterPages {
++        //PDFR_DEBUG {
++          (Rotating page, and then centering it) ==
++        } if
++        90 rotate
++        0 5 index neg translate
++        5 index 1 index exch sub 2 div  
++        2 index 6 index sub 2 div neg                   % bw bh px0 py0 pw ph lm bm
++        translate
++    } {
++      //FitPages {
++        1 index 5 index div 1 index 7 index div         % bw bh px0 py0 pw ph sx sy
++        2 copy gt {
++          exch
++        } if
++        pop dup scale                                   % bw bh px0 py0 pw ph
+       } if
+-      pop dup scale                                     % bw bh px0 py0 pw ph
+-    } if
+-    90 rotate
+-    0 5 index neg translate
++      90 rotate
++      0 5 index neg translate
++    } ifelse
+   } {
+-    //FitPages {
+-      1 index 6 index div 1 index 6 index div           % bw bh px0 py0 pw ph sx sy
+-      2 copy gt {
+-        exch
++    //CenterPages {
++        //PDFR_DEBUG {
++          (Ccentering page) ==
++        } if
++        1 index 6 index sub 2 div 
++        1 index 6 index sub 2 div                       % bw bh px0 py0 pw ph lm bm
++        translate
++    } {
++      //FitPages {
++        1 index 6 index div 1 index 6 index div         % bw bh px0 py0 pw ph sx sy
++        2 copy gt {
++          exch
++        } if
++        pop dup scale                                   % bw bh px0 py0 pw ph
+       } if
+-      pop dup scale                                     % bw bh px0 py0 pw ph
+-    } if
++    } ifelse
+   } ifelse                                               
+   pop pop                                               % bw bh px0 py0
+   translate                                             % bw bh
+diff --git a/Resource/Init/pdf_base.ps b/Resource/Init/pdf_base.ps
+--- a/Resource/Init/pdf_base.ps
++++ b/Resource/Init/pdf_base.ps
+@@ -720,6 +720,10 @@ currentdict /no_debug_dict undef
+      (   **** Operator 'endobj' is misspelled as 'endjobj'.\n) pdfformaterror
+      endobj exit
+   } bind
++  /enbobj { % Bug 690397.
++     (   **** Operator 'endobj' is misspelled as 'enbobj'.\n) pdfformaterror
++     endobj exit
++  } bind
+                 % OmniForm generates PDF file with endobj missing in some
+                 % objects. AR ignores this. So we have to do it too.
+   /obj { pop pop endobj exit } bind
+diff --git a/Resource/Init/pdf_draw.ps b/Resource/Init/pdf_draw.ps
+--- a/Resource/Init/pdf_draw.ps
++++ b/Resource/Init/pdf_draw.ps
+@@ -397,16 +397,20 @@ end
+ 			% Stack: mark ... smaskdict
+     dup /BC knownoget {
+       dup /Background exch 4 2 roll
+-      gsave
++      gsave //nodict begin
+         1 index /G oget /Group oget /CS knownoget {
+ 	  resolvecolorspace dup setgcolorspace csput
+ 	} if
+         aload pop setcolor [ currentgray ]
+-      grestore
++      end grestore
+       /GrayBackground exch 3 2 roll
+     } if
+     dup /TR knownoget {
+-      resolveidfnproc /TransferFunction exch 3 2 roll
++      dup /Identity eq {
++        pop
++      } {
++        resolvefnproc /TransferFunction exch 3 2 roll
++      } ifelse
+     } if    
+     dup /G oget dup /BBox oget /BBox exch 4 2 roll
+     /.execmaskgroup cvx 2 packedarray cvx /Draw exch 3 2 roll
+@@ -414,16 +418,44 @@ end
+   } ifelse SMask
+ } bdef
+ 
++% Functions specific to the Device* colorspaces to force the switch to
++% the Device* colorspace so that the SMask will not get a CIEBased* colorspace
++% in the case when UseCIEColor changes the Device* colorspace to something else.
++% Also see the logic in pdf_main.ps:pdfopen that similarly defines these resources.
++/forceDefaultCS <<
++  {
++    currentcolorspace setcolorspace	% this will switch to Device colorspace
++  } bind
++  /DeviceGray exch
++  /DeviceRGB 1 index
++  /DeviceCMYK 1 index
++>>
++def
++
+ % This procedure is called to actually render the soft mask.
+ /.execmaskgroup {	% <masknum> <paramdict> <formdict> .execmaskgroup -
+-	% Save our place in PDFfile, and do a gsave to avoid resetting
+-	% the color space.
+-  currentcolorspace 4 1 roll
++    % Save our place in PDFfile. Do not use gsave-grestore when creating
++    % a soft mask with .begintransparencygroup because high level devices
++    % need to modify the graphic state by storing the soft mask ID.
++    % Save the ExtGState (//nodict begin) BEFORE changing the colorspace
++  mark currentcolor counttomark dup 4 add exch roll pop
++  currentcolorspace 4 1 roll .getuseciecolor 4 1 roll //nodict begin
+   PDFfile fileposition 4 1 roll
+ 	% We have to select the group's color space so that the
+ 	% background color will be interpreted correctly.
+-  dup /Group oget /CS knownoget { resolvecolorspace dup setgcolorspace csput } if
+-  exch dup /BBox get aload pop .begintransparencymaskgroup {
++	% [save/restore]DefaultCS make sure that the SMask logic sees
++	% the Device* spaces, not CIEBased* that UseCIEColor may have
++	% established.
++  false .setuseciecolor		% SMask gets processed without UseCIEColor
++  dup /Group oget /CS knownoget {
++    resolvecolorspace dup setgcolorspace csput
++    //true		% use currentcolorspace
++  } {
++    % inheriting the colorspace -- make sure Device* spaces are not CIEBased
++    forceDefaultCS currentcolorspace 0 get .knownget { exec } if
++    //false		% no defined colorspace
++  } ifelse
++  3 -1 roll dup /BBox get aload pop .begintransparencymaskgroup {
+     dup /Resources knownoget { oforce } { 0 dict } ifelse
+     exch false resolvestream
+     .execgroup .endtransparencymask
+@@ -431,12 +463,12 @@ end
+     .discardtransparencymask stop
+   } if
+   PDFfile exch setfileposition 
+-  setcolorspace
++  .setuseciecolor setcolorspace setcolor end	% restore colorspace, color and ExtGState (end)
+ } bdef
+ % Paint a Form+Group XObject, either for a transparency mask or for a Do.
+ /.execgroup {		% <resdict> <stream> .execgroup -
+   gsave //nodict begin
+-  null SMask
++  newpath null SMask
+   1 .setopacityalpha 1 .setshapealpha
+   /Compatible .setblendmode
+ 	% Execute the body of the Form, similar to DoForm.
+@@ -773,7 +805,7 @@ currentdict end readonly def
+   exch //false resolvestream pdfopdict .pdfruncontext
+ 
+   countdictstack exch sub dup 0 gt { 
+-     (   **** Warning: Pattern stream has imbalanced q/Q operators (too many q's)\n)
++     (   **** Warning: Pattern stream has unbalanced q/Q operators \(too many q's\)\n)
+      pdfformaterror
+      { Q } repeat
+    } {
+@@ -796,16 +828,18 @@ currentdict end readonly def
+     1 index /File get dup fileposition 3 1 roll
+ 		% Stack: dict savepos pos file
+     dup 3 -1 roll setfileposition
+-    dup 3 index /Length oget
+-
+-    dup 65535 le {
+-      dup 0 eq {
+-        pop pop ()
++    dup 3 index /Length knownoget {
++      dup 65535 le {
++        dup 0 eq {
++          pop pop ()
++        } {
++          string readstring pop
++        } ifelse
+       } {
+-        string readstring pop
++        () /SubFileDecode filter /ReusableStreamDecode filter
+       } ifelse
+     } {
+-      () /SubFileDecode filter /ReusableStreamDecode filter
++      0 (endstream) /SubFileDecode filter /ReusableStreamDecode filter
+     } ifelse
+ 		% Stack: dict savepos file string
+     3 1 roll exch setfileposition
+@@ -820,6 +854,7 @@ currentdict end readonly def
+     2 index /Resources knownoget { oforce } { 0 dict } ifelse
+     /.pdfpaintproc cvx
+   ] cvx put
++  dup /.pattern_uses_transparency  1 index patternusestransparency put
+   PDFDEBUG { pdfdict /PDFSTEPcount .knownget { 1 le } { true } ifelse { (%Pattern: ) print dup === flush } if } if
+ } bdef
+ 
+@@ -1108,24 +1143,41 @@ end
+ } bdef
+ 
+ /doimagesmask { % <imagemask> doimagesmask -
+-  PDFusingtransparency { currentdict /SMask knownoget } { false } ifelse {
+-    .begintransparencymaskimage
+-    PDFfile fileposition exch
+-    gsave //nodict begin
+-    null /SoftMask gput
+-    1 .setopacityalpha 1 .setshapealpha
+-    /Compatible .setblendmode
+-    DoImage
+-    end grestore
+-    PDFfile exch setfileposition
+-    0 .endtransparencymask
++  PDFusingtransparency {
++    currentdict /SMask knownoget
++  } {
++    false
++  } ifelse
++  {	% We are doing transparency and SMask is present in the image
++	% stack: <imagemask> <SMask>
++    currentdevice .devicename /pdfwrite eq {
++      pop	% pdfwrite will process SMask directly during 'doimage'
++    } {
++      .begintransparencymaskimage
++      PDFfile fileposition exch
++      gsave //nodict begin
++      null /SoftMask gput
++      1 .setopacityalpha 1 .setshapealpha
++      /Compatible .setblendmode
++      DoImage
++      end grestore
++      PDFfile exch setfileposition
++      0 .endtransparencymask
++    } ifelse
+     << /Subtype /Group /Isolated true 
+       /.image_with_SMask true % pdfwrite needs : see gs/src/ztrans.c, gs/src/gdevpdft.c 
+     >> 0 0 1 1 .begintransparencygroup
+     doimage
+     .endtransparencygroup
+   } {
+-    doimage
++    SoftMask //null ne {
++      % the image doesn't have an SMask, but the ExtGState does, force a group.
++      << /Subtype /Group /Isolated true >> 0 0 1 1 .begintransparencygroup
++      doimage
++      .endtransparencygroup
++    }
++    { doimage }
++    ifelse
+   } ifelse
+ } bdef
+ 
+@@ -1164,9 +1216,7 @@ end
+     % which is done under a rush of 8.63 release.
+     % The purpose is to disable a conversion of an image with soft mask
+     % into a Type 103 image, which currently allocates a full mask buffer
+-    % before writing clist. Note that imagemask installs
+-    % the transparency mask anyway (likely another bug), 
+-    % so the image is still masked.
++    % before writing clist.
+     % With this workaround the Matte color is not working (ignored).
+     is_big_mask not 
+   } {
+@@ -1226,11 +1276,17 @@ end
+   /.paintform cvx
+   ] cvx /PaintProc exch put
+     % Adjust pdfemptycount since we have an extra dictionary on the stack
+-  pdfemptycount exch
+-  /pdfemptycount where pop count 2 sub /pdfemptycount exch put
+-  q execform Q			% gsave / grestore around the Form
++  pdfemptycount countdictstack  3 -1 roll
++  /pdfemptycount count 1 sub store
++  q execform  			% gsave / grestore around the Form
+     % Restore pdfemptycount
+-  /pdfemptycount where pop exch /pdfemptycount exch put
++  countdictstack exch sub
++  dup 1 gt {
++    (   **** Warning: Pattern stream has unbalanced q/Q operators \(too many q's\)\n)
++    pdfformaterror
++  } if
++  { Q } repeat
++  /pdfemptycount exch store
+ } bdef
+ 
+ /_dops_save 1 array def
+@@ -1298,6 +1354,8 @@ end
+   oforce //unabbrevtypedict 1 index type .knownget { exec } if
+ } bdef
+ 
++/is_space_dict << 0 0 9 9 10 10 12 12 13 13 32 32 >> readonly def
++
+ drawopdict begin
+   /BI { mark } bdef
+   /ID {
+@@ -1314,23 +1372,34 @@ drawopdict begin
+ 	% between the last byte of valid data and an EOL.
+         % Some files (PDFOUT v3.8d by GenText) have EI immediately following
+         % the stream. Some have no EOL and garbage bytes.
+-        % Therefore, we skip all bytes before EI or EOL 
+-    0
+-      { PDFsource read not { //true exit } if
+-        dup 10 eq 1 index 13 eq or
+-          { pop PDFsource token pop /EI ne exit
+-          }
+-        if
+-        exch 69 eq 1 index 73 eq and { //false exit } if  % 'EI'
+-      }
+-    loop
+-    exch pop
+-      { /ID cvx /syntaxerror signalerror
+-      }
+-    if
++        % Sometimes (bug 690300) CCITTDecode filter consumes 'E' in 'EI'.
++        % Therefore, we search for <start>I<sp|end> or <start|sp>EI<sp|end> 
++    PDFsource read not {
++      /ID cvx /syntaxerror signalerror
++    } if
++    dup 73 eq {
++      pop 10 69 73     % Seed to: <sp>EI
++    } {
++      10 10 3 -1 roll  % Seed to: <sp><sp><any>
++    } ifelse
++    { PDFsource read not dup { 10 exch } if
++      //is_space_dict 2 index known
++      3 index 73 eq and 4 index 69 eq and
++      //is_space_dict 6 index known and {
++        pop pop pop pop pop exit
++      } {
++          {
++            pop pop pop /ID cvx /syntaxerror signalerror
++          } {
++            4 -1 roll pop
++          } ifelse
++      } ifelse
++    } loop
+   } bdef
+ end
+ 
++currentdict /is_space_dict undef
++
+ % ================================ Text ================================ %
+ 
+ drawopdict begin
+@@ -1401,38 +1470,42 @@ end
+ /drawborder {		% <annot> drawborder -
+   gsave
+   dup /BS known 1 index /Border known or {
+-  dup /BS knownoget {
++    dup /BS knownoget {
+       dup type /dicttype ne   % <annot> <border> <bad?>
+     } {
+       dup /Border oget 
+-      dup type /arraytype ne  % <annot> [border] <bad?>
+-    } ifelse
+-    { 
+-      (   **** Warning: Wrong type of annotation border object.\n)
++      dup type /arraytype eq {
++        dup length 3 lt
++      } {
++        //true
++      } ifelse                % <annot> [border] <bad?>
++    } ifelse { 
++      (   **** Warning: Wrong annotation border object, no border is drawn.\n)
+       pdfformaterror
++      pop { 0 0 0 }
+     } if
+     dup type /dicttype eq {
+-    dup /W knownoget not { 1 } if
++      dup /W knownoget not { 1 } if
+       % Per PDF1.6 Reference table 8.13, /W in the border style dictionary is
+       % expressed in points (an absolute unit), so compensate here for any
+       % scaling of the PostScript user space done due to /UserUnit.
+       % Scaling due to -dPDFFitPage is not undone, to keep the correct border width
+       % compared to the size of the surrounding marks.
+-      //systemdict /NoUserUnit .knownget not { false } if not
++      //systemdict /NoUserUnit .knownget not { //false } if not
+       //systemdict /PDFFitPage known not and {	% UserUnit is ignored if -dPDFFitPage
+         Page /UserUnit knownoget { div } if
+       } if
+-    [] 2 index /S knownoget {
+-      /D eq { 2 index /D knownoget not { [3] } if exch pop } if
+-    } if 3 -1 roll pop strokeborder
+-  } {
++      {} 2 index /S knownoget {
++        /D eq { 2 index /D knownoget not { {3} } if exch pop } if
++      } if 3 -1 roll pop strokeborder
++    } {
+       dup 2 get
+-      exch dup length 3 gt { 3 get } { pop [] } ifelse
++      exch dup length 3 gt { 3 get } { pop {} } ifelse
+       strokeborder
+     } ifelse
+-    } {
+-      1 [] strokeborder
+-    } ifelse
++  } {
++    1 {} strokeborder
++  } ifelse
+   grestore
+ } bdef
+ 
+diff --git a/Resource/Init/pdf_font.ps b/Resource/Init/pdf_font.ps
+--- a/Resource/Init/pdf_font.ps
++++ b/Resource/Init/pdf_font.ps
+@@ -652,6 +652,11 @@ setglobal
+                 % Yet another case of broken PDF's that Adobe Reader accepts.
+       1 index dup /FontName known {
+         /FontName oget
++        dup type /nametype ne {
++          (   **** /FontName attribute in FontDescriptor is not a name.\n)
++          pdfformaterror
++          cvn
++        } if
+       } {
+         (   **** FontDescriptor missing required /FontName key. BaseFont name used.\n)
+         pdfformaterror
+@@ -735,9 +740,43 @@ setglobal
+ % The whole type1 stream can be executed directly. There's no need to process
+ % Length1, 2, 3 keys.
+ 
+-/readtype1dict 5 dict dup begin
++/readtype1dict 10 dict dup begin
+   /definefont {
+     exch pop
++
++    /topFontDict where {
++      { /FontType    % in PLRM order
++        /FontMatrix
++        /FontName
++        /FontInfo
++        /WMode
++        /Encoding
++        /FontBBox
++        /UniqueID 
++        /XUID
++        /PaintType
++        /StrokeWidth
++        /Metrics
++        /Metrics2
++        /CDevProc
++        /CharStrings
++        /Private
++        /WeightVector
++      } {
++        2 copy .knownget {
++          % Stack: font topFontDict /key val
++          3 index 3 1 roll put
++          dup /MisplacedKey 0 put
++        } {
++          pop
++        } ifelse
++      } forall
++      /MisplacedKey known {
++        (   **** Warning: Type 1 font defines some of the keys in the external scope.\n)
++        pdfformaterror
++      } if
++    } if
++
+     dup /UniqueID .knownget {
+       dup dup 0 lt exch 16#ffffff gt or {
+         (   **** Warning: Ignoring invalid /UniqueID = ) exch =string cvs
+@@ -793,10 +832,31 @@ setglobal
+     pdfformaterror
+   } ifelse } .bind def
+ 
+-  currentdict dup dup
+-  /undef_proc_warning undef
+-  /missing-type1-procs undef
+-  /readonly-op-dict undef
++  /prev_get /get load def
++
++  /get {
++    dup /FontName eq {
++      % No warning, probably FontName is defined elsewhere; see definefont above.
++      .knownget not { /Missing } if
++    } {
++      dup /UniqueID eq {
++        % We don't want fonts to check /UniqueID and do 'restore'.
++        pop pop 16#FEDCBA98  % Arbitrary and invalid value
++      } {
++        prev_get
++      } ifelse
++    } ifelse
++  } bdef
++
++  /prev_begin /begin load def
++
++  /begin {
++    dup //systemdict eq { pop 0 dict } if
++    prev_begin
++  } bdef
++
++  { /undef_proc_warning /missing-type1-procs /readonly-op-dict }
++  { currentdict exch undef } forall
+ 
+ end readonly def
+ 
+@@ -1348,8 +1408,8 @@ currentdict /eexec_pdf_param_dict .undef
+     concatstrings concatstrings
+     cvn
+     QUIET not {
+-      (Substituting CID font resource ) print dup ==only
+-      ( for ) print 1 index ==only (.\n) print
++      (Substituting CID font ) print dup ==only
++      ( for ) print 1 index ==only (, see doc/Use.htm#CIDFontSubstitution.) =
+     } if
+     exch pop
+     dup /CIDFont resourcestatus {
+@@ -1579,11 +1639,11 @@ currentdict /eexec_pdf_param_dict .undef
+     } 2 bndef
+ 
+   <01000401> <01000402> <01000403> <01000404> % Type 1C
+-  <01000C02>
++  <01000C02> <01000C03>
+     { exch pop
+       dup /Subtype get
+       fontloadprocs exch get exec
+-    } 5 bndef 
++    } 6 bndef 
+ 
+   <00010000> (true) (typ1) (ttcf)  % TrueType OpenType
+     { exch pop readtruetype
+@@ -1627,9 +1687,15 @@ currentdict /bndef undef
+                                           % /key res res desc stream
+         dup //null ne {
+           PDFfile fileposition 
+-          1 index //true resolvestream dup
+-          4 string readstring pop
+-	  exch closefile
++          mark {
++            2 index //true resolvestream dup
++            4 string readstring pop
++	    exch closefile
++          } stopped {
++            cleartomark /bad_stream
++          } {
++            exch pop
++          } ifelse
+           PDFfile 3 -1 roll setfileposition
+           dup length 4 lt { pop /bad_stream } if
+         } {
+diff --git a/Resource/Init/pdf_main.ps b/Resource/Init/pdf_main.ps
+--- a/Resource/Init/pdf_main.ps
++++ b/Resource/Init/pdf_main.ps
+@@ -955,15 +955,22 @@ pdfdict begin
+  { Trailer /Root oget /Pages oget
+    dup /Count knownoget {
+      dup 0 le {
+-       pop (   **** Warning:  Invalid Page count.\n) pdfformaterror
+-       % find the last page and use that as the Count
+-       1 1 999999999 {
+-         dup pdffindpage?
+-	 exch pop
+-         //null eq { exit } { pop } ifelse
+-       } for
+-       1 sub		% decrement to last page that we were able to find
+-       2 copy /Count exch put
++       pop 
++       dup /Kids knownoget {
++         pop
++         (   **** Warning:  Invalid Page count.\n) pdfformaterror
++         % find the last page and use that as the Count
++         1 1 999999999 {
++           dup pdffindpage?
++	   exch pop
++           //null eq { exit } { pop } ifelse
++         } for
++         1 sub		% decrement to last page that we were able to find
++         2 copy /Count exch put
++       } {
++         0 % return 0 and keep 0 page count.
++         (   **** Warning:  PDF document has no pages.\n) pdfformaterror
++       } ifelse
+      } if
+      exch pop
+    } {
+@@ -1215,9 +1222,18 @@ end readonly def
+   /Link {
+     mark exch
+     dup /C knownoget { /Color exch 3 -1 roll } if
+-     { /Rect /Border }
+-     { 2 copy knownoget { 3 -1 roll } { pop } ifelse }
+-    forall dup /A knownoget {
++    dup /Rect knownoget { /Rect exch 3 -1 roll } if
++    dup /Border knownoget {
++      dup type /arraytype eq {
++        dup length 3 lt
++      } {
++        //true
++      } ifelse {
++        pop [ 0 0 0 ] % Following AR5 use invisible border.
++      } if
++      /Border exch 3 -1 roll
++    } if
++    dup /A knownoget {
+       dup /URI known {
+         /A mark 3 2 roll    % <<>> /A [ <<action>>
+         { oforce } forall
+@@ -1539,7 +1555,7 @@ currentdict /PDF2PS_matrix_key undef
+   % Some PDF files don't have matching q/Q (gsave/grestore) so we need
+   % to clean up any left over dicts from the dictstack
+   countdictstack PDFdictstackcount sub dup 0 ne { 
+-    (   **** Warning: File has imbalanced q/Q operators \(too many q's\)\n)
++    (   **** Warning: File has unbalanced q/Q operators \(too many q's\)\n)
+     pdfformaterror
+     { end } repeat
+   } {
+@@ -1626,17 +1642,27 @@ currentdict /PDF2PS_matrix_key undef
+ /extgstateusestransparency {	% <gstate dict> extgstateusestransparency <bool>
+   //false exch		% Assume no transparency
+   {			% establish loop context
+-    exch pop oforce
+     dup /BM knownoget { dup /Normal ne exch /Compatible ne and
+ 	                    { pop not exit } if
+                           } if
+     dup /ca knownoget { 1 ne { pop not exit } if } if
+     dup /CA knownoget { 1 ne { pop not exit } if } if
+     dup /SMask knownoget { /None ne { pop not exit } if } if
+-    pop
+-  } forall
++    pop exit
++  } loop
+ } bind def
+ 
++% Check if transparency is used in a Pattern
++/patternusestransparency {	% <Pattern dict> patternusestransparency <bool>
++  //false exch		% Assume no transparency
++  {
++    4 dict 1 index resourceusestransparency { pop not exit } if
++    dup /ExtGState knownoget { extgstateusestransparency { pop not exit } if } if
++    pop exit
++  } loop
++} bind def
++
++
+ % Check the Resources of a page or Form. Check for loops in the resource chain.
+ /resourceusestransparency {	% <dict> <dict> resourceusestransparency <bool>
+   {	% Use loop to provide an exitable context.
+@@ -1651,19 +1677,33 @@ currentdict /PDF2PS_matrix_key undef
+     } if
+     2 copy //true put              % In the current chain.
+     dup /ExtGState knownoget {
+-      extgstateusestransparency
++      //false exch
++      { exch pop oforce extgstateusestransparency { pop //true exit } if
++      } forall
++      { pop //true exit } if
++    } if
++    dup /Pattern knownoget {
++      //false exch
++      { exch pop oforce patternusestransparency { pop //true exit } if
++      } forall
+       { pop //true exit } if
+     } if
+     dup /XObject knownoget {
+-      //false exch {
+-	exch pop oforce dup /Subtype get
+-	dup /Image eq { 1 index /SMask known { pop pop not exit } if } if
+-	/Form eq {
+-	  3 index exch resourceusestransparency { not exit } if
+-	} {
+-	  pop
+-	} ifelse
+-      } forall { pop //true exit } if
++      dup type /dicttype eq {
++        //false exch {
++	  exch pop oforce dup /Subtype get
++	  dup /Image eq { 1 index /SMask known { pop pop not exit } if } if
++	  /Form eq {
++	    3 index exch resourceusestransparency { not exit } if
++	  } {
++	    pop
++	  } ifelse
++        } forall { pop //true exit } if
++      } {
++        (   **** Ignoring non-dictionary /XObject attribute.\n)
++        pdfformaterror
++        pop
++      } ifelse
+     } if
+     2 copy //false put             % Visited but not in the current chain.
+     pop //false exit
+@@ -1748,9 +1788,13 @@ currentdict /PDF2PS_matrix_key undef
+       { exch pop oforce /ColorSpace oget 3 index colorspacespotcolors } forall
+     } if
+     /XObject knownoget {
+-      { exch pop oforce dup
+-        /Subtype get /Form eq { resourcespotcolors } { pop } ifelse
+-      } forall
++      dup type /dicttype eq {
++        { exch pop oforce dup
++          /Subtype get /Form eq { resourcespotcolors } { pop } ifelse
++        } forall
++      } {
++        pop % Just ignore here, already reported by resourceusestransparency.
++      } ifelse
+     } if
+     exit
+   } loop
+diff --git a/Resource/Init/pdf_ops.ps b/Resource/Init/pdf_ops.ps
+--- a/Resource/Init/pdf_ops.ps
++++ b/Resource/Init/pdf_ops.ps
+@@ -115,7 +115,7 @@ nodict readonly pop
+   } {
+     //true	% formaterror -- not a gsave dict
+   } ifelse
+-  { (\n   **** File has imbalanced q/Q operators \(too many Q's\) ****\n)
++  { (\n   **** File has unbalanced q/Q operators \(too many Q's\) ****\n)
+     pdfformaterror
+   } if
+ } bdef
+@@ -371,10 +371,16 @@ end def
+ } bdef
+ /fsexec		% <fillop|strokeop> fsexec -
+  {		% Preserve the current point, if any.
++   SoftMask //null ne {
++     mark /Subtype /Group /Isolated true .dicttomark pathbbox .begintransparencygroup
++   } if
+     { currentpoint } stopped
+     { $error /newerror false put   cvx exec }
+     { 3 -1 roll cvx exec moveto }
+    ifelse
++   SoftMask //null ne {
++     .endtransparencygroup
++   } if
+  } bdef
+ 
+ % ---------------- Path painting and clipping ---------------- %
+diff --git a/Resource/Init/pdf_sec.ps b/Resource/Init/pdf_sec.ps
+--- a/Resource/Init/pdf_sec.ps
++++ b/Resource/Init/pdf_sec.ps
+@@ -328,16 +328,17 @@ def
+   pop
+     % this step is for the AES cipher only
+     Trailer /Encrypt oget
+-    dup /StmF known
+-     {
+-      dup /StmF oget
+-      exch /CF oget exch oget /CFM oget
+-      /AESV2 eq {
+-        (sAlT) concatstrings
+-      } if
+-     }
+-     { pop }
+-    ifelse
++    dup /StmF knownoget {
++      exch /CF knownoget {
++        exch oget /CFM oget /AESV2 eq {
++          (sAlT) concatstrings
++        } if
++      } {
++        pop
++      } ifelse
++    } {
++      pop
++    } ifelse
+   md5 0 FileKey length 5 add 2 index length .min getinterval
+ } bind def
+ 
+@@ -397,12 +398,15 @@ def
+ 	        {			% If StrF is present ...
+ 		  dup /Identity eq not	% Check if StrF != Identity
+ 	  	   { /StdCF eq
+-		       { Trailer /Encryption oget /StdCF oget /CFM oget
+-			 /AESV2 eq
+-			   % Decrypt string
+-			   { 1 index aesdecode }
+-			   { 1 index arc4decode }
+-			 ifelse
++		       { Trailer /Encrypt oget /CF knownoget {
++                           /StdCF oget /CFM oget /AESV2 eq
++                         } {
++                           //false
++                         } ifelse {     % Decrypt string
++			   1 index aesdecode
++                         } {
++                           1 index arc4decode
++                         } ifelse
+ 		       }
+ 		       { 1 index arc4decode }
+ 		     ifelse		% If StrF != StdCF
+@@ -477,8 +481,10 @@ currentdict /PDFScanRules_null undef
+       } if
+ 	% Check if the stream encryption handler (StmF) == Identity.
+       PDFDEBUG {
+-	Trailer /Encrypt oget /CF get /StdCF get /CFM get
+-	(Encrypt StmF is StdCF with CFM ) print =
++	Trailer /Encrypt oget /CF knownoget {
++          /StdCF oget /CFM oget
++	  (Encrypt StmF is StdCF with CFM ) print =
++        } if
+       } if
+       /StmF knownoget			% Get StmF (if present)
+       not { /Identity } if		% If StmF not present default = Identity
+@@ -504,13 +510,13 @@ currentdict /PDFScanRules_null undef
+       exch 
+ 	% Stack: readdata? dict parms filternames file/string
+       3 index /StreamKey get
+-      Trailer /Encrypt oget dup /StmF 
+-      known
+-       {
+-	dup /StmF oget		% stack: key Encrypt StmF
+-	exch /CF oget
+-	exch oget /CFM oget	% stack: key StmF-CFM
+-	/AESV2 eq
++      Trailer /Encrypt oget
++      dup /StmF knownoget
++       {                        % stack: key Encrypt StmF
++	exch /CF knownoget {
++	  exch oget /CFM oget	% stack: key StmF-CFM
++	  /AESV2 eq
++        } { pop //false } ifelse
+ 	 { aesdecodefilter }	% install the requested filter
+ 	 { arc4decodefilter }
+ 	ifelse
+diff --git a/base/Makefile.in b/base/Makefile.in
+--- a/base/Makefile.in
++++ b/base/Makefile.in
+@@ -82,6 +82,7 @@ CUPSLIBDIRS=@CUPSLIBDIRS@
+ CUPSSERVERBIN=@CUPSSERVERBIN@
+ CUPSSERVERROOT=@CUPSSERVERROOT@
+ CUPSDATA=@CUPSDATA@
++CUPSPDFTORASTER=@CUPSPDFTORASTER@
+ 
+ # Define the default directory/ies for the runtime
+ # initialization and font files.  Separate multiple directories with a :.
+@@ -180,11 +181,14 @@ JBIG2_LIB=jbig2dec
+ SHARE_JBIG2=@SHARE_JBIG2@
+ JBIG2SRCDIR=@JBIG2DIR@
+ 
+-# uncomment the following to compile in the Luratech ldf_jb2 codec
++# uncomment the following three lines and one of the last two to
++# compile in the Luratech ldf_jb2 codec
+ #JBIG2_LIB=luratech
+ #SHARE_JBIG2=0
+ #JBIG2SRCDIR=ldf_jb2
+-#JBIG2_CFLAGS=-DUSE_LDF_JB2
++#JBIG2_CFLAGS=-DUSE_LDF_JB2 -DLINUX
++#JBIG2_CFLAGS=-DUSE_LDF_JB2 -DMAC -DMAC_OS_X_BUILD
++
+ 
+ # Choose the library to use for (JPXDecode support)
+ # whether to link to an external build or compile in from source
+@@ -194,11 +198,13 @@ SHARE_JPX=@SHARE_JASPER@
+ JPXSRCDIR=@JASPERDIR@
+ JPX_CFLAGS=-DJAS_CONFIGURE
+ 
+-# uncomment the following to compile in the Luratech lwf_jp2 codec
++# uncomment the following three lines and one of the last two to
++# compile in the Luratech lwf_jp2 codec
+ #JPX_LIB=luratech
+ #SHARE_JPX=0
+ #JPXSRCDIR=lwf_jp2
+ #JPX_CFLAGS=-DUSE_LWF_JP2 -DLINUX
++#JPX_CFLAGS=-DUSE_LWF_JP2 -DMAC -DMAC_OS_X_BUILD
+ 
+ # Define the directory where the icclib source are stored.
+ # See icclib.mak for more information
+@@ -506,7 +512,7 @@ include $(GLSRCDIR)/unixinst.mak
+ # Clean up after the autotools scripts
+ # configure.ac and Makefile.in are symlinks from a subdir 
+ # (created by autogen.sh) and so are safe to remove
+-distclean : clean config-clean
++distclean : clean config-clean soclean debugclean
+ 	-$(RM_) -r $(BINDIR) $(GLOBJDIR) $(PSOBJDIR)
+ 	-$(RM_) -r autom4te.cache
+ 	-$(RM_) config.log config.status
+diff --git a/base/configure.ac b/base/configure.ac
+--- a/base/configure.ac
++++ b/base/configure.ac
+@@ -420,6 +420,9 @@ dnl look for CUPS...
+ AC_ARG_ENABLE([cups], AC_HELP_STRING([--disable-cups],
+     [Don't include CUPS support]))
+ 
++AC_ARG_WITH([pdftoraster], AC_HELP_STRING([--without-pdftoraster],
++    [Don't include CUPS' pdftoraster filter]))
++
+ CUPSDEV=""
+ CUPSINCLUDE=""
+ CUPSCFLAGS=""
+@@ -429,6 +432,8 @@ CUPSCONFIG="${CUPSCONFIG:=}"
+ CUPSSERVERBIN=""
+ CUPSSERVERROOT=""
+ CUPSDATA=""
++CUPSVERSION="0"
++CUPSPDFTORASTER="0"
+ 
+ if ( test -d cups ); then
+     if test x$enable_cups != xno; then
+@@ -446,6 +451,12 @@ if ( test -d cups ); then
+ 	    CUPSDATA="`$CUPSCONFIG --datadir`"
+ 	    CUPSINCLUDE="include cups/cups.mak"
+ 	    CUPSDEV="\$(DD)cups.dev"
++	    CUPSVERSION="`$CUPSCONFIG --version`"
++	    if ( test x$with_pdftoraster != xno ); then
++	        if test "$CUPSVERSION" ">" "1.2"; then
++		    CUPSPDFTORASTER="1"
++		fi
++	    fi
+ 	fi
+     fi
+ fi
+@@ -458,6 +469,7 @@ AC_SUBST(CUPSINCLUDE)
+ AC_SUBST(CUPSSERVERBIN)
+ AC_SUBST(CUPSSERVERROOT)
+ AC_SUBST(CUPSDATA)
++AC_SUBST(CUPSPDFTORASTER)
+ 
+ 
+ dnl look for IJS implementation
+@@ -781,7 +793,7 @@ P_DEVS=""
+ F_DEVS=""
+ 
+ dnl Known printers
+-HP_DEVS="cdj500 djet500 djet500c dnj650c cljet5pr deskjet laserjet ljetplus ljet2p ljet3 ljet3d ljet4 ljet4d lj4dith lj5mono lj5gray cdeskjet cdjcolor cdjmono cdj550 pj pjxl pjxl300 lp2563 paintjet pjetxl cljet5 cljet5c pxlmono pxlcolor cdj670 cdj850 cdj880 cdj890 cdj970 cdj1600 chp2200 pcl3 hpdjplus hpdjportable hpdj310 hpdj320 hpdj340 hpdj400 hpdj500 hpdj500c hpdj510 hpdj520 hpdj540 hpdj550c hpdj560c hpdj600 hpdj660c hpdj670c hpdj680c hpdj690c hpdj850c hpdj855c hpdj870c hpdj890c hpdj1120c lj3100sw"
++HP_DEVS="cdj500 djet500 djet500c dnj650c cljet5pr deskjet laserjet ljetplus ljet2p ljet3 ljet3d ljet4 ljet4d lj4dith lj5mono lj5gray cdeskjet cdjcolor cdjmono cdj550 pj pjxl pjxl300 lp2563 paintjet pjetxl cljet5 cljet5c pxlmono pxlcolor cdj670 cdj850 cdj880 cdj890 cdj970 cdj1600 cdnj500 chp2200 pcl3 hpdjplus hpdjportable hpdj310 hpdj320 hpdj340 hpdj400 hpdj500 hpdj500c hpdj510 hpdj520 hpdj540 hpdj550c hpdj560c hpdj600 hpdj660c hpdj670c hpdj680c hpdj690c hpdj850c hpdj855c hpdj870c hpdj890c hpdj1120c lj3100sw"
+ PCLXL_DEVS="pxlmono pxlcolor"
+ EPSON_DEVS="eps9high eps9mid epson epsonc escp lp8000 lq850 photoex st800 stcolor alc1900 alc2000 alc4000 alc4100 alc8500 alc8600 alc9100 lp3000c lp8000c lp8200c lp8300c lp8500c lp8800c lp9000c lp9200c lp9500c lp9800c lps6500 epl2050 epl2050p epl2120 epl2500 epl2750 epl5800 epl5900 epl6100 epl6200 lp1800 lp1900 lp2200 lp2400 lp2500 lp7500 lp7700 lp7900 lp8100 lp8300f lp8400f lp8600 lp8600f lp8700 lp8900 lp9000b lp9100 lp9200b lp9300 lp9400 lp9600 lp9600s lps4500"
+ CANON_DEVS="bj10e bj200 bjc600 bjc800 lbp8 lips3 bjcmono bjcgray bjccmyk bjccolor"
+diff --git a/base/contrib.mak b/base/contrib.mak
+--- a/base/contrib.mak
++++ b/base/contrib.mak
+@@ -782,7 +782,7 @@ $(DD)inferno.dev : $(inferno_) $(DD)page.dev
+ 	$(SETPDEV) $(DD)inferno $(inferno_)
+ 
+ $(GLOBJ)gdevifno.$(OBJ) : $(GLSRC)gdevifno.c $(PDEVH)\
+- $(gsparam_h) $(gxlum_h)
++ $(gsparam_h)
+ 	$(GLCC) $(GLO_)gdevifno.$(OBJ) $(C_) $(GLSRC)gdevifno.c
+ 
+ ### --------------------------- MGR devices ---------------------------- ###
+diff --git a/base/devs.mak b/base/devs.mak
+--- a/base/devs.mak
++++ b/base/devs.mak
+@@ -418,12 +418,10 @@ $(GLOBJ)gdevvglb.$(OBJ) : $(GLSRC)gdevvglb.c $(GDEV) $(gdevpccm_h) $(gsparam_h)
+ ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
+ 
+ $(GLOBJ)lvga256.so : $(lvga256_)
+-	$(CCLD) -shared -Wl,'-solvga256.so' $(lvga256_) -lvga -lvgagl
+-	mv lvga256.so $(GLOBJ)lvga256.so
++	$(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)lvga256.so $(lvga256_) -lvga -lvgagl
+ 
+ $(GLOBJ)vgalib.so : $(vgalib_)
+-	$(CCLD) -shared -Wl,'-sovgalib.so' $(vgalib_) -lvga -lvgagl
+-	mv vgalib.so $(GLOBJ)vgalib.so
++	$(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)vgalib.so $(vgalib_) -lvga -lvgagl
+ 
+ ### -------------------------- The X11 device -------------------------- ###
+ 
+@@ -526,8 +524,7 @@ $(GLOBJ)gdevxalt.$(OBJ) : $(GLSRC)gdevxalt.c $(GDEVX) $(math__h) $(memory__h)\
+ ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
+ 
+ $(GLOBJ)X11.so : $(x11alt_) $(x11_)
+-	$(CCLD) -shared -Wl,'-soX11.so' $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
+-	mv X11.so $(GLOBJ)X11.so
++	$(CCLD) $(LDFLAGS) -shared -o $(GLOBJ)X11.so $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
+ 
+ ###### --------------- Memory-buffered printer devices --------------- ######
+ 
+diff --git a/base/dmmain.c b/base/dmmain.c
+--- a/base/dmmain.c
++++ /dev/null
+@@ -1,997 +0,0 @@
+-/* Copyright (C) 2001-2006 Artifex Software, Inc.
+-   All Rights Reserved.
+-  
+-   This software is provided AS-IS with no warranty, either express or
+-   implied.
+-
+-   This software is distributed under license and may not be copied, modified
+-   or distributed except as expressly authorized under the terms of that
+-   license.  Refer to licensing information at http://www.artifex.com/
+-   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
+-   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
+-*/
+-/* $Id: dmmain.c 8022 2007-06-05 22:23:38Z giles $ */
+-
+-/* Ghostscript shlib example wrapper for Macintosh (Classic/Carbon) contributed
+-   by Nigel Hathaway. Uses the Metrowerks CodeWarrior SIOUX command-line library.
+- */
+-
+-#if __ide_target("Ghostscript PPC (Debug)") || __ide_target("Ghostscript PPC (Release)")
+-#define TARGET_API_MAC_CARBON 0
+-#define TARGET_API_MAC_OS8 1
+-#define ACCESSOR_CALLS_ARE_FUNCTIONS 1
+-#endif
+-
+-#include <Carbon.h>
+-
+-#include <stdlib.h>
+-#include <string.h>
+-#include <stdio.h>
+-#include <console.h>
+-#include <SIOUX.h>
+-#include <SIOUXGlobals.h>
+-#include <SIOUXMenus.h>
+-
+-#include "gscdefs.h"
+-#define GSREVISION gs_revision
+-#include "ierrors.h"
+-#include "iapi.h"
+-
+-#if DEBUG
+-#include "vdtrace.h"
+-#endif
+-
+-#include "gdevdsp.h"
+-
+-#define kScrollBarWidth   15
+-#define MAX_ARGS 25
+-
+-Boolean   gRunningOnX = false;
+-Boolean   gDone;
+-ControlActionUPP gActionFunctionScrollUPP;
+-
+-const char start_string[] = "systemdict /start get exec\n";
+-void *instance;
+-
+-const unsigned int display_format = DISPLAY_COLORS_RGB | DISPLAY_UNUSED_FIRST |
+-                                    DISPLAY_DEPTH_8 | DISPLAY_BIGENDIAN |
+-                                    DISPLAY_TOPFIRST;
+-typedef struct IMAGE_S IMAGE;
+-struct IMAGE_S {
+-    void *handle;
+-    void *device;
+-    WindowRef  windowRef;
+-    ControlRef scrollbarVertRef;
+-    ControlRef scrollbarHorizRef;
+-    PixMapHandle pixmapHdl;
+-    UInt64 update_time;
+-    int update_interval;
+-    IMAGE *next;
+-};
+-
+-IMAGE *first_image;
+-
+-static IMAGE *image_find(void *handle, void *device);
+-
+-static int GSDLLCALL gsdll_stdin(void *instance, char *buf, int len);
+-static int GSDLLCALL gsdll_stdout(void *instance, const char *str, int len);
+-static int GSDLLCALL gsdll_stderr(void *instance, const char *str, int len);
+-static int GSDLLCALL gsdll_poll(void *handle);
+-
+-static int display_open(void *handle, void *device);
+-static int display_preclose(void *handle, void *device);
+-static int display_close(void *handle, void *device);
+-static int display_presize(void *handle, void *device, int width, int height, 
+-    int raster, unsigned int format);
+-static int display_size(void *handle, void *device, int width, int height, 
+-    int raster, unsigned int format, unsigned char *pimage);
+-static int display_sync(void *handle, void *device);
+-static int display_page(void *handle, void *device, int copies, int flush);
+-static int display_update(void *handle, void *device, 
+-    int x, int y, int w, int h);
+-
+-static size_t get_input(void *ptr, size_t size);
+-
+-static void window_create (IMAGE *img);
+-static void window_invalidate (WindowRef windowRef);
+-static void window_adjust_scrollbars (WindowRef windowRef);
+-
+-void    main                      (void);
+-OSErr   quitAppEventHandler       (AppleEvent *,AppleEvent *,SInt32);
+-void    doEvents                  (EventRecord *);
+-void    doMouseDown               (EventRecord *);
+-void    doUpdate                  (EventRecord *);
+-void    doUpdateWindow            (EventRecord *);
+-void    doOSEvent                 (EventRecord *);
+-void    doInContent               (EventRecord *,WindowRef);
+-pascal void    actionFunctionScroll      (ControlRef,ControlPartCode);
+-
+-/*********************************************************************/
+-/* stdio functions */
+-static int GSDLLCALL
+-gsdll_stdin(void *instance, char *buf, int len)
+-{
+-    if (isatty(fileno(stdin)))
+-       return get_input(buf, len);
+-    else
+-       return fread(buf, 1, len, stdin);
+-}
+-
+-static int GSDLLCALL
+-gsdll_stdout(void *instance, const char *str, int len)
+-{
+-    int n = fwrite(str, 1, len, stdout);
+-    fflush(stdout);
+-    return n;
+-}
+-
+-static int GSDLLCALL
+-gsdll_stderr(void *instance, const char *str, int len)
+-{
+-    return gsdll_stdout(instance, str, len);
+-}
+-
+-/* Poll the caller for cooperative multitasking. */
+-/* If this function is NULL, polling is not needed */
+-static int GSDLLCALL gsdll_poll(void *handle)
+-{
+-    EventRecord eventStructure;
+-
+-    while (WaitNextEvent(everyEvent, &eventStructure, 0, NULL))
+-        doEvents(&eventStructure);
+-
+-    return (gDone ? e_Fatal : 0);
+-}
+-/*********************************************************************/
+-
+-/* new dll display device */
+-
+-/* New device has been opened */
+-/* This is the first event from this device. */
+-static int display_open(void *handle, void *device)
+-{
+-    IMAGE *img = (IMAGE *)malloc(sizeof(IMAGE));
+-    if (img == NULL)
+-       return -1;
+-    memset(img, 0, sizeof(IMAGE));
+-
+-    /* add to list */
+-    if (first_image)
+-       img->next = first_image;
+-    first_image = img;
+-
+-    /* remember device and handle */
+-    img->handle = handle;
+-    img->device = device;
+-
+-    /* create window */
+-    window_create(img);
+-
+-    gsdll_poll(handle);
+-    return 0;
+-}
+-
+-/* Device is about to be closed. */
+-/* Device will not be closed until this function returns. */
+-static int display_preclose(void *handle, void *device)
+-{
+-    /* do nothing - no thread synchonisation needed */
+-    return 0;
+-}
+-
+-/* Device has been closed. */
+-/* This is the last event from this device. */
+-static int display_close(void *handle, void *device)
+-{
+-    IMAGE *img = image_find(handle, device);
+-    if (img == NULL)
+-       return -1;
+-
+-    gsdll_poll(handle);
+-
+-    /* remove from list */
+-    if (img == first_image)
+-        first_image = img->next;
+-    else
+-    {
+-        IMAGE *tmp;
+-        for (tmp = first_image; tmp!=0; tmp=tmp->next)
+-        {
+-            if (img == tmp->next)
+-            tmp->next = img->next;
+-        }
+-    }
+-
+-    DisposePixMap(img->pixmapHdl);   // need to go in doCloseWindow()
+-    DisposeWindow(img->windowRef);
+-
+-    free(img);
+-
+-    return 0;
+-}
+-
+-/* Device is about to be resized. */
+-/* Resize will only occur if this function returns 0. */
+-static int display_presize(void *handle, void *device, int width, int height, 
+-    int raster, unsigned int format)
+-{
+-    /* Check for correct format (32-bit RGB), fatal error if not */
+-    if (format != display_format)
+-    {
+-        printf("DisplayFormat has been set to an incompatible value.\n");
+-        fflush(stdout);
+-        return e_rangecheck;
+-    }
+-
+-    return 0;
+-}
+-   
+-/* Device has been resized. */
+-/* New pointer to raster returned in pimage */
+-static int display_size(void *handle, void *device, int width, int height, 
+-    int raster, unsigned int format, unsigned char *pimage)
+-{
+-    PixMapPtr pixmap;
+-    IMAGE *img = image_find(handle, device);
+-    if (img == NULL)
+-       return -1;
+-
+-    /* Check that image is within allowable bounds */
+-    if (raster > 0x3fff)
+-    {
+-       printf("QuickDraw can't cope with an image this big.\n");
+-       fflush(stdout);
+-       if (img->pixmapHdl)
+-       {
+-           DisposePixMap(img->pixmapHdl);
+-           img->pixmapHdl = NULL;
+-       }
+-       return e_rangecheck;
+-    }
+-
+-    /* Create the PixMap */
+-    if (!img->pixmapHdl)
+-        img->pixmapHdl = NewPixMap();
+-
+-    pixmap = *(img->pixmapHdl);
+-    pixmap->baseAddr = (char*)pimage;
+-    pixmap->rowBytes = (((SInt16)raster) & 0x3fff) | 0x8000;
+-    pixmap->bounds.right = width;
+-    pixmap->bounds.bottom = height;
+-    pixmap->packType = 0;
+-    pixmap->packSize = 0;
+-    pixmap->pixelType = RGBDirect;
+-    pixmap->pixelSize = 32;
+-    pixmap->cmpCount = 3;
+-    pixmap->cmpSize = 8;
+-
+-    /* Update the display window */
+-    window_adjust_scrollbars(img->windowRef);
+-    window_invalidate(img->windowRef);
+-    return gsdll_poll(handle);
+-}
+-   
+-/* flushpage */
+-static int display_sync(void *handle, void *device)
+-{
+-    IMAGE *img = image_find(handle, device);
+-    if (img == NULL)
+-       return -1;
+-
+-    window_invalidate(img->windowRef);
+-    gsdll_poll(handle);
+-
+-    return 0;
+-}
+-
+-/* showpage */
+-/* If you want to pause on showpage, then don't return immediately */
+-static int display_page(void *handle, void *device, int copies, int flush)
+-{
+-    return display_sync(handle, device);
+-}
+-
+-/* Poll the caller for cooperative multitasking. */
+-/* If this function is NULL, polling is not needed */
+-static int display_update(void *handle, void *device, 
+-    int x, int y, int w, int h)
+-{
+-    UInt64 t1;
+-    UInt64 t2;
+-    int delta;
+-    IMAGE *img = image_find(handle, device);
+-    if (img == NULL)
+-       return -1;
+-
+-    Microseconds((UnsignedWide*)&t1);
+-    delta = (t1 - img->update_time) / 1000000L;
+-    if (img->update_interval < 1)
+-    img->update_interval = 1;    /* seconds */
+-    if (delta < 0)
+-        img->update_time = t1;
+-    else if (delta > img->update_interval)
+-    {
+-        /* redraw window */
+-        window_invalidate(img->windowRef);
+-
+-        /* Make sure the update interval is at least 10 times
+-         * what it takes to paint the window
+-         */
+-        Microseconds((UnsignedWide*)&t2);
+-        delta = (t2 - t1) / 1000;
+-        if (delta < 0)
+-            delta += 60000;    /* delta = time to redraw */
+-        if (delta > img->update_interval * 100)
+-            img->update_interval = delta/100;
+-        img->update_time = t2;
+-    }
+-
+-    return gsdll_poll(handle);
+-}
+-
+-display_callback display = { 
+-    sizeof(display_callback),
+-    DISPLAY_VERSION_MAJOR,
+-    DISPLAY_VERSION_MINOR,
+-    display_open,
+-    display_preclose,
+-    display_close,
+-    display_presize,
+-    display_size,
+-    display_sync,
+-    display_page,
+-    display_update,
+-    NULL,    /* memalloc */
+-    NULL,    /* memfree */
+-    NULL	 /* display_separation */
+-};
+-
+-static IMAGE * image_find(void *handle, void *device)
+-{
+-    IMAGE *img;
+-    for (img = first_image; img!=0; img=img->next) {
+-    if ((img->handle == handle) && (img->device == device))
+-        return img;
+-    }
+-    return NULL;
+-}
+-
+-/*********************************************************************/
+-
+-static char *stdin_buf = NULL;
+-static size_t stdin_bufpos = 0;
+-static size_t stdin_bufsize = 0;
+-
+-/* This function is a fudge which allows the SIOUX window to be waiting for
+-   input and not be modal at the same time. (Why didn't MetroWerks think of that?)
+-   It is based on the SIOUX function ReadCharsFromConsole(), and contains an
+-   event loop which allows other windows to be active.
+-   It collects characters up to when the user presses ENTER, stores the complete
+-   buffer and gives as much to the calling function as it wants until it runs
+-   out, at which point it gets another line (or set of lines if pasting from the
+-   clipboard) from the user.
+-*/
+-static size_t get_input(void *ptr, size_t size)
+-{
+-    EventRecord eventStructure;
+-    long charswaiting, old_charswaiting = 0;
+-    char *text;
+-
+-#if SIOUX_USE_WASTE
+-    Handle textHandle;
+-#endif
+-
+-    /* If needing more input, set edit start position */
+-    if (!stdin_buf)
+-#if SIOUX_USE_WASTE
+-        SIOUXselstart = WEGetTextLength(SIOUXTextWindow->edit);
+-#else
+-        SIOUXselstart = (*SIOUXTextWindow->edit)->teLength;
+-#endif
+-
+-    /* Wait until user presses exit (or quits) */
+-    while(!gDone && !stdin_buf)
+-    {
+-#if SIOUX_USE_WASTE
+-        charswaiting = WEGetTextLength(SIOUXTextWindow->edit) - SIOUXselstart;
+-#else
+-        if ((*SIOUXTextWindow->edit)->teLength > 0)
+-            charswaiting = (*SIOUXTextWindow->edit)->teLength - SIOUXselstart;
+-        else
+-            charswaiting = ((unsigned short) (*SIOUXTextWindow->edit)->teLength) - SIOUXselstart;
+-#endif
+-
+-        /* If something has happened, see if we need to do anything */
+-        if (charswaiting != old_charswaiting)
+-        {
+-#if SIOUX_USE_WASTE
+-            textHandle = WEGetText(SIOUXTextWindow->edit);
+-            HLock(textHandle);
+-            text = *textHandle + SIOUXselstart;
+-#else
+-            text = (*(*SIOUXTextWindow->edit)->hText) + SIOUXselstart;
+-#endif
+-            /* If user has pressed enter, gather up the buffer ready for returning */
+-            if (text[charswaiting-1] == '\r')
+-            {
+-                stdin_buf = malloc(charswaiting);
+-                if (!stdin_buf)
+-                    return -1;
+-                stdin_bufsize = charswaiting;
+-                memcpy(stdin_buf, text, stdin_bufsize);
+-                SIOUXselstart += charswaiting;
+-                
+-                text = stdin_buf;
+-                while (text = memchr(text, '\r', charswaiting - (text - stdin_buf)))
+-                    *text = '\n';
+-            }
+-#if SIOUX_USE_WASTE
+-            HUnlock(textHandle);
+-#endif
+-            old_charswaiting = charswaiting;
+-
+-            if (stdin_buf)
+-                break;
+-        }
+-
+-        /* Wait for next event and process it */
+-        SIOUXState = SCANFING;
+-
+-        if(WaitNextEvent(everyEvent, &eventStructure, SIOUXSettings.sleep ,NULL))
+-            doEvents(&eventStructure);
+-        else
+-            SIOUXHandleOneEvent(&eventStructure);
+-
+-        SIOUXState = IDLE;
+-    }
+-
+-    /* If data has been entered, return as much as has been requested */
+-    if (stdin_buf && !gDone)
+-    {
+-        if (size >= stdin_bufsize - stdin_bufpos)
+-        {
+-            size = stdin_bufsize - stdin_bufpos;
+-            memcpy (ptr, stdin_buf + stdin_bufpos, size);
+-            free(stdin_buf);
+-            stdin_buf = NULL;
+-            stdin_bufpos = 0;
+-            stdin_bufsize = 0;
+-        }
+-        else
+-        {
+-            memcpy (ptr, stdin_buf + stdin_bufpos, size);
+-            stdin_bufpos += size;
+-        }
+-        return size;
+-    }
+-    else if (stdin_buf)
+-    {
+-        free(stdin_buf);
+-        stdin_buf = NULL;
+-        stdin_bufpos = 0;
+-        stdin_bufsize = 0;
+-    }
+-
+-    return 0;
+-}
+-
+-/*********************************************************************/
+-
+-static void window_create(IMAGE *img)
+-{
+-    WindowRef windowRef;
+-    Str255    windowTitle = "\pGhostscript Image";
+-    Rect      windowRect = {20,4,580,420};//, portRect;
+-    Rect      scrollbarRect = {0,0,0,0};
+-
+-#if TARGET_API_MAC_CARBON
+-    GetAvailableWindowPositioningBounds(GetMainDevice(),&windowRect);
+-#endif
+-
+-    /* Create a new suitablty positioned window */
+-    windowRect.top = windowRect.top * 2 + 2;
+-    windowRect.bottom -= 10;
+-    windowRect.left += 4;
+-    windowRect.right = ((windowRect.bottom - windowRect.top) * 3) / 4 + windowRect.left;
+-
+-    if(!(windowRef = NewCWindow(NULL, &windowRect, windowTitle, true,
+-                                zoomDocProc, (WindowRef) -1, false, 0)))
+-        ExitToShell();
+-
+-    img->windowRef = windowRef;
+-
+-    SetWRefCon(img->windowRef, (SInt32)img);
+-
+-    /* Create the window's scrollbars */
+-#if TARGET_API_MAC_CARBON
+-    if(gRunningOnX)
+-        ChangeWindowAttributes(windowRef,kWindowLiveResizeAttribute,0);
+-
+-    CreateScrollBarControl(windowRef, &scrollbarRect, 0, 0, 0, 0,
+-                           true, gActionFunctionScrollUPP, &(img->scrollbarVertRef));
+-
+-    CreateScrollBarControl(windowRef, &scrollbarRect, 0, 0, 0, 0,
+-                           true, gActionFunctionScrollUPP, &(img->scrollbarHorizRef));
+-#else
+-    img->scrollbarVertRef = NewControl(windowRef,&scrollbarRect,"\p",false,0,0,0,scrollBarProc,0);
+-    img->scrollbarHorizRef = NewControl(windowRef,&scrollbarRect,"\p",false,0,0,0,scrollBarProc,0);
+-#endif
+-
+-    window_adjust_scrollbars(windowRef);
+-}
+-
+-static void window_invalidate(WindowRef windowRef)
+-{
+-    Rect portRect;
+-
+-    GetWindowPortBounds(windowRef, &portRect);
+-    InvalWindowRect(windowRef, &portRect);
+-}
+-
+-static void window_adjust_scrollbars(WindowRef windowRef)
+-{
+-    IMAGE *img;
+-    Rect   portRect;
+-
+-    img = (IMAGE*)GetWRefCon(windowRef);
+-    GetWindowPortBounds(windowRef,&portRect);
+-
+-    /* Move the crollbars to the edges of the window */
+-    HideControl(img->scrollbarVertRef);
+-    HideControl(img->scrollbarHorizRef);
+-
+-    MoveControl(img->scrollbarVertRef,portRect.right - kScrollBarWidth,
+-                portRect.top - 1);
+-    MoveControl(img->scrollbarHorizRef,portRect.left - 1,
+-                portRect.bottom - kScrollBarWidth);
+-
+-    SizeControl(img->scrollbarVertRef,kScrollBarWidth + 1,
+-                portRect.bottom - portRect.top - kScrollBarWidth + 1);
+-    SizeControl(img->scrollbarHorizRef, portRect.right - portRect.left - kScrollBarWidth + 1,
+-                kScrollBarWidth + 1);
+-
+-    /* Adjust the scroll position showing */
+-    if (img->pixmapHdl)
+-    {
+-        PixMap *pixmap = *(img->pixmapHdl);
+-        int visibleHeight = portRect.bottom - portRect.top - kScrollBarWidth;
+-        int visibleWidth = portRect.right - portRect.left - kScrollBarWidth;
+-
+-        if (pixmap->bounds.bottom > visibleHeight)
+-        {
+-            SetControl32BitMaximum(img->scrollbarVertRef,
+-                                   pixmap->bounds.bottom - visibleHeight);
+-            SetControlViewSize(img->scrollbarVertRef,visibleHeight);
+-        }
+-        else
+-            SetControlMaximum(img->scrollbarVertRef, 0);
+-
+-        if (pixmap->bounds.right > visibleWidth)
+-        {
+-            SetControl32BitMaximum(img->scrollbarHorizRef,
+-                                   pixmap->bounds.right - visibleWidth);
+-            SetControlViewSize(img->scrollbarHorizRef, visibleWidth);
+-        }
+-        else
+-            SetControlMaximum(img->scrollbarHorizRef, 0);
+-    }
+-
+-    ShowControl(img->scrollbarVertRef);
+-    ShowControl(img->scrollbarHorizRef);
+-}
+-
+-/*********************************************************************/
+-void main(void)
+-{
+-    int code;
+-    int exit_code;
+-    int argc;
+-    char **argv;
+-    char dformat[64], ddevice[32];
+-    SInt32        response;
+-
+-    /* Initialize operating environment */
+-#if TARGET_API_MAC_CARBON
+-    MoreMasterPointers(224);
+-#else
+-    MoreMasters();
+-#endif
+-    InitCursor();
+-    FlushEvents(everyEvent,0);
+-
+-    if (AEInstallEventHandler(kCoreEventClass,kAEQuitApplication,
+-                              NewAEEventHandlerUPP((AEEventHandlerProcPtr) quitAppEventHandler),
+-                              0L,false) != noErr)
+-        ExitToShell();
+-
+-	gActionFunctionScrollUPP = NewControlActionUPP(&actionFunctionScroll);
+-
+-    Gestalt(gestaltMenuMgrAttr,&response);
+-    if(response & gestaltMenuMgrAquaLayoutMask)
+-                gRunningOnX = true;
+-
+-    /* Initialize SIOUX */
+-    SIOUXSettings.initializeTB = false;
+-    SIOUXSettings.standalone = false;
+-    SIOUXSettings.asktosaveonclose = false;
+-    SIOUXSettings.sleep = GetCaretTime();
+-    SIOUXSettings.userwindowtitle = "\pGhostscript";
+-
+-    /* Get arguments from user */
+-    argc = ccommand(&argv);
+-
+-    /* Show command line window */
+-    if (InstallConsole(0))
+-        ExitToShell();
+-
+-    /* Part of fudge to make SIOUX accept characters without becoming modal */
+-    SelectWindow(SIOUXTextWindow->window);
+-    PostEvent(keyDown, 0x4c00);  // Enter
+-    ReadCharsFromConsole(dformat, 0x7FFF);
+-    clrscr();
+-
+-    /* Add in the display format as the first command line argument */
+-    if (argc >= MAX_ARGS - 1)
+-    {
+-       printf("Too many command line arguments\n");
+-       return;
+-    }
+-
+-    memmove(&argv[3], &argv[1], (argc-1) * sizeof(char**));
+-    argc += 2;
+-    argv[1] = ddevice;
+-    argv[2] = dformat;
+-
+-	sprintf(ddevice, "-sDEVICE=display");
+-    sprintf(dformat, "-dDisplayFormat=%d", display_format);
+-
+-    /* Run Ghostscript */
+-    if (gsapi_new_instance(&instance, NULL) < 0)
+-    {
+-       printf("Can't create Ghostscript instance\n");
+-       return;
+-    }
+-
+-#ifdef DEBUG
+-    visual_tracer_init();
+-    set_visual_tracer(&visual_tracer);
+-#endif
+-
+-    gsapi_set_stdio(instance, gsdll_stdin, gsdll_stdout, gsdll_stderr);
+-    gsapi_set_poll(instance, gsdll_poll);
+-    gsapi_set_display_callback(instance, &display);
+-
+-    code = gsapi_init_with_args(instance, argc, argv);
+-    if (code == 0)
+-       code = gsapi_run_string(instance, start_string, 0, &exit_code);
+-    else 
+-    {
+-       printf("Failed to initialize. Error %d.\n", code);
+-       fflush(stdout);
+-    }
+-    code = gsapi_exit(instance);
+-    if (code != 0) 
+-    {
+-       printf("Failed to terminate. Error %d.\n", code);
+-       fflush(stdout);
+-    }
+-
+-    gsapi_delete_instance(instance);
+-
+-#ifdef DEBUG
+-    visual_tracer_close();
+-#endif
+-
+-    /* Ghostscript has finished - let user see output before quitting */
+-    WriteCharsToConsole("\r[Finished - hit any key to quit]", 33);
+-    fflush(stdout);
+-
+-    /* Process events until a key is hit or user quits from menu */
+-    while(!gDone)
+-    {
+-        EventRecord eventStructure;
+-
+-        if(WaitNextEvent(everyEvent,&eventStructure,SIOUXSettings.sleep,NULL))
+-        {
+-            if (eventStructure.what == keyDown)
+-            gDone = true;
+-
+-            doEvents(&eventStructure);
+-        }
+-        else
+-            SIOUXHandleOneEvent(&eventStructure);
+-    }
+-}
+-
+-/*********************************************************************/
+-
+-void doEvents(EventRecord *eventStrucPtr)
+-{
+-    WindowRef      windowRef;
+-  
+-    if (eventStrucPtr->what == mouseDown &&
+-        FindWindow(eventStrucPtr->where,&windowRef) == inMenuBar)
+-        SelectWindow(SIOUXTextWindow->window);
+-
+-    SIOUXSettings.standalone = true;
+-    if (SIOUXHandleOneEvent(eventStrucPtr))
+-    {
+-        if (SIOUXQuitting)
+-            gDone = true;
+-        SIOUXSettings.standalone = false;
+-        return;
+-    }
+-    SIOUXSettings.standalone = false;
+-
+-    switch(eventStrucPtr->what)
+-    {
+-    case kHighLevelEvent:
+-        AEProcessAppleEvent(eventStrucPtr);
+-        break;
+-
+-    case mouseDown:
+-        doMouseDown(eventStrucPtr);
+-        break;
+-
+-    case keyDown:
+-    case autoKey:
+-        break;
+-
+-    case updateEvt:
+-        doUpdate(eventStrucPtr);
+-        break;
+-
+-    case activateEvt:
+-        DrawGrowIcon(windowRef);
+-        break;
+-
+-    case osEvt:
+-        doOSEvent(eventStrucPtr);
+-        break;
+-    }
+-}
+-
+-void doMouseDown(EventRecord *eventStrucPtr)
+-{
+-    WindowRef      windowRef;
+-    WindowPartCode partCode, zoomPart;
+-    BitMap         screenBits;
+-    Rect           constraintRect, mainScreenRect;
+-    Point          standardStateHeightAndWidth;
+-    long           newSize;
+-
+-    partCode = FindWindow(eventStrucPtr->where,&windowRef);
+-
+-    switch(partCode)
+-    {
+-    case inMenuBar:
+-        break;
+-
+-    case inContent:
+-        if(windowRef != FrontWindow())
+-            SelectWindow(windowRef);
+-        else
+-            doInContent(eventStrucPtr,windowRef);
+-        break;
+-
+-    case inDrag:
+-        DragWindow(windowRef,eventStrucPtr->where,NULL);
+-        break;
+-
+-    case inGoAway:
+-        break;
+-
+-    case inGrow:
+-        constraintRect.top   = 75;
+-        constraintRect.left = 250;
+-        constraintRect.bottom = constraintRect.right = 32767;
+-        newSize = GrowWindow(windowRef,eventStrucPtr->where,&constraintRect);
+-        if (newSize != 0)
+-            SizeWindow(windowRef,LoWord(newSize),HiWord(newSize),true);
+-        window_adjust_scrollbars(windowRef);
+-        window_invalidate(windowRef);
+-        break;
+-
+-    case inZoomIn:
+-    case inZoomOut:
+-        mainScreenRect = GetQDGlobalsScreenBits(&screenBits)->bounds;
+-        standardStateHeightAndWidth.v = mainScreenRect.bottom;
+-        standardStateHeightAndWidth.h = mainScreenRect.right;
+-
+-        if(IsWindowInStandardState(windowRef,&standardStateHeightAndWidth,NULL))
+-            zoomPart = inZoomIn;
+-        else
+-            zoomPart = inZoomOut;
+-
+-        if(TrackBox(windowRef,eventStrucPtr->where,partCode))
+-        {
+-            ZoomWindowIdeal(windowRef,zoomPart,&standardStateHeightAndWidth);
+-            window_adjust_scrollbars(windowRef);
+-        }
+-        break;
+-    }
+-}
+-
+-void doUpdate(EventRecord *eventStrucPtr)
+-{
+-    WindowRef windowRef;
+-
+-    windowRef = (WindowRef) eventStrucPtr->message;
+-  
+-    window_adjust_scrollbars(windowRef);
+-
+-    BeginUpdate(windowRef);
+-
+-    SetPortWindowPort(windowRef);
+-    doUpdateWindow(eventStrucPtr);
+-
+-    EndUpdate(windowRef);
+-}
+-
+-void doUpdateWindow(EventRecord *eventStrucPtr)
+-{
+-    IMAGE *img;
+-    WindowRef    windowRef;
+-    Rect         srcRect, destRect, fillRect;
+-    PixMapHandle srcPixmapHdl, destPixmapHdl;
+-    RGBColor     grayColour = { 0xC000,0xC000,0xC000 };
+-    SInt32  hScroll, vScroll;
+-  
+-    windowRef = (WindowRef) eventStrucPtr->message;
+-    img = (IMAGE*)GetWRefCon(windowRef);
+-    srcPixmapHdl = img->pixmapHdl;
+-    destPixmapHdl = GetPortPixMap(GetWindowPort(windowRef));
+-    hScroll = GetControl32BitValue(img->scrollbarHorizRef);
+-    vScroll = GetControl32BitValue(img->scrollbarVertRef);
+-
+-    if (srcPixmapHdl)
+-    {
+-        PixMap *pixmap = *srcPixmapHdl;
+-        PixPatHandle hdlPixPat = NewPixPat();
+-        MakeRGBPat(hdlPixPat, &grayColour);
+-
+-        GetWindowPortBounds(windowRef,&destRect);
+-        destRect.right  -= kScrollBarWidth;
+-        destRect.bottom -= kScrollBarWidth;
+-
+-        if (destRect.right > pixmap->bounds.right)
+-        {
+-            fillRect.top = destRect.top;
+-            fillRect.bottom = destRect.bottom;
+-            fillRect.left = pixmap->bounds.right;
+-            fillRect.right = destRect.right;
+-            FillCRect(&fillRect, hdlPixPat);
+-            destRect.right = pixmap->bounds.right;
+-        }
+-        if (destRect.bottom > pixmap->bounds.bottom)
+-        {
+-            fillRect.top = pixmap->bounds.bottom;
+-            fillRect.bottom = destRect.bottom;
+-            fillRect.left = destRect.left;
+-            fillRect.right = destRect.right;
+-            FillCRect(&fillRect, hdlPixPat);
+-            destRect.bottom = pixmap->bounds.bottom;
+-        }
+-        DisposePixPat(hdlPixPat);
+-    
+-        srcRect = destRect;
+-        srcRect.left += hScroll;
+-        srcRect.right += hScroll;
+-        srcRect.top += vScroll;
+-        srcRect.bottom += vScroll;
+-    
+-        CopyBits((BitMap*)*srcPixmapHdl, (BitMap*)*destPixmapHdl,
+-                 &srcRect, &destRect, srcCopy, NULL);
+-    }
+-
+-    DrawGrowIcon(windowRef);
+-}
+-
+-void doOSEvent(EventRecord *eventStrucPtr)
+-{
+-    switch((eventStrucPtr->message >> 24) & 0x000000FF)
+-    {
+-    case suspendResumeMessage:
+-        if((eventStrucPtr->message & resumeFlag) == 1)
+-          SetThemeCursor(kThemeArrowCursor);
+-        break;
+-    }
+-}
+-
+-void doInContent(EventRecord *eventStrucPtr,WindowRef windowRef)
+-{
+-    ControlPartCode controlPartCode;
+-    ControlRef      controlRef;
+-
+-    SetPortWindowPort(windowRef);
+-    GlobalToLocal(&eventStrucPtr->where);
+-
+-    if(controlRef = FindControlUnderMouse(eventStrucPtr->where,windowRef,&controlPartCode))
+-    {
+-#if TARGET_API_MAC_CARBON
+-        TrackControl(controlRef,eventStrucPtr->where,(ControlActionUPP) -1);
+-#else
+-        if (controlPartCode == kControlIndicatorPart)
+-            TrackControl(controlRef,eventStrucPtr->where,NULL);
+-        else
+-            TrackControl(controlRef,eventStrucPtr->where,gActionFunctionScrollUPP);
+-#endif
+-
+-        window_invalidate(windowRef);
+-    }
+-}
+-
+-pascal void actionFunctionScroll(ControlRef controlRef,ControlPartCode controlPartCode)
+-{
+-    SInt32 scrollDistance, controlValue, oldControlValue, controlMax;
+-
+-    if(controlPartCode != kControlNoPart)
+-    {
+-        if(controlPartCode != kControlIndicatorPart)
+-        {
+-            switch(controlPartCode)
+-            {
+-            case kControlUpButtonPart:
+-            case kControlDownButtonPart:
+-                scrollDistance = 10;
+-                break;
+-
+-            case kControlPageUpPart:
+-            case kControlPageDownPart:
+-                scrollDistance = 100;
+-                break;
+-
+-            default:
+-                scrollDistance = 0;
+-                break;
+-            }
+-
+-            if (scrollDistance)
+-            {
+-                if((controlPartCode == kControlDownButtonPart) ||
+-                   (controlPartCode == kControlPageDownPart))
+-                    scrollDistance = -scrollDistance;
+-
+-                controlValue = GetControl32BitValue(controlRef);
+-
+-                if(((controlValue == GetControl32BitMaximum(controlRef)) && scrollDistance < 0) ||
+-                   ((controlValue == GetControl32BitMinimum(controlRef)) && scrollDistance > 0))
+-                    return;
+-
+-                oldControlValue = controlValue;
+-                controlMax = GetControl32BitMaximum(controlRef);
+-                controlValue = oldControlValue - scrollDistance;
+-  
+-                if(controlValue < 0)
+-                    controlValue = 0;
+-                else if(controlValue > controlMax)
+-                    controlValue = controlMax;
+-
+-                SetControl32BitValue(controlRef,controlValue);
+-            }
+-        }
+-    }
+-}
+-
+-OSErr quitAppEventHandler(AppleEvent *appEvent,AppleEvent *reply,SInt32 handlerRefcon)
+-{
+-    OSErr    osError;
+-    DescType returnedType;
+-    Size     actualSize;
+-
+-    osError = AEGetAttributePtr(appEvent,keyMissedKeywordAttr,typeWildCard,&returnedType,NULL,0,
+-                                &actualSize);
+-
+-    if(osError == errAEDescNotFound)
+-    {
+-        gDone = true;
+-        osError = noErr;
+-    }
+-    else if(osError == noErr)
+-        osError = errAEParamMissed;
+-
+-    return osError;
+-}
+-
+-/*********************************************************************/
+-
+diff --git a/base/dmmain.r b/base/dmmain.r
+--- a/base/dmmain.r
++++ /dev/null
+@@ -1,2537 +0,0 @@
+-/* Copyright (C) 2001-2006 Artifex Software, Inc.
+-   All Rights Reserved.
+- 
+-   This software is provided AS-IS with no warranty, either express or
+-   implied.
+-
+-   This software is distributed under license and may not be copied, modified
+-   or distributed except as expressly authorized under the terms of that
+-   license.  Refer to licensing information at http://www.artifex.com/
+-   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
+-   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
+-*/
+-/* $Id: dmmain.r 8022 2007-06-05 22:23:38Z giles $ */
+-
+-/* Resource data (Rez format) for the MacOS Ghostscript shlib example wrapper
+-   contributed by Nigel Hathaway. See dmmain.c for rest of this code.
+- */
+-
+-#include "Types.r"
+-
+-resource 'BNDL' (128) {
+-	'MCGS',
+-	0,
+-	{	/* array TypeArray: 2 elements */
+-		/* [1] */
+-		'ICN#',
+-		{	/* array IDArray: 1 elements */
+-			/* [1] */
+-			0, 128
+-		},
+-		/* [2] */
+-		'FREF',
+-		{	/* array IDArray: 2 elements */
+-			/* [1] */
+-			0, 128,
+-			/* [2] */
+-			1, 129
+-		}
+-	}
+-};
+-
+-resource 'FREF' (128) {
+-	'APPL',
+-	0,
+-	""
+-};
+-
+-resource 'FREF' (129) {
+-	'****',
+-	1,
+-	""
+-};
+-
+-data 'MWBB' (1008) {
+-	$"0001 0000"                                          /* .... */
+-};
+-
+-data 'MPSR' (1005) {
+-	$"0009 4D6F 6E61 636F 0000 0000 0000 0000"            /* .ÆMonaco........ */
+-	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
+-	$"0000 0003 0004 0030 0004 01CA 027B 0030"            /* .......0...Ê.{.0 */
+-	$"0004 01CA 027B BA5E B2EF 0000 0000 0000"            /* ...Ê.{º^²ï...... */
+-	$"0000 0000 0000 0100"                                /* ........ */
+-};
+-
+-resource 'ICN#' (128, "Application Icon") {
+-	{	/* array: 2 elements */
+-		/* [1] */
+-		$"0000 0000 0000 0800 0000 0A00 000B F200"
+-		$"007F 4200 00FC 0700 01F0 1F80 03E0 1F80"
+-		$"03E5 3FC0 03E0 1FC0 03E0 0FC0 03F0 0780"
+-		$"01F8 8300 00FC 4600 003C 0800 00F4 0000"
+-		$"03E0 0000 07E0 0000 07FF 6000 07FF FF00"
+-		$"07FF FFC0 01FF FFE0 007F FFF0 0000 17F0"
+-		$"0780 01F8 0F04 00F0 0E08 03E0 0F07 FFD0"
+-		$"0780 D820 03F0 0380 007F FC00 0005 40",
+-		/* [2] */
+-		$"0000 1800 0000 1E00 0000 1E00 001F FF00"
+-		$"00FF FF00 01FF FF00 03FF FF80 03FF FFC0"
+-		$"07FF FFC0 07FF FFC0 07FF FFC0 03FF FFC0"
+-		$"03FF FF80 01FF FF00 007F FE00 03FF F000"
+-		$"07FF F800 07FF FE00 0FFF FF80 0FFF FFE0"
+-		$"07FF FFF0 03FF FFF8 01FF FFF8 027F FFFC"
+-		$"1FFF FFFC 1FFF FFFC 1FFF FFF8 1FFF FFF8"
+-		$"1FFF FFF0 07FF FFC0 01FF FF00 007F FC"
+-	}
+-};
+-
+-resource 'ics#' (128, "Application Icon") {
+-	{	/* array: 2 elements */
+-		/* [1] */
+-		$"0000 00A0 0F10 1C78 1878 1C18 0E20 0600"
+-		$"1800 3FD0 1FF8 057C 300C 3358 18A8 0340",
+-		/* [2] */
+-		$"0070 07F0 1FF0 1FF8 3FF8 3FF8 1FF8 1FF0"
+-		$"3FF0 3FFC 3FFE 1FFE 7FFE 7FFE 7FFC 1FF0"
+-	}
+-};
+-
+-resource 'icl8' (128, "Application Icon") {
+-	$"0000 0000 0000 0000 0000 0000 0000 0000"
+-	$"0000 0000 F600 0000 0000 0000 0000 0000"
+-	$"0000 0000 0000 0000 0000 0000 0000 0000"
+-	$"0000 0000 5656 0000 0000 0000 0000 0000"
+-	$"0000 0000 0000 0000 0000 0000 0000 0000"
+-	$"0000 00F6 FCF8 F900 0000 0000 0000 0000"
+-	$"0000 0000 0000 0000 0000 00F6 56F9 FCAC"
+-	$"FCFC ACFE F600 FFF6 0000 0000 0000 0000"
+-	$"0000 0000 0000 0000 F5FA FDFF FFFF FFFF"
+-	$"FD81 F800 00F7 FFF7 0000 0000 0000 0000"
+-	$"0000 0000 0000 00F6 E0FF FFFF FFFD F92B"
+-	$"0000 0000 F6AC FFFA 0000 0000 0000 0000"
+-	$"0000 0000 0000 2BFF EAFF FFFE F700 0000"
+-	$"0000 0056 FFFF FFFF 8100 0000 0000 0000"
+-	$"0000 0000 0000 FCFF FFFF FF56 0000 00F5"
+-	$"F500 FAFF FFFF FFFF FFF8 0000 0000 0000"
+-	$"0000 0000 00F6 FFFF FFFF FE00 0079 0055"
+-	$"F600 FBFF FFFF FFFF FFFD 0000 0000 0000"
+-	$"0000 0000 002B FFFF FFFF FC00 007A F6F5"
+-	$"4F00 00AC FFFF FFFF FFFF 0000 0000 0000"
+-	$"0000 0000 00F6 FFFF FFFF FFF5 0000 F500"
+-	$"0000 00F5 ACFF FFFF FFFC 0000 0000 0000"
+-	$"0000 0000 0000 FCFF FFFF FF81 0000 0024"
+-	$"F600 0000 F5FD FFFF FF2B 0000 0000 0000"
+-	$"0000 0000 0000 F5FF FFFF FFFF 8100 0000"
+-	$"7A7A 0000 00FA FFFF F800 0000 0000 0000"
+-	$"0000 0000 0000 00F6 FDFF FFFF FFFB 0000"
+-	$"F579 0000 00FB F4F8 0000 0000 0000 0000"
+-	$"0000 0000 0000 0000 0056 FFFF FFFF F800"
+-	$"0000 00F6 8181 0000 0000 0000 0000 0000"
+-	$"0000 0000 0000 00F8 81FE FFFF FDFA F500"
+-	$"0000 2BF7 0000 0000 0000 0000 0000 0000"
+-	$"0000 0000 00F5 FCFF FFFF FBF6 0000 0000"
+-	$"0000 0000 0000 0000 0000 0000 0000 0000"
+-	$"0000 0000 00AC FFFF FFFF FC2B 0000 0000"
+-	$"0000 0000 0000 0000 0000 0000 0000 0000"
+-	$"0000 0000 2BFF FFFF FFFF FFFF E0FC FC81"
+-	$"FAF9 FAF7 2B00 0000 0000 0000 0000 0000"
+-	$"0000 0000 F6FF FFFF FFFF FFFF FFFF FFFF"
+-	$"FFFF FFFF FFFF ACF9 F600 0000 0000 0000"
+-	$"0000 0000 00FC FFFF FFFF FFFF FFFF FFFF"
+-	$"FFFF FFFF FFFF FFFF FF81 F600 0000 0000"
+-	$"0000 0000 0000 FAFF FFFF FFFF FFFF FFFF"
+-	$"FFFF FFFF FFFF FFFF FFFF FE2B 0000 0000"
+-	$"0000 0000 0000 0000 F8FB FCFF FFFF FFFF"
+-	$"FFFF FFFF FFFF FFFF FFFF FFFD 0000 0000"
+-	$"0000 0000 0000 0000 0000 0000 00F5 F7F7"
+-	$"2BF7 F8FA FAFD FFFF FFFF FFFF F900 0000"
+-	$"0000 0000 F7AC FFFF FCF6 0000 0000 0000"
+-	$"0000 0000 0000 F5FE FFFF FFFF F900 0000"
+-	$"0000 00F6 FFFF FFFB 0000 0000 2B81 F700"
+-	$"0000 0000 0000 00F9 FFFF FFFF 0000 0000"
+-	$"0000 002B FFFF FF2B 0000 0000 FAFB 0000"
+-	$"0000 0000 00F5 F8FF FFFF FEF6 F500 0000"
+-	$"0000 00F5 FEFF FFFC 0000 0000 F5FC FDFC"
+-	$"ACFC ACFC FDFF FFFF FF81 F556 F500 0000"
+-	$"0000 0000 F8FF FFFF FBF5 0000 0000 F6FA"
+-	$"81AC FCFC FCFA 562B F5F8 FCF5 0000 0000"
+-	$"0000 0000 002B FCFF FFFE FCF9 F82B 0000"
+-	$"0000 0000 2BF7 FAFC FD56 0000 0000 0000"
+-	$"0000 0000 0000 00F7 FAFE FFFF FFFF FFFF"
+-	$"FFFF FFFF FFAC 812B 0000 0000 0000 0000"
+-	$"0000 0000 0000 0000 0000 F52B F9F9 FAF9"
+-	$"FAF8 F72B F6"
+-};
+-
+-resource 'icl4' (128, "Application Icon") {
+-	$"0000 0000 0000 0000 0000 C000 0000 0000"
+-	$"0000 0000 0000 0000 0000 CD00 0000 0000"
+-	$"0000 0000 0000 0000 000C ECD0 0000 0000"
+-	$"0000 0000 000C DDEE EEEE C0FC 0000 0000"
+-	$"0000 0000 0DFF FFFF AEC0 0CFC 0000 0000"
+-	$"0000 000C FFFF FEDC 0000 CEFD 0000 0000"
+-	$"0000 00CA FFFA C000 000D AFFF D000 0000"
+-	$"0000 00EF FFFD 000C 00DF FFFF FD00 0000"
+-	$"0000 0CFF FFF0 0D0C C0EF FFFF FE00 0000"
+-	$"0000 0CFF FFE0 07C0 C00E FFFF FF00 0000"
+-	$"0000 00FF FFF0 0000 0000 EFFF FE00 0000"
+-	$"0000 00EF FFFE 0000 C000 CAFF FC00 0000"
+-	$"0000 000F FFFF D000 7D00 0DFF C000 0000"
+-	$"0000 000C EFFF FE00 0D00 0EFD 0000 0000"
+-	$"0000 0000 0DFF FFD0 000C DD00 0000 0000"
+-	$"0000 000C EEFF AD00 00CC 0000 0000 0000"
+-	$"0000 00EF FFE0 0000 0000 0000 0000 0000"
+-	$"0000 0EFF FFEC 0000 0000 0000 0000 0000"
+-	$"0000 CFFF FFFF FEED DDDC C000 0000 0000"
+-	$"0000 CFFF FFFF FFFF FFFF FFED C000 0000"
+-	$"0000 0EFF FFFF FFFF FFFF FFFF FDC0 0000"
+-	$"0000 00DF FFFF FFFF FFFF FFFF FFAC 0000"
+-	$"0000 0000 CEEF FFFF FFFF FFFF FFFE 0000"
+-	$"0000 0000 0000 00CC CCDD DAFF FFFF D000"
+-	$"0000 CEFF EC00 0000 0000 000F FFFF D000"
+-	$"000C FFFE 0000 CEC0 0000 000D FFFF 0000"
+-	$"000C FFFC 0000 DD00 0000 00DF FFF0 C000"
+-	$"0000 FFFE 0000 0EFE EEEE FFFF FD0D 0000"
+-	$"0000 CFFF E000 00CD DEEE EDDC 0DE0 0000"
+-	$"0000 0CEF FFED CC00 0000 CCDD FC00 0000"
+-	$"0000 000C DAFF FFFF FFFF FEEC 0000 0000"
+-	$"0000 0000 000C DDDD DDCC"
+-};
+-
+-resource 'ics8' (128, "Application Icon") {
+-	$"0000 0000 0000 0000 0000 2B00 0000 0000"
+-	$"0000 0000 0000 2B56 F8F9 F856 0000 0000"
+-	$"0000 0000 FBFF FFFB 56F5 F7FC 0000 0000"
+-	$"0000 00FC FFFD F500 00F9 FFFF F900 0000"
+-	$"0000 F5FF FF56 2B2A F6FB FFFF FF00 0000"
+-	$"0000 00FE FFFB 00F5 0000 FBFF FC00 0000"
+-	$"0000 00F8 FFFF FA00 7900 F7FD F500 0000"
+-	$"0000 00F5 F9FF FDF6 00F6 F800 0000 0000"
+-	$"0000 2BEA FF56 0000 0000 0000 0000 0000"
+-	$"0000 81FF FFFF FEFD FCFC FAF8 0000 0000"
+-	$"0000 F6FE FFFF FFFF FFFF FFFF FEF7 0000"
+-	$"0000 0000 2B56 FA81 81FC FDFF FFFF F600"
+-	$"0000 ACFE 2B00 2BF5 0000 00F8 FFFF F500"
+-	$"00F5 FFFC 0000 FA56 56F8 F9FD FE56 F500"
+-	$"0000 56E0 FBF7 F6F6 F856 56F9 56F6 0000"
+-	$"0000 0000 F881 FCAC FC81 FA2B"
+-};
+-
+-resource 'ics4' (128, "Application Icon") {
+-	$"0000 0000 00C0 0000 0000 00CD CDCD 0000"
+-	$"0000 EFFD D0CE 0000 000E FA00 0DFF D000"
+-	$"000F FDCC 0EFF F000 000F FE00 00EF E000"
+-	$"000C FFD0 D0CE 0000 0000 DFF0 0CC0 0000"
+-	$"00CF FD00 0000 0000 00DF FFFA EEDD 0000"
+-	$"00CA FFFF FFFF FC00 0000 CDDE DEEF FFC0"
+-	$"00EF C0C0 000C FF00 00FE 00DD CDDF AD00"
+-	$"00DF DCC0 DCDD D000 0000 DDEE EDDC"
+-};
+-
+-resource 'icm8' (128, "Application Icon") {
+-	$"0000 0000 0000 0000 0000 F800 0000 0000"
+-	$"0000 0000 2BFA FBAC 8156 F681 0000 0000"
+-	$"0000 00FA FFFD F7F5 0056 FDFF F800 0000"
+-	$"0000 F5FF FF56 2B2A F556 FFFF FF00 0000"
+-	$"0000 00FB FFFE F600 4F00 56FF F800 0000"
+-	$"0000 00F5 81EA FEF5 00F6 F8F6 0000 0000"
+-	$"0000 F8FF FFFA 2BF6 F600 0000 0000 0000"
+-	$"0000 56FF FFFF FFFF FFFF E0FC F9F5 0000"
+-	$"0000 00F6 F981 FBFC FCAC FDFF FFFD F500"
+-	$"0000 FDFD F600 F700 0000 0056 FFFE F500"
+-	$"0000 ACFE 2B00 F7F9 8181 FBFB 81F7 0000"
+-	$"0000 00F7 FAFB FBFA FAF9 56F8 F6"
+-};
+-
+-resource 'icm4' (128, "Application Icon") {
+-	$"0000 0000 00C0 0000 0000 CDEE ECCE 0000"
+-	$"000D FAC0 0DEF C000 000F FD0C 0DFF F000"
+-	$"000E FFC0 C0DF C000 0000 DFEC 00CC 0000"
+-	$"00CF FDC0 C000 0000 00DF FFFF FFFE D000"
+-	$"000C DDEE EEFF FF00 00AE C0C0 000D FEC0"
+-	$"00FE C0CD DEDE DC00 000C DDED DDDC C0"
+-};
+-
+-resource 'icm#' (128, "Application Icon") {
+-	{	/* array: 2 elements */
+-		/* [1] */
+-		$"0000 0350 1C30 1C78 1C10 0620 1900 3FF8"
+-		$"0B7C 300C 31B0 0720",
+-		/* [2] */
+-		$"0070 0FF0 1FF8 3FF8 3FF8 1FF0 3FF8 3FFC"
+-		$"1FFE 7FFE 7FFE 3FF8"
+-	}
+-};
+-
+-resource 'icns' (128, "Application Icon") {
+-	{	/* array elementArray: 20 elements */
+-		/* [1] */
+-		'ICN#',
+-		$"0000 0000 0000 0800 0000 0A00 000B F200"
+-		$"007F 4200 00FC 0700 01F0 1F80 03E0 1F80"
+-		$"03E5 3FC0 03E0 1FC0 03E0 0FC0 03F0 0780"
+-		$"01F8 8300 00FC 4600 003C 0800 00F4 0000"
+-		$"03E0 0000 07E0 0000 07FF 6000 07FF FF00"
+-		$"07FF FFC0 01FF FFE0 007F FFF0 0000 17F0"
+-		$"0780 01F8 0F04 00F0 0E08 03E0 0F07 FFD0"
+-		$"0780 D820 03F0 0380 007F FC00 0005 4000"
+-		$"0000 1800 0000 1E00 0000 1E00 001F FF00"
+-		$"00FF FF00 01FF FF00 03FF FF80 03FF FFC0"
+-		$"07FF FFC0 07FF FFC0 07FF FFC0 03FF FFC0"
+-		$"03FF FF80 01FF FF00 007F FE00 03FF F000"
+-		$"07FF F800 07FF FE00 0FFF FF80 0FFF FFE0"
+-		$"07FF FFF0 03FF FFF8 01FF FFF8 027F FFFC"
+-		$"1FFF FFFC 1FFF FFFC 1FFF FFF8 1FFF FFF8"
+-		$"1FFF FFF0 07FF FFC0 01FF FF00 007F FC00",
+-		/* [2] */
+-		'icl4',
+-		$"0000 0000 0000 0000 0000 C000 0000 0000"
+-		$"0000 0000 0000 0000 0000 CD00 0000 0000"
+-		$"0000 0000 0000 0000 000C ECD0 0000 0000"
+-		$"0000 0000 000C DDEE EEEE C0FC 0000 0000"
+-		$"0000 0000 0DFF FFFF AEC0 0CFC 0000 0000"
+-		$"0000 000C FFFF FEDC 0000 CEFD 0000 0000"
+-		$"0000 00CA FFFA C000 000D AFFF D000 0000"
+-		$"0000 00EF FFFD 000C 00DF FFFF FD00 0000"
+-		$"0000 0CFF FFF0 0D0C C0EF FFFF FE00 0000"
+-		$"0000 0CFF FFE0 07C0 C00E FFFF FF00 0000"
+-		$"0000 00FF FFF0 0000 0000 EFFF FE00 0000"
+-		$"0000 00EF FFFE 0000 C000 CAFF FC00 0000"
+-		$"0000 000F FFFF D000 7D00 0DFF C000 0000"
+-		$"0000 000C EFFF FE00 0D00 0EFD 0000 0000"
+-		$"0000 0000 0DFF FFD0 000C DD00 0000 0000"
+-		$"0000 000C EEFF AD00 00CC 0000 0000 0000"
+-		$"0000 00EF FFE0 0000 0000 0000 0000 0000"
+-		$"0000 0EFF FFEC 0000 0000 0000 0000 0000"
+-		$"0000 CFFF FFFF FEED DDDC C000 0000 0000"
+-		$"0000 CFFF FFFF FFFF FFFF FFED C000 0000"
+-		$"0000 0EFF FFFF FFFF FFFF FFFF FDC0 0000"
+-		$"0000 00DF FFFF FFFF FFFF FFFF FFAC 0000"
+-		$"0000 0000 CEEF FFFF FFFF FFFF FFFE 0000"
+-		$"0000 0000 0000 00CC CCDD DAFF FFFF D000"
+-		$"0000 CEFF EC00 0000 0000 000F FFFF D000"
+-		$"000C FFFE 0000 CEC0 0000 000D FFFF 0000"
+-		$"000C FFFC 0000 DD00 0000 00DF FFF0 C000"
+-		$"0000 FFFE 0000 0EFE EEEE FFFF FD0D 0000"
+-		$"0000 CFFF E000 00CD DEEE EDDC 0DE0 0000"
+-		$"0000 0CEF FFED CC00 0000 CCDD FC00 0000"
+-		$"0000 000C DAFF FFFF FFFF FEEC 0000 0000"
+-		$"0000 0000 000C DDDD DDCC 0000 0000 0000",
+-		/* [3] */
+-		'icl8',
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 F600 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 5656 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 00F6 FCF8 F900 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 00F6 56F9 FCAC"
+-		$"FCFC ACFE F600 FFF6 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 F5FA FDFF FFFF FFFF"
+-		$"FD81 F800 00F7 FFF7 0000 0000 0000 0000"
+-		$"0000 0000 0000 00F6 E0FF FFFF FFFD F92B"
+-		$"0000 0000 F6AC FFFA 0000 0000 0000 0000"
+-		$"0000 0000 0000 2BFF EAFF FFFE F700 0000"
+-		$"0000 0056 FFFF FFFF 8100 0000 0000 0000"
+-		$"0000 0000 0000 FCFF FFFF FF56 0000 00F5"
+-		$"F500 FAFF FFFF FFFF FFF8 0000 0000 0000"
+-		$"0000 0000 00F6 FFFF FFFF FE00 0079 0055"
+-		$"F600 FBFF FFFF FFFF FFFD 0000 0000 0000"
+-		$"0000 0000 002B FFFF FFFF FC00 007A F6F5"
+-		$"4F00 00AC FFFF FFFF FFFF 0000 0000 0000"
+-		$"0000 0000 00F6 FFFF FFFF FFF5 0000 F500"
+-		$"0000 00F5 ACFF FFFF FFFC 0000 0000 0000"
+-		$"0000 0000 0000 FCFF FFFF FF81 0000 0024"
+-		$"F600 0000 F5FD FFFF FF2B 0000 0000 0000"
+-		$"0000 0000 0000 F5FF FFFF FFFF 8100 0000"
+-		$"7A7A 0000 00FA FFFF F800 0000 0000 0000"
+-		$"0000 0000 0000 00F6 FDFF FFFF FFFB 0000"
+-		$"F579 0000 00FB F4F8 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0056 FFFF FFFF F800"
+-		$"0000 00F6 8181 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00F8 81FE FFFF FDFA F500"
+-		$"0000 2BF7 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 00F5 FCFF FFFF FBF6 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 00AC FFFF FFFF FC2B 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 2BFF FFFF FFFF FFFF E0FC FC81"
+-		$"FAF9 FAF7 2B00 0000 0000 0000 0000 0000"
+-		$"0000 0000 F6FF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF ACF9 F600 0000 0000 0000"
+-		$"0000 0000 00FC FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FF81 F600 0000 0000"
+-		$"0000 0000 0000 FAFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FE2B 0000 0000"
+-		$"0000 0000 0000 0000 F8FB FCFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFD 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 00F5 F7F7"
+-		$"2BF7 F8FA FAFD FFFF FFFF FFFF F900 0000"
+-		$"0000 0000 F7AC FFFF FCF6 0000 0000 0000"
+-		$"0000 0000 0000 F5FE FFFF FFFF F900 0000"
+-		$"0000 00F6 FFFF FFFB 0000 0000 2B81 F700"
+-		$"0000 0000 0000 00F9 FFFF FFFF 0000 0000"
+-		$"0000 002B FFFF FF2B 0000 0000 FAFB 0000"
+-		$"0000 0000 00F5 F8FF FFFF FEF6 F500 0000"
+-		$"0000 00F5 FEFF FFFC 0000 0000 F5FC FDFC"
+-		$"ACFC ACFC FDFF FFFF FF81 F556 F500 0000"
+-		$"0000 0000 F8FF FFFF FBF5 0000 0000 F6FA"
+-		$"81AC FCFC FCFA 562B F5F8 FCF5 0000 0000"
+-		$"0000 0000 002B FCFF FFFE FCF9 F82B 0000"
+-		$"0000 0000 2BF7 FAFC FD56 0000 0000 0000"
+-		$"0000 0000 0000 00F7 FAFE FFFF FFFF FFFF"
+-		$"FFFF FFFF FFAC 812B 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 F52B F9F9 FAF9"
+-		$"FAF8 F72B F600 0000 0000 0000 0000 0000",
+-		/* [4] */
+-		'il32',
+-		$"91FF 00DF 9CFF 01A0 909A FF03 D350 AF80"
+-		$"91FF 02CF A080 8140 0538 24D5 FF00 DF8D"
+-		$"FF02 EF80 2081 0008 0420 60A2 FFFF BF00"
+-		$"BF8C FF01 CF10 8100 022C 86BF 81FF 03DF"
+-		$"3000 728B FF01 CF10 8000 0110 B083 FF01"
+-		$"9410 8000 0066 8AFF 0040 8100 00A2 80FF"
+-		$"03E5 E3FF 7C83 0000 A088 FF00 DF81 0008"
+-		$"10FF FF82 FF91 C7FF 6083 0000 3088 FF00"
+-		$"BF81 0009 40FF FF66 E3D5 BAFF F330 8300"
+-		$"88FF 00DF 8200 03EF FFF1 E381 FF01 EF30"
+-		$"8100 0044 89FF 004C 8100 006C 80FF 01F1"
+-		$"C780 FF05 EF20 0000 04C5 89FF 01DF 1081"
+-		$"0000 6C80 FF01 7458 80FF 0380 0000 A08B"
+-		$"FF01 D120 8100 0460 FFFF E382 80FF 0254"
+-		$"10A2 8EFF 0192 0280 0000 A081 FF03 DB64"
+-		$"60EF 8DFF 07AF 6412 0204 2080 EF80 FF01"
+-		$"CFBB 8EFF 01EF 4480 0001 50CF 96FF 0040"
+-		$"8100 0150 CF95 FF00 CF84 0003 1040 4268"
+-		$"8080 01BF D18C FF01 CF02 8D00 0238 92DF"
+-		$"89FF 0044 8F00 0204 62DF 88FF 0070 9000"
+-		$"0110 CF89 FF02 A060 408D 0001 22EF 8DFF"
+-		$"00DF 81BF 04A0 8070 2002 8200 0090 84FF"
+-		$"05B4 3600 0046 DB89 FF01 DF20 8100 0090"
+-		$"83FF 00DF 8000 0058 81FF 02CF 68BF 85FF"
+-		$"0080 8000 0110 EF83 FF00 BF80 0000 BF81"
+-		$"FF01 705A 84FF 07EF A410 0000 10CF EF83"
+-		$"FF04 EF10 0000 5281 FF02 EF42 2082 4000"
+-		$"2681 0003 68E7 96EF 84FF 05A2 0200 0052"
+-		$"EF81 FF02 D380 6080 4007 4480 90BF EFA4"
+-		$"54EF 86FF 08C3 4000 0010 5080 AFCF 83FF"
+-		$"05CF AF80 4C24 A28A FF02 BF70 2086 0004"
+-		$"0400 3260 C38F FF02 EFBF 9081 8003 A0BF"
+-		$"C7DF 88FF 91FF 00DE 9BFF 02FE A090 9AFF"
+-		$"03D3 50AF 8091 FF02 CFA0 8081 4005 3824"
+-		$"D4FF 00DF 8DFF 02EF 8020 8100 0804 2060"
+-		$"A2FF FFBF 00BF 8CFF 01CF 1081 0002 2C85"
+-		$"BF81 FF03 DF30 0072 8BFF 01CF 1080 0001"
+-		$"10B0 83FF 0194 1080 0000 668A FF00 4081"
+-		$"0000 A280 FF03 ECEB FF7C 8300 00A0 88FF"
+-		$"00DF 8100 0810 FFFF A6FF B1D7 FF60 8300"
+-		$"002F 88FF 00BF 8100 0940 FFFF 92EB E1CE"
+-		$"FFF2 3083 0088 FF00 DE82 0003 EFFF F5EB"
+-		$"81FF 01EF 3081 0000 4489 FF00 4C81 0000"
+-		$"6B80 FF01 F5D7 80FF 05EF 2000 0004 C589"
+-		$"FF01 DF10 8100 006B 80FF 019C 8780 FF03"
+-		$"8000 00A0 8BFF 01D1 2081 0004 60FF FFEB"
+-		$"A680 FF02 5410 A28E FF01 9202 8000 00A0"
+-		$"81FF 03DB 6360 EF8D FF07 AF64 1202 0420"
+-		$"80EF 80FF 01CF BB8E FF01 EF44 8000 0150"
+-		$"CF96 FF00 3F81 0001 50CF 95FF 00CF 8400"
+-		$"0310 4042 6880 8001 BFD1 8CFF 01CF 028D"
+-		$"0002 3892 DF89 FF00 448F 0002 0462 DF88"
+-		$"FF00 7090 0001 10CF 89FF 02A0 6040 8D00"
+-		$"0122 EF8D FF00 DF81 BF04 9F80 7020 0282"
+-		$"0000 9084 FF05 B336 0000 46DB 89FF 01DF"
+-		$"2081 0000 9083 FF00 DF80 0000 5881 FF04"
+-		$"CF68 BFFE FE83 FF00 8080 0001 10EF 83FF"
+-		$"00BF 8000 00BF 81FF 0170 5A84 FF07 EFA4"
+-		$"1000 0010 CFEE 83FF 04EF 1000 0052 81FF"
+-		$"08EF 4220 4040 3F3F 4026 8100 0368 E795"
+-		$"EF84 FF05 A102 0000 52EF 81FF 0DD3 8060"
+-		$"403F 3F43 8090 BFEF A354 EF86 FF08 C340"
+-		$"0000 1050 80AF CF82 FF06 FECF AF7F 4C24"
+-		$"A28A FF02 BF70 2086 0004 0400 3260 C38F"
+-		$"FF02 EFBF 9081 8003 A0BF C7DF 88FF 90FF"
+-		$"01FE DC9B FF03 FCA0 90FE 99FF 03D3 50AF"
+-		$"8091 FF02 CFA0 7F81 4005 3C24 D8FF 00DF"
+-		$"8DFF 02ED 8020 8100 0804 1E60 A4FF FFBF"
+-		$"00BF 8CFF 01CF 0F81 0003 2C80 BEFD 80FF"
+-		$"03DF 3000 748B FF01 CF10 8000 0110 B082"
+-		$"FF02 FE94 1080 0000 6C8A FF00 4081 0000"
+-		$"A480 FF03 F0EF FF7C 8300 00A0 88FF 00DE"
+-		$"8100 0810 FFFF B8FF C2DF FF5F 8300 002E"
+-		$"88FF 00BF 8100 0940 FFFF A7ED E7D8 FFF0"
+-		$"2F83 0088 FF00 DC82 0003 EFFF F6EE 81FF"
+-		$"01EE 3081 0000 4489 FF00 4C81 000E 6AFD"
+-		$"FFFF F6DE FDFF FFEF 2000 0008 C589 FF01"
+-		$"DE10 8100 056A FFFF FEAF 9E80 FF03 8000"
+-		$"00A0 8BFF 01D2 2081 0004 60FF FFEF B880"
+-		$"FF02 5410 A48E FF01 9404 8000 00A0 81FF"
+-		$"03DB 645F EF8C FF08 FDAF 6414 0404 1F80"
+-		$"EE80 FF01 CEBB 8EFF 01EF 4680 0002 50CE"
+-		$"FE95 FF00 3E81 0001 4ECE 95FF 00CD 8400"
+-		$"0310 4044 6880 8001 BFD2 8CFF 01CF 048D"
+-		$"0002 3894 DF89 FF00 478F 0002 0464 DF88"
+-		$"FF00 6F90 0001 10CF 88FF 03FE A060 408D"
+-		$"0001 23ED 86FF 00FE 83FF 00DF 81BF 049C"
+-		$"8070 2004 8200 0090 83FF 07FE B23C 0000"
+-		$"48DA FD88 FF01 DF20 8100 0090 83FF 00DF"
+-		$"8000 0057 81FF 04CF 70BF FCFC 82FF 01FE"
+-		$"8080 0001 10ED 83FF 00BF 8000 00BF 81FF"
+-		$"0270 58FD 83FF 07EF A410 0000 10CF EC83"
+-		$"FF04 EF10 0000 5481 FF08 ED44 2040 403D"
+-		$"3D40 2881 0003 68E7 9AEF 83FF 06FE A304"
+-		$"0000 53EF 81FF 0DD2 8060 3E3C 3C45 8090"
+-		$"BEEE A357 EF86 FF14 C240 0000 1050 80AF"
+-		$"CFFF FDFF FFFE FCCF AF7A 4C24 A48A FF02"
+-		$"BE70 1E86 0004 0800 3460 C78E FF03 FDEF"
+-		$"BF90 8180 04A0 BFCA DFFD 87FF",
+-		/* [5] */
+-		'l8mk',
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0005 FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0005 FFFF 0500 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 00FF FFFF FF00 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 00FF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
+-		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
+-		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FF00 0000 0000 0000"
+-		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
+-		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
+-		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
+-		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
+-		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
+-		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FF00 0000 0000 0000"
+-		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
+-		$"0000 0000 0000 05FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
+-		$"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FF00 0000 0000 0000"
+-		$"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000"
+-		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
+-		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 0000 0000 0005 FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 0000 0000 0500 00FF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000"
+-		$"0000 0005 FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000"
+-		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000"
+-		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 0005 FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
+-		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
+-		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0005 FFFF FFFF FFFF"
+-		$"FFFF FFFF FF05 0000 0000 0000 0000 0000",
+-		/* [6] */
+-		'ich#',
+-		$"0000 0000 0000 0000 0001 0000 0000 0002"
+-		$"8000 0000 0002 4000 0000 000C 4000 0000"
+-		$"1FFC 6000 0001 FFE0 6000 0007 FF00 E000"
+-		$"000F F801 F000 003F E003 F800 003F 800F"
+-		$"FC00 007F 800F FC00 007F 091F FE00 007F"
+-		$"010F FE00 00FF 0887 FE00 007F 8003 FE00"
+-		$"007F 8001 FC00 003F C000 FC00 003F E0C0"
+-		$"F000 001F F020 7000 000F F840 C000 0001"
+-		$"F801 8000 0003 FC0E 0000 000F F000 0000"
+-		$"007F 0000 0000 007E 0000 0000 00FF 8000"
+-		$"0000 01FF F690 0000 01FF FFFF 0000 01FF"
+-		$"FFFF F000 00FF FFFF FC00 007F FFFF FF00"
+-		$"003F FFFF FF80 0007 FFFF FFC0 0000 5FFF"
+-		$"FFC0 0000 0001 FFE0 01FC 0000 1FE0 03F0"
+-		$"0000 1FC0 03E0 1800 1FC0 03E0 3000 1F80"
+-		$"07E0 1801 FF00 03F0 0FFF FC40 01F8 02FF"
+-		$"4100 00FC 0000 0E00 007F C000 F800 000F"
+-		$"FFFF C000 0001 FFFE 0000 0000 0480 0000"
+-		$"0000 0006 0000 0000 0007 4000 0000 0007"
+-		$"8000 0000 0007 C000 0000 100F E000 0000"
+-		$"7FFF E000 0003 FFFF E000 000F FFFF E000"
+-		$"001F FFFF F000 003F FFFF F800 007F FFFF"
+-		$"FC00 007F FFFF FE00 00FF FFFF FE00 00FF"
+-		$"FFFF FE00 00FF FFFF FE00 00FF FFFF FE00"
+-		$"00FF FFFF FE00 007F FFFF FC00 007F FFFF"
+-		$"F800 001F FFFF F000 001F FFFF F000 0007"
+-		$"FFFF C000 0003 FFFE 0000 007F FFFC 0000"
+-		$"007F FFFE 0000 00FF FFFF 8000 01FF FFFF"
+-		$"C000 03FF FFFF F800 01FF FFFF FC00 01FF"
+-		$"FFFF FF00 01FF FFFF FF80 00FF FFFF FFC0"
+-		$"007F FFFF FFE0 001F FFFF FFF0 0000 FFFF"
+-		$"FFF0 0043 FFFF FFF0 03FF FFFF FFF0 07FF"
+-		$"FFFF FFF0 07FF FFFF FFF0 07FF FFFF FFE0"
+-		$"07FF FFFF FFE0 03FF FFFF FFC0 07FF FFFF"
+-		$"FF80 01FF FFFF FF00 01FF FFFF FE00 001F"
+-		$"FFFF F000 0007 FFFF 8000 0000 3FE4 0000",
+-		/* [7] */
+-		'ich4',
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00CE 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 00DC"
+-		$"D000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00F0 DD00 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 DAE0"
+-		$"CFC0 0000 0000 0000 0000 0000 0000 0000"
+-		$"0CDE EFFF FFFF FE00 0FA0 0000 0000 0000"
+-		$"0000 0000 0000 00DE FFFF FFFF FFED C000"
+-		$"CFF0 0000 0000 0000 0000 0000 0000 CFFF"
+-		$"FFFF FFFF C000 0000 EFF0 0000 0000 0000"
+-		$"0000 0000 000C FFFF FFFF ECC0 0000 000D"
+-		$"FFFD 0000 0000 0000 0000 0000 00DF FFFF"
+-		$"FFD0 0000 0000 0CFF FFFF E000 0000 0000"
+-		$"0000 0000 0CFF FFFF FD00 0000 0000 EFFF"
+-		$"FFFF FE00 0000 0000 0000 0000 0AFF FFFF"
+-		$"F000 0000 C00D FFFF FFFF FFC0 0000 0000"
+-		$"0000 0000 CFFF FFFF D000 D00D C00D FFFF"
+-		$"FFFF FFE0 0000 0000 0000 0000 CFFF FFFF"
+-		$"0000 9007 C00C FFFF FFFF FFF0 0000 0000"
+-		$"0000 0000 CFFF FFFF 0000 7C00 C000 CAFF"
+-		$"FFFF FFF0 0000 0000 0000 0000 CFFF FFFF"
+-		$"D000 0C00 0000 00FF FFFF FFE0 0000 0000"
+-		$"0000 0000 0FFF FFFF F000 0000 0000 000F"
+-		$"FFFF FFC0 0000 0000 0000 0000 0DFF FFFF"
+-		$"FD00 0000 CC00 000C FFFF FE00 0000 0000"
+-		$"0000 0000 00AF FFFF FFD0 0000 7DD0 0000"
+-		$"EFFF E000 0000 0000 0000 0000 000E FFFF"
+-		$"FFFE 0000 0690 0000 DFFE 0000 0000 0000"
+-		$"0000 0000 000C EFFF FFFF E000 0CC0 000C"
+-		$"FFDC 0000 0000 0000 0000 0000 0000 0CDF"
+-		$"FFFF FD00 0000 00DF E000 0000 0000 0000"
+-		$"0000 0000 0000 00EF FFFF FD00 0000 DED0"
+-		$"0000 0000 0000 0000 0000 0000 00CD EFFF"
+-		$"FFAE C000 000C C000 0000 0000 0000 0000"
+-		$"0000 0000 0DFF FFFE DC00 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 DFFF FFFD"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 000C FFFF FFFE DC00 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 000E FFFF FFFF"
+-		$"FFFE EDED CCDC C000 0000 0000 0000 0000"
+-		$"0000 000F FFFF FFFF FFFF FFFF FFFF FFFD"
+-		$"DC00 0000 0000 0000 0000 000E FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFED C000 0000 0000"
+-		$"0000 000C FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FED0 0000 0000 0000 0000 CFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFA 0000 0000"
+-		$"0000 0000 0CAF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF EC00 0000 0000 0000 0000 DEAF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FE00 0000"
+-		$"0000 0000 0000 0000 CDDD EFFF FFFF FFFF"
+-		$"FFFF FFFF FFC0 0000 0000 0000 0000 0000"
+-		$"0000 0000 000C CCDD FFFF FFFF FFE0 0000"
+-		$"0000 00CD EFFF FDC0 0000 0000 0000 0000"
+-		$"00DF FFFF FFE0 0000 0000 00EF FFFF C000"
+-		$"0000 0000 0000 0000 000A FFFF FFC0 0000"
+-		$"0000 0CFF FFFC 0000 000F ECC0 0000 0000"
+-		$"000E FFFF FF00 0000 0000 0CFF FFF0 0000"
+-		$"00DF D000 0000 0000 0CDF FFFF A000 0000"
+-		$"0000 0DFF FFFC 0000 00CF AC00 0000 00CD"
+-		$"EAFF FFFE 0CC0 0000 0000 00AF FFFE 0000"
+-		$"0000 EFFF FFFF FFFF FFFF FED0 CD00 0000"
+-		$"0000 00CF FFFF E000 0000 0CDE EFFF FFFE"
+-		$"EDDC 00CE D000 0000 0000 000C FFFF FFC0"
+-		$"0000 0000 0000 0000 000C DFFC 0000 0000"
+-		$"0000 0000 0DFF FFFF EEDC C000 0000 00CC"
+-		$"DEEA FD00 0000 0000 0000 0000 000C EFFF"
+-		$"FFFF FFFF FFFF FFFF FFDC 0000 0000 0000"
+-		$"0000 0000 0000 00CD FFFF FFFF FFFF FEFD"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"00CC CCDC CD00 0000 0000 0000 0000 0000",
+-		/* [8] */
+-		'ich8',
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 F6AC"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 81F6"
+-		$"FA00 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 00F5 FF00"
+-		$"5681 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 FAAC 8100"
+-		$"2BFF 2B00 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"00F8 F9FB FBFF FFFF FFFF FFFE FFAC F500"
+-		$"00FF FD00 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 F9AC"
+-		$"FFFF FFFF FFFF FFFF FFFF ACFA F600 0000"
+-		$"2BFF FF00 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 F8FF FFFF"
+-		$"FFFF FFFF FFFF FFFF F800 0000 0000 0000"
+-		$"FBFF FF00 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 00F8 FFFF FFFF"
+-		$"FFFF FFFF FBF7 F600 0000 0000 0000 F5FA"
+-		$"FFFF FFFA 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 F9FF FFFF FFFF"
+-		$"FFFF FA00 0000 0000 0000 0000 00F8 FEFF"
+-		$"FFFF FFFF 8100 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 00F8 FFFF FFFF FFFF"
+-		$"FFF9 0000 0000 0000 0000 0000 FCFF FFFF"
+-		$"FFFF FFFF FFFC 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 00AC FFFF FFFF FFFF"
+-		$"FFF6 0000 0000 00F6 F600 00F9 FFFF FFFF"
+-		$"FFFF FFFF FFFF 2B00 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 F5FF FFFF FFFF FFFF"
+-		$"F900 0000 7A00 007A 4F00 00FA FFFF FFFF"
+-		$"FFFF FFFF FFFF FB00 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 F8FF FFFF FFFF FFFF"
+-		$"0000 0000 C800 0079 2B00 00F6 FEFF FFFF"
+-		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 F8FF FFFF FFFF FFFF"
+-		$"0000 0000 A5F6 00F5 5500 0000 F6FE FFFF"
+-		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 2BFF FFFF FFFF FFFF"
+-		$"FA00 0000 F52A 0000 0000 0000 00F5 FEFF"
+-		$"FFFF FFFF FFFF FC00 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
+-		$"FF00 0000 0000 0000 0000 0000 0000 F6FF"
+-		$"FFFF FFFF FFFF F800 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 00F9 FFFF FFFF FFFF"
+-		$"FF81 0000 0000 00F5 4FF5 0000 0000 00F6"
+-		$"FFFF FFFF FFFC 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 FDFF FFFF FFFF"
+-		$"FFFF 8100 0000 0000 55C9 5500 0000 0000"
+-		$"FBFF FFFF FB00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 00AC FFFF FFFF"
+-		$"FFFF FFAC 0000 0000 25A4 C900 0000 0000"
+-		$"FBFF FFFD 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 00F5 ACFF FFFF"
+-		$"FFFF FFFF FB00 0000 0055 2B00 0000 00F6"
+-		$"FEFF 81F5 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 00F6 FAFF"
+-		$"FFFF FFFF FFF9 0000 0000 0000 0000 F9FF"
+-		$"ACF5 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 FBFE"
+-		$"FFFF FFFF FFF9 0000 0000 0000 FAFC F900"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 2B56 ACFF FFFF"
+-		$"FFFF FEFB 2B00 0000 0000 00F6 F800 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 00FA FFFF FFFF FFFD"
+-		$"F92B 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 FAFF FFFF FFFF FFF8"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00F6 FFFF FFFF FFFF FFFE"
+-		$"F92B 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00FD FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFB FBFB FB56 F8F8 F8F8 F600 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFF9"
+-		$"FAF6 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00AC FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF AC81 2B00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00F6 FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFAC 5600 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 F8FF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFD 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 00F8 FDFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FDF5 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 56FB FEFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFAC 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"2BFA F9FA FDFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF F800 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 00F5 F8F8 F8FB"
+-		$"FDFF FFFF FFFF FFFF FFFF FB00 0000 0000"
+-		$"0000 0000 0000 F5FA FCFF FFFF FFFA F500"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"00F5 FAFF FFFF FFFF FFFF FB00 0000 0000"
+-		$"0000 0000 0000 ACFF FFFF FFFF F600 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 00FD FFFF FFFF FFFF F800 0000 0000"
+-		$"0000 0000 002B FFFF FFFF FF56 0000 0000"
+-		$"0000 F5FD FCF8 F600 0000 0000 0000 0000"
+-		$"0000 00FB FFFF FFFF FFFE 0000 0000 0000"
+-		$"0000 0000 00F8 FFFF FFFF FF00 0000 0000"
+-		$"0000 F9FF 5600 0000 0000 0000 0000 0000"
+-		$"00F6 F9FF FFFF FFFF FDF5 0000 0000 0000"
+-		$"0000 0000 00F8 FFFF FFFF FFF6 0000 0000"
+-		$"0000 F6FF FFF8 0000 0000 0000 0000 F6F9"
+-		$"FBFF FFFF FFFF FFFC 00F6 F800 0000 0000"
+-		$"0000 0000 0000 FEFF FFFF FFFB 0000 0000"
+-		$"0000 00F6 FCFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFD 5600 F6FA 0000 0000 0000"
+-		$"0000 0000 0000 F7FF FFFF FFFF FBF6 0000"
+-		$"0000 0000 002B FAFB ACFF FFFF FFFF FFAC"
+-		$"FBFB F8F8 0000 F6AC FA00 0000 0000 0000"
+-		$"0000 0000 0000 002B FFFF FFFF FFFF F800"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 00F6 F9FF FFF8 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 F581 FFFF FFFF FFFF"
+-		$"FBFB F9F8 2B00 0000 0000 0000 0000 2BF8"
+-		$"F9FB FBFF FDF9 F500 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 00F9 FBFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFE 812B 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 F8FA"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFD FDF9"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 2BF8 F8F8 F8F8 F8F8 F500 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000",
+-		/* [9] */
+-		'ih32',
+-		$"CBFF 01D5 40AB FF02 71D5 71A9 FF04 E300"
+-		$"FF8E 71A7 FF06 8035 60FF D500 C09B FF03"
+-		$"AA8E 5555 8300 070E 0B39 E6FF FF00 2B98"
+-		$"FF01 8E39 8700 0239 75D5 80FF 02C6 0000"
+-		$"96FF 00AA 8700 010B AA84 FF02 5500 0095"
+-		$"FF00 AA85 0002 4EB5 D584 FF01 E380 8000"
+-		$"0075 93FF 0080 8400 0071 87FF 01AA 1C82"
+-		$"0000 6091 FF00 AA84 0000 8087 FF00 5085"
+-		$"0000 4090 FF00 3983 0001 06E3 82FF 04D0"
+-		$"CDFF FF87 8700 00C6 8EFF 00E3 8400 0080"
+-		$"80FF 076A FFFF 6DB5 FFFF 7187 0000 558E"
+-		$"FF00 AA84 0081 FF08 20FF FF6A B5FF FFD5"
+-		$"1087 008E FF00 AA84 0081 FF04 39CD FFE6"
+-		$"9C80 FF01 D51C 8600 8EFF 00C6 8400 0080"
+-		$"80FF 01E6 CE84 FF01 E31C 8400 0040 8FFF"
+-		$"000B 8400 8AFF 00D5 8400 00AA 8FFF 007F"
+-		$"8400 006A 82FF 02E6 B5DA 82FF 00D5 8200"
+-		$"0045 91FF 002B 8400 006A 82FF 0283 2083"
+-		$"82FF 0055 8000 0055 93FF 002B 8400 0040"
+-		$"81FF 02DA 2020 82FF 0355 0000 2B94 FF01"
+-		$"E639 8400 0055 81FF 0190 B581 FF04 D523"
+-		$"005B E396 FF01 D571 8300 008E 85FF 0391"
+-		$"0639 E399 FF01 600B 8200 0080 83FF 0280"
+-		$"4080 98FF 02D5 8E40 8100 0307 1C55 C683"
+-		$"FF01 E3AA 99FF 0079 8200 021C 80C6 A3FF"
+-		$"0080 8300 00AA A4FF 00D5 8400 021C 80C6"
+-		$"A2FF 002B 8800 8055 015B 9C81 AA00 D597"
+-		$"FF94 0003 0580 80D5 92FF 0030 9600 0307"
+-		$"3575 C68F FF01 DA04 9900 0135 918E FF00"
+-		$"AA9B 0000 2B8E FF01 AA2B 9A00 012B E38F"
+-		$"FF02 8E55 1C97 0000 3C93 FF00 C080 8000"
+-		$"2B92 0000 AA9D FF00 E380 AA02 551C 0485"
+-		$"0000 5588 FF02 E380 4380 0002 0B6B EA8F"
+-		$"FF01 E380 8400 0055 88FF 0035 8200 00D5"
+-		$"93FF 002B 8300 00AA 87FF 00C6 8200 009C"
+-		$"83FF 04E3 2B47 AAD5 89FF 0055 8200 001C"
+-		$"88FF 00AA 8200 84FF 028E 0098 89FF 01E3"
+-		$"8082 0001 2BE3 88FF 00AA 8200 00DA 83FF"
+-		$"03D5 000B AA85 FF03 DF88 550B 8200 0340"
+-		$"FFD5 AA88 FF00 1C81 0000 5584 FF01 D53C"
+-		$"8D00 042B 9CFF DA78 89FF 00AE 8200 0155"
+-		$"DA84 FF03 CD80 5539 8300 0935 5555 AAAA"
+-		$"FFFF CD40 808B FF01 C80B 8200 00AA 91FF"
+-		$"04DF 8000 05AA 8DFF 01E3 7183 0004 5555"
+-		$"8EAA C686 FF08 C6AA 8E55 550E 2380 E391"
+-		$"FF01 8E55 9000 0304 1C60 C697 FF01 AA80"
+-		$"8A00 0220 2B80 9FFF 00C6 84AA 00E3 92FF"
+-		$"CAFF 04FE D340 FFFE A9FF 0271 D571 A9FF"
+-		$"04E3 00FF 8E71 9EFF 00FE 85FF 0680 355F"
+-		$"FFD5 00C0 9BFF 03AA 8E55 5583 0007 0E0B"
+-		$"39E5 FFFF 002B 98FF 018E 3987 0002 3975"
+-		$"D580 FF02 C600 0096 FF00 A887 0002 0BA9"
+-		$"FD83 FF02 5500 0095 FF00 AA85 0002 4EB3"
+-		$"D484 FF01 E380 8000 0075 93FF 0080 8400"
+-		$"0071 87FF 01AA 1C82 0000 6091 FF00 AA84"
+-		$"0000 8087 FF00 4F85 0000 4090 FF00 3983"
+-		$"0001 06E3 82FF 04DC DCFF FF87 8700 00C6"
+-		$"8EFF 00E2 8400 0080 80FF 0795 FFFF 97CA"
+-		$"FFFF 7187 0000 548E FF00 AA84 0081 FF08"
+-		$"60FE FF95 CAFF FFD3 1087 008E FF00 AA84"
+-		$"0081 FF09 72DC FFED B8FF FFFE D41C 8600"
+-		$"8EFF 00C6 8400 0080 80FF 01ED DB84 FF01"
+-		$"E31C 8400 0040 8EFF 01FE 0B84 008A FF00"
+-		$"D584 0000 A98F FF00 7F84 0001 69FE 81FF"
+-		$"03ED C9E5 FE81 FF00 D582 0000 4591 FF00"
+-		$"2B84 0000 6982 FF02 A660 A682 FF00 5580"
+-		$"0000 5593 FF00 2B84 0000 4081 FF02 E560"
+-		$"6082 FF03 5500 002B 94FF 01E6 3984 0000"
+-		$"5581 FF01 B0CA 81FF 04D5 2300 5BE3 96FF"
+-		$"01D5 7183 0000 8E85 FF03 8F06 38E3 99FF"
+-		$"0160 0B82 0000 8083 FF02 8040 8097 FF03"
+-		$"FED4 8E40 8100 0307 1C55 C683 FF01 E2AA"
+-		$"99FF 0077 8200 021C 7FC6 A3FF 0080 8300"
+-		$"00AA A4FF 00D3 8400 021C 7FC6 A2FF 002A"
+-		$"8800 8055 015B 9C81 AA02 D5FF FE95 FF94"
+-		$"0003 0580 80D5 92FF 0030 9600 0307 3575"
+-		$"C68F FF01 D904 9900 0135 918E FF00 AA9B"
+-		$"0000 2B8E FF01 AA2B 9A00 012B E38F FF02"
+-		$"8E55 1C97 0000 3C93 FF00 C080 8000 2B92"
+-		$"0000 A99D FF00 E180 AA02 551C 0485 0000"
+-		$"5588 FF02 E280 4380 0003 0B6B E9FE 8EFF"
+-		$"01E3 8084 0000 5587 FF01 FE35 8200 00D5"
+-		$"87FF 01FE FE87 FF00 2B83 0000 AA87 FF00"
+-		$"C682 0000 9C83 FF06 E32B 47AA D5FE FE87"
+-		$"FF00 5582 0001 1CFE 87FF 00AA 8200 84FF"
+-		$"028E 0098 89FF 01E3 8082 0002 2BE3 FE87"
+-		$"FF00 AA82 0000 DA83 FF03 D500 0BAA 81FF"
+-		$"07FD FDFF FFDF 8855 0B82 0003 40FF D5AA"
+-		$"88FF 001C 8100 0055 83FF 02FE D53C 8D00"
+-		$"042B 9CFF D978 89FF 00AD 8200 0155 D984"
+-		$"FF03 CD7F 5539 8300 0935 5555 AAAA FFFF"
+-		$"CD40 808B FF01 C70B 8200 00AA 88FF 00FE"
+-		$"81FD 08FF FFFE FEDF 8000 05AA 8DFF 01E3"
+-		$"7183 0007 5555 8EAA C6FF FFFE 81FF 0AFE"
+-		$"FEC6 AA8E 5455 0E23 80E3 91FF 018D 5590"
+-		$"0003 041C 60C6 96FF 02FD A980 8A00 0320"
+-		$"2B7F FE9E FF00 C684 AA03 E3FF FFFE 8FFF"
+-		$"9AFF 01FD FDAB FF04 FAD0 40FF FDA8 FF03"
+-		$"FD71 D571 A9FF 04E3 00FF 8E71 9EFF 00FC"
+-		$"85FF 0680 3568 FFD5 00C0 9BFF 03AA 8E55"
+-		$"5583 0007 150B 39E5 FFFF 002B 98FF 018E"
+-		$"3987 0002 3978 D580 FF02 C600 0096 FF00"
+-		$"A387 0002 0BA5 F883 FF02 5500 0095 FF00"
+-		$"AA85 0003 4EAA D2FD 83FF 01E3 8080 0000"
+-		$"7893 FF00 8084 0000 7187 FF01 AA1C 8200"
+-		$"006A 91FF 00AA 8400 0080 87FF 004C 8500"
+-		$"0040 90FF 0039 8300 010B E382 FF04 E4E3"
+-		$"FFFF 8787 0000 C68E FF00 DF84 0000 8080"
+-		$"FF07 AAFF FFAE D5FF FF70 8700 0052 8EFF"
+-		$"00AA 8400 81FF 0880 FAFF AAD5 FFFF D010"
+-		$"8700 8EFF 00AA 8400 80FF 0AFD 8EE3 FFEF"
+-		$"C6FF FFFC D21C 8600 8EFF 00C3 8400 0080"
+-		$"80FF 01EF E183 FF02 FDE3 1C84 0000 408E"
+-		$"FF01 FA0B 8400 8AFF 00D5 8400 00A8 8FFF"
+-		$"007F 8400 0167 FC81 FF03 EFD2 EAFC 81FF"
+-		$"00D5 8200 0053 90FF 01FD 2B84 0000 6781"
+-		$"FF03 FDB7 80B5 82FF 0055 8000 0055 93FF"
+-		$"002B 8400 0040 81FF 02EA 8080 82FF 0355"
+-		$"0000 2B94 FF01 E839 8400 0055 81FF 01C0"
+-		$"D581 FF04 D523 0060 E396 FF01 D571 8300"
+-		$"008E 85FF 038E 0B37 E399 FF01 6B15 8200"
+-		$"0080 83FF 0280 4080 97FF 03FC D28E 4081"
+-		$"0004 071C 53C6 FD82 FF02 E1AA FD98 FF00"
+-		$"7C82 0004 1C7D C6FF FDA1 FF00 8083 0000"
+-		$"AAA4 FF00 D084 0002 1B7D C5A1 FF01 FD28"
+-		$"8800 8055 0160 9C81 AA02 D5FF FC95 FF94"
+-		$"0003 0B80 80D5 92FF 0035 9600 0307 3578"
+-		$"C68F FF01 DD07 9900 0135 958E FF00 AA9B"
+-		$"0000 2B8E FF01 A82B 9A00 012B E38E FF03"
+-		$"FD8E 551C 9700 013E FD92 FF00 C080 8000"
+-		$"2B92 0000 A88B FF00 FD8E FF00 DC80 AA02"
+-		$"551C 0785 0000 5588 FF02 E180 4E80 0003"
+-		$"0E6B E6FC 8EFF 01E3 8084 0000 5587 FF01"
+-		$"FD33 8200 00D5 87FF 01FD FD87 FF00 2B83"
+-		$"0000 AA87 FF00 C682 0000 9A83 FF06 E32B"
+-		$"55AA D5FC FC85 FF02 FDFF 5582 0001 1CFC"
+-		$"87FF 00AA 8200 84FF 038E 0095 FD88 FF01"
+-		$"E380 8200 022B E3FA 87FF 00AA 8200 00DF"
+-		$"83FF 03D5 000B A881 FF07 F8F8 FFFF DF90"
+-		$"550B 8200 0340 FFD5 AA88 FF00 1C81 0000"
+-		$"5583 FF02 FCD5 408D 0004 2B9C FFDD 7E88"
+-		$"FF01 FDAF 8200 0155 DD84 FF03 CD7D 5539"
+-		$"8300 0940 5555 A8AA FDFD CD47 808B FF01"
+-		$"CC0B 8200 00AA 88FF 00FA 81F8 08FF FFFA"
+-		$"FCDF 8000 0BA8 8CFF 02FD E371 8300 0755"
+-		$"558E AAC6 FFFF FC81 FF0A FAFC C6AA 8E52"
+-		$"530E 2380 E391 FF01 8C55 9000 0307 1C6B"
+-		$"C696 FF02 F8A5 808A 0003 352B 7CFD 9EFF"
+-		$"00C6 84AA 03E3 FFFF FC8F FF",
+-		/* [10] */
+-		'h8mk',
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0005 0500"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0005 FFFF"
+-		$"0005 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0005 FFFF"
+-		$"FF00 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 00FF FFFF"
+-		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0005 0000 0000 0000 0000 FFFF FFFF"
+-		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"00FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 00FF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 05FF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0005 FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 00FF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 00DB FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 00FF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0005 FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FF05 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FF00 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 05FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
+-		$"0000 0000 0000 00DB FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FF00 0000 0000 0000"
+-		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
+-		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000"
+-		$"0000 0000 0000 0000 0000 0005 FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
+-		$"0000 0000 0000 0000 0005 0000 0000 FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
+-		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
+-		$"0000 0000 0005 FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
+-		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
+-		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000"
+-		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000"
+-		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
+-		$"0000 0000 0005 FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FF00 0000 0000 0000"
+-		$"0000 0000 0000 00DB FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
+-		$"0000 0000 0000 0005 FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 00FF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0005 FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"0500 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 FFFF FFFF FFFF FFFF FF00 0005 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000",
+-		/* [11] */
+-		'ics#',
+-		$"0000 00A0 0F10 1C78 1878 1C18 0E20 0600"
+-		$"1800 3FD0 1FF8 057C 300C 3358 18A8 0340"
+-		$"0070 07F0 1FF0 1FF8 3FF8 3FF8 1FF8 1FF0"
+-		$"3FF0 3FFC 3FFE 1FFE 7FFE 7FFE 7FFC 1FF0",
+-		/* [12] */
+-		'ics4',
+-		$"0000 0000 00C0 0000 0000 00CD CDCD 0000"
+-		$"0000 EFFD D0CE 0000 000E FA00 0DFF D000"
+-		$"000F FDCC 0EFF F000 000F FE00 00EF E000"
+-		$"000C FFD0 D0CE 0000 0000 DFF0 0CC0 0000"
+-		$"00CF FD00 0000 0000 00DF FFFA EEDD 0000"
+-		$"00CA FFFF FFFF FC00 0000 CDDE DEEF FFC0"
+-		$"00EF C0C0 000C FF00 00FE 00DD CDDF AD00"
+-		$"00DF DCC0 DCDD D000 0000 DDEE EDDC 0000",
+-		/* [13] */
+-		'ics8',
+-		$"0000 0000 0000 0000 0000 2B00 0000 0000"
+-		$"0000 0000 0000 2B56 F8F9 F856 0000 0000"
+-		$"0000 0000 FBFF FFFB 56F5 F7FC 0000 0000"
+-		$"0000 00FC FFFD F500 00F9 FFFF F900 0000"
+-		$"0000 F5FF FF56 2B2A F6FB FFFF FF00 0000"
+-		$"0000 00FE FFFB 00F5 0000 FBFF FC00 0000"
+-		$"0000 00F8 FFFF FA00 7900 F7FD F500 0000"
+-		$"0000 00F5 F9FF FDF6 00F6 F800 0000 0000"
+-		$"0000 2BEA FF56 0000 0000 0000 0000 0000"
+-		$"0000 81FF FFFF FEFD FCFC FAF8 0000 0000"
+-		$"0000 F6FE FFFF FFFF FFFF FFFF FEF7 0000"
+-		$"0000 0000 2B56 FA81 81FC FDFF FFFF F600"
+-		$"0000 ACFE 2B00 2BF5 0000 00F8 FFFF F500"
+-		$"00F5 FFFC 0000 FA56 56F8 F9FD FE56 F500"
+-		$"0000 56E0 FBF7 F6F6 F856 56F9 56F6 0000"
+-		$"0000 0000 F881 FCAC FC81 FA2B 0000 0000",
+-		/* [14] */
+-		'is32',
+-		$"87FF 00C3 87FF 06F3 C79F 9F8C B598 84FF"
+-		$"08F3 6008 0B53 9FE8 B34C 84FF 0948 002C"
+-		$"EBF8 F884 0400 8182 FF0A E700 0093 B9D2"
+-		$"E061 0000 0C82 FF0A F713 0057 FCF5 F1FB"
+-		$"5000 4383 FF09 B008 0073 FF8C FFB4 2DE7"
+-		$"83FF 08EB 8202 28E3 FFD9 B0FB 83FF 03CB"
+-		$"1100 9089 FF00 6880 0006 142B 4050 75B2"
+-		$"F782 FF01 D01C 8500 011A AF83 FF13 BF90"
+-		$"7860 6048 2401 0009 DFFF FFF7 3B16 C8FF"
+-		$"CDEF 80FF 139F 0004 DFFF FFEB 0444 FFFF"
+-		$"7F97 9F9F 852D 1A97 F780 FF0B 9A10 54B3"
+-		$"DFD4 A79F 9187 96D0 82FF 08EF A36C 4440"
+-		$"4863 84C8 81FF 87FF 00C3 87FF 06F3 C79F"
+-		$"9F8C B598 84FF 08F3 6008 0B52 9FE8 B34C"
+-		$"84FF 0948 002C EBFA FA84 0400 8182 FF0A"
+-		$"E700 0093 CDDF E960 0000 0C82 FF0A F713"
+-		$"0057 FCF8 F5FB 5000 4383 FF09 B008 0072"
+-		$"FFAD FFB4 2DE7 83FF 08EB 8202 28E3 FFD9"
+-		$"B0FB 83FF 03CB 1100 8F89 FF00 6880 0006"
+-		$"142B 4050 74B2 F782 FF01 D01C 8500 011A"
+-		$"AF83 FF13 BF90 7860 6048 2401 0008 DFFF"
+-		$"FFF7 3A16 C8FF CDEF 80FF 139F 0004 DFFF"
+-		$"FFEB 0444 FFFF 7F97 9F9F 852D 1A97 F780"
+-		$"FF0B 9910 54B3 DFD4 A79F 9086 96D0 82FF"
+-		$"08EF A36C 4440 4863 84C8 81FF 86FF 01FE"
+-		$"C287 FF06 F3C7 9F9F 8DB6 9884 FF08 F35F"
+-		$"080B 519F E8B3 4D84 FF09 4800 2DEB FBFB"
+-		$"8304 0083 82FF 0AE7 0000 93D7 E5ED 5F00"
+-		$"000C 82FF 0AF6 1300 56FC F9F6 FB50 0044"
+-		$"83FF 09B0 0800 72FF BDFF B42D E783 FF08"
+-		$"EA83 0328 E3FF D9B0 FB83 FF03 CB12 008F"
+-		$"89FF 0068 8000 0614 2B40 5075 B2F7 82FF"
+-		$"01D1 1C85 0001 1AAF 83FF 2ABF 9078 6060"
+-		$"4724 0100 09DF FFFF F73C 16C8 FFCF EEFE"
+-		$"FFFF 9F00 04DF FFFF EB04 45FF FF7E 979F"
+-		$"9F86 2D1A 98F6 80FF 0B9A 1055 B3DF D3A7"
+-		$"9D91 8596 D182 FF08 EFA3 6C44 4048 6584"
+-		$"C981 FF",
+-		/* [15] */
+-		's8mk',
+-		$"0000 0000 0000 0000 0005 FF05 0000 0000"
+-		$"0000 0000 00FF FFFF FFFF FFFF 0000 0000"
+-		$"0000 00FF FFFF FFFF FFFF FFFF 0000 0000"
+-		$"0000 00FF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 FFFF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 FFFF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 00FF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 00FF FFFF FFFF FFFF FFFF 0000 0000"
+-		$"0000 FFFF FFFF FFFF FFFF FFFF 0000 0000"
+-		$"0000 FFFF FFFF FFFF FFFF FFFF FFFF 0000"
+-		$"0000 FFFF FFFF FFFF FFFF FFFF FFFF FF00"
+-		$"0000 0005 FFFF FFFF FFFF FFFF FFFF FF00"
+-		$"00FF FFFF FFFF FFFF FFFF FFFF FFFF FF00"
+-		$"00FF FFFF FFFF FFFF FFFF FFFF FFFF FF00"
+-		$"0005 FFFF FFFF FFFF FFFF FFFF FFFF 0000"
+-		$"0000 00FF FFFF FFFF FFFF FFFF 0000 0000",
+-		/* [16] */
+-		'icm#',
+-		$"0000 0350 1C30 1C78 1C10 0620 1900 3FF8"
+-		$"0B7C 300C 31B0 0720 0070 0FF0 1FF8 3FF8"
+-		$"3FF8 1FF0 3FF8 3FFC 1FFE 7FFE 7FFE 3FF8",
+-		/* [17] */
+-		'icm4',
+-		$"0000 0000 00C0 0000 0000 CDEE ECCE 0000"
+-		$"000D FAC0 0DEF C000 000F FD0C 0DFF F000"
+-		$"000E FFC0 C0DF C000 0000 DFEC 00CC 0000"
+-		$"00CF FDC0 C000 0000 00DF FFFF FFFE D000"
+-		$"000C DDEE EEFF FF00 00AE C0C0 000D FEC0"
+-		$"00FE C0CD DEDE DC00 000C DDED DDDC C000",
+-		/* [18] */
+-		'icm8',
+-		$"0000 0000 0000 0000 0000 F800 0000 0000"
+-		$"0000 0000 2BFA FBAC 8156 F681 0000 0000"
+-		$"0000 00FA FFFD F7F5 0056 FDFF F800 0000"
+-		$"0000 F5FF FF56 2B2A F556 FFFF FF00 0000"
+-		$"0000 00FB FFFE F600 4F00 56FF F800 0000"
+-		$"0000 00F5 81EA FEF5 00F6 F8F6 0000 0000"
+-		$"0000 F8FF FFFA 2BF6 F600 0000 0000 0000"
+-		$"0000 56FF FFFF FFFF FFFF E0FC F9F5 0000"
+-		$"0000 00F6 F981 FBFC FCAC FDFF FFFD F500"
+-		$"0000 FDFD F600 F700 0000 0056 FFFE F500"
+-		$"0000 ACFE 2B00 F7F9 8181 FBFB 81F7 0000"
+-		$"0000 00F7 FAFB FBFA FAF9 56F8 F600 0000",
+-		/* [19] */
+-		'it32',
+-		$"0000 0000 FFFF FFFF FFFF C9FF 0100 00FC"
+-		$"FF01 0000 F8FF 0000 80FF 0100 00F7 FF01"
+-		$"0000 80FF 0100 00F6 FF01 0000 81FF 0100"
+-		$"00F5 FF80 0080 FF80 00F4 FF80 0081 FF80"
+-		$"00F2 FF81 0081 FF80 00F1 FF00 4080 0082"
+-		$"FF81 00ED FF82 0001 2020 83FF 8100 D9FF"
+-		$"8D00 0240 2020 8200 0020 84FF 8100 D3FF"
+-		$"9B00 85FF 8200 CDFF 9C00 0140 0087 FF82"
+-		$"00CA FF9F 0089 FF82 00C7 FF9E 0001 2000"
+-		$"8AFF 8300 C5FF 9E00 8EFF 8300 C3FF 9800"
+-		$"0040 8000 91FF 8400 C1FF 9C00 93FF 8400"
+-		$"C0FF 9700 0160 0096 FF85 00BF FF93 0002"
+-		$"4040 0099 FF88 00BC FF94 0000 4099 FF89"
+-		$"0001 2000 BAFF 9300 9BFF 8C00 0020 B8FF"
+-		$"9300 9AFF 9000 B6FF 9200 9BFF 9000 0120"
+-		$"20B4 FF92 009A FF00 4094 00B3 FF91 009A"
+-		$"FF97 00B1 FF92 0099 FF00 4097 00B1 FF91"
+-		$"0090 FF00 2085 FF01 4040 9800 AFFF 9100"
+-		$"0020 8EFF 023A 2020 85FF 9A00 AFFF 9100"
+-		$"88FF 0020 83FF 8020 85FF 9B00 AEFF 9100"
+-		$"87FF 0120 2083 FF80 2085 FF9B 00AD FF92"
+-		$"0086 FF80 2083 FF02 203A 2086 FF9A 00AD"
+-		$"FF91 0087 FF80 2083 FF80 2086 FF9B 00AC"
+-		$"FF91 0087 FF80 2083 FF80 2087 FF00 4099"
+-		$"00AC FF91 0087 FF80 2084 FF80 2087 FF99"
+-		$"00AC FF91 0087 FF81 2084 FF01 2020 88FF"
+-		$"9800 ACFF 9100 88FF 8020 92FF 9700 ACFF"
+-		$"9200 88FF 8020 92FF 9600 ACFF 9200 A1FF"
+-		$"9200 0140 00AE FF91 00A2 FF93 00AE FF92"
+-		$"00A2 FF91 00AF FF00 4091 00A3 FF90 00B0"
+-		$"FF92 00A3 FF8D 0000 60B1 FF01 4040 9000"
+-		$"0040 A3FF 8B00 0120 00B2 FF91 0001 4040"
+-		$"8CFF 8220 8EFF 8B00 0020 B4FF 9300 8DFF"
+-		$"8220 8DFF 8A00 B5FF 9300 0040 8CFF 8320"
+-		$"8CFF 8900 B7FF 9200 0140 408C FF82 208C"
+-		$"FF88 00B9 FF94 008B FF83 208B FF87 00BB"
+-		$"FF94 008B FF82 208B FF86 00BD FF00 2093"
+-		$"008A FF81 208C FF85 00BF FF94 008A FF01"
+-		$"2020 8CFF 0040 8300 0020 C2FF 9300 99FF"
+-		$"8400 C6FF 9200 97FF 8300 CAFF 9000 96FF"
+-		$"8300 CDFF 8F00 93FF 0500 2000 2000 00CE"
+-		$"FF01 2020 8E00 90FF 8040 8000 CFFF 0300"
+-		$"0020 208D 008F FF01 0000 8040 CFFF 0040"
+-		$"9100 90FF 8000 CFFF 9300 E4FF 8E00 0040"
+-		$"8100 E6FF 9100 E7FF 0120 208E 00E9 FF8F"
+-		$"00EA FF8F 00EA FF90 00E9 FF92 00E8 FF94"
+-		$"00E5 FF98 00E2 FF9C 00DD FFA8 00D2 FFA5"
+-		$"0004 2000 0040 4089 00C4 FFBC 0000 20BD"
+-		$"FFC3 00B7 FFC4 0001 4040 B4FF C800 0020"
+-		$"B2FF 0020 CA00 AFFF 0020 CB00 0040 AEFF"
+-		$"CD00 0020 ACFF 0020 CF00 ABFF D100 ABFF"
+-		$"D000 ABFF D000 ABFF D000 ACFF CF00 AFFF"
+-		$"CB00 0020 B0FF CA00 B4FF C700 B9FF C200"
+-		$"C2FF B800 D6FF A500 DEFF 9C00 E1FF 0200"
+-		$"0020 9600 A2FF 0020 8900 0140 40B1 FF95"
+-		$"009F FF03 0000 2020 8900 0040 B4FF 9300"
+-		$"9DFF 8D00 0060 B7FF 9200 9CFF 0040 8C00"
+-		$"B9FF 9100 9CFF 8D00 BBFF 9000 9CFF 8C00"
+-		$"92FF 0200 2020 8200 9FFF 8F00 9CFF 8B00"
+-		$"0020 92FF 0400 0020 2000 A3FF 8F00 9CFF"
+-		$"8B00 0060 91FF 8100 A5FF 8E00 9DFF 8B00"
+-		$"92FF 8100 A4FF 8E00 9EFF 8B00 91FF 8100"
+-		$"0060 A3FF 8E00 9FFF 8B00 92FF 8200 A0FF"
+-		$"8F00 A0FF 8B00 92FF 8200 0040 9CFF 0100"
+-		$"408F 0082 FF00 009B FF8B 0000 2092 FF84"
+-		$"0095 FF01 4020 9100 0140 4082 FF01 0000"
+-		$"9CFF 8B00 93FF AE00 0240 4000 83FF 0100"
+-		$"009D FF8C 0093 FF01 0020 AC00 84FF 0120"
+-		$"009F FF8C 0094 FFAA 0085 FF01 2020 A0FF"
+-		$"0020 8C00 95FF 0100 40A2 0087 FF80 00A2"
+-		$"FF8D 0097 FF94 0000 2084 008A FF03 0000"
+-		$"2000 A4FF 8D00 0020 9BFF 8E00 0020 8FFF"
+-		$"0400 4000 0020 A6FF 0020 8D00 BBFF 8400"
+-		$"A8FF 0040 8E00 B5FF 0040 8300 0120 00AC"
+-		$"FF91 00AF FF02 0040 4083 00B0 FF95 00A3"
+-		$"FF8A 00B4 FF99 0097 FF8C 0001 4000 B8FF"
+-		$"BC00 0220 0000 BDFF BA00 0020 C3FF B000"
+-		$"0020 8000 C9FF A400 0120 2083 00D3 FF9F"
+-		$"0004 2020 4000 00DC FF92 00FF FFFF FFB3"
+-		$"FFFF FFCA FF00 FBFD FF00 FBFC FF03 FBFB"
+-		$"0000 F6FF 01FB FB81 FF01 0000 80FF 00FB"
+-		$"F4FF 0000 80FF 0100 00F7 FF01 0000 80FF"
+-		$"0100 00F5 FF02 FB00 0081 FF01 0000 F5FF"
+-		$"8000 80FF 8000 F4FF 8000 81FF 8000 F2FF"
+-		$"8100 81FF 8000 F1FF 0040 8000 82FF 8100"
+-		$"D6FF 00FB 93FF 8200 0220 20FB 82FF 8100"
+-		$"D9FF 8D00 0240 2020 8200 0220 FFFB 82FF"
+-		$"8100 D3FF 9B00 01FB FB83 FF82 00CD FF9C"
+-		$"0001 4000 87FF 8200 CAFF 9F00 89FF 8200"
+-		$"C7FF 9E00 0120 008A FF83 00C5 FF9E 008E"
+-		$"FF83 00C0 FF02 FBFB FF98 0000 4080 0001"
+-		$"FBFB 8FFF 8400 C0FF 00FB 9C00 03FF FFFB"
+-		$"FB8F FF84 00C0 FF97 0003 6000 FBFB 94FF"
+-		$"8500 BFFF 9300 0440 4000 FBFB 97FF 8800"
+-		$"BCFF 9400 0440 FFFF FBFB 95FF 8900 0120"
+-		$"00BA FF93 009B FF8C 0000 20B8 FF93 009A"
+-		$"FF90 00B6 FF92 009B FF90 0001 2020 B4FF"
+-		$"9200 99FF 01FB 4094 00B3 FF91 009A FF97"
+-		$"00B1 FF92 008D FF00 FB88 FF00 4097 00B1"
+-		$"FF91 008E FF02 FBFF 6085 FF01 4040 9800"
+-		$"AFFF 9100 0020 8EFF 026E 6060 85FF 9A00"
+-		$"ADFF 01FB FF91 0088 FF00 6083 FF80 6085"
+-		$"FF9B 0000 FBAB FF01 FBFF 9100 87FF 0160"
+-		$"6083 FF80 6085 FF9B 0000 FBAC FF92 0086"
+-		$"FF80 6083 FF02 606E 6084 FF01 FBFF 9A00"
+-		$"ADFF 9100 87FF 8060 83FF 8060 86FF 9B00"
+-		$"ACFF 9100 87FF 8060 01FB FB81 FF80 6085"
+-		$"FF02 FBFB 4099 00AC FF91 0087 FF80 6084"
+-		$"FF80 6084 FF02 FBFB FF99 00AC FF91 0086"
+-		$"FF00 FB81 6082 FF03 FBFF 6060 88FF 9800"
+-		$"ACFF 9100 88FF 8060 90FF 01FB FF97 00AC"
+-		$"FF92 0088 FF80 608F FF02 FBFF FF96 00AC"
+-		$"FF92 0088 FF03 FBFF FFFB 92FF 9200 0140"
+-		$"00AC FF01 FBFB 9100 A2FF 9300 ACFF 01FB"
+-		$"FB92 00A2 FF91 00AF FF00 4091 00A3 FF90"
+-		$"0000 FBAF FF92 0001 FBFB 8CFF 80FB 8FFF"
+-		$"8D00 0060 B1FF 0140 4090 0002 40FF FB91"
+-		$"FF00 FB8C FF8B 0001 2000 B2FF 9100 0240"
+-		$"40FB 8BFF 8260 01FF FB8C FF8B 0001 20FB"
+-		$"B1FF 01FB FF93 0001 FBFB 89FF 01FB FF82"
+-		$"6001 FBFB 8BFF 8A00 B5FF 9300 0040 8CFF"
+-		$"8360 8CFF 8900 B7FF 9200 0140 408B FF00"
+-		$"FB82 608C FF88 00B9 FF94 008B FF83 608B"
+-		$"FF87 00BB FF94 008B FF82 608B FF86 00BD"
+-		$"FF00 2093 008A FF81 608C FF85 00BE FF00"
+-		$"FB94 008A FF01 6060 8CFF 0040 8300 0020"
+-		$"C2FF 9300 99FF 8400 C6FF 9200 94FF 02FB"
+-		$"FBFF 8300 CAFF 9000 94FF 01FB FB83 00CD"
+-		$"FF8F 0093 FF06 0020 0020 0000 FBCD FF01"
+-		$"2020 8E00 90FF 8040 8000 CFFF 0300 0020"
+-		$"208D 008F FF01 0000 8040 CFFF 0040 9100"
+-		$"80FF 00FB 8AFF 01FB FF80 0001 FFFB CAFF"
+-		$"02FB FFFF 9300 E1FF 02FB FBFF 8E00 0040"
+-		$"8100 01FF FBE2 FF01 FBFB 9100 81FF 00FB"
+-		$"E2FF 0120 208E 0000 FBE8 FF8F 00EA FF8F"
+-		$"00EA FF90 00E8 FF00 FB92 0001 FBFB E5FF"
+-		$"00FB 9400 E5FF 9800 00FB DFFF 01FB FB9C"
+-		$"00DD FFA8 008F FF01 FBFB BEFF A500 0420"
+-		$"0000 4040 8900 C4FF BC00 0020 BDFF C300"
+-		$"B7FF C400 0140 40B4 FFC8 0000 20B2 FF00"
+-		$"20CA 00AF FF00 20CB 0000 40AE FFCD 0000"
+-		$"20AB FF01 FB20 CF00 ABFF D100 ABFF D000"
+-		$"ABFF D000 ABFF D000 A8FF 00FB 80FF CF00"
+-		$"AFFF CB00 0220 FBFB AEFF CA00 ABFF 00FB"
+-		$"85FF C700 B9FF C200 00FB C1FF B800 D4FF"
+-		$"01FB FBA5 00D3 FF01 FBFB 86FF 9C00 A3FF"
+-		$"00FB BAFF 0200 0020 9600 A2FF 0020 8900"
+-		$"0440 40FF FBFB AEFF 9500 9FFF 0300 0020"
+-		$"2089 0004 40FF FFFB FBB0 FF93 009C FF00"
+-		$"FB8D 0000 60B7 FF92 009A FF02 FBFB 408C"
+-		$"00B9 FF91 009C FF8D 009C FF01 FBFB 9AFF"
+-		$"9000 9CFF 8C00 92FF 0200 2020 8200 80FF"
+-		$"01FB FB9A FF8F 009C FF8B 0002 20FF FB90"
+-		$"FF04 0000 2020 0084 FF01 FBFB 9AFF 8F00"
+-		$"00FB 9BFF 8B00 0060 91FF 8100 A1FF 00FB"
+-		$"80FF 8E00 80FF 00FB 99FF 8B00 92FF 8100"
+-		$"A4FF 8E00 81FF 00FB 99FF 8B00 91FF 8100"
+-		$"0060 A3FF 8E00 81FF 01FB FB99 FF8B 0092"
+-		$"FF82 0080 FF00 FB9C FF8F 00A0 FF8B 0092"
+-		$"FF82 0003 40FF FFFB 99FF 0100 408F 0082"
+-		$"FF00 009B FF8B 0000 2092 FF84 0088 FF83"
+-		$"FB84 FF01 4020 9100 0140 4082 FF01 0000"
+-		$"9CFF 8B00 90FF 02FB FBFF AE00 0240 4000"
+-		$"81FF 03FB FB00 009D FF8C 0093 FF01 0020"
+-		$"AC00 84FF 0120 009F FF8C 0094 FFAA 0085"
+-		$"FF01 2020 9EFF 02FB FB20 8C00 02FF FFFB"
+-		$"92FF 0100 40A2 0002 FFFF FB84 FF80 00A2"
+-		$"FF8D 0096 FF00 FB94 0000 2084 0001 FFFB"
+-		$"84FF 00FB 80FF 0300 0020 00A4 FF8D 0000"
+-		$"209B FF8E 0000 208F FF04 0040 0000 20A6"
+-		$"FF00 208D 009E FF8A FB8D FF84 0000 FBA6"
+-		$"FF01 FB40 8E00 AFFF 80FB 80FF 0040 8300"
+-		$"0120 00A9 FF02 FBFF FF91 00AB FF80 FB03"
+-		$"FF00 4040 8300 B0FF 9500 89FF 01FB FB89"
+-		$"FF81 FB85 FF8A 00B4 FF99 0097 FF8C 0001"
+-		$"4000 B8FF BC00 0220 0000 BDFF BA00 0020"
+-		$"BFFF 00FB 80FF B000 0020 8000 C7FF 01FB"
+-		$"FBA4 0001 2020 8300 CCFF 01FB FB82 FF9F"
+-		$"0008 2020 4000 00FF FFFB FBD8 FF92 0084"
+-		$"FF01 FBFB FFFF FFFF AAFF FFFF CAFF 00F0"
+-		$"FDFF 00F0 FCFF 03F0 F000 00F6 FF01 F0F0"
+-		$"81FF 0100 0080 FF00 F0F4 FF00 0080 FF01"
+-		$"0000 F7FF 0100 0080 FF01 0000 F5FF 02F0"
+-		$"0000 81FF 0100 00F5 FF80 0080 FF80 00F4"
+-		$"FF80 0081 FF80 00F2 FF81 0081 FF80 00F1"
+-		$"FF00 4080 0082 FF81 00D6 FF00 F093 FF82"
+-		$"0002 4040 F082 FF81 00D9 FF8D 0080 4082"
+-		$"0002 40FF F082 FF81 00D3 FF9B 0001 F0F0"
+-		$"83FF 8200 CDFF 9C00 0140 0087 FF82 00CA"
+-		$"FF9F 0089 FF82 00C7 FF9E 0001 4000 8AFF"
+-		$"8300 C5FF 9E00 8EFF 8300 C0FF 02F0 F0FF"
+-		$"9800 0040 8000 01F0 F08F FF84 00C0 FF00"
+-		$"F09C 0003 FFFF F0F0 8FFF 8400 C0FF 9700"
+-		$"0340 00F0 F094 FF85 00BF FF93 0004 4040"
+-		$"00F0 F097 FF88 00BC FF94 0004 40FF FFF0"
+-		$"F095 FF89 0001 4000 BAFF 9300 9BFF 8C00"
+-		$"0040 B8FF 9300 9AFF 9000 B6FF 9200 9BFF"
+-		$"9000 0140 40B4 FF92 0099 FF01 F040 9400"
+-		$"B3FF 9100 9AFF 9700 B1FF 9200 8DFF 00F0"
+-		$"88FF 0040 9700 B1FF 9100 8EFF 02F0 FF80"
+-		$"85FF 0140 4098 00AF FF91 0000 408E FF02"
+-		$"A580 8085 FF9A 00AD FF01 F0FF 9100 88FF"
+-		$"0080 83FF 8080 85FF 9B00 00F0 ABFF 01F0"
+-		$"FF91 0087 FF01 8080 83FF 8080 85FF 9B00"
+-		$"00F0 ACFF 9200 86FF 8080 83FF 0280 A580"
+-		$"84FF 01F0 FF9A 00AD FF91 0087 FF80 8083"
+-		$"FF80 8086 FF9B 00AC FF91 0087 FF80 8001"
+-		$"F0F0 81FF 8080 85FF 02F0 F040 9900 ACFF"
+-		$"9100 87FF 8080 84FF 8080 84FF 02F0 F0FF"
+-		$"9900 ACFF 9100 86FF 00F0 8180 82FF 03F0"
+-		$"FF80 8088 FF98 00AC FF91 0088 FF80 8090"
+-		$"FF01 F0FF 9700 ACFF 9200 88FF 8080 8FFF"
+-		$"02F0 FFFF 9600 ACFF 9200 88FF 03F0 FFFF"
+-		$"F092 FF92 0001 4000 ACFF 01F0 F091 00A2"
+-		$"FF93 00AC FF01 F0F0 9200 A2FF 9100 AFFF"
+-		$"0040 9100 A3FF 9000 00F0 AFFF 9200 01F0"
+-		$"F08C FF80 F08F FF8D 0000 80B1 FF01 4040"
+-		$"9000 0240 FFF0 91FF 00F0 8CFF 8B00 0140"
+-		$"00B2 FF91 0002 4040 F08B FF82 8001 FFF0"
+-		$"8CFF 8B00 0140 F0B1 FF01 F0FF 9300 01F0"
+-		$"F089 FF01 F0FF 8280 01F0 F08B FF8A 00B5"
+-		$"FF93 0000 408C FF83 808C FF89 00B7 FF92"
+-		$"0001 4040 8BFF 00F0 8280 8CFF 8800 B9FF"
+-		$"9400 8BFF 8380 8BFF 8700 BBFF 9400 8BFF"
+-		$"8280 8BFF 8600 BDFF 0040 9300 8AFF 8180"
+-		$"8CFF 8500 BEFF 00F0 9400 8AFF 0180 808C"
+-		$"FF00 4083 0000 40C2 FF93 0099 FF84 00C6"
+-		$"FF92 0094 FF02 F0F0 FF83 00CA FF90 0094"
+-		$"FF01 F0F0 8300 CDFF 8F00 93FF 0600 4000"
+-		$"4000 00F0 CDFF 0140 408E 0090 FF80 4080"
+-		$"00CF FF03 0000 4040 8D00 8FFF 0100 0080"
+-		$"40CF FF00 4091 0080 FF00 F08A FF01 F0FF"
+-		$"8000 01FF F0CA FF02 F0FF FF93 00E1 FF02"
+-		$"F0F0 FF8E 0000 4081 0001 FFF0 E2FF 01F0"
+-		$"F091 0081 FF00 F0E2 FF01 4040 8E00 00F0"
+-		$"E8FF 8F00 EAFF 8F00 EAFF 9000 E8FF 00F0"
+-		$"9200 01F0 F0E5 FF00 F094 00E5 FF98 0000"
+-		$"F0DF FF01 F0F0 9C00 DDFF A800 8FFF 01F0"
+-		$"F0BE FFA5 0004 4000 0040 4089 00C4 FFBC"
+-		$"0000 40BD FFC3 00B7 FFC4 0001 4040 B4FF"
+-		$"C800 0040 B2FF 0040 CA00 AFFF 0040 CB00"
+-		$"0040 AEFF CD00 0040 ABFF 01F0 40CF 00AB"
+-		$"FFD1 00AB FFD0 00AB FFD0 00AB FFD0 00A8"
+-		$"FF00 F080 FFCF 00AF FFCB 0002 40F0 F0AE"
+-		$"FFCA 00AB FF00 F085 FFC7 00B9 FFC2 0000"
+-		$"F0C1 FFB8 00D4 FF01 F0F0 A500 D3FF 01F0"
+-		$"F086 FF9C 00A3 FF00 F0BA FF02 0000 4096"
+-		$"00A2 FF00 4089 0004 4040 FFF0 F0AE FF95"
+-		$"009F FF03 0000 4040 8900 0440 FFFF F0F0"
+-		$"B0FF 9300 9CFF 00F0 8D00 0080 B7FF 9200"
+-		$"9AFF 02F0 F040 8C00 B9FF 9100 9CFF 8D00"
+-		$"9CFF 01F0 F09A FF90 009C FF8C 0092 FF02"
+-		$"0040 4082 0080 FF01 F0F0 9AFF 8F00 9CFF"
+-		$"8B00 0240 FFF0 90FF 0400 0040 4000 84FF"
+-		$"01F0 F09A FF8F 0000 F09B FF8B 0000 4091"
+-		$"FF81 00A1 FF00 F080 FF8E 0080 FF00 F099"
+-		$"FF8B 0092 FF81 00A4 FF8E 0081 FF00 F099"
+-		$"FF8B 0091 FF81 0000 40A3 FF8E 0081 FF01"
+-		$"F0F0 99FF 8B00 92FF 8200 80FF 00F0 9CFF"
+-		$"8F00 A0FF 8B00 92FF 8200 0340 FFFF F099"
+-		$"FF01 0040 8F00 82FF 0000 9BFF 8B00 0040"
+-		$"92FF 8400 88FF 83F0 84FF 0140 4091 0001"
+-		$"4040 82FF 0100 009C FF8B 0090 FF02 F0F0"
+-		$"FFAE 0002 4040 0081 FF03 F0F0 0000 9DFF"
+-		$"8C00 93FF 0100 40AC 0084 FF01 4000 9FFF"
+-		$"8C00 94FF AA00 85FF 0140 409E FF02 F0F0"
+-		$"408C 0002 FFFF F092 FF01 0040 A200 02FF"
+-		$"FFF0 84FF 8000 A2FF 8D00 96FF 00F0 9400"
+-		$"0040 8400 01FF F084 FF00 F080 FF03 0000"
+-		$"4000 A4FF 8D00 0040 9BFF 8E00 0040 8FFF"
+-		$"0400 4000 0040 A6FF 0040 8D00 9EFF 8AF0"
+-		$"8DFF 8400 00F0 A6FF 01F0 408E 00AF FF80"
+-		$"F080 FF00 4083 0001 4000 A9FF 02F0 FFFF"
+-		$"9100 ABFF 80F0 03FF 0040 4083 00B0 FF95"
+-		$"0089 FF01 F0F0 89FF 81F0 85FF 8A00 B4FF"
+-		$"9900 97FF 8C00 0140 00B8 FFBC 0002 4000"
+-		$"00BD FFBA 0000 40BF FF00 F080 FFB0 0000"
+-		$"4080 00C7 FF01 F0F0 A400 0140 4083 00CC"
+-		$"FF01 F0F0 82FF 9F00 8040 0500 00FF FFF0"
+-		$"F0D8 FF92 0084 FF01 F0F0 FFFF FFFF AAFF",
+-		/* [20] */
+-		't8mk',
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0005"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0500 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0505 FFFF 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0005 0500"
+-		$"00FF FFFF FF00 0000 0500 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0005"
+-		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"FFFF FFFF FFFF FFFF FF00 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 00FF"
+-		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 BFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0500 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 00FF FFFF FFFF"
+-		$"DBFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF BFDB DBFF FFFF FFFF"
+-		$"DBFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 00FF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF BFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0505 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF BFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"05FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 00FF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF DBFF"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 00FF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"DB00 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 00FF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFDB DB00 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0500 FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FF05 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0500 FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FF05 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFBF FF00 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0505 FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0505 FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 BFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF 0500 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF 9B00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 00BF BFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFDB FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFDB 0500 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0005 00FF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 00FF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFBF BFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FF00 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 00FF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 00DB"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0005"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFBF FFFF FFFF FFFF DB00 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FF00 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFDB FFDB FFFF 0500 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00DB DBFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF BFBF"
+-		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 00FF FFDB DBFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFBF BFBF"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 BFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0500"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0500 00FF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0005 0500 FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0005 05FF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 00DB DBFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 05FF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 05FF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FF00 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0505 FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FF00 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFBF FFFF FFFF"
+-		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 DBFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 DBFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 05DB FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FF00 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0500 0000 FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0005 0000"
+-		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 00FF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0500 0000 0000 0000"
+-		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 00DB FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF BFBF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 FFFF DBDB FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF BFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0005 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0005"
+-		$"05BF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 00FF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 00FF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 00FF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 00FF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 00FF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 00FF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 00FF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FF00 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFBF BFFF FFFF FFFF FFFF FFFF"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFDB FF00"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"00FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFDB 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0005"
+-		$"05DB FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF DBFF 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFBF FFFF DB00 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 DBFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF 0500 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 05BF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFBF"
+-		$"FFFF FFFF FFFF DBFF 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0500 00FF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFBF"
+-		$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 00FF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"BFFF 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 00FF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF DBFF FF00"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 00FF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF DB00 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0005"
+-		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF DBFF FFFF 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0505 FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFDB DBFF"
+-		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0505 0000 0000 00FF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF FFFF FFFF FFFF FFDB DBBF"
+-		$"FFFF 0000 0505 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"00FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
+-		$"FFFF FFFF FFFF 0000 0000 0000 0005 0500"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-		$"0000 0000 0000 0000 0000 0000 0000 0000"
+-	}
+-};
+diff --git a/base/gdevbit.c b/base/gdevbit.c
+--- a/base/gdevbit.c
++++ b/base/gdevbit.c
+@@ -653,7 +653,7 @@ bit_put_params(gx_device * pdev, gs_param_list * plist)
+ 		     pdev->color_info.depth == 32 ? cmyk_8bit_map_cmyk_color :
+ 		     bit_map_cmyk_color);
+     }
+-    /* Reset the sparable and linear shift, masks, bits. */
++    /* Reset the separable and linear shift, masks, bits. */
+     set_linear_color_bits_mask_shift(pdev);
+     pdev->color_info.separable_and_linear = GX_CINFO_SEP_LIN;
+     ((gx_device_bit *)pdev)->FirstLine = FirstLine;
+@@ -671,16 +671,18 @@ bit_print_page(gx_device_printer * pdev, FILE * prn_stream)
+     byte *in = gs_alloc_bytes(pdev->memory, line_size, "bit_print_page(in)");
+     byte *data;
+     int nul = !strcmp(pdev->fname, "nul") || !strcmp(pdev->fname, "/dev/null");
+-    int lnum = ((gx_device_bit *)pdev)->FirstLine;
+-    int bottom = ((gx_device_bit *)pdev)->LastLine;
++    int lnum = ((gx_device_bit *)pdev)->FirstLine >= pdev->height ?  pdev->height - 1 :
++		 ((gx_device_bit *)pdev)->FirstLine;
++    int bottom = ((gx_device_bit *)pdev)->LastLine >= pdev->height ?  pdev->height - 1 :
++		 ((gx_device_bit *)pdev)->LastLine;
+     int line_count = any_abs(bottom - lnum);
+     int i, step = lnum > bottom ? -1 : 1;
+ 
+     if (in == 0)
+ 	return_error(gs_error_VMerror);
+     if ((lnum == 0) && (bottom == 0))
+-	bottom = pdev->height - 1;
+-    for (i = 0; i < line_count; i++, lnum += step) {
++	line_count = pdev->height - 1;		/* default when LastLine == 0, FirstLine == 0 */
++    for (i = 0; i <= line_count; i++, lnum += step) {
+ 	gdev_prn_get_bits(pdev, lnum, in, &data);
+ 	if (!nul)
+ 	    fwrite(data, 1, line_size, prn_stream);
+diff --git a/base/gdevdevn.c b/base/gdevdevn.c
+--- a/base/gdevdevn.c
++++ b/base/gdevdevn.c
+@@ -216,7 +216,7 @@ devn_get_color_comp_index(gx_device * dev, gs_devn_params * pdevn_params,
+ {
+     int num_order = pdevn_params->num_separation_order_names;
+     int color_component_number = 0;
+-    int max_spot_colors = GX_DEVICE_MAX_SEPARATIONS;
++    int max_spot_colors = GX_DEVICE_MAX_SEPARATIONS - MAX_DEVICE_PROCESS_COLORS;
+ 
+     /*
+      * Check if the component is in either the process color model list
+@@ -470,8 +470,9 @@ devn_put_params(gx_device * pdev, gs_param_list * plist,
+             case 0:
+ 	        if (page_spot_colors < -1)
+ 		    return_error(gs_error_rangecheck);
+-	        if (page_spot_colors > GX_DEVICE_COLOR_MAX_COMPONENTS)
+-		    page_spot_colors = GX_DEVICE_COLOR_MAX_COMPONENTS;
++	        if (page_spot_colors > GX_DEVICE_COLOR_MAX_COMPONENTS - MAX_DEVICE_PROCESS_COLORS)
++		    page_spot_colors = GX_DEVICE_COLOR_MAX_COMPONENTS - MAX_DEVICE_PROCESS_COLORS;  
++                    /* Need to leave room for the process colors in GX_DEVICE_COLOR_MAX_COMPONENTS  */
+         }
+         /* 
+          * The DeviceN device can have zero components if nothing has been
+diff --git a/base/gdevifno.c b/base/gdevifno.c
+--- a/base/gdevifno.c
++++ b/base/gdevifno.c
+@@ -22,14 +22,12 @@
+ 
+ #include "gdevprn.h"
+ #include "gsparam.h"
+-#include "gxlum.h"
+-#include <stdlib.h>
+ 
+ #define nil ((void*)0)
+ 
+ /*
+- * ERROR 
+- * is used to go up the stack and 
++ * ERROR
++ * is used to go up the stack and
+  * eventually return_error(gs_error_Fatal) to gs.
+  */
+ #define ERROR (-2)
+@@ -49,11 +47,13 @@ struct Rectangle {
+ };
+ static Point ZP = { 0, 0 };
+ 
+-static WImage* initwriteimage(FILE *f, Rectangle r, int ldepth);
+-static int writeimageblock(WImage *w, uchar *data, int ndata);
++static WImage* initwriteimage(FILE *f, Rectangle r, int ldepth, gs_memory_t *mem);
++static int writeimageblock(WImage *w, uchar *data, int ndata, gs_memory_t *mem);
+ static int bytesperline(Rectangle, int);
+ static int rgb2cmap(int, int, int);
+-static long cmap2rgb(int);
++/* static long cmap2rgb(int); */ /* not currently used */
++
++void init_p9color(ulong *p9color);
+ 
+ #define X_DPI	100
+ #define Y_DPI	100
+@@ -72,8 +72,16 @@ typedef struct inferno_device_s {
+ 	int color, gray;
+ 	int cmapcall;
+ 	int nbits;
++	ulong *p9color;	/* index blue most sig, red least sig */
+ } inferno_device;
+ 
++/* structure descriptor for the garbage collector */
++/* we must use the final version because gx_device_common requires
++   a finalisation call, but such procedures aren't inherited. */
++gs_private_st_suffix_add1_final(st_inferno_device, inferno_device,
++        "inferno_device", inferno_device_enum_ptrs, inferno_device_reloc_ptrs,
++                          gx_device_finalize, st_device_printer, p9color);
++
+ static const gx_device_procs inferno_procs =
+ 	prn_color_params_procs(inferno_open, gdev_prn_output_page, inferno_close,
+ 		inferno_rgb2cmap, inferno_cmap2rgb,
+@@ -81,7 +89,8 @@ static const gx_device_procs inferno_procs =
+ 
+ 
+ inferno_device far_data gs_inferno_device =
+-{ prn_device_body(inferno_device, inferno_procs, "inferno",
++{ prn_device_stype_body(inferno_device, inferno_procs, "inferno",
++	&st_inferno_device,
+ 	DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
+ 	X_DPI, Y_DPI,
+ 	0,0,0,0,	/* margins */
+@@ -98,7 +107,7 @@ inferno_device far_data gs_inferno_device =
+  * ghostscript asks us how to convert between
+  * rgb and color map entries
+  */
+-static gx_color_index 
++static gx_color_index
+ inferno_rgb2cmap(gx_device *dev, const gx_color_value cv[]) {
+ 	int shift;
+ 	inferno_device *bdev = (inferno_device*) dev;
+@@ -128,7 +137,7 @@ inferno_rgb2cmap(gx_device *dev, const gx_color_value cv[]) {
+ 	/*
+ 	 * we keep track of what ldepth bitmap this is by watching
+ 	 * what colors gs asks for.
+-	 * 
++	 *
+ 	 * one catch: sometimes print_page gets called more than one
+ 	 * per page (for multiple copies) without cmap calls inbetween.
+ 	 * if bdev->cmapcall is 0 when print_page gets called, it uses
+@@ -149,7 +158,7 @@ inferno_rgb2cmap(gx_device *dev, const gx_color_value cv[]) {
+ 	return ((((blue<<4)|green)<<4)|red);
+ }
+ 
+-static int 
++static int
+ inferno_cmap2rgb(gx_device *dev, gx_color_index color,
+   gx_color_value rgb[3]) {
+ 	int shift, i;
+@@ -186,13 +195,12 @@ inferno_cmap2rgb(gx_device *dev, gx_color_index color,
+ #define Glevs	16
+ #define Blevs	16
+ #define Mlevs	16
+-#define Rfactor 1		/* multiple of red level in p9color[] index */
++#define Rfactor 1		/* multiple of red level in e cp9color[] index */
+ #define Gfactor Rlevs
+ #define Bfactor	(Rlevs*Glevs)
+-			
+-ulong p9color[Rlevs*Glevs*Blevs];	/* index blue most sig, red least sig */
++#define p9color_size (sizeof(ulong)*Rlevs*Glevs*Blevs)
+ 
+-void init_p9color(void)		/* init at run time since p9color[] is so big */
++void init_p9color(ulong *p9color)	/* init at run time since p9color[] is so big */
+ {
+ 	int r, g, b, o;
+ 	ulong* cur = p9color;
+@@ -232,18 +240,25 @@ inferno_open(gx_device *dev)
+ 	bdev->ldepth = 3;
+ 	bdev->nbits = 4;	/* 4 bits per color per pixel (12 bpp, then we dither) */
+ 				/* if you change this, change the entry in gs_inferno_device */
+-	init_p9color();
++	bdev->p9color = (ulong *)gs_alloc_bytes(bdev->memory, p9color_size, "plan 9 colour cube");
++	if (bdev->p9color == NULL)
++		return_error(gs_error_VMerror);
++	init_p9color(bdev->p9color);
+ 	return gdev_prn_open(dev);
+ }
+ 
+-/* 
++/*
+  * inferno_close() is called at the end, once everything
+  * is finished.  we have nothing to do.
+  */
+ static int
+ inferno_close(gx_device *dev)
+ {
++	inferno_device *bdev = (inferno_device*) dev;
+ 	int code;
++
++	gs_free_object(dev->memory, bdev->p9color, "plan 9 colour cube");
++
+ 	code = gdev_prn_close(dev);
+ 	if(code < 0)
+ 		return_error(code);
+@@ -258,7 +273,7 @@ inferno_close(gx_device *dev)
+ static int
+ inferno_print_page(gx_device_printer *pdev, FILE *f)
+ {
+-	uchar buf[16384];	/* == 8192 dots across */
++	uchar *buf;
+ 	uchar *p;
+ 	WImage *w;
+ 	int bpl, y;
+@@ -274,7 +289,7 @@ inferno_print_page(gx_device_printer *pdev, FILE *f)
+ 	Rectangle r;
+ 
+ 	gsbpl = gdev_prn_raster(pdev);
+-	if(gsbpl > sizeof(buf)) {
++	if(gsbpl > 16384) {	/* == 8192 dots across */
+ 		errprintf("bitmap far too wide for inferno\n");
+ 		return_error(gs_error_Fatal);
+ 	}
+@@ -290,12 +305,18 @@ inferno_print_page(gx_device_printer *pdev, FILE *f)
+ 	r.max.x = pdev->width;
+ 	r.max.y = pdev->height;
+ 	bpl = bytesperline(r, ldepth);
+-	w = initwriteimage(f, r, ldepth);
++	w = initwriteimage(f, r, ldepth, bdev->memory);
+ 	if(w == nil) {
+ 		errprintf("initwriteimage failed\n");
+ 		return_error(gs_error_Fatal);
+ 	}
+ 
++	buf = gs_alloc_bytes(bdev->memory, gsbpl, "inferno line buffer");
++	if(buf == NULL) {
++		errprintf("couldn't allocate line buffer\n");
++		return_error(gs_error_VMerror);
++	}
++
+ 	/*
+ 	 * i wonder if it is faster to put the switch around the for loops
+ 	 * to save all the ldepth lookups.
+@@ -314,10 +335,10 @@ inferno_print_page(gx_device_printer *pdev, FILE *f)
+ 					r<<=4;
+ 					g<<=4;
+ 					b<<=4;
+-					p[x] = rgb2cmap(r,g,b);	
++					p[x] = rgb2cmap(r,g,b);
+ 				}
+ 				if(1){
+-					u = p9color[us];
++					u = bdev->p9color[us];
+ 					/* the ulong in p9color is a 2x2 matrix.  pull the entry
+ 					 * u[x%2][y%2], more or less.
+ 					 */
+@@ -345,19 +366,25 @@ inferno_print_page(gx_device_printer *pdev, FILE *f)
+ 		xmod = pdev->width % ppb[ldepth];
+ 		if(xmod)
+ 			p[(x-1)/ppb[ldepth]] <<= ((ppb[ldepth]-xmod)*bpp[ldepth]);
+-		if(writeimageblock(w, p, bpl) == ERROR)
++		if(writeimageblock(w, p, bpl, bdev->memory) == ERROR) {
++			gs_free_object(bdev->memory, buf, "inferno line buffer");
++			/* w leaks here */
+ 			return_error(gs_error_Fatal);
++		}
+ 	}
+-	if(writeimageblock(w, nil, 0) == ERROR)
++	gs_free_object(bdev->memory, buf, "inferno line buffer");
++	if(writeimageblock(w, nil, 0, bdev->memory) == ERROR) {
+ 		return_error(gs_error_Fatal);
++	}
+ 
+ 	return 0;
+ }
+ 
+ /*
+  * this is a modified version of the image compressor
+- * from fb/bit2enc.  it is modified only in that it 
++ * from fb/bit2enc.  it is modified only in that it
+  * now compiles as part of gs.
++ * some updates have been made to use dynamic memory.
+  */
+ 
+ /*
+@@ -402,7 +429,7 @@ struct WImage {
+ 	/*
+ 	 * ibase is the pointer to where the beginning of
+ 	 * the input "is" in memory.  whenever we "slide" the
+-	 * buffer N bytes, what we are actually doing is 
++	 * buffer N bytes, what we are actually doing is
+ 	 * decrementing ibase by N.
+ 	 * the ulongs in the Hlist structures are just
+ 	 * pointers relative to ibase.
+@@ -537,7 +564,7 @@ gobbleline(WImage *w)
+ 		/* hash table lookup */
+ 		for(hp=w->hash[w->h].next;hp;hp=hp->next){
+ 			/*
+-			 * the next block is an optimization of 
++			 * the next block is an optimization of
+ 			 * for(s=p, t=w->ibase+hp->p; s<es && *s == *t; s++, t++)
+ 			 * 	;
+ 			 */
+@@ -563,7 +590,7 @@ gobbleline(WImage *w)
+ 		}
+ 
+ 		/*
+-		 * if we didn't find a long enough run, append to 
++		 * if we didn't find a long enough run, append to
+ 		 * the raw dump buffer
+ 		 */
+ 		if(runlen<NMATCH){
+@@ -636,7 +663,7 @@ shiftwindow(WImage *w, uchar *data, uchar *edata)
+ }
+ 
+ static WImage*
+-initwriteimage(FILE *f, Rectangle r, int ldepth)
++initwriteimage(FILE *f, Rectangle r, int ldepth, gs_memory_t *mem)
+ {
+ 	WImage *w;
+ 	int n, bpl;
+@@ -648,7 +675,7 @@ initwriteimage(FILE *f, Rectangle r, int ldepth)
+ 	}
+ 
+ 	n = NMEM+NMATCH+NRUN+bpl*2;
+-	w = malloc(n+sizeof(*w));
++	w = (WImage*)gs_alloc_bytes(mem, n+sizeof(*w), "inferno image");
+ 	if(w == nil)
+ 		return nil;
+ 	w->inbuf = (uchar*) &w[1];
+@@ -673,7 +700,7 @@ initwriteimage(FILE *f, Rectangle r, int ldepth)
+ }
+ 
+ static int
+-writeimageblock(WImage *w, uchar *data, int ndata)
++writeimageblock(WImage *w, uchar *data, int ndata, gs_memory_t *mem)
+ {
+ 	uchar *edata;
+ 
+@@ -685,7 +712,7 @@ writeimageblock(WImage *w, uchar *data, int ndata)
+ 		if(w->r.min.y != w->origr.max.y) {
+ 			errprintf("not enough data supplied to writeimage\n");
+ 		}
+-		free(w);
++		gs_free_object(mem, w, "inferno image");
+ 		return 0;
+ 	}
+ 
+@@ -704,7 +731,7 @@ writeimageblock(WImage *w, uchar *data, int ndata)
+ }
+ 
+ /*
+- * functions from the Plan9/Brazil drawing libraries 
++ * functions from the Plan9/Brazil drawing libraries
+  */
+ static int
+ bytesperline(Rectangle r, int ld)
+diff --git a/base/gdevm24.c b/base/gdevm24.c
+--- a/base/gdevm24.c
++++ b/base/gdevm24.c
+@@ -24,11 +24,10 @@
+ /*
+  * Define whether to use the library's memset.
+  */
+-/*#define USE_MEMSET*/
++#define USE_MEMSET
++
+ /*
+- * Define whether to use memcpy for very wide fills.  We thought this
+- * made a big difference, but it turned out to be an artifact of the
+- * profiler.
++ * Define whether to use memcpy for very wide fills.
+  */
+ /*#define USE_MEMCPY*/
+ 
+diff --git a/base/gdevmem.c b/base/gdevmem.c
+--- a/base/gdevmem.c
++++ b/base/gdevmem.c
+@@ -168,9 +168,11 @@ gs_make_mem_device(gx_device_memory * dev, const gx_device_memory * mdproto,
+ 	dev->cached_colors = target->cached_colors;
+     }
+     if (dev->color_info.depth == 1) {
+-	gdev_mem_mono_set_inverted(dev,
+-				   (target == 0 || 
+-                                    dev->color_info.polarity == GX_CINFO_POLARITY_SUBTRACTIVE));
++	gx_color_value cv[3];
++
++       cv[0] = cv[1] = cv[2] = 0;
++	gdev_mem_mono_set_inverted(dev, (target == 0 ||
++				   (*dev_proc(dev, map_rgb_color))((gx_device *)dev, cv) != 0));
+     }
+     check_device_separable((gx_device *)dev);
+     gx_device_fill_in_procs((gx_device *)dev);
+diff --git a/base/gdevp14.c b/base/gdevp14.c
+--- a/base/gdevp14.c
++++ b/base/gdevp14.c
+@@ -43,6 +43,8 @@
+ #include "gxclpath.h"
+ #include "gxdcconv.h"
+ #include "vdtrace.h"
++#include "gscolorbuffer.h"
++#include "gsptype2.h"
+ 
+ /* Visual  trace options : set one to 1. */
+ #define VD_PAINT_MASK 0
+@@ -50,7 +52,8 @@
+ #define VD_PAINT_ALPHA 1
+ 
+ #if RAW_DUMP
+-unsigned char global_index = 0;
++unsigned int global_index = 0;
++unsigned int clist_band_count = 0;
+ #endif
+ 
+ /*
+@@ -82,6 +85,9 @@ gs_private_st_ptrs2(st_pdf14_ctx, pdf14_ctx, "pdf14_ctx",
+ 		    pdf14_ctx_enum_ptrs, pdf14_ctx_reloc_ptrs,
+ 		    stack, maskbuf);
+ 
++gs_private_st_ptrs1(st_pdf14_clr, pdf14_parent_color_t, "pdf14_clr",
++		    pdf14_clr_enum_ptrs, pdf14_clr_reloc_ptrs,
++		    previous);
+ 
+ /* ------ The device descriptors ------	*/
+ 
+@@ -120,6 +126,8 @@ static int pdf14_clist_get_param_compressed_color_list(pdf14_device * p14dev);
+ 
+ static	const gx_color_map_procs *
+     pdf14_get_cmap_procs(const gs_imager_state *, const gx_device *);
++static	const gx_color_map_procs *
++    pdf14_get_cmap_procs_group(const gs_imager_state *, const gx_device *);
+ 
+ #define	XSIZE (int)(8.5	* X_DPI)	/* 8.5 x 11 inch page, by default */
+ #define	YSIZE (int)(11 * Y_DPI)
+@@ -228,6 +236,27 @@ static int pdf14_cmykspot_put_image(gx_device * dev, gs_imager_state * pis,
+ static int pdf14_custom_put_image(gx_device * dev, gs_imager_state * pis,
+ 	       						gx_device * target);
+ 
++/* Used to alter device color mapping procs based upon group or softmask color space */
++static int pdf14_update_device_color_procs(gx_device *dev,
++			      gs_transparency_color_t group_color,
++			      gs_imager_state *pis);
++
++
++/* Used to alter device color mapping procs based upon group or softmask color space */
++/* Uses color procs stack so that it can be used with clist writer */
++static int
++pdf14_update_device_color_procs_push_c(gx_device *dev,
++			      gs_transparency_color_t group_color,
++			      gs_imager_state *pis);
++
++static int
++pdf14_update_device_color_procs_pop_c(gx_device *dev,
++			      gs_imager_state *pis);
++
++
++static void pdf14_push_parent_color(gx_device *dev, const gs_imager_state *pis);
++static void pdf14_pop_parent_color(gx_device *dev, const gs_imager_state *pis);
++
+ static const pdf14_procs_t gray_pdf14_procs = {
+     pdf14_unpack_additive,
+     pdf14_put_image
+@@ -274,9 +303,10 @@ static const pdf14_nonseparable_blending_procs_t custom_blending_procs = {
+ };
+ 
+ const pdf14_device gs_pdf14_Gray_device	= {
+-    std_device_color_stype_body(pdf14_device, &pdf14_Gray_procs, "pdf14gray",
++    std_device_std_color_full_body_type(pdf14_device, &pdf14_Gray_procs, "pdf14gray",
+ 				&st_pdf14_device,
+-				XSIZE, YSIZE, X_DPI, Y_DPI, 8, 255, 256),
++				XSIZE, YSIZE, X_DPI, Y_DPI, 8, 
++	                        0, 0, 0, 0, 0, 0),
+     { 0 },			/* Procs */
+     NULL,			/* target */
+     { 0 },			/* devn_params - not used */
+@@ -365,7 +395,7 @@ const pdf14_device gs_pdf14_custom_device = {
+ static	
+ ENUM_PTRS_WITH(pdf14_device_enum_ptrs, pdf14_device *pdev)
+ {
+-    index -= 3;
++    index -= 4;
+     if (index < pdev->devn_params.separations.num_separations)
+ 	ENUM_RETURN(pdev->devn_params.separations.names[index].data);
+     index -= pdev->devn_params.separations.num_separations;
+@@ -374,10 +404,13 @@ ENUM_PTRS_WITH(pdf14_device_enum_ptrs, pdf14_device *pdev)
+     return 0;
+ }
+ case 0:	return ENUM_OBJ(pdev->ctx);
+-case 1:	ENUM_RETURN(gx_device_enum_ptr(pdev->target));
+-case 2: ENUM_RETURN(pdev->devn_params.compressed_color_list);
++case 1: return ENUM_OBJ(pdev->trans_group_parent_cmap_procs);
++case 2:	ENUM_RETURN(gx_device_enum_ptr(pdev->target));
++case 3: ENUM_RETURN(pdev->devn_params.compressed_color_list);
+ ENUM_PTRS_END
+ 
++
++
+ static	RELOC_PTRS_WITH(pdf14_device_reloc_ptrs, pdf14_device *pdev)
+ {
+     {
+@@ -389,6 +422,7 @@ static	RELOC_PTRS_WITH(pdf14_device_reloc_ptrs, pdf14_device *pdev)
+     }
+     RELOC_PTR(pdf14_device, devn_params.compressed_color_list);
+     RELOC_VAR(pdev->ctx);
++    RELOC_VAR(pdev->trans_group_parent_cmap_procs);
+     pdev->target = gx_device_reloc_ptr(pdev->target, gcst);
+ }
+ RELOC_PTRS_END
+@@ -406,6 +440,12 @@ pdf14_buf_new(gs_int_rect *rect, bool has_alpha_g, bool	has_shape, bool idle,
+ 	       int n_chan,
+ 	       gs_memory_t *memory)
+ {
++
++	/* Note that alpha_g is the alpha for the GROUP */
++	/* This is distinct from the alpha that may also exist */
++	/* for the objects within the group.  Hence it can introduce */
++	/* yet another plane */
++
+     pdf14_buf *result;
+     int rowstride = (rect->q.x - rect->p.x + 3) & -4;
+     int height = (rect->q.y - rect->p.y);
+@@ -421,6 +461,7 @@ pdf14_buf_new(gs_int_rect *rect, bool has_alpha_g, bool	has_shape, bool idle,
+     if (result == NULL)
+ 	return result;
+ 
++    result->saved = NULL;
+     result->isolated = false;
+     result->knockout = false;
+     result->has_alpha_g = has_alpha_g;
+@@ -433,6 +474,9 @@ pdf14_buf_new(gs_int_rect *rect, bool has_alpha_g, bool	has_shape, bool idle,
+     result->maskbuf = NULL;
+     result->idle = idle;
+     result->mask_id = 0;
++    result->parent_color_info_procs.get_cmap_procs = NULL;
++    result->parent_color_info_procs.parent_color_mapping_procs = NULL;
++    result->parent_color_info_procs.parent_color_comp_index = NULL;
+ 
+     if (height <= 0 || idle) {
+ 	/* Empty clipping - will skip all drawings. */
+@@ -479,7 +523,8 @@ pdf14_ctx_new(gs_int_rect *rect, int n_chan, bool additive, gs_memory_t	*memory)
+     if (result == NULL)
+ 	return result;
+ 
+-    buf = pdf14_buf_new(rect, false, false, false, n_chan, memory);
++	/* Note:  buffer creation expects alpha to be in number of channels */
++    buf = pdf14_buf_new(rect, false, false, false, n_chan+1, memory);
+     if (buf == NULL) {
+ 	gs_free_object(memory, result, "pdf14_ctx_new");
+ 	return NULL;
+@@ -541,7 +586,7 @@ pdf14_push_transparency_group(pdf14_ctx	*ctx, gs_int_rect *rect,
+ 			      bool isolated, bool knockout,
+ 			      byte alpha, byte shape,
+ 			      gs_blend_mode_t blend_mode, bool idle,
+-			      uint mask_id)
++			      uint mask_id, int numcomps)
+ {
+     pdf14_buf *tos = ctx->stack;
+     pdf14_buf *buf, *backdrop;
+@@ -559,8 +604,18 @@ pdf14_push_transparency_group(pdf14_ctx	*ctx, gs_int_rect *rect,
+ 
+     has_shape = tos->has_shape || tos->knockout;
+ 
+-    buf = pdf14_buf_new(rect, !isolated, has_shape, idle, ctx->n_chan, ctx->memory);
+-    if_debug3('v', "[v]push buf: %d x %d, %d channels\n", buf->rect.p.x, buf->rect.p.y, buf->n_chan);
++    /* We need to create this based upon the size of
++    the color space + an alpha channel. NOT the device size
++    or the previous ctx size. */
++
++    /* The second parameter in pdf14_buf_new decides if we should
++       add a GROUP alpha channel to the buffer.  If it is NOT isolated, then this
++       buffer will be added.  If it is isolated, then the buffer will not be added.
++       I question the redundancy here of the alpha and the group alpha channel, but
++       that will need to be looked at later. */
++
++    buf = pdf14_buf_new(rect, !isolated, has_shape, idle, numcomps+1, ctx->memory);
++    if_debug3('v', "[v]push buf: %d x %d, %d channels\n", buf->rect.q.x - buf->rect.p.x, buf->rect.q.y - buf->rect.p.y, buf->n_chan);
+     if (buf == NULL)
+ 	return_error(gs_error_VMerror);
+     buf->isolated = isolated;
+@@ -589,17 +644,36 @@ pdf14_push_transparency_group(pdf14_ctx	*ctx, gs_int_rect *rect,
+ 						 (buf->has_shape ? 1 : 0)));
+     else 
+ 	pdf14_preserve_backdrop(buf, tos, has_shape);
++
++
++#if RAW_DUMP
++  
++    /* Dump the current buffer to see what we have. */
++
++    dump_raw_buffer(ctx->stack->rect.q.y-ctx->stack->rect.p.y, 
++                ctx->stack->rowstride, ctx->stack->n_planes,
++                ctx->stack->planestride, ctx->stack->rowstride, 
++                "TransGroupPush",ctx->stack->data);
++
++    global_index++;
++
++
++#endif
++
+     return 0;
++
+ }
+ 
+ static	int
+ pdf14_pop_transparency_group(pdf14_ctx *ctx,
+-    const pdf14_nonseparable_blending_procs_t * pblend_procs)
++    const pdf14_nonseparable_blending_procs_t * pblend_procs, int curr_num_color_comp)
+ {
+     pdf14_buf *tos = ctx->stack;
+     pdf14_buf *nos = tos->saved;
+     pdf14_buf *maskbuf = tos->maskbuf;
+     int x0, x1, y0, y1;
++    byte *new_data_buf;
++    int num_noncolor_planes, new_num_planes;
+ 
+     if (nos == NULL)
+ 	return_error(gs_error_rangecheck);
+@@ -637,9 +711,94 @@ pdf14_pop_transparency_group(pdf14_ctx *ctx,
+ 	x0 = max(x0, maskbuf->rect.p.x);
+ 	x1 = min(x1, maskbuf->rect.q.x);
+     }
+-    if (x0 < x1 && y0 < y1)
+-	pdf14_compose_group(tos, nos, maskbuf, x0, x1, y0, y1, 
+-		ctx->n_chan, ctx->additive, pblend_procs);
++
++
++#if RAW_DUMP
++  
++    /* Dump the current buffer to see what we have. */
++
++    dump_raw_buffer(ctx->stack->rect.q.y-ctx->stack->rect.p.y, 
++                ctx->stack->rowstride, ctx->stack->n_planes,
++                ctx->stack->planestride, ctx->stack->rowstride, 
++                "Trans_Group_Pop",ctx->stack->data);
++
++
++#endif
++
++
++	/* If the color spaces are different and we actually did do a swap of the procs for color */
++    if(nos->parent_color_info_procs.num_components != curr_num_color_comp && nos->parent_color_info_procs.parent_color_mapping_procs != NULL){
++
++        if (x0 < x1 && y0 < y1) {
++
++            /* The NOS blending color space is different than that of the
++               TOS.  It is necessary to transform the TOS buffer data to the
++               color space of the NOS prior to doing the pdf14_compose_group 
++               operation.  For now we are going to do very generic transformations.
++               This will be replaced when we bring in the updated color flow. */
++
++            /* Allocate the new buffer.  If the number of channels in the the new
++              color space was less than or equal to the previous one, we could
++              reuse.  Save that for a later optimization. */
++
++            num_noncolor_planes = tos->n_planes - curr_num_color_comp;
++            new_num_planes = num_noncolor_planes + nos->parent_color_info_procs.num_components;
++            new_data_buf = gs_alloc_bytes(ctx->memory, tos->planestride*new_num_planes,
++					        "pdf14_buf_new");
++            if (new_data_buf == NULL)	    
++                return_error(gs_error_VMerror);
++
++            /* Initialize with 0.  Need to double check about this...
++               may need to do some adjustments for the shape etc plane */
++            /* i.e. copy over those planes that exist beyond the count
++               of the number of color components */
++
++	    memset(new_data_buf, 0, tos->planestride*new_num_planes); 
++
++            /* Go ahead and do the conversion on the buffer */
++
++            /* later this will be replaced by gscms_transform_color_buffer */
++            /* This simple function is for planar data only.  */
++
++            gs_transform_color_buffer_generic(tos->data,tos->rowstride,tos->planestride,
++                curr_num_color_comp,tos->rect,new_data_buf,nos->parent_color_info_procs.num_components,num_noncolor_planes);
++     
++             /* Free the old object */
++
++              gs_free_object(ctx->memory, tos->data, "pdf14_buf_free");
++                 tos->data = new_data_buf;
++
++             /* Adjust the plane and channel size now */
++
++             tos->n_chan = nos->n_chan;
++             tos->n_planes = nos->n_planes;
++
++#if RAW_DUMP
++  
++			/* Dump the current buffer to see what we have. */
++
++			dump_raw_buffer(ctx->stack->rect.q.y-ctx->stack->rect.p.y, 
++						ctx->stack->rowstride, ctx->stack->n_planes,
++						ctx->stack->planestride, ctx->stack->rowstride, 
++						"Trans_Group_ColorConv",ctx->stack->data);
++
++#endif
++
++             /* compose */
++	     
++             pdf14_compose_group(tos, nos, maskbuf, x0, x1, y0, y1, nos->n_chan, 
++                 nos->parent_color_info_procs.isadditive, 
++                 nos->parent_color_info_procs.parent_blending_procs);
++
++        }
++
++
++    } else {
++
++        if (x0 < x1 && y0 < y1)
++	    pdf14_compose_group(tos, nos, maskbuf, x0, x1, y0, y1,nos->n_chan, ctx->additive, pblend_procs);
++
++    }
+ 
+ exit:
+     ctx->stack = nos;
+@@ -651,6 +810,7 @@ exit:
+ 	 */
+ 	ctx->maskbuf = (maskbuf != NULL ? maskbuf->maskbuf : NULL);
+     }
++
+     if_debug1('v', "[v]pop buf, idle=%d\n", tos->idle);
+     pdf14_buf_free(tos, ctx->memory);
+     if (maskbuf != NULL) {
+@@ -669,10 +829,13 @@ exit:
+ static	int
+ pdf14_push_transparency_mask(pdf14_ctx *ctx, gs_int_rect *rect,	byte bg_alpha,
+ 			     byte *transfer_fn, bool idle, bool replacing,
+-			     uint mask_id)
++			     uint mask_id, gs_transparency_mask_subtype_t subtype, 
++                             bool SMask_is_CIE, int numcomps)
+ {
+-    pdf14_buf *buf;
+ 
++ 
++    pdf14_buf *buf;
++    
+     if_debug2('v', "[v]pdf14_push_transparency_mask, idle=%d, replacing=%d\n", idle, replacing);
+     if (replacing && ctx->maskbuf != NULL) {
+ 	if (ctx->maskbuf->maskbuf != NULL) {
+@@ -688,7 +851,15 @@ pdf14_push_transparency_mask(pdf14_ctx *ctx, gs_int_rect *rect,	byte bg_alpha,
+ 	pdf14_buf_free(ctx->maskbuf, ctx->memory);
+ 	ctx->maskbuf = NULL;
+     }
+-    buf = pdf14_buf_new(rect, false, false, idle, ctx->n_chan, ctx->memory);
++
++    /* An optimization to consider is that if the SubType is Alpha
++       then we really should only be allocating the alpha band and
++       only draw with that channel.  Current architecture makes that 
++       a bit tricky.  We need to create this based upon the size of
++       the color space + an alpha channel. NOT the device size
++       or the previous ctx size */
++
++    buf = pdf14_buf_new(rect, false, false, idle, numcomps+1, ctx->memory);
+     if (buf == NULL)
+ 	return_error(gs_error_VMerror);
+ 
+@@ -708,8 +879,32 @@ pdf14_push_transparency_mask(pdf14_ctx *ctx, gs_int_rect *rect,	byte bg_alpha,
+ 	buf->maskbuf = ctx->maskbuf;
+     }
+ 
++
++#if RAW_DUMP
++  
++    /* Dump the current buffer to see what we have. */
++    
++    if (ctx->stack->planestride > 0 ){
++        dump_raw_buffer(ctx->stack->rect.q.y-ctx->stack->rect.p.y, 
++                    ctx->stack->rowstride, ctx->stack->n_planes,
++                    ctx->stack->planestride, ctx->stack->rowstride, 
++                    "Raw_Buf_PreSmask",ctx->stack->data);
++
++        global_index++;
++    }
++
++
++#endif
++
+     buf->saved = ctx->stack;
+     ctx->stack = buf;
++
++    /* Soft Mask related information so we know how to 
++       compute luminosity when we pop the soft mask */
++
++    buf->SMask_is_CIE = SMask_is_CIE;
++    buf->SMask_SubType = subtype;
++
+     if (buf->data != NULL)
+ 	memset(buf->data, 0, buf->planestride * buf->n_chan);
+     return 0;
+@@ -719,15 +914,78 @@ static	int
+ pdf14_pop_transparency_mask(pdf14_ctx *ctx)
+ {
+     pdf14_buf *tos = ctx->stack;
++    byte *new_data_buf;
+ 
+     if_debug1('v', "[v]pdf14_pop_transparency_mask, idle=%d\n", tos->idle);
+     ctx->stack = tos->saved;
++    tos->saved = NULL;  /* To avoid issues with GC */
++
+     if (tos->maskbuf) {
+ 	/* The maskbuf of the ctx->maskbuf entry is never used, free it now */
++        /* In other words, the Smask will not have an Smask */
+ 	pdf14_buf_free(tos->maskbuf, ctx->memory);
+ 	tos->maskbuf = NULL;
+     }
+-    ctx->maskbuf = tos;
++
++    if (tos->data == NULL) {
++
++        /* This can occur in clist rendering if the soft mask does
++           not intersect the current band.  It would be nice to
++           catch this earlier and just avoid creating the structure
++           to begin with.  For now we need to delete the structure
++           that was created.  */
++
++	pdf14_buf_free(tos, ctx->memory);
++	ctx->maskbuf = NULL;
++
++    } else {
++
++        /* Lets get this to a monochrome buffer and map it to a luminance only value */
++        /* This will reduce our memory.  We won't reuse the existing one, due */
++        /* Due to the fact that on certain systems we may have issues recovering */
++        /* the data after a resize */
++ 
++	new_data_buf = gs_alloc_bytes(ctx->memory, tos->planestride,
++					"pdf14_buf_new");
++        if (new_data_buf == NULL)	    
++            return_error(gs_error_VMerror);
++
++        /* Initialize with 0.  Need to do this since in Smask_Luminosity_Mapping 
++           we won't be filling everything during the remap if it had not been 
++           written into by the PDF14 fill rect */
++
++        memset(new_data_buf, 0, tos->planestride);
++
++        Smask_Luminosity_Mapping(tos->rect.q.y - tos->rect.p.y ,tos->rect.q.x - tos->rect.p.x,tos->n_chan, 
++            tos->rowstride, tos->planestride, new_data_buf, tos->data, ctx->additive,
++            tos->SMask_is_CIE, tos->SMask_SubType); 
++
++         /* Free the old object, NULL test was above */
++
++          gs_free_object(ctx->memory, tos->data, "pdf14_buf_free");
++             tos->data = new_data_buf;
++
++         /* Data is single channel now */
++
++         tos->n_chan = 1;
++         tos->n_planes = 1;
++
++        /* If we were CIE based, clean up the joint cache we created.
++           see comments in gs_begin_transparency_mask */
++
++      /*  if ( tos->SMask_is_CIE ){
++
++            gs_free_object(mem, pis->cie_joint_caches,
++		   "gx_cie_to_xyz_free(joint caches)");
++
++        } */
++
++        /* Assign as mask buffer */
++
++        ctx->maskbuf = tos;
++
++     }
++
+     return 0;
+ }
+ 
+@@ -744,7 +1002,7 @@ pdf14_open(gx_device *dev)
+     rect.p.y = 0;
+     rect.q.x = dev->width;
+     rect.q.y = dev->height;
+-    pdev->ctx = pdf14_ctx_new(&rect, dev->color_info.num_components + 1,
++    pdev->ctx = pdf14_ctx_new(&rect, dev->color_info.num_components,
+ 	pdev->color_info.polarity != GX_CINFO_POLARITY_SUBTRACTIVE, dev->memory);
+     if (pdev->ctx == NULL)
+ 	return_error(gs_error_VMerror);
+@@ -852,6 +1110,21 @@ pdf14_put_image(gx_device * dev, gs_imager_state * pis, gx_device * target)
+ 	return code;
+     }
+ 
++#if RAW_DUMP
++  
++    /* Dump the current buffer to see what we have. */
++
++    dump_raw_buffer(pdev->ctx->stack->rect.q.y-pdev->ctx->stack->rect.p.y, 
++                pdev->ctx->stack->rect.q.x-pdev->ctx->stack->rect.p.x, 
++				pdev->ctx->stack->n_planes,
++                pdev->ctx->stack->planestride, pdev->ctx->stack->rowstride, 
++                "PDF14_PUTIMAGE",pdev->ctx->stack->data);
++
++    global_index++;
++    clist_band_count++;
++
++#endif
++
+     linebuf = gs_alloc_bytes(pdev->memory, width * num_comp, "pdf14_put_image");
+     for (y = 0; y < height; y++) {
+ 	gx_image_plane_t planes;
+@@ -898,7 +1171,6 @@ pdf14_cmykspot_put_image(gx_device * dev, gs_imager_state * pis, gx_device * tar
+     pdf14_device * pdev = (pdf14_device *)dev;
+     pdf14_buf *buf = pdev->ctx->stack;
+     gs_int_rect rect = buf->rect;
+-    int x0 = rect.p.x, y0 = rect.p.y;
+     int x1, y1, width, height;
+     gs_devn_params * pdevn_params = &pdev->devn_params;
+     gs_separations * pseparations = &pdevn_params->separations;
+@@ -930,6 +1202,7 @@ pdf14_cmykspot_put_image(gx_device * dev, gs_imager_state * pis, gx_device * tar
+                 "CMYK_SPOT_PUTIMAGE",pdev->ctx->stack->data);
+ 
+     global_index++;
++    clist_band_count++;
+ 
+ 
+ #endif
+@@ -1112,6 +1385,24 @@ pdf14_fill_path(gx_device *dev,	const gs_imager_state *pis,
+ 			   const gx_clip_path *pcpath)
+ {
+     gs_imager_state new_is = *pis;
++    int code;
++    gs_pattern2_instance_t *pinst = NULL;
++
++
++   if (pdcolor != NULL && gx_dc_is_pattern2_color(pdcolor)) {
++
++ 	pinst =
++	    (gs_pattern2_instance_t *)pdcolor->ccolor.pattern;
++           pinst->saved->has_transparency = true;
++
++           /* The transparency color space operations are driven
++              by the pdf14 clist writer device.  */
++
++           pinst->saved->trans_device = dev;
++
++    }
++
++
+ 
+     /*
+      * The blend operations are not idempotent.  Force non-idempotent
+@@ -1119,7 +1410,20 @@ pdf14_fill_path(gx_device *dev,	const gs_imager_state *pis,
+      */
+     new_is.log_op |= lop_pdf14;
+     pdf14_set_marking_params(dev, pis);
+-    return gx_default_fill_path(dev, &new_is, ppath, params, pdcolor, pcpath);
++
++    new_is.trans_device = dev;
++    new_is.has_transparency = true;
++
++    code = gx_default_fill_path(dev, &new_is, ppath, params, pdcolor, pcpath);
++
++    new_is.trans_device = NULL;
++    new_is.has_transparency = false;
++
++    if (pinst != NULL){
++        pinst->saved->trans_device = NULL;
++    }
++
++    return code;
+ }
+ 
+ static	int
+@@ -1258,13 +1562,18 @@ static	pdf14_default_colorspace_t
+ pdf14_determine_default_blend_cs(gx_device * pdev)
+ {
+     if (pdev->color_info.polarity == GX_CINFO_POLARITY_ADDITIVE)
++
+ 	/*
+ 	 * Note:  We do not allow the SeparationOrder device parameter for
+ 	 * additive devices.  Thus we always have 1 colorant for DeviceGray
+-	 * and 3 colorants for DeviceRGB.  We do not currently support
+-	 * blending in a DeviceGray color space.  Thus we oniy use DeviceRGB.
++	 * and 3 colorants for DeviceRGB. 
+ 	 */
+-	return PDF14_DeviceRGB;
++
++         if (pdev->color_info.num_components == 1)
++             return PDF14_DeviceGray;
++         else
++            return PDF14_DeviceRGB;
++
+     else {
+ 	/*
+ 	 * Check if the device is CMYK only or CMYK plus spot colors.
+@@ -1332,6 +1641,22 @@ get_pdf14_device_proto(gx_device * dev, pdf14_device ** pdevproto,
+     switch (dev_cs) {
+ 	case PDF14_DeviceGray:
+ 	    *pdevproto = (pdf14_device *)&gs_pdf14_Gray_device;
++
++            /* We want gray to be single channel.  Low level 
++               initialization of gray device prototype is 
++               peculiar in that in dci_std_color_num_components
++               the comment is
++              "A device is monochrome only if it is bi-level"
++
++              Here we want monochrome anytime we have a gray device.
++              To avoid breaking things elsewhere, we will overide
++              the prototype intialization here */
++               
++            *ptempdevproto = **pdevproto;
++            ptempdevproto->color_info.max_components = 1;
++            ptempdevproto->color_info.num_components = ptempdevproto->color_info.max_components;
++            *pdevproto = ptempdevproto;
++
+ 	    break;
+ 	case PDF14_DeviceRGB:
+ 	    *pdevproto = (pdf14_device *)&gs_pdf14_RGB_device;
+@@ -1438,12 +1763,14 @@ gx_update_pdf14_compositor(gx_device * pdev, gs_imager_state * pis,
+ 	    pis->get_cmap_procs = p14dev->save_get_cmap_procs;
+ 	    gx_set_cmap_procs(pis, p14dev->target);
+ 	    /* Send image out raster data to output device */
+-	    {	/* hack: Reset lop_pdf14, which could be set by 
+-		   pdf14_fill_path, pdf14_stroke_path
+-		   to prevent a failure ingx_image_enum_begin. */
++            {
++		/* Make a copy so we can change the ROP */
+ 		gs_imager_state new_is = *pis;
+ 
+-		new_is.log_op &= ~lop_pdf14;
++		/* We don't use the imager state log_op since this is for the */
++		/* clist playback. Putting the image (band in the case of the */
++		/* clist) only needs to use the default ROP to copy the data  */
++		new_is.log_op = rop3_default;
+ 		p14dev->pdf14_procs->put_image(pdev, &new_is, p14dev->target);
+ 	    }
+ 	    pdf14_disable_device(pdev);
+@@ -1529,11 +1856,12 @@ pdf14_create_compositor(gx_device * dev, gx_device * * pcdev,
+ 		if (op_pct->params.retain_any_comps && !op_pct->params.retain_spot_comps)
+ 		{
+ 
+-			p14dev->drawn_comps = op_pct->params.drawn_comps;
++                    p14dev->drawn_comps = op_pct->params.drawn_comps;
+ 
+ 		} else {
+ 
+-			p14dev->drawn_comps = (1 << p14dev->color_info.num_components) - 1; 
++                    /* Draw everything. If this parameter was not set, clist does not fill it in.  */
++                    p14dev->drawn_comps = ( (gx_color_index) 1 << (p14dev->color_info.num_components)) - (gx_color_index) 1; 
+ 		}
+ 
+ 		*pcdev = dev;
+@@ -1698,18 +2026,99 @@ pdf14_begin_transparency_group(gx_device *dev,
+     double alpha = pis->opacity.alpha * pis->shape.alpha;
+     gs_int_rect rect;
+     int code;
++    bool isolated;
++    bool sep_target = (strcmp(pdev->dname, "PDF14cmykspot") == 0);
++    int group_color_numcomps;
++    gs_transparency_color_t group_color;
++
++    /* If the target device supports separations, then 
++       we should should NOT create the group.  The exception to this 
++       rule would be if we just popped a transparency mask */
+ 
+     code = compute_group_device_int_rect(pdev, &rect, pbbox, pis);
++
+     if (code < 0)
+ 	return code;
+     if_debug4('v', "[v]pdf14_begin_transparency_group, I = %d, K = %d, alpha = %g, bm = %d\n",
+ 	      ptgp->Isolated, ptgp->Knockout, alpha, pis->blend_mode);
++
++    /* If the group color is unknown, then we must use the previous group color
++       space or the device process color space */
++        
++    if (ptgp->group_color == UNKNOWN){
++
++        if (pdev->ctx->stack){
++            /* Use previous group color space */
++            group_color_numcomps = pdev->ctx->stack->n_chan-1;  /* Remove alpha */
++        } else {
++            /* Use process color space */
++            group_color_numcomps = pdev->color_info.num_components;
++        }
++
++        switch (group_color_numcomps) {
++            case 1:				
++                group_color = GRAY_SCALE;       
++                break;
++            case 3:				
++                group_color = DEVICE_RGB;       
++                break;
++            case 4:				
++                group_color = DEVICE_CMYK;       
++            break;
++            default:
++                
++                /* We can end up here if we are in
++                   a deviceN color space and 
++                   we have a sep output device */
++
++                group_color = DEVICEN;
++
++            break;
++
++         }  
++    
++    } else {
++
++        group_color_numcomps = ptgp->group_color_numcomps;
++        group_color = ptgp->group_color;
++
++    }
++
++    /* If needed, update the color mapping procs. But only if we dont have a sep device.
++        The exception would be if we are in doing the group for a soft mask */
++
++    if (!sep_target) {
++        code = pdf14_update_device_color_procs(dev,group_color,pis);
++    } else {
++        code = 0;
++        group_color_numcomps = pdev->color_info.num_components;
++    }
++
++    /* Note that our initial device buffer may have had a different color space
++       than the first transparency group.  In such a case, we really should force
++       this first group to be isolated, anytime that the parent color space is 
++       different than its child group, it should be isolated, per the PDF spec */
++
++    if (code == 1){
++
++        isolated = true;
++        if_debug0('v', "[v]Transparency group color space change\n");
++
++    } else {
++
++        isolated = ptgp->Isolated;
++
++    }
++
++    if (code < 0)
++	return code;
++
+     code = pdf14_push_transparency_group(pdev->ctx, &rect,
+-					 ptgp->Isolated, ptgp->Knockout,
++					 isolated, ptgp->Knockout,
+ 					 (byte)floor (255 * alpha + 0.5),
+ 					 (byte)floor (255 * pis->shape.alpha + 0.5),
+ 					 pis->blend_mode, ptgp->idle,
+-					 ptgp->mask_id);
++					 ptgp->mask_id,group_color_numcomps);
+     return code;
+ }
+ 
+@@ -1720,6 +2129,7 @@ pdf14_end_transparency_group(gx_device *dev,
+ {
+     pdf14_device *pdev = (pdf14_device *)dev;
+     int code;
++    pdf14_parent_color_t *parent_color;
+ 
+     if_debug0('v', "[v]pdf14_end_transparency_group\n");
+     vd_get_dc('c');
+@@ -1727,11 +2137,437 @@ pdf14_end_transparency_group(gx_device *dev,
+     vd_set_scale(0.01);
+     vd_set_origin(0, 0);
+     vd_erase(RGB(192, 192, 192));
+-    code = pdf14_pop_transparency_group(pdev->ctx, pdev->blend_procs);
++    code = pdf14_pop_transparency_group(pdev->ctx, pdev->blend_procs,pdev->color_info.num_components);
++
++
++   /* May need to reset some color stuff related
++     * to a mismatch between the parents color space
++     * and the group blending space */
++	
++	parent_color = &(pdev->ctx->stack->parent_color_info_procs);
++
++	if (!(parent_color->parent_color_mapping_procs == NULL && 
++		parent_color->parent_color_comp_index == NULL)) {
++
++			pis->get_cmap_procs = parent_color->get_cmap_procs;
++			gx_set_cmap_procs(pis, dev);
++
++			pdev->procs.get_color_mapping_procs = parent_color->parent_color_mapping_procs;
++			pdev->procs.get_color_comp_index = parent_color->parent_color_comp_index;
++			pdev->color_info.polarity = parent_color->polarity;
++			pdev->color_info.num_components = parent_color->num_components;
++			pdev->blend_procs = parent_color->parent_blending_procs;
++			pdev->ctx->additive = parent_color->isadditive;
++			pdev->pdf14_procs = parent_color->unpack_procs;
++                        pdev->color_info.depth = parent_color->depth;
++			
++			parent_color->get_cmap_procs = NULL;
++			parent_color->parent_color_comp_index = NULL;
++			parent_color->parent_color_mapping_procs = NULL;
++	}
++
++
++
++
++
++
++
++
++
+     vd_release_dc;
+     return code;
+ }
+ 
++
++static int
++pdf14_update_device_color_procs(gx_device *dev,
++			      gs_transparency_color_t group_color,
++			      gs_imager_state *pis)
++{
++
++    pdf14_device *pdevproto;
++    pdf14_device *pdev = (pdf14_device *)dev;
++    const pdf14_procs_t *new_14procs;
++    pdf14_parent_color_t *parent_color_info = &(pdev->ctx->stack->parent_color_info_procs);
++    gx_color_polarity_t new_polarity;
++    int new_num_comps;
++    bool new_additive;
++    byte new_depth;
++
++    if_debug0('v', "[v]pdf14_update_device_color_procs\n");
++
++
++   /* Update the device procs at this
++       stage.  Many of the procs are based upon the color
++       space of the device.  We want to remain in 
++       the color space defined by the color space of
++       the soft mask or transparency group as opposed to the 
++       device color space.  
++       Later, when we pop the softmask we will collapse it
++       to a single band and then compose with it
++       to the device color space (or the parent layer
++       space).  In the case where we pop an isolated transparency 
++       group, we will do the blending in the proper color
++       space and then transform the data when we pop the group. 
++       Remember that only isolated groups can have color spaces
++       that are different than their parent. */
++
++	parent_color_info->get_cmap_procs = NULL;
++        parent_color_info->parent_color_mapping_procs = NULL;
++        parent_color_info->parent_color_comp_index = NULL;
++
++        switch (group_color) {
++
++            case GRAY_SCALE:
++
++                new_polarity = GX_CINFO_POLARITY_ADDITIVE;
++                new_num_comps = 1;
++                pdevproto = (pdf14_device *)&gs_pdf14_Gray_device;
++                new_additive = true;
++                new_14procs = &gray_pdf14_procs;
++                new_depth = 8;
++
++
++                break;
++
++            case DEVICE_RGB:			 	
++            case CIE_XYZ:				
++
++                new_polarity = GX_CINFO_POLARITY_ADDITIVE;
++                new_num_comps = 3;
++                pdevproto = (pdf14_device *)&gs_pdf14_RGB_device;
++                new_additive = true;
++                new_14procs = &rgb_pdf14_procs;
++                new_depth = 24;
++
++                break; 
++
++            case DEVICE_CMYK:				
++
++                new_polarity = GX_CINFO_POLARITY_SUBTRACTIVE;
++                new_num_comps = 4;
++                pdevproto = (pdf14_device *)&gs_pdf14_CMYK_device;
++                new_additive = false;
++                new_14procs = &cmyk_pdf14_procs;
++                new_depth = 32;
++
++                break;
++
++            default:			
++	        return_error(gs_error_rangecheck);
++	        break;
++
++         }    
++
++        if_debug2('v', "[v]pdf14_update_device_color_procs,num_components_old = %d num_components_new = %d\n", 
++            pdev->color_info.num_components,new_num_comps);
++
++        /* Save the old information */
++
++        parent_color_info->get_cmap_procs = pis->get_cmap_procs;
++        parent_color_info->parent_color_mapping_procs = 
++            pdev->procs.get_color_mapping_procs;
++        parent_color_info->parent_color_comp_index = 
++            pdev->procs.get_color_comp_index;
++        parent_color_info->parent_blending_procs = pdev->blend_procs;
++        parent_color_info->polarity = pdev->color_info.polarity;
++        parent_color_info->num_components = pdev->color_info.num_components;
++        parent_color_info->isadditive = pdev->ctx->additive;
++        parent_color_info->unpack_procs = pdev->pdf14_procs;
++        parent_color_info->depth = pdev->color_info.depth;
++
++        /* Set new information */
++
++        pis->get_cmap_procs = pdf14_get_cmap_procs_group;
++        gx_set_cmap_procs(pis, dev);
++        pdev->procs.get_color_mapping_procs = 
++            pdevproto->static_procs->get_color_mapping_procs;
++        pdev->procs.get_color_comp_index = 
++            pdevproto->static_procs->get_color_comp_index;
++        pdev->blend_procs = pdevproto->blend_procs;
++        pdev->color_info.polarity = new_polarity;
++        pdev->color_info.num_components = new_num_comps;
++        pdev->ctx->additive = new_additive; 
++        pdev->pdf14_procs = new_14procs;
++        pdev->color_info.depth = new_depth;
++
++        return(1);  /* Lets us detect that we did do an update */
++
++}
++
++
++/* A new version that works with the color_procs stack 
++   for transparency groups */
++
++static int
++pdf14_update_device_color_procs_push_c(gx_device *dev,
++			      gs_transparency_color_t group_color,
++			      gs_imager_state *pis)
++{
++
++    pdf14_device *pdevproto;
++    pdf14_device *pdev = (pdf14_device *)dev;
++    gx_device_clist_writer * cldev = (gx_device_clist_writer *)pdev->pclist_device;
++    const pdf14_procs_t *new_14procs;
++    bool update_color_info;
++    gx_color_polarity_t new_polarity;
++    int new_num_comps;
++    bool new_additive;
++    byte new_depth;
++
++    if_debug0('v', "[v]pdf14_update_device_color_procs_push_c\n");
++
++   /* Check if we need to alter the device procs at this
++       stage.  Many of the procs are based upon the color
++       space of the device.  We want to remain in 
++       the color space defined by the color space of
++       the soft mask or transparency group as opposed to the 
++       device color space.  
++       Later, when we pop the softmask we will collapse it
++       to a single band and then compose with it
++       to the device color space (or the parent layer
++       space).  In the case where we pop an isolated transparency 
++       group, we will do the blending in the proper color
++       space and then transform the data when we pop the group. 
++       Remember that only isolated groups can have color spaces
++       that are different than their parent. */
++
++        update_color_info = false;
++
++        switch (group_color) {
++
++            case GRAY_SCALE:
++
++                  if (pdev->color_info.num_components != 1){ 
++
++                    update_color_info = true;
++                    new_polarity = GX_CINFO_POLARITY_ADDITIVE;
++                    new_num_comps = 1;
++                    pdevproto = (pdf14_device *)&gs_pdf14_Gray_device;
++                    new_additive = true;
++                    new_14procs = &gray_pdf14_procs;
++                    new_depth = 8;
++
++                }
++
++                break;
++
++            case DEVICE_RGB:			 	
++            case CIE_XYZ:				
++
++                if (pdev->color_info.num_components != 3){ 
++
++                    update_color_info = true;
++                    new_polarity = GX_CINFO_POLARITY_ADDITIVE;
++                    new_num_comps = 3;
++                    pdevproto = (pdf14_device *)&gs_pdf14_RGB_device;
++                    new_additive = true;
++                    new_14procs = &rgb_pdf14_procs;
++                    new_depth = 24;
++                }
++
++                break; 
++
++            case DEVICE_CMYK:				
++
++                if (pdev->color_info.num_components != 4){ 
++
++                    update_color_info = true;
++                    new_polarity = GX_CINFO_POLARITY_SUBTRACTIVE;
++                    new_num_comps = 4;
++                    pdevproto = (pdf14_device *)&gs_pdf14_CMYK_device;
++                    new_additive = false;
++                    new_14procs = &cmyk_pdf14_procs;
++                    new_depth = 32;
++
++                }
++
++                break;
++
++            default:			
++	        return_error(gs_error_rangecheck);
++	        break;
++
++         }    
++
++         if (update_color_info){
++
++            if_debug2('v', "[v]pdf14_update_device_color_procs_push_c,num_components_old = %d num_components_new = %d\n", 
++                pdev->color_info.num_components,new_num_comps);
++
++            /* Set new information in the device */
++
++            pis->get_cmap_procs = pdf14_get_cmap_procs_group;
++            gx_set_cmap_procs(pis, dev);
++            pdev->procs.get_color_mapping_procs = 
++                pdevproto->static_procs->get_color_mapping_procs;
++            pdev->procs.get_color_comp_index = 
++                pdevproto->static_procs->get_color_comp_index;
++            pdev->blend_procs = pdevproto->blend_procs;
++            pdev->color_info.polarity = new_polarity;
++            pdev->color_info.num_components = new_num_comps;
++            pdev->pdf14_procs = new_14procs;
++            pdev->color_info.depth = new_depth;
++
++            cldev->clist_color_info.depth = pdev->color_info.depth;
++            cldev->clist_color_info.polarity = pdev->color_info.polarity;
++            cldev->clist_color_info.num_components = pdev->color_info.num_components;
++
++
++
++            if (pdev->ctx)
++            {
++               pdev->ctx->additive = new_additive; 
++            }
++
++            return(1);  /* Lets us detect that we did do an update */
++
++         }
++
++         if_debug0('v', "[v]procs not updated\n");
++
++         return 0;
++}
++
++
++static int
++pdf14_update_device_color_procs_pop_c(gx_device *dev,gs_imager_state *pis)
++{
++
++    pdf14_device *pdev = (pdf14_device *)dev;
++    pdf14_parent_color_t *parent_color = pdev->trans_group_parent_cmap_procs;
++    gx_device_clist_writer * cldev = (gx_device_clist_writer *)pdev->pclist_device;
++
++
++    if_debug0('v', "[v]pdf14_update_device_color_procs_pop_c\n");
++  
++    /* The color procs are always pushed.  Simply restore them. */
++
++    if (!(parent_color->parent_color_mapping_procs == NULL && 
++        parent_color->parent_color_comp_index == NULL)) {
++
++        if_debug2('v', "[v]pdf14_update_device_color_procs_pop_c,num_components_old = %d num_components_new = %d\n", 
++            pdev->color_info.num_components,parent_color->num_components);
++
++        pis->get_cmap_procs = parent_color->get_cmap_procs;
++        gx_set_cmap_procs(pis, dev);
++
++        pdev->procs.get_color_mapping_procs = parent_color->parent_color_mapping_procs;
++        pdev->procs.get_color_comp_index = parent_color->parent_color_comp_index;
++        pdev->color_info.polarity = parent_color->polarity;
++        pdev->color_info.depth = parent_color->depth;
++        pdev->color_info.num_components = parent_color->num_components;
++        pdev->blend_procs = parent_color->parent_blending_procs;
++        pdev->pdf14_procs = parent_color->unpack_procs;
++
++        /* clist writer fill rect has no access to imager state */
++        /* and it forwards the target device.  this information */
++        /* is passed along to use in this case */
++
++        cldev->clist_color_info.depth = pdev->color_info.depth;
++        cldev->clist_color_info.polarity = pdev->color_info.polarity;
++        cldev->clist_color_info.num_components = pdev->color_info.num_components;
++
++        if (pdev->ctx){
++            pdev->ctx->additive = parent_color->isadditive;
++        }
++
++         if_debug0('v', "[v]procs updated\n");
++
++    } else {
++
++        if_debug0('v', "[v]pdf14_update_device_color_procs_pop_c ERROR \n");
++
++    }
++
++    return 0;
++}
++
++
++
++
++
++
++
++
++   /* When a transparency group is pushed, the parent colorprocs
++      are initialized.  Since the color mapping procs are
++      all based upon the device, we must have a nested list 
++      based upon the transparency group color space.  This 
++      nesting must be outside the nested ctx structures 
++      to allow the nesting for the clist writer */
++
++static void
++pdf14_push_parent_color(gx_device *dev, const gs_imager_state *pis)
++{
++
++    pdf14_device *pdev = (pdf14_device *)dev;
++    pdf14_parent_color_t *new_parent_color;
++
++    if_debug0('v', "[v]pdf14_push_parent_color\n");
++
++    /* Allocate a new one */
++
++    new_parent_color = gs_alloc_struct(dev->memory, pdf14_parent_color_t,&st_pdf14_clr,
++					        "pdf14_clr_new");
++
++    /* Link to old one */
++
++    new_parent_color->previous = pdev->trans_group_parent_cmap_procs;
++
++    /* Reassign new one to dev */
++
++    pdev->trans_group_parent_cmap_procs = new_parent_color;
++
++    /* Initialize with values */
++
++    new_parent_color->get_cmap_procs = pis->get_cmap_procs;
++    new_parent_color->parent_color_mapping_procs = 
++        pdev->procs.get_color_mapping_procs;
++    new_parent_color->parent_color_comp_index = 
++        pdev->procs.get_color_comp_index;
++    new_parent_color->parent_blending_procs = pdev->blend_procs;
++    new_parent_color->polarity = pdev->color_info.polarity;
++    new_parent_color->num_components = pdev->color_info.num_components;
++    new_parent_color->unpack_procs = pdev->pdf14_procs;
++    new_parent_color->depth = pdev->color_info.depth;
++
++    /* isadditive is only used in ctx */
++    if (pdev->ctx)
++    {
++        new_parent_color->isadditive = pdev->ctx->additive;
++    }
++
++}
++
++   /* When a transparency group is popped, the parent colorprocs
++      must be restored.  Since the color mapping procs are
++      all based upon the device, we must have a nested list 
++      based upon the transparency group color space.  This 
++      nesting must be outside the nested ctx structures 
++      to allow the nesting for the clist writer */
++
++static void
++pdf14_pop_parent_color(gx_device *dev, const gs_imager_state *pis)
++{
++
++    pdf14_device *pdev = (pdf14_device *)dev;
++    pdf14_parent_color_t *old_parent_color_info = pdev->trans_group_parent_cmap_procs;
++
++     if_debug0('v', "[v]pdf14_pop_parent_color\n");
++
++   /* Update the link */
++
++    pdev->trans_group_parent_cmap_procs = old_parent_color_info->previous;
++
++    /* Free the old one */
++
++    gs_free_object(dev->memory, old_parent_color_info, "pdf14_clr_free");
++
++ 
++}
++
++
+ static	int
+ pdf14_begin_transparency_mask(gx_device	*dev,
+ 			      const gx_transparency_mask_params_t *ptmp,
+@@ -1746,6 +2582,8 @@ pdf14_begin_transparency_mask(gx_device	*dev,
+ 					       "pdf14_begin_transparency_mask");
+     gs_int_rect rect;
+     int code;
++    int group_color_numcomps;
++    gs_transparency_color_t group_color; 
+ 
+     if (transfer_fn == NULL)
+ 	return_error(gs_error_VMerror);
+@@ -1756,19 +2594,105 @@ pdf14_begin_transparency_mask(gx_device	*dev,
+ 	bg_alpha = (int)(255 * ptmp->GrayBackground + 0.5);
+     if_debug1('v', "pdf14_begin_transparency_mask, bg_alpha = %d\n", bg_alpha);
+     memcpy(transfer_fn, ptmp->transfer_fn, size_of(ptmp->transfer_fn));
++
++   /* If the group color is unknown, then we must use the previous group color
++       space or the device process color space */
++        
++    if (ptmp->group_color == UNKNOWN){
++
++        if (pdev->ctx->stack){
++            /* Use previous group color space */
++            group_color_numcomps = pdev->ctx->stack->n_chan-1;  /* Remove alpha */
++        } else {
++            /* Use process color space */
++            group_color_numcomps = pdev->color_info.num_components;
++        }
++
++        switch (group_color_numcomps) {
++            case 1:				
++                group_color = GRAY_SCALE;       
++                break;
++            case 3:				
++                group_color = DEVICE_RGB;       
++                break;
++            case 4:				
++                group_color = DEVICE_CMYK;       
++            break;
++            default:
++                
++                /* We can end up here if we are in
++                   a deviceN color space and 
++                   we have a sep output device */
++
++                group_color = DEVICEN;
++
++            break;
++
++         }  
++    
++    } else {
++
++        group_color = ptmp->group_color;
++        group_color_numcomps = ptmp->group_color_numcomps;
++
++    }
++
++
++    /* Always update the color mapping procs.  Otherwise we end up
++       fowarding to the target device. */
++    code = pdf14_update_device_color_procs(dev,group_color,pis);
++    if (code < 0)
++	return code;
++
++    /* Note that the soft mask always follows the group color requirements even
++       when we have a separable device */
++
+     return pdf14_push_transparency_mask(pdev->ctx, &rect, bg_alpha,
+ 					transfer_fn, ptmp->idle, ptmp->replacing,
+-					ptmp->mask_id);
++					ptmp->mask_id, ptmp->subtype, 
++                                        ptmp->SMask_is_CIE, group_color_numcomps);
+ }
+ 
+ static	int
+-pdf14_end_transparency_mask(gx_device *dev,
++pdf14_end_transparency_mask(gx_device *dev, gs_imager_state *pis,
+ 			  gs_transparency_mask_t **pptm)
+ {
+     pdf14_device *pdev = (pdf14_device *)dev;
++    pdf14_parent_color_t *parent_color;
++    int ok;
+ 
+     if_debug0('v', "pdf14_end_transparency_mask\n");
+-    return pdf14_pop_transparency_mask(pdev->ctx);
++
++    ok = pdf14_pop_transparency_mask(pdev->ctx);
++
++    /* May need to reset some color stuff related
++     * to a mismatch between the Smask color space
++     * and the Smask blending space */
++
++    if (pdev->ctx->stack != NULL ) {
++
++        parent_color = &(pdev->ctx->stack->parent_color_info_procs);
++
++        if (!(parent_color->parent_color_mapping_procs == NULL && 
++            parent_color->parent_color_comp_index == NULL)) {
++
++                pis->get_cmap_procs = parent_color->get_cmap_procs;;
++                gx_set_cmap_procs(pis, dev);
++                pdev->procs.get_color_mapping_procs = parent_color->parent_color_mapping_procs;
++                pdev->procs.get_color_comp_index = parent_color->parent_color_comp_index;
++                pdev->color_info.polarity = parent_color->polarity;
++                pdev->color_info.num_components = parent_color->num_components;
++                pdev->color_info.depth = parent_color->depth;
++                pdev->blend_procs = parent_color->parent_blending_procs;
++                pdev->ctx->additive = parent_color->isadditive;
++                pdev->pdf14_procs = parent_color->unpack_procs;
++                parent_color->get_cmap_procs = NULL;
++                parent_color->parent_color_comp_index = NULL;
++                parent_color->parent_color_mapping_procs = NULL;
++        }
++    }
++
++    return ok;
+ }
+ 
+ static	int
+@@ -1793,7 +2717,6 @@ pdf14_mark_fill_rectangle(gx_device * dev,
+     int alpha_g_off = shape_off + (has_shape ? planestride : 0);
+     bool overprint = pdev->overprint;
+     gx_color_index drawn_comps = pdev->drawn_comps;
+-    bool overprint_mode = pdev->overprint_mode;
+     gx_color_index comps;
+     byte shape = 0; /* Quiet compiler. */
+     byte src_alpha;
+@@ -1879,8 +2802,8 @@ pdf14_mark_fill_rectangle(gx_device * dev,
+ 	}
+ 	line += rowstride;
+     }
+-
+-#if RAW_DUMP
++#if 0
++/* #if RAW_DUMP */
+  
+     /* Dump the current buffer to see what we have. */
+ 	
+@@ -1993,6 +2916,9 @@ pdf14_mark_fill_rectangle_ko_simple(gx_device *	dev,
+ static	cmap_proc_gray(pdf14_cmap_gray_direct);
+ static	cmap_proc_rgb(pdf14_cmap_rgb_direct);
+ static	cmap_proc_cmyk(pdf14_cmap_cmyk_direct);
++static	cmap_proc_gray(pdf14_cmap_gray_direct_group);
++static	cmap_proc_rgb(pdf14_cmap_rgb_direct_group);
++static	cmap_proc_cmyk(pdf14_cmap_cmyk_direct_group);
+ static	cmap_proc_rgb_alpha(pdf14_cmap_rgb_alpha_direct);
+ static	cmap_proc_separation(pdf14_cmap_separation_direct);
+ static	cmap_proc_devicen(pdf14_cmap_devicen_direct);
+@@ -2008,6 +2934,16 @@ static	const gx_color_map_procs pdf14_cmap_many = {
+      pdf14_cmap_is_halftoned
+     };
+ 
++static	const gx_color_map_procs pdf14_cmap_many_group = {
++     pdf14_cmap_gray_direct_group,
++     pdf14_cmap_rgb_direct_group,
++     pdf14_cmap_cmyk_direct_group,
++     pdf14_cmap_rgb_alpha_direct,
++     pdf14_cmap_separation_direct,
++     pdf14_cmap_devicen_direct,
++     pdf14_cmap_is_halftoned
++    };
++
+ /**
+  * Note: copied from gxcmap.c because it's inlined.
+  **/
+@@ -2098,17 +3034,232 @@ pdf14_cmap_cmyk_direct(frac c, frac m, frac y, frac k, gx_device_color * pdc,
+ 	color_set_pure(pdc, color);
+ }
+ 
++/* color mapping for when we have an smask or a isolated transparency group with another color space */
++static	void
++pdf14_cmap_gray_direct_group(frac gray, gx_device_color * pdc, const gs_imager_state * pis,
++		 gx_device * dev, gs_color_select_t select)
++{
++    int i, ncomps = dev->color_info.num_components;
++    frac cm_comps[GX_DEVICE_COLOR_MAX_COMPONENTS];
++    gx_color_value cv[GX_DEVICE_COLOR_MAX_COMPONENTS];
++    gx_color_index color;
++    gx_device *trans_device;
++
++     /*  We may be coming from the clist writer 
++         which often forwards us the target device.
++         If this occurs we actually need to get to
++         the color space defined by the transparency group
++         and we use the operators defined by the transparency device 
++         to do the job.  
++       */
++
++    if (pis->trans_device != NULL){
++
++        trans_device = pis->trans_device;
++
++    } else {
++
++        trans_device = dev;
++    }
++ 
++    ncomps = trans_device->color_info.num_components;
++
++   /* If we are doing concretization of colors in an SMask or isolated group 
++       then just return the color as is */
++
++   if (ncomps == 1 ){
++
++	cv[0] = frac2cv(gray);
++
++        /* encode as a color index */
++        color = pdf14_encode_smask_color(trans_device,cv,1);
++
++        /* check if the encoding was successful; we presume failure is rare */
++         if (color != gx_no_color_index)
++	    color_set_pure(pdc, color);
++
++    } else {
++
++        /* map to the color model */
++        dev_proc(trans_device, get_color_mapping_procs)(trans_device)->map_gray(trans_device, gray, cm_comps);
++
++        for (i = 0; i < ncomps; i++)
++	    cv[i] = frac2cv(cm_comps[i]);
++
++        /* encode as a color index */
++        color = dev_proc(trans_device, encode_color)(trans_device, cv);
++
++        /* check if the encoding was successful; we presume failure is rare */
++        if (color != gx_no_color_index)
++	    color_set_pure(pdc, color);
++
++    }
++
++}
++
++/* color mapping for when we have an smask or a isolated transparency group with another color space */
++static	void
++pdf14_cmap_rgb_direct_group(frac r, frac g, frac b, gx_device_color *	pdc,
++     const gs_imager_state * pis, gx_device * dev, gs_color_select_t select)
++{
++    int i, ncomps = dev->color_info.num_components;
++    frac cm_comps[GX_DEVICE_COLOR_MAX_COMPONENTS];
++    gx_color_value cv[GX_DEVICE_COLOR_MAX_COMPONENTS];
++    gx_color_index color;
++    gx_device *trans_device;
++
++     /*  We may be coming from the clist writer 
++         which often forwards us the target device.
++         If this occurs we actually need to get to
++         the color space defined by the transparency group
++         and we use the operators defined by the transparency device 
++         to do the job.  
++       */
++
++    if (pis->trans_device != NULL){
++
++        trans_device = pis->trans_device;
++
++    } else {
++
++        trans_device = dev;
++    }
++ 
++    ncomps = trans_device->color_info.num_components;
++
++    if ( ncomps == 3 ){
++
++        cv[0] = frac2cv(r);
++        cv[1] = frac2cv(g);
++        cv[2] = frac2cv(b);
++
++        /* encode as a color index */
++        color = pdf14_encode_smask_color(trans_device,cv,3);
++
++       /* check if the encoding was successful; we presume failure is rare */
++         if (color != gx_no_color_index)
++        color_set_pure(pdc, color);    
++
++    } else {
++
++        /* map to the device color model */
++        /* We can end up here, if for example we had a DeviceN
++           color space with a CIE based alternate space and
++           a output device that was  RGB but a blending
++           space that was CMYK.  The proper way to solve this
++           is to introduce another color space for the graphic
++           state that has its own Joint CIE Cache between the
++           source and a CMYK CRD (the transparency color space).
++           The problem is that we can
++           only have one CRD, which is defined by the output
++           device.  We will fix these issues with the
++           new ICC base color architecture. */
++
++        dev_proc(trans_device, get_color_mapping_procs)(trans_device)->map_rgb(trans_device, pis, r, g, b, cm_comps);
++
++        for (i = 0; i < ncomps; i++)
++            cv[i] = frac2cv(cm_comps[i]);
++
++        /* encode as a color index */
++        color = dev_proc(trans_device, encode_color)(trans_device, cv);
++
++        /* check if the encoding was successful; we presume failure is rare */
++        if (color != gx_no_color_index)
++            color_set_pure(pdc, color);
++
++    }
++}
++
++/* color mapping for when we have an smask or a isolated transparency group with another color space */
++static	void
++pdf14_cmap_cmyk_direct_group(frac c, frac m, frac y, frac k, gx_device_color * pdc,
++     const gs_imager_state * pis, gx_device * dev, gs_color_select_t select)
++{
++    int i, ncomps = dev->color_info.num_components;
++    frac cm_comps[GX_DEVICE_COLOR_MAX_COMPONENTS];
++    gx_color_value cv[GX_DEVICE_COLOR_MAX_COMPONENTS];
++    gx_color_index color;
++    gx_device *trans_device;
++
++     /*  We may be coming from the clist writer 
++         which often forwards us the target device.
++         If this occurs we actually need to get to
++         the color space defined by the transparency group
++         and we use the operators defined by the transparency device 
++         to do the job.  
++       */
++
++    if (pis->trans_device != NULL){
++
++        trans_device = pis->trans_device;
++
++    } else {
++
++        trans_device = dev;
++    }
++ 
++    ncomps = trans_device->color_info.num_components;
++
++    if (ncomps == 4 ){
++
++        cv[0] = frac2cv(c);
++        cv[1] = frac2cv(m);
++        cv[2] = frac2cv(y);
++        cv[3] = frac2cv(k);
++
++         /* encode as a color index */
++        color = pdf14_encode_smask_color(trans_device,cv,4);
++
++        /* check if the encoding was successful; we presume failure is rare */
++        if (color != gx_no_color_index)
++	    color_set_pure(pdc, color); 
++
++    } else {
++
++        /* map to the color model */
++        dev_proc(trans_device, get_color_mapping_procs)(trans_device)->map_cmyk(trans_device, c, m, y, k, cm_comps);
++
++        for (i = 0; i < ncomps; i++)
++	    cv[i] = frac2cv(cm_comps[i]);
++
++        color = dev_proc(trans_device, encode_color)(trans_device, cv);
++        if (color != gx_no_color_index) 
++	    color_set_pure(pdc, color);
++
++    }
++}
++
+ static	void
+ pdf14_cmap_rgb_alpha_direct(frac r, frac g, frac b, frac alpha,	gx_device_color	* pdc,
+      const gs_imager_state * pis, gx_device * dev, gs_color_select_t select)
+ {
+-    int i, ncomps = dev->color_info.num_components;
++    int i, ncomps;
+     frac cm_comps[GX_DEVICE_COLOR_MAX_COMPONENTS];
+-    gx_color_value cv_alpha, cv[GX_DEVICE_COLOR_MAX_COMPONENTS];
++    gx_color_value cv[GX_DEVICE_COLOR_MAX_COMPONENTS];
+     gx_color_index color;
++    gx_device *trans_device;
++
++     /*  We may be coming from the clist writer 
++         which often forwards us the target device.
++         If this occurs we actually need to get to
++         the color space defined by the transparency group
++         and we use the operators defined by the transparency device 
++         to do the job.  
++       */
++
++    if (pis->trans_device != NULL){
++
++        trans_device = pis->trans_device;
++
++    } else {
++
++        trans_device = dev;
++    }
++ 
++    ncomps = trans_device->color_info.num_components;
+ 
+     /* map to the color model */
+-    dev_proc(dev, get_color_mapping_procs)(dev)->map_rgb(dev, pis, r, g, b, cm_comps);
++    dev_proc(trans_device, get_color_mapping_procs)(trans_device)->map_rgb(trans_device, pis, r, g, b, cm_comps);
+ 
+     /* pre-multiply to account for the alpha weighting */
+     if (alpha != frac_1) {
+@@ -2126,11 +3277,13 @@ pdf14_cmap_rgb_alpha_direct(frac r, frac g, frac b, frac alpha,	gx_device_color
+ 	cv[i] = frac2cv(cm_comps[i]);
+ 
+     /* encode as a color index */
+-    if (dev_proc(dev, map_rgb_alpha_color) != gx_default_map_rgb_alpha_color &&
++   /* if (dev_proc(dev, map_rgb_alpha_color) != gx_default_map_rgb_alpha_color &&
+ 	 (cv_alpha = frac2cv(alpha)) != gx_max_color_value)
+-	color = dev_proc(dev, map_rgb_alpha_color)(dev, cv[0], cv[1], cv[2], cv_alpha);
+     else
+-	color = dev_proc(dev, encode_color)(dev, cv);
++	color = dev_proc(dev, encode_color)(dev, cv);  */
++
++    color = dev_proc(trans_device, encode_color)(trans_device, cv); 
++
+ 
+     /* check if the encoding was successful; we presume failure is rare */
+     if (color != gx_no_color_index)
+@@ -2185,7 +3338,6 @@ pdf14_cmap_separation_direct(frac all, gx_device_color * pdc, const gs_imager_st
+ 	color_set_pure(pdc, color);
+ }
+ 
+-
+ static	void
+ pdf14_cmap_devicen_direct(const	frac * pcc, 
+     gx_device_color * pdc, const gs_imager_state * pis, gx_device * dev,
+@@ -2195,12 +3347,32 @@ pdf14_cmap_devicen_direct(const	frac * pcc,
+     frac cm_comps[GX_DEVICE_COLOR_MAX_COMPONENTS];
+     gx_color_value cv[GX_DEVICE_COLOR_MAX_COMPONENTS];
+     gx_color_index color;
++    gx_device *trans_device;
++
++     /*  We may be coming from the clist writer 
++         which often forwards us the target device.
++         If this occurs we actually need to get to
++         the color space defined by the transparency group
++         and we use the operators defined by the transparency device 
++         to do the job.  
++       */
++
++    if (pis->trans_device != NULL){
++
++        trans_device = pis->trans_device;
++
++    } else {
++
++        trans_device = dev;
++    }
++ 
++    ncomps = trans_device->color_info.num_components;
+ 
+     /* map to the color model */
+     map_components_to_colorants(pcc, &(pis->color_component_map), cm_comps);;
+ 
+     /* apply the transfer function(s); convert to color values */
+-    if (dev->color_info.polarity == GX_CINFO_POLARITY_ADDITIVE)
++    if (trans_device->color_info.polarity == GX_CINFO_POLARITY_ADDITIVE)
+ 	for (i = 0; i < ncomps; i++)
+ 	    cv[i] = frac2cv(gx_map_color_frac(pis,
+ 				cm_comps[i], effective_transfer[i]));
+@@ -2210,7 +3382,7 @@ pdf14_cmap_devicen_direct(const	frac * pcc,
+ 			(frac)(frac_1 - cm_comps[i]), effective_transfer[i]));
+ 
+     /* encode as a color index */
+-    color = dev_proc(dev, encode_color)(dev, cv);
++    color = dev_proc(trans_device, encode_color)(trans_device, cv);
+ 
+     /* check if the encoding was successful; we presume failure is rare */
+     if (color != gx_no_color_index)
+@@ -2230,6 +3402,14 @@ pdf14_get_cmap_procs(const gs_imager_state *pis, const gx_device * dev)
+     return &pdf14_cmap_many;
+ }
+ 
++static	const gx_color_map_procs *
++pdf14_get_cmap_procs_group(const gs_imager_state *pis, const gx_device * dev)
++{
++    /* The pdf14 marking device itself is always continuous tone. */
++    return &pdf14_cmap_many_group;
++}
++
++
+ static int 
+ pdf14_pattern_manage(gx_device *pdev, gx_bitmap_id id,
+ 		gs_pattern1_instance_t *pinst, pattern_manage_t function)
+@@ -2271,6 +3451,23 @@ gs_pdf14_device_push(gs_memory_t *mem, gs_imager_state * pis,
+     code = dev_proc((gx_device *) p14dev, open_device) ((gx_device *) p14dev);
+     *pdev = (gx_device *) p14dev;
+     pdf14_set_marking_params((gx_device *)p14dev, pis);
++
++    p14dev->trans_group_parent_cmap_procs = NULL;
++
++#if RAW_DUMP
++  
++    /* Dump the current buffer to see what we have. */
++
++    dump_raw_buffer(p14dev->ctx->stack->rect.q.y-p14dev->ctx->stack->rect.p.y, 
++                p14dev->ctx->stack->rect.q.x-p14dev->ctx->stack->rect.p.x, 
++				p14dev->ctx->stack->n_planes,
++                p14dev->ctx->stack->planestride, p14dev->ctx->stack->rowstride, 
++                "Device_Push",p14dev->ctx->stack->data);
++
++    global_index++;
++
++
++#endif
+     return code;
+ }
+ 
+@@ -2370,6 +3567,8 @@ c_pdf14trans_write(const gs_composite_t	* pct, byte * data, uint * psize, gx_dev
+ 		return code;
+ 	    *pbuf++ = (pparams->Isolated & 1) + ((pparams->Knockout & 1) << 1);
+ 	    *pbuf++ = pparams->blend_mode;
++	    *pbuf++ = pparams->group_color;
++	    put_value(pbuf, pparams->group_color_numcomps);
+ 	    put_value(pbuf, pparams->opacity.alpha);
+ 	    put_value(pbuf, pparams->shape.alpha);
+ 	    put_value(pbuf, pparams->bbox);
+@@ -2381,6 +3580,8 @@ c_pdf14trans_write(const gs_composite_t	* pct, byte * data, uint * psize, gx_dev
+ 	    if (code < 0)
+ 		return code;
+ 	    put_value(pbuf, pparams->subtype);
++	    *pbuf++ = pparams->group_color;
++	    put_value(pbuf, pparams->group_color_numcomps);
+ 	    *pbuf++ = pparams->replacing;
+ 	    *pbuf++ = pparams->function_is_identity;
+ 	    *pbuf++ = pparams->Background_components;
+@@ -2498,6 +3699,8 @@ c_pdf14trans_read(gs_composite_t * * ppct, const byte *	data,
+ 	    params.Isolated = (*data) & 1;
+ 	    params.Knockout = (*data++ >> 1) & 1;
+ 	    params.blend_mode = *data++;
++	    params.group_color = *data++;  /* Trans group color */
++            read_value(data,params.group_color_numcomps);  /* color group size */
+ 	    read_value(data, params.opacity.alpha);
+ 	    read_value(data, params.shape.alpha);
+ 	    read_value(data, params.bbox);
+@@ -2518,6 +3721,8 @@ c_pdf14trans_read(gs_composite_t * * ppct, const byte *	data,
+ 		 */
+ 	    data = cmd_read_matrix(&params.ctm, data);
+ 	    read_value(data, params.subtype);
++            params.group_color = *data++;
++	    read_value(data, params.group_color_numcomps);
+ 	    params.replacing = *data++;
+ 	    params.function_is_identity = *data++;
+ 	    params.Background_components = *data++;
+@@ -2958,19 +4163,19 @@ static	dev_proc_begin_typed_image(pdf14_clist_begin_typed_image);
+ static	const gx_device_procs pdf14_clist_Gray_procs =
+ 	pdf14_clist_procs(gx_default_DevGray_get_color_mapping_procs,
+ 			gx_default_DevGray_get_color_comp_index,
+-			gx_default_8bit_map_gray_color,
+-			gx_default_8bit_map_color_gray);
++			pdf14_encode_color,
++			pdf14_decode_color);
+ 
+ static	const gx_device_procs pdf14_clist_RGB_procs =
+ 	pdf14_clist_procs(gx_default_DevRGB_get_color_mapping_procs,
+ 			gx_default_DevRGB_get_color_comp_index,
+-			gx_default_rgb_map_rgb_color,
+-			gx_default_rgb_map_color_rgb);
++			pdf14_encode_color,
++			pdf14_decode_color);
+ 
+ static	const gx_device_procs pdf14_clist_CMYK_procs =
+ 	pdf14_clist_procs(gx_default_DevCMYK_get_color_mapping_procs,
+ 			gx_default_DevCMYK_get_color_comp_index,
+-			cmyk_8bit_map_cmyk_color, cmyk_8bit_map_color_cmyk);
++			pdf14_encode_color, pdf14_decode_color);
+ 
+ static	const gx_device_procs pdf14_clist_CMYKspot_procs =
+ 	pdf14_clist_procs(pdf14_cmykspot_get_color_mapping_procs,
+@@ -3080,6 +4285,22 @@ get_pdf14_clist_device_proto(gx_device * dev, pdf14_clist_device ** pdevproto,
+     switch (dev_cs) {
+ 	case PDF14_DeviceGray:
+ 	    *pdevproto = (pdf14_clist_device *)&pdf14_clist_Gray_device;
++
++           /* We want gray to be single channel.  Low level 
++               initialization of gray device prototype is 
++               peculiar in that in dci_std_color_num_components
++               the comment is
++              "A device is monochrome only if it is bi-level"
++
++              Here we want monochrome anytime we have a gray device.
++              To avoid breaking things elsewhere, we will overide
++              the prototype intialization here */
++               
++            *ptempdevproto = **pdevproto;
++            ptempdevproto->color_info.max_components = 1;
++            ptempdevproto->color_info.num_components = ptempdevproto->color_info.max_components;
++            *pdevproto = ptempdevproto;
++
+ 	    break;
+ 	case PDF14_DeviceRGB:
+ 	    *pdevproto = (pdf14_clist_device *)&pdf14_clist_RGB_device;
+@@ -3596,6 +4817,7 @@ pdf14_clist_create_compositor(gx_device	* dev, gx_device ** pcdev,
+ {
+     pdf14_clist_device * pdev = (pdf14_clist_device *)dev;
+     int code;
++    bool sep_target;
+ 
+     /* We only handle a few PDF 1.4 transparency operations 4 */
+     if (gs_is_pdf14trans_compositor(pct)) {
+@@ -3672,8 +4894,92 @@ pdf14_clist_create_compositor(gx_device	* dev, gx_device ** pcdev,
+ 		if (pdf14pct->params.Background_components != 0 && 
+ 		    pdf14pct->params.Background_components != pdev->color_info.num_components)
+ 		    return_error(gs_error_rangecheck);
++
++                /* We need to update the clist writer device procs based upon the
++                   the group color space.  For simplicity, the list item is created even if the
++                   color space did not change */
++
++                /* First store the current ones */
++
++                pdf14_push_parent_color(dev, pis);
++
++                /* Now update the device procs. Not 
++                   if we have a sep target though */
++
++                sep_target = (strcmp(pdev->dname, "PDF14clistcustom") == 0) || (strcmp(pdev->dname, "PDF14clistcmykspot") == 0);
++
++                if (!sep_target)
++                   code = pdf14_update_device_color_procs_push_c(dev,
++			          pdf14pct->params.group_color,pis);
++
++               /* Note that our initial device buffer may have had a different color space
++                   than the first transparency group.  In such a case, we really should force
++                   this first group to be isolated, anytime that the parent color space is 
++                   different than its child group, it should be isolated, per the PDF spec */
++                /* MJV */
++             /*   if (code == 1){
++
++                    isolated = true;
++                    if_debug0('v', "[v]Transparency group color space change\n");
++
++                } else {
++
++                    isolated = ptgp->Isolated;
++
++                } */
++
+ 		break;
+-	    default:
++
++	    case PDF14_BEGIN_TRANS_MASK:
++
++                /* We need to update the clist writer device procs based upon the
++                   the group color space.  For simplicity, the list item is created even if the
++                   color space did not change */
++
++                /* First store the current ones */
++
++                pdf14_push_parent_color(dev, pis);
++
++                /* Now update the device procs */
++
++               code = pdf14_update_device_color_procs_push_c(dev,
++			      pdf14pct->params.group_color,pis);
++
++		break;
++
++
++            /* When we get a trans group pop, we need to update the color mapping procs */
++	    case PDF14_END_TRANS_GROUP:
++
++               /* We need to update the clist writer device procs based upon the
++                   the group color space. */
++
++                /* First restore our procs */
++                
++               code = pdf14_update_device_color_procs_pop_c(dev,pis);
++
++                /* Now pop the old one */
++
++                pdf14_pop_parent_color(dev, pis);
++
++                break;
++
++	    case PDF14_END_TRANS_MASK:
++
++                /* We need to update the clist writer device procs based upon the
++                   the group color space. */
++
++                /* First restore our procs */
++                
++               code = pdf14_update_device_color_procs_pop_c(dev,pis);
++
++                /* Now pop the old one */
++
++                pdf14_pop_parent_color(dev, pis);
++
++                break;
++
++            default:
+ 		break;		/* Pass remaining ops to target */
+ 	}
+     }
+@@ -3772,6 +5078,7 @@ pdf14_clist_update_params(pdf14_clist_device * pdev, const gs_imager_state * pis
+     return code;
+ }
+ 
++
+ /*
+  * fill_path routine for the PDF 1.4 transaprency compositor device for
+  * writing the clist.
+@@ -3785,6 +5092,7 @@ pdf14_clist_fill_path(gx_device	*dev, const gs_imager_state *pis,
+     pdf14_clist_device * pdev = (pdf14_clist_device *)dev;
+     gs_imager_state new_is = *pis;
+     int code;
++    gs_pattern2_instance_t *pinst = NULL;
+ 
+     /*
+      * Ensure that that the PDF 1.4 reading compositor will have the current
+@@ -3795,12 +5103,47 @@ pdf14_clist_fill_path(gx_device	*dev, const gs_imager_state *pis,
+     code = pdf14_clist_update_params(pdev, pis);
+     if (code < 0)
+ 	return code;
++
++    /* If we are doing a shading fill and we are in a tranparency
++       group of a different color space, then we do not want to 
++       do the shading in the device color space. It must occur in
++       the source space.  To handle it in the device space would 
++       require knowing all the nested transparency group color spaces
++       as well as the transparency.  Some of the shading code
++       ignores this, so we have to pass on the clist_writer device
++       to enable proper mapping to the transparency group color space. */
++
++    if (pdcolor != NULL && gx_dc_is_pattern2_color(pdcolor) && pdev->trans_group_parent_cmap_procs != NULL) {
++
++ 	pinst =
++	    (gs_pattern2_instance_t *)pdcolor->ccolor.pattern;
++           pinst->saved->has_transparency = true;
++
++           /* The transparency color space operations are driven
++              by the pdf14 clist writer device.  */
++
++           pinst->saved->trans_device = dev;
++
++    }
++
+     /*
+      * The blend operations are not idempotent.  Force non-idempotent
+      * filling and stroking operations.
+      */
+     new_is.log_op |= lop_pdf14;
+-    return gx_forward_fill_path(dev, &new_is, ppath, params, pdcolor, pcpath);
++    new_is.trans_device = dev;
++    new_is.has_transparency = true;
++
++    code = gx_forward_fill_path(dev, &new_is, ppath, params, pdcolor, pcpath);
++
++    new_is.trans_device = NULL;
++    new_is.has_transparency = false;
++
++    if (pinst != NULL){
++        pinst->saved->trans_device = NULL;
++    }
++
++    return code;
+ }
+ 
+ /*
+@@ -3887,9 +5230,19 @@ pdf14_clist_begin_image(gx_device * dev,
+     code = pdf14_clist_update_params(pdev, pis);
+     if (code < 0)
+ 	return code;
++
+     /* Pass image to the target */
+-    return gx_forward_begin_image(dev, pis, pim, format, prect,
++    code = gx_forward_begin_image(dev, pis, pim, format, prect,
+ 					pdcolor, pcpath, memory, pinfo);
++
++    if (code < 0)
++        return gx_default_begin_image(dev, pis, pim, format, prect,
++					pdcolor, pcpath, memory, pinfo);
++    else return code;
++
++
++
++
+ }
+ 
+ static	int
+@@ -3902,6 +5255,7 @@ pdf14_clist_begin_typed_image(gx_device	* dev, const gs_imager_state * pis,
+ {
+     pdf14_clist_device * pdev = (pdf14_clist_device *)dev;
+     int code;
++    gs_imager_state * pis_noconst = pis; /* Break 'const'. */
+ 
+     /*
+      * Ensure that that the PDF 1.4 reading compositor will have the current
+@@ -3909,12 +5263,39 @@ pdf14_clist_begin_typed_image(gx_device	* dev, const gs_imager_state * pis,
+      * do not have access to the imager state.  Thus we have to pass any
+      * changes explictly.
+      */
++
+     code = pdf14_clist_update_params(pdev, pis);
+     if (code < 0)
+ 	return code;
++
+     /* Pass image to the target */
+-    return gx_forward_begin_typed_image(dev, pis, pmat,
+-			    pic, prect, pdcolor, pcpath, mem, pinfo);
++
++    /* Do a quick change to the imager state
++       so that if we can return with -1 in
++       case the clist writer cannot handle
++       this image itself.  In such a case,
++       we want to make sure we dont use the
++       target device.  I don't necc. like
++       doing it this way.  Probably need to
++       go back and do something a bit
++       more elegant. */
++
++    pis_noconst->has_transparency = true;
++    code = gx_forward_begin_typed_image(dev, pis, pmat,
++			    pic, prect, pdcolor, pcpath, mem, pinfo);  
++    if (code < 0){
++
++        code = gx_default_begin_typed_image(dev, pis, pmat, pic, prect,
++					pdcolor, pcpath, mem, pinfo);
++        pis_noconst->has_transparency = false;
++        return code;
++
++    } else {
++        
++        pis_noconst->has_transparency = false;
++        return code;
++
++    }
+ }
+ 
+ /*
+@@ -3934,6 +5315,9 @@ c_pdf14trans_clist_write_update(const gs_composite_t * pcte, gx_device * dev,
+     pdf14_clist_device * p14dev;
+     int code = 0;
+ 
++    p14dev = (pdf14_clist_device *)(*pcdev);
++
++
+     /* We only handle the push/pop operations */
+     switch (pdf14pct->params.pdf14_op) {
+ 	case PDF14_PUSH_DEVICE:
+@@ -3947,6 +5331,15 @@ c_pdf14trans_clist_write_update(const gs_composite_t * pcte, gx_device * dev,
+ 	     * transfer functions will be applied at the end after we have done
+ 	     * our PDF 1.4 blend operations.
+ 	     */
++
++            /* Also if the bit depth is not 8 per channel we need to adjust 
++               as all the pdf14 compositing code is for 8 bits per channel.  The
++               clist writer device uses this information to make sure the proper
++               bit depth is written */
++
++            if (cdev->clist_color_info.num_components * 8 != cdev->clist_color_info.depth)
++                cdev->clist_color_info.depth = cdev->clist_color_info.num_components * 8;
++
+ 	    p14dev = (pdf14_clist_device *)(*pcdev);
+ 	    p14dev->saved_target_color_info = dev->color_info;
+ 	    dev->color_info = (*pcdev)->color_info;
+diff --git a/base/gdevp14.h b/base/gdevp14.h
+--- a/base/gdevp14.h
++++ b/base/gdevp14.h
+@@ -31,6 +31,58 @@ typedef enum {
+ typedef struct pdf14_buf_s pdf14_buf;
+ #endif
+ 
++/*
++ * This structure contains procedures for processing routine which differ
++ * between the different blending color spaces.
++ */
++typedef struct {
++    /*
++     * Unpack a device color.  This routine is similar to the device's
++     * decode_color procedure except for two things.  The procedure produces
++     * 1 byte values instead of gx_color_values (2 bytes) and the output
++     * values are inverted for subtractive color spaces (like CMYK).
++     * A separate procedure is used instead of the decode_color to minimize
++     * execution time.
++     */
++    void (* unpack_color)(int num_comp, gx_color_index color,
++			       	pdf14_device * p14dev, byte * out);
++    /*
++     * This procedure sends the final rasterized transparency data to the
++     * output device as an image.
++     */
++    int (* put_image)(gx_device * dev,
++		    gs_imager_state * pis, gx_device * target);
++} pdf14_procs_s;
++
++typedef pdf14_procs_s pdf14_procs_t;
++
++/* A structure to hold information
++ * about the parent color related
++ * procs and other information.
++ * These may change depending upon
++ * if the blending space is different
++ * than the base space.  The structure
++ * is a list that is updated upon
++ * every transparency group push and pop */
++
++typedef struct pdf14_parent_color_s pdf14_parent_color_t;
++
++struct pdf14_parent_color_s {
++
++    int num_components;
++    bool isadditive;
++    gx_color_polarity_t polarity;
++    byte depth;  /* used in clist writer cmd_put_color */
++    const gx_color_map_procs *(*get_cmap_procs)(const gs_imager_state *,
++						     const gx_device *);
++    const gx_cm_color_map_procs *(*parent_color_mapping_procs)(const gx_device *);
++    int (*parent_color_comp_index)(gx_device *, const char *, int, int); 
++    const pdf14_procs_t * unpack_procs;
++    const pdf14_nonseparable_blending_procs_t * parent_blending_procs;
++    pdf14_parent_color_t *previous;
++ 
++};
++
+ typedef struct pdf14_ctx_s pdf14_ctx;
+ 
+ struct pdf14_buf_s {
+@@ -60,7 +112,14 @@ struct pdf14_buf_s {
+     gs_int_rect bbox;
+     pdf14_buf *maskbuf; /* Save pdf14_ctx_s::maksbuf. */
+     bool idle;
++
++    bool SMask_is_CIE;
++    gs_transparency_mask_subtype_t SMask_SubType;
++
+     uint mask_id;
++    pdf14_parent_color_t parent_color_info_procs;
++
++    gs_transparency_color_t color_space;  /* Different groups can have different spaces for blending */
+ };
+ 
+ struct pdf14_ctx_s {
+@@ -97,30 +156,7 @@ typedef struct gs_pdf14trans_params_s gs_pdf14trans_params_t;
+ typedef struct pdf14_device_s pdf14_device;
+ #endif
+ 
+-/*
+- * This structure contains procedures for processing routine which differ
+- * between the different blending color spaces.
+- */
+-typedef struct {
+-    /*
+-     * Unpack a device color.  This routine is similar to the device's
+-     * decode_color procedure except for two things.  The procedure produces
+-     * 1 byte values instead of gx_color_values (2 bytes) and the output
+-     * values are inverted for subtractive color spaces (like CMYK).
+-     * A separate procedure is used instead of the decode_color to minimize
+-     * execution time.
+-     */
+-    void (* unpack_color)(int num_comp, gx_color_index color,
+-			       	pdf14_device * p14dev, byte * out);
+-    /*
+-     * This procedure sends the final rasterized transparency data to the
+-     * output device as an image.
+-     */
+-    int (* put_image)(gx_device * dev,
+-		    gs_imager_state * pis, gx_device * target);
+-} pdf14_procs_s;
+ 
+-typedef pdf14_procs_s pdf14_procs_t;
+ 
+ /*
+  * Define the default post-clist (clist reader) PDF 1.4 compositing device.
+@@ -155,6 +191,9 @@ typedef struct pdf14_device_s {
+     dev_proc_decode_color(*my_decode_color);
+     dev_proc_get_color_mapping_procs(*my_get_color_mapping_procs);
+     dev_proc_get_color_comp_index(*my_get_color_comp_index);
++    
++    pdf14_parent_color_t *trans_group_parent_cmap_procs;
++
+ } pdf14_device_t;
+ 
+ /*
+diff --git a/base/gdevpbm.c b/base/gdevpbm.c
+--- a/base/gdevpbm.c
++++ b/base/gdevpbm.c
+@@ -682,6 +682,13 @@ pbm_print_page_loop(gx_device_printer * pdev, char magic, FILE * pstream,
+ 	case '7':		/* pam */
+ 	case '9':		/* plan9bm */
+ 	    break;
++        case '3':               /* pkm */
++        case '6':               /* pkmraw */
++	    if (fprintf(pstream, "%d\n", 255) < 0) {
++                code = gs_note_error(gs_error_ioerror);
++                goto punt;
++            }
++            break;
+ 	default:
+ 	    if (fprintf(pstream, "%d\n", pdev->color_info.max_gray) < 0) {
+                 code = gs_note_error(gs_error_ioerror);
+@@ -992,9 +999,9 @@ pkm_print_row_4(gx_device_printer * pdev, byte * data, int depth,
+ 	gx_color_value rgb[3];
+ 
+ 	cmyk_1bit_map_color_rgb((gx_device *)pdev, (gx_color_index)i, rgb);
+-	rv[i] = rgb[0] / gx_max_color_value;
+-	gv[i] = rgb[1] / gx_max_color_value;
+-	bv[i] = rgb[2] / gx_max_color_value;
++	rv[i] = rgb[0] / gx_max_color_value * 0xff;
++	gv[i] = rgb[1] / gx_max_color_value * 0xff;
++	bv[i] = rgb[2] / gx_max_color_value * 0xff;
+     }
+     /*
+      * Contrary to what the documentation implies, gcc compiles putc
+diff --git a/base/gdevpdf.c b/base/gdevpdf.c
+--- a/base/gdevpdf.c
++++ b/base/gdevpdf.c
+@@ -15,7 +15,6 @@
+ /* PDF-writing driver */
+ #include "fcntl_.h"
+ #include "memory_.h"
+-#include "string_.h"
+ #include "time_.h"
+ #include "unistd_.h"
+ #include "gx.h"
+@@ -211,6 +210,9 @@ pdf_open_temp_file(gx_device_pdf *pdev, pdf_temp_file_t *ptf)
+ {
+     char fmode[4];
+ 
++    if (strlen(gp_fmode_binary_suffix) > 2)
++	return_error(gs_error_invalidfileaccess);
++
+     strcpy(fmode, "w+");
+     strcat(fmode, gp_fmode_binary_suffix);
+     ptf->file =
+@@ -784,11 +786,11 @@ pdf_print_orientation(gx_device_pdf * pdev, pdf_page_t *page)
+ 
+ /* Close the current page. */
+ static int
+-pdf_close_page(gx_device_pdf * pdev)
++pdf_close_page(gx_device_pdf * pdev, int num_copies)
+ {
+-    int page_num = ++(pdev->next_page);
++    int page_num;
+     pdf_page_t *page;
+-    int code;
++    int code, i;
+ 
+     /*
+      * If the very first page is blank, we need to open the document
+@@ -806,89 +808,99 @@ pdf_close_page(gx_device_pdf * pdev)
+     }
+     pdf_close_contents(pdev, true);
+ 
+-    /*
+-     * We can't write the page object or the annotations array yet, because
+-     * later pdfmarks might add elements to them.  Write the other objects
+-     * that the page references, and record what we'll need later.
+-     *
+-     * Start by making sure the pages array element exists.
+-     */
+-
+-    pdf_page_id(pdev, page_num);
+-    page = &pdev->pages[page_num - 1];
+-    page->MediaBox.x = pdev->MediaSize[0];
+-    page->MediaBox.y = pdev->MediaSize[1];
+-    page->contents_id = pdev->contents_id;
+-    page->NumCopies_set = pdev->NumCopies_set;
+-    page->NumCopies = pdev->NumCopies;
+-    /* pdf_store_page_resources sets procsets, resource_ids[]. */
+-    code = pdf_store_page_resources(pdev, page);
+-    if (code < 0)
+-	return code;
+-
+-    /* Write the Functions. */
+-
+-    code = pdf_write_resource_objects(pdev, resourceFunction);
+-    if (code < 0)
+-	return code;
+-
+-    /* Save viewer's memory with cleaning resources. */
+-
+-    if (pdev->MaxViewerMemorySize < 10000000) {
+-	/* fixme: the condition above and the cleaning algorithm
+-	   may be improved with counting stored resource size
+-	   and creating multiple streams per page. */
+-
+-	if (pdev->ForOPDFRead) {
+-	    pdf_resource_t *pres = pdf_find_resource_by_resource_id(pdev, resourcePage, pdev->contents_id);
++    if (!pdev->DoNumCopies)
++	num_copies = 1;
++
++    for(i=0;i<num_copies;i++) {
++	bool clear_resource_use = i < num_copies - 1 ? 0 : 1;
++
++	page_num = ++(pdev->next_page);
++        /*
++         * We can't write the page object or the annotations array yet, because
++         * later pdfmarks might add elements to them.  Write the other objects
++         * that the page references, and record what we'll need later.
++         *
++         * Start by making sure the pages array element exists.
++         */
++
++        pdf_page_id(pdev, page_num);
++        page = &pdev->pages[page_num - 1];
++        page->MediaBox.x = pdev->MediaSize[0];
++        page->MediaBox.y = pdev->MediaSize[1];
++        page->contents_id = pdev->contents_id;
++        page->NumCopies_set = pdev->NumCopies_set;
++        page->NumCopies = pdev->NumCopies;
++        /* pdf_store_page_resources sets procsets, resource_ids[]. */
++        code = pdf_store_page_resources(pdev, page, clear_resource_use);
++        if (code < 0)
++	    return code;
++
++        /* Write the Functions. */
++
++        code = pdf_write_resource_objects(pdev, resourceFunction);
++        if (code < 0)
++	    return code;
++
++        /* Save viewer's memory with cleaning resources. */
++
++        if (pdev->MaxViewerMemorySize < 10000000) {
++	    /* fixme: the condition above and the cleaning algorithm
++		may be improved with counting stored resource size
++		and creating multiple streams per page. */
++
++	    if (pdev->ForOPDFRead) {
++		pdf_resource_t *pres = pdf_find_resource_by_resource_id(pdev, resourcePage, pdev->contents_id);
+ 	    
+-	    if (pres != NULL) {
+-		code = cos_dict_put_c_strings((cos_dict_t *)pres->object, "/.CleanResources", "/All");
+-		if (code < 0)
+-		    return code;
++		if (pres != NULL) {
++		    code = cos_dict_put_c_strings((cos_dict_t *)pres->object, "/.CleanResources", "/All");
++		    if (code < 0)
++			return code;
++		}
+ 	    }
++	    code = pdf_close_text_document(pdev);
++	    if (code < 0)
++		return code;
++	    code = pdf_write_and_free_all_resource_objects(pdev);
++	    if (code < 0)
++		return code;
+ 	}
+-	code = pdf_close_text_document(pdev);
+-	if (code < 0)
+-	    return code;
+-	code = pdf_write_and_free_all_resource_objects(pdev);
+-	if (code < 0)
+-	    return code;
+-    }
+ 
+-    /* Close use of text on the page. */
++        /* Close use of text on the page. */
+ 
+-    pdf_close_text_page(pdev);
++        pdf_close_text_page(pdev);
+ 
+-    /* Accumulate text rotation. */
++	/* Accumulate text rotation. */
+ 
+-    page->text_rotation.Rotate =
+-	(pdev->params.AutoRotatePages == arp_PageByPage ?
+-	 pdf_dominant_rotation(&page->text_rotation) : -1);
+-    {
+-	int i;
++	page->text_rotation.Rotate =
++	    (pdev->params.AutoRotatePages == arp_PageByPage ?
++	    pdf_dominant_rotation(&page->text_rotation) : -1);
++	{
++	    int i;
+ 
+-	for (i = 0; i < countof(page->text_rotation.counts); ++i)
+-	    pdev->text_rotation.counts[i] += page->text_rotation.counts[i];
+-    }
++	    for (i = 0; i < countof(page->text_rotation.counts); ++i)
++		pdev->text_rotation.counts[i] += page->text_rotation.counts[i];
++	}
+ 
+-    /* Record information from DSC comments. */
++	/* Record information from DSC comments. */
+ 
+-    page->dsc_info = pdev->page_dsc_info;
+-    if (page->dsc_info.orientation < 0)
+-	page->dsc_info.orientation = pdev->doc_dsc_info.orientation;
++	page->dsc_info = pdev->page_dsc_info;
++	if (page->dsc_info.orientation < 0)
++	    page->dsc_info.orientation = pdev->doc_dsc_info.orientation;
+ #ifdef Bug688793
+-    if (page->dsc_info.viewing_orientation < 0)
+-       page->dsc_info.viewing_orientation =
++	if (page->dsc_info.viewing_orientation < 0)
++	page->dsc_info.viewing_orientation =
+            pdev->doc_dsc_info.viewing_orientation;
+ #endif
+-    if (page->dsc_info.bounding_box.p.x >= page->dsc_info.bounding_box.q.x ||
+-	page->dsc_info.bounding_box.p.y >= page->dsc_info.bounding_box.q.y
+-	)
+-	page->dsc_info.bounding_box = pdev->doc_dsc_info.bounding_box;
++	if (page->dsc_info.bounding_box.p.x >= page->dsc_info.bounding_box.q.x ||
++	    page->dsc_info.bounding_box.p.y >= page->dsc_info.bounding_box.q.y
++	    )
++	    page->dsc_info.bounding_box = pdev->doc_dsc_info.bounding_box;
+ 
+-    /* Finish up. */
++	/* Finish up. */
+ 
++	if(pdf_ferror(pdev))
++	    return(gs_note_error(gs_error_ioerror));
++    }
+     pdf_reset_page(pdev);
+     return (pdf_ferror(pdev) ? gs_note_error(gs_error_ioerror) : 0);
+ }
+@@ -1030,7 +1042,7 @@ static int
+ pdf_output_page(gx_device * dev, int num_copies, int flush)
+ {
+     gx_device_pdf *const pdev = (gx_device_pdf *) dev;
+-    int code = pdf_close_page(pdev);
++    int code = pdf_close_page(pdev, num_copies);
+ 
+     return (code < 0 ? code :
+ 	    pdf_ferror(pdev) ? gs_note_error(gs_error_ioerror) :
+@@ -1067,7 +1079,7 @@ pdf_close(gx_device * dev)
+ 	    return code;
+     }
+     if (pdev->contents_id != 0)
+-	pdf_close_page(pdev);
++	pdf_close_page(pdev, 1);
+ 
+     /* Write the page objects. */
+ 
+@@ -1122,7 +1134,6 @@ pdf_close(gx_device * dev)
+     if (code >= 0)
+ 	code = code1;
+ 
+-
+     /* Create the Pages tree. */
+ 
+     pdf_open_obj(pdev, Pages_id);
+@@ -1134,7 +1145,7 @@ pdf_close(gx_device * dev)
+     {
+ 	int i;
+ 
+-	for (i = 0; i < pdev->next_page; ++i)
++	for (i = 0; i < pdev->next_page; ++i) 
+ 	    pprintld1(s, "%ld 0 R\n", pdev->pages[i].Page->id);
+     }
+     pprintd1(s, "] /Count %d\n", pdev->next_page);
+diff --git a/base/gdevpdfb.c b/base/gdevpdfb.c
+--- a/base/gdevpdfb.c
++++ b/base/gdevpdfb.c
+@@ -260,8 +260,8 @@ pdf_copy_mono(gx_device_pdf *pdev,
+ 	 * We don't have to worry about color space scaling: the color
+ 	 * space is always a Device space.
+ 	 */
+-	code = pdf_color_space(pdev, &cs_value, NULL, pcs,
+-			       &writer.pin->color_spaces, in_line);
++	code = pdf_color_space_named(pdev, &cs_value, NULL, pcs,
++			       &writer.pin->color_spaces, in_line, NULL, 0);
+ 	if (code < 0)
+ 	    return code;
+ 	pcsvalue = &cs_value;
+@@ -410,8 +410,8 @@ pdf_copy_color_data(gx_device_pdf * pdev, const byte * base, int sourcex,
+     pdf_image_writer_init(piw);
+     pdev->ParamCompatibilityLevel = pdev->CompatibilityLevel;
+     if ((code = pdf_begin_write_image(pdev, piw, id, w, h, NULL, in_line)) < 0 ||
+-	(code = pdf_color_space(pdev, &cs_value, NULL, pcs,
+-				&piw->pin->color_spaces, in_line)) < 0 ||
++	(code = pdf_color_space_named(pdev, &cs_value, NULL, pcs,
++				&piw->pin->color_spaces, in_line, NULL, 0)) < 0 ||
+ 	(for_pattern < 2 || nbytes < 512000 ?
+ 	    (code = psdf_setup_lossless_filters((gx_device_psdf *) pdev,
+ 			&piw->binary[0], (gs_pixel_image_t *)pim, false)) :
+diff --git a/base/gdevpdfc.c b/base/gdevpdfc.c
+--- a/base/gdevpdfc.c
++++ b/base/gdevpdfc.c
+@@ -345,7 +345,7 @@ pdf_separation_color_space(gx_device_pdf *pdev,
+ 
+     if ((code = cos_array_add(pca, cos_c_string_value(&v, csname))) < 0 ||
+ 	(code = cos_array_add_no_copy(pca, snames)) < 0 ||
+-	(code = pdf_color_space(pdev, &v, &ranges, alt_space, pcsn, false)) < 0 ||
++	(code = pdf_color_space_named(pdev, &v, &ranges, alt_space, pcsn, false, NULL, 0)) < 0 ||
+ 	(code = cos_array_add(pca, &v)) < 0 ||
+ 	(code = pdf_function_scaled(pdev, pfn, ranges, &v)) < 0 ||
+ 	(code = cos_array_add(pca, &v)) < 0 ||
+@@ -472,8 +472,8 @@ pdf_indexed_color_space(gx_device_pdf *pdev, cos_value_t *pvalue,
+      * in PDF, unlike PostScript, the values from the lookup table are
+      * scaled automatically.
+      */
+-    if ((code = pdf_color_space(pdev, pvalue, NULL, base_space,
+-				&pdf_color_space_names, false)) < 0 ||
++    if ((code = pdf_color_space_named(pdev, pvalue, NULL, base_space,
++				&pdf_color_space_names, false, NULL, 0)) < 0 ||
+ 	(code = cos_array_add(pca,
+ 			      cos_c_string_value(&v, 
+ 						 pdf_color_space_names.Indexed
+@@ -571,9 +571,9 @@ pdf_color_space_named(gx_device_pdf *pdev, cos_value_t *pvalue,
+ 	    ) {
+ 	    if (res_name != NULL)
+ 		return 0; /* Ignore .includecolorspace */
+-            return pdf_color_space( pdev, pvalue, ppranges,
++            return pdf_color_space_named( pdev, pvalue, ppranges,
+                                     pcs->base_space,
+-                                    pcsn, by_name);
++                                    pcsn, by_name, NULL, 0);
+ 	}
+         break;
+     default:
+@@ -832,7 +832,7 @@ pdf_color_space_named(gx_device_pdf *pdev, cos_value_t *pvalue,
+ 				  csa->colorant_name, &name_string, &name_string_length);
+ 		    if (code < 0)
+ 			return code;
+-		    code = pdf_color_space(pdev, &v_separation, NULL, csa->cspace, pcsn, false);
++		    code = pdf_color_space_named(pdev, &v_separation, NULL, csa->cspace, pcsn, false, NULL, 0);
+ 		    if (code < 0)
+ 			return code;
+ 		    code = pdf_string_to_cos_name(pdev, name_string, name_string_length, &v_colorant_name);
+@@ -878,9 +878,9 @@ pdf_color_space_named(gx_device_pdf *pdev, cos_value_t *pvalue,
+ 	break;
+ 
+     case gs_color_space_index_Pattern:
+-	if ((code = pdf_color_space(pdev, pvalue, ppranges,
++	if ((code = pdf_color_space_named(pdev, pvalue, ppranges,
+ 				    pcs->base_space,
+-				    &pdf_color_space_names, false)) < 0 ||
++				    &pdf_color_space_names, false, NULL, 0)) < 0 ||
+ 	    (code = cos_array_add(pca,
+ 				  cos_c_string_value(&v, "/Pattern"))) < 0 ||
+ 	    (code = cos_array_add(pca, pvalue)) < 0
+@@ -957,16 +957,6 @@ pdf_color_space_named(gx_device_pdf *pdev, cos_value_t *pvalue,
+     return 0;
+ }
+ 
+-int
+-pdf_color_space(gx_device_pdf *pdev, cos_value_t *pvalue,
+-		const gs_range_t **ppranges,
+-		const gs_color_space *pcs,
+-		const pdf_color_space_names_t *pcsn,
+-		bool by_name)
+-{
+-    return pdf_color_space_named(pdev, pvalue, ppranges, pcs, pcsn, by_name, NULL, 0);
+-}
+-
+ /* ---------------- Miscellaneous ---------------- */
+ 
+ /* Create colored and uncolored Pattern color spaces. */
+@@ -1018,7 +1008,7 @@ pdf_cs_Pattern_uncolored_hl(gx_device_pdf *pdev,
+ 		const gs_color_space *pcs, cos_value_t *pvalue)
+ {
+     /* Only for high level colors. */
+-    return pdf_color_space(pdev, pvalue, NULL, pcs, &pdf_color_space_names, true);
++    return pdf_color_space_named(pdev, pvalue, NULL, pcs, &pdf_color_space_names, true, NULL, 0);
+ }
+ 
+ /* Set the ProcSets bits corresponding to an image color space. */
+diff --git a/base/gdevpdfe.c b/base/gdevpdfe.c
+--- a/base/gdevpdfe.c
++++ b/base/gdevpdfe.c
+@@ -24,7 +24,6 @@
+ #include "gdevpdfx.h"
+ #include "gdevpdfg.h"
+ #include "gdevpdfo.h"
+-#include "gdevpdtf.h"
+ #include "ConvertUTF.h"
+ 
+ 
+@@ -730,204 +729,12 @@ pdf_document_metadata(gx_device_pdf *pdev)
+ 	if (code < 0)
+ 	    return code;
+ 	sprintf(buf, "%ld 0 R", pres->object->id);
+-	cos_dict_put_c_key_object(pdev->Catalog, "/Metadata", pres->object);
++	code = cos_dict_put_c_key_object(pdev->Catalog, "/Metadata", pres->object);
++	if (code < 0)
++	    return code;
+     }
+     return 0;
+ }
+ 
+ /* --------------------------------------------  */
+ 
+-/* Write Font metadata */
+-static int
+-pdf_write_font_metadata(gx_device_pdf *pdev, const pdf_base_font_t *pbfont, 
+-			const byte *digest, int digest_length)
+-{
+-    char instance_uuid[40];
+-    int code;
+-    stream *s = pdev->strm;
+-    gs_font_info_t info;
+-    gs_font_base *pfont = pbfont->complete;
+-
+-    if (pfont == NULL)
+-	pfont = pbfont->copied;
+-    /* Fixme: For True Type fonts need to get Coipyright, Owner from the TT data. */
+-    pdf_make_uuid(digest, pdf_uuid_time(pdev), pdev->DocumentTimeSeq, instance_uuid, sizeof(instance_uuid));
+-    code = pfont->procs.font_info((gs_font *)pfont, NULL,
+-		    (FONT_INFO_COPYRIGHT | FONT_INFO_NOTICE |
+-			FONT_INFO_FAMILY_NAME | FONT_INFO_FULL_NAME),
+-					&info);
+-    if (code < 0)
+-	return code;
+-    pdf_xml_ins_beg(s, "xpacket");
+-    pdf_xml_attribute_name(s, "begin");
+-    pdf_xml_copy(s, dd);
+-    pdf_xml_attribute_name(s, "id");
+-    pdf_xml_attribute_value(s, "W5M0MpCehiHzreSzNTczkc9d");
+-    pdf_xml_ins_end(s);
+-    pdf_xml_newline(s);
+-
+-    pdf_xml_copy(s, "<?adobe-xap-filters esc=\"CRLF\"?>\n");
+-    pdf_xml_copy(s, "<x:xmpmeta xmlns:x='adobe:ns:meta/'"
+-	                      " x:xmptk='XMP toolkit 2.9.1-13, framework 1.6'>\n");
+-    {
+-	pdf_xml_copy(s, "<rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' "
+-	                         "xmlns:iX='http://ns.adobe.com/iX/1.0/'>\n");
+-	{
+-
+-	    pdf_xml_tag_open_beg(s, "rdf:Description");
+-	    pdf_xml_attribute_name(s, "rdf:about");
+-	    pdf_xml_attribute_value(s, instance_uuid);
+-	    pdf_xml_attribute_name(s, "xmlns:xmp");
+-	    pdf_xml_attribute_value(s, "http://ns.adobe.com/xap/1.0/");
+-	    pdf_xml_tag_end(s);
+-	    {
+-		pdf_xml_tag_open_beg(s, "xmp:Title");
+-		pdf_xml_tag_end(s);
+-		{
+-		    pdf_xml_tag_open(s, "rdf:Alt");
+-		    {
+-			pdf_xml_tag_open_beg(s, "rdf:li");
+-			pdf_xml_attribute_name(s, "xml:lang");
+-			pdf_xml_attribute_value(s, "x-default");
+-			pdf_xml_tag_end(s);
+-			{
+-			   pdf_xml_data_write(s, pbfont->font_name.data, pbfont->font_name.size);
+-			}
+-			pdf_xml_tag_close(s, "rdf:li");
+-		    }
+-		    pdf_xml_tag_close(s, "rdf:Alt");
+-		}
+-		pdf_xml_tag_close(s, "xmp:Title");
+-	    }
+-	    pdf_xml_tag_close(s, "rdf:Description");
+-	    pdf_xml_newline(s);
+-
+-
+-	    pdf_xml_tag_open_beg(s, "rdf:Description");
+-	    pdf_xml_attribute_name(s, "rdf:about");
+-	    pdf_xml_attribute_value(s, instance_uuid);
+-	    pdf_xml_attribute_name(s, "xmlns:xmpRights");
+-	    pdf_xml_attribute_value(s, "http://ns.adobe.com/xap/1.0/rights/");
+-	    pdf_xml_tag_end(s);
+-	    if (info.members & FONT_INFO_COPYRIGHT) {
+-		pdf_xml_tag_open_beg(s, "xmpRights:Copyright");
+-		pdf_xml_tag_end(s);
+-		{
+-		    pdf_xml_tag_open(s, "rdf:Alt");
+-		    {
+-			pdf_xml_tag_open_beg(s, "rdf:li");
+-			pdf_xml_attribute_name(s, "xml:lang");
+-			pdf_xml_attribute_value(s, "x-default");
+-			pdf_xml_tag_end(s);
+-			{
+-			   pdf_xml_data_write(s, info.Copyright.data, info.Copyright.size);
+-			}
+-			pdf_xml_tag_close(s, "rdf:li");
+-		    }
+-		    pdf_xml_tag_close(s, "rdf:Alt");
+-		}
+-		pdf_xml_tag_close(s, "xmpRights:Copyright");
+-
+-		/* Don't have an Owner, write Copyright instead. */
+-		pdf_xml_tag_open_beg(s, "xmpRights:Owner");
+-		pdf_xml_tag_end(s);
+-		{
+-		    pdf_xml_tag_open(s, "rdf:Alt");
+-		    {
+-			pdf_xml_tag_open_beg(s, "rdf:li");
+-			pdf_xml_attribute_name(s, "xml:lang");
+-			pdf_xml_attribute_value(s, "x-default");
+-			pdf_xml_tag_end(s);
+-			{
+-			   pdf_xml_data_write(s, info.Copyright.data, info.Copyright.size);
+-			}
+-			pdf_xml_tag_close(s, "rdf:li");
+-		    }
+-		    pdf_xml_tag_close(s, "rdf:Alt");
+-		}
+-		pdf_xml_tag_close(s, "xmpRights:Owner");
+-	    }
+-	    {
+-		pdf_xml_tag_open_beg(s, "xmpRights:Marked");
+-		pdf_xml_tag_end(s);
+-		{
+-		    pdf_xml_string_write(s, "True");
+-		}
+-		pdf_xml_tag_close(s, "xmpRights:Marked");
+-	    }
+-	    if (info.members & FONT_INFO_NOTICE) {
+-		pdf_xml_tag_open_beg(s, "xmpRights:UsageTerms");
+-		pdf_xml_tag_end(s);
+-		{
+-		    pdf_xml_tag_open(s, "rdf:Alt");
+-		    {
+-			pdf_xml_tag_open_beg(s, "rdf:li");
+-			pdf_xml_attribute_name(s, "xml:lang");
+-			pdf_xml_attribute_value(s, "x-default");
+-			pdf_xml_tag_end(s);
+-			{
+-			   pdf_xml_data_write(s, info.Notice.data, info.Notice.size);
+-			}
+-			pdf_xml_tag_close(s, "rdf:li");
+-		    }
+-		    pdf_xml_tag_close(s, "rdf:Alt");
+-		}
+-		pdf_xml_tag_close(s, "xmpRights:UsageTerms");
+-	    }
+-	    pdf_xml_tag_close(s, "rdf:Description");
+-	    pdf_xml_newline(s);
+-	}
+-	pdf_xml_copy(s, "</rdf:RDF>\n");
+-    }
+-    pdf_xml_copy(s, "</x:xmpmeta>\n");
+-
+-    pdf_xml_copy(s, "                                                                        \n");
+-    pdf_xml_copy(s, "                                                                        \n");
+-    pdf_xml_copy(s, "<?xpacket end='w'?>");
+-    return 0;
+-}
+-
+-int
+-pdf_font_metadata(gx_device_pdf *pdev, const pdf_base_font_t *pbfont, 
+-		  const byte *digest, int digest_length, gs_id *metadata_object_id)
+-{  
+-    /* Acrobat Distiller does not create font Metadata, and the ISO spec says 
+-     * only that files 'should' contain font Metadata. Attempts to include 
+-     * font metadata cause Acrobat to complain about XMP schemas (because 
+-     * the ISO spec uses non-existent tags).
+-     * For now we disable writing of font Metadata
+-     */
+-    return 0;
+-
+-    *metadata_object_id = gs_no_id;
+-    if (pdev->CompatibilityLevel < 1.4)
+-	return 0;
+-    /* The PDF/A specification redss about 
+-	"embedded Type 0, Type 1, or TrueType font programs",
+-	but we believe that "embedded Type 0 font programs"
+-	do not exist.
+-	We create Metadata for Type 1,2,42,9,11.
+-    */
+-    if (pdev->PDFA) {
+-	pdf_resource_t *pres;
+-	int code;
+-	int options = DATA_STREAM_NOT_BINARY;
+-
+-	if (pdev->EncryptMetadata)
+-	    options |= DATA_STREAM_ENCRYPT;
+-	code = pdf_open_aside(pdev, resourceOther, gs_no_id, &pres, true, options);
+-	if (code < 0)
+-	    return code;
+-	code = pdf_write_font_metadata(pdev, pbfont, digest, digest_length);
+-	if (code < 0)
+-	    return code;
+-	code = pdf_close_aside(pdev);
+-	if (code < 0)
+-	    return code;
+-	code = COS_WRITE_OBJECT(pres->object, pdev);
+-	if (code < 0)
+-	    return code;
+-	*metadata_object_id = pres->object->id;
+-    }
+-    return 0;
+-}
+diff --git a/base/gdevpdfg.c b/base/gdevpdfg.c
+--- a/base/gdevpdfg.c
++++ b/base/gdevpdfg.c
+@@ -187,6 +187,8 @@ pdf_viewer_state_from_imager_state(gx_device_pdf * pdev,
+     pdf_viewer_state_from_imager_state_aux(&vs, pis);
+     gx_hld_save_color(pis, pdevc, &vs.saved_fill_color);
+     gx_hld_save_color(pis, pdevc, &vs.saved_stroke_color);
++    vs.fill_used_process_color = 0;
++    vs.stroke_used_process_color = 0;
+     pdf_load_viewer_state(pdev, &vs);
+ }
+ 
+@@ -376,8 +378,8 @@ pdf_reset_color(gx_device_pdf * pdev, const gs_imager_state * pis,
+ 	        scn:
+ 		    command = ppscc->setcolorn;
+ 		    if (!gx_hld_saved_color_same_cspace(&temp, psc)) {
+-			code = pdf_color_space(pdev, &cs_value, NULL, pcs,
+-					&pdf_color_space_names, true);
++			code = pdf_color_space_named(pdev, &cs_value, NULL, pcs,
++					&pdf_color_space_names, true, NULL, 0);
+ 			/* fixme : creates redundant PDF objects. */
+ 			if (code == gs_error_rangecheck) {
+ 			    /* The color space can't write to PDF. */
+@@ -812,6 +814,7 @@ pdf_write_spot_function(gx_device_pdf *pdev, const gx_ht_order *porder,
+     uint i;
+     int code = 0;
+ 
++    params.array_size = 0;
+     params.m = 2;
+     params.Domain = domain_spot;
+     params.n = 1;
+diff --git a/base/gdevpdfg.h b/base/gdevpdfg.h
+--- a/base/gdevpdfg.h
++++ b/base/gdevpdfg.h
+@@ -87,11 +87,6 @@ int pdf_cspace_init_Device(gs_memory_t *mem, gs_color_space **ppcs, int num_comp
+  * to be scaled (to convert a CIEBased space to ICCBased), store a pointer
+  * to the ranges in *ppranges, otherwise set *ppranges to 0.
+  */
+-int pdf_color_space(gx_device_pdf *pdev, cos_value_t *pvalue,
+-		    const gs_range_t **ppranges,
+-		    const gs_color_space *pcs,
+-		    const pdf_color_space_names_t *pcsn,
+-		    bool by_name);
+ int pdf_color_space_named(gx_device_pdf *pdev, cos_value_t *pvalue,
+ 		    const gs_range_t **ppranges,
+ 		    const gs_color_space *pcs,
+@@ -346,5 +341,3 @@ int pdf_copy_color_data(gx_device_pdf * pdev, const byte * base, int sourcex,
+ 
+ /* Write metadata */
+ int pdf_document_metadata(gx_device_pdf *pdev);
+-int pdf_font_metadata(gx_device_pdf *pdev, const pdf_base_font_t *pbfont, 
+-		  const byte *digest, int digest_length, gs_id *metadata_object_id);
+diff --git a/base/gdevpdfi.c b/base/gdevpdfi.c
+--- a/base/gdevpdfi.c
++++ b/base/gdevpdfi.c
+@@ -369,8 +369,11 @@ pdf_begin_typed_image_impl(gx_device_pdf *pdev, const gs_imager_state * pis,
+ 		    )
+ 		    goto nyi;
+ 	}
+-	in_line = context == PDF_IMAGE_DEFAULT &&
+-	    can_write_image_in_line(pdev, pim1);
++        /* If image is not type 3X and we can write in-line then make it so */
++
++ 	 in_line = context == PDF_IMAGE_DEFAULT &&
++	    can_write_image_in_line(pdev, pim1); 
++
+ 	image[0].type1 = *pim1;
+ 	break;
+     }
+@@ -653,9 +656,9 @@ pdf_begin_typed_image_impl(gx_device_pdf *pdev, const gs_imager_state * pis,
+ 	     */
+ 	    cos_c_string_value(&cs_value, names->DeviceRGB);
+         } else {
+-	    code = pdf_color_space(pdev, &cs_value, &pranges,
++	    code = pdf_color_space_named(pdev, &cs_value, &pranges,
+ 				     pcs,
+-				     names, in_line);
++				     names, in_line, NULL, 0);
+ 	    if (code < 0)
+ 	        convert_to_process_colors = true;
+         }
+@@ -1326,8 +1329,11 @@ pdf_image3x_make_mcde(gx_device *dev, const gs_imager_state *pis,
+ 	if (code < 0)
+ 	    return code;
+     }
+-    return cos_dict_put_c_key_object(cos_stream_dict(pmcs), "/SMask",
+-				     pmie->writer.pres->object);
++/* Don't put SMask here because pmie->writer.pres->object may be substituted
++ * after the image stream is accummulated. pdf_end_and_do_image will set
++ * SMask with the right value. Bug 690345.
++ */ 
++    return 0;
+ }
+ 
+ pdf_resource_t *pdf_substitute_pattern(pdf_resource_t *pres)
+diff --git a/base/gdevpdfj.c b/base/gdevpdfj.c
+--- a/base/gdevpdfj.c
++++ b/base/gdevpdfj.c
+@@ -14,7 +14,6 @@
+ /* $Id$ */
+ /* Image-writing utilities for pdfwrite driver */
+ #include "memory_.h"
+-#include "string_.h"
+ #include "gx.h"
+ #include "gserrors.h"
+ #include "gdevpdfx.h"
+@@ -24,6 +23,7 @@
+ #include "gsiparm4.h"
+ #include "gdevpsds.h"
+ #include "spngpx.h"
++#include <stdlib.h> /* for atoi */
+ 
+ #define CHECK(expr)\
+   BEGIN if ((code = (expr)) < 0) return code; END
+@@ -445,9 +445,32 @@ pdf_end_image_binary(gx_device_pdf *pdev, pdf_image_writer *piw, int data_h)
+     else
+ 	code = psdf_end_binary(&piw->binary[0]);
+     /* If the image ended prematurely, update the Height. */
+-    if (data_h != piw->height)
+-	code1 = cos_dict_put_c_key_int(cos_stream_dict(piw->data),
++    if (data_h != piw->height) {
++	char data[255];
++	int OutHeight;
++	cos_value_t *value;
++	value = (cos_value_t *)cos_dict_find(cos_stream_dict(piw->data),
++				      (const byte *)piw->pin->Height, strlen(piw->pin->Height));
++	if (!value || value->contents.chars.size > 255)
++	    return(gs_error_rangecheck);
++	strncpy((char *)&data, (const char *)value->contents.chars.data, value->contents.chars.size);
++	data[value->contents.chars.size] = 0x00;
++	OutHeight = atoi(data);
++	if (OutHeight != piw->height) {
++	    /* Looks like we are downsampling, so we can't use the number
++	     * of rows of data actually received, we must divide those by
++	     * the sampling factor.
++	     */
++	    float factor = (float)OutHeight / piw->height;
++	    OutHeight = (int)(factor * data_h);
++	    code1 = cos_dict_put_c_key_int(cos_stream_dict(piw->data),
++				      piw->pin->Height, OutHeight);
++	} else {
++	
++	    code1 = cos_dict_put_c_key_int(cos_stream_dict(piw->data),
+ 				      piw->pin->Height, data_h);
++	}
++    }
+     return code < 0 ? code : code1;
+ }
+ 
+diff --git a/base/gdevpdfk.c b/base/gdevpdfk.c
+--- a/base/gdevpdfk.c
++++ b/base/gdevpdfk.c
+@@ -255,8 +255,8 @@ pdf_make_iccbased(gx_device_pdf *pdev, cos_array_t *pca, int ncomps,
+     case gs_color_space_index_DeviceCMYK:
+ 	break;			/* implicit (default) */
+     default:
+-	if ((code = pdf_color_space(pdev, &v, NULL, pcs_alt,
+-				    &pdf_color_space_names, false)) < 0 ||
++	if ((code = pdf_color_space_named(pdev, &v, NULL, pcs_alt,
++				    &pdf_color_space_names, false, NULL, 0)) < 0 ||
+ 	    (code = cos_dict_put_c_key(cos_stream_dict(pcstrm), "/Alternate",
+ 				       &v)) < 0
+ 	    )
+diff --git a/base/gdevpdfm.c b/base/gdevpdfm.c
+--- a/base/gdevpdfm.c
++++ b/base/gdevpdfm.c
+@@ -15,7 +15,6 @@
+ /* pdfmark processing for PDF-writing driver */
+ #include "math_.h"
+ #include "memory_.h"
+-#include "string_.h"
+ #include "gx.h"
+ #include "gserrors.h"
+ #include "gsutil.h"		/* for bytes_compare */
+@@ -108,7 +107,8 @@ pdfmark_page_number(gx_device_pdf * pdev, const gs_param_string * pnstr)
+ {
+     int page = pdev->next_page + 1;
+ 
+-    if (pnstr->data == 0);
++    if (pnstr->data == 0)
++	page -= 1;
+     else if (pdf_key_eq(pnstr, "/Next"))
+ 	++page;
+     else if (pdf_key_eq(pnstr, "/Prev"))
+diff --git a/base/gdevpdfo.c b/base/gdevpdfo.c
+--- a/base/gdevpdfo.c
++++ b/base/gdevpdfo.c
+@@ -14,7 +14,6 @@
+ /* $Id$ */
+ /* Cos object support */
+ #include "memory_.h"
+-#include "string_.h"
+ #include "gx.h"
+ #include "gserrors.h"
+ #include "gsparam.h"
+diff --git a/base/gdevpdfp.c b/base/gdevpdfp.c
+--- a/base/gdevpdfp.c
++++ b/base/gdevpdfp.c
+@@ -14,7 +14,6 @@
+ /* $Id$ */
+ /* Get/put parameters for PDF-writing driver */
+ #include "memory_.h"
+-#include "string_.h"
+ #include "gx.h"
+ #include "gserrors.h"
+ #include "gdevpdfx.h"
+@@ -109,6 +108,8 @@ static const gs_param_item_t pdf_param_items[] = {
+     pi("SetPageSize", gs_param_type_bool, SetPageSize),
+     pi("RotatePages", gs_param_type_bool, RotatePages),
+     pi("FitPages", gs_param_type_bool, FitPages),
++    pi("CenterPages", gs_param_type_bool, CenterPages),
++    pi("DoNumCopies", gs_param_type_bool, DoNumCopies),
+ #undef pi
+     gs_param_item_end
+ };
+@@ -194,12 +195,10 @@ gdev_pdf_get_params(gx_device * dev, gs_param_list * plist)
+     float cl = (float)pdev->CompatibilityLevel;
+     int code;
+     int cdv = CoreDistVersion;
+-    int EmbedFontObjects = 1;
+ 
+     pdev->ParamCompatibilityLevel = cl;
+     code = gdev_psdf_get_params(dev, plist);
+     if (code < 0 ||
+-	(code = param_write_int(plist, ".EmbedFontObjects", &EmbedFontObjects)) < 0 ||
+ 	(code = param_write_int(plist, "CoreDistVersion", &cdv)) < 0 ||
+ 	(code = param_write_float(plist, "CompatibilityLevel", &cl)) < 0 ||
+ 	(pdev->is_ps2write && (code = param_write_string(plist, "OPDFReadProcsetPath", &pdev->OPDFReadProcsetPath)) < 0) ||
+diff --git a/base/gdevpdfr.c b/base/gdevpdfr.c
+--- a/base/gdevpdfr.c
++++ b/base/gdevpdfr.c
+@@ -14,7 +14,6 @@
+ /* $Id$ */
+ /* Named object pdfmark processing */
+ #include "memory_.h"
+-#include "string_.h"
+ #include "gx.h"
+ #include "gserrors.h"
+ #include "gsutil.h"		/* for bytes_compare */
+diff --git a/base/gdevpdft.c b/base/gdevpdft.c
+--- a/base/gdevpdft.c
++++ b/base/gdevpdft.c
+@@ -103,8 +103,8 @@ pdf_make_group_dict(gx_device_pdf * pdev, const gs_pdf14trans_params_t * pparams
+     if (gstate != NULL) {
+ 	const gs_color_space *cs = gstate->color_space;
+ 
+-	code = pdf_color_space(pdev, &cs_value, NULL, cs,
+-		&pdf_color_space_names, false);
++	code = pdf_color_space_named(pdev, &cs_value, NULL, cs,
++		&pdf_color_space_names, false, NULL, 0);
+ 	if (code < 0)
+ 	    return code;
+ 	code = cos_dict_put_c_key(group_dict, "/CS", &cs_value);
+@@ -211,6 +211,8 @@ pdf_end_transparency_group(gs_imager_state * pis, gx_device_pdf * pdev)
+ {
+     int bottom = (pdev->ResourcesBeforeUsage ? 1 : 0);
+ 
++    if (!is_in_page(pdev)) 
++	return 0;	/* corresponds to check in pdf_begin_transparency_group */
+     if (pdev->image_with_SMask) {
+ 	/* An internal group for the image implementation. 
+ 	   See pdf_begin_transparency_group. */
+@@ -396,6 +398,7 @@ gdev_pdf_begin_transparency_mask(gx_device *dev,
+ 
+ int
+ gdev_pdf_end_transparency_mask(gx_device *dev,
++    gs_imager_state *pis,
+     gs_transparency_mask_t **pptm)
+ {
+     return 0;
+diff --git a/base/gdevpdfu.c b/base/gdevpdfu.c
+--- a/base/gdevpdfu.c
++++ b/base/gdevpdfu.c
+@@ -15,7 +15,6 @@
+ /* Output utilities for PDF-writing driver */
+ #include "memory_.h"
+ #include "jpeglib_.h"		/* for sdct.h */
+-#include "string_.h"
+ #include "gx.h"
+ #include "gserrors.h"
+ #include "gscdefs.h"
+@@ -304,7 +303,7 @@ pdf_open_document(gx_device_pdf * pdev)
+ 	    int width = (int)(pdev->width * 72.0 / pdev->HWResolution[0] + 0.5);
+ 	    int height = (int)(pdev->height * 72.0 / pdev->HWResolution[1] + 0.5);
+ 	    
+-	    stream_write(s, (byte *)"%!PS-Adobe-2.0\r", 15);
++	    stream_write(s, (byte *)"%!\r", 3);
+ 	    sprintf(BBox, "%%%%BoundingBox: 0 0 %d %d\r", width, height);
+ 	    stream_write(s, (byte *)BBox, strlen(BBox));
+ 	    if(pdev->SetPageSize)
+@@ -313,6 +312,8 @@ pdf_open_document(gx_device_pdf * pdev)
+ 		stream_puts(s, "/RotatePages true def\n");
+ 	    if(pdev->FitPages)
+ 		stream_puts(s, "/FitPages true def\n");
++	    if(pdev->CenterPages)
++		stream_puts(s, "/CenterPages true def\n");
+ 	    if (pdev->params.CompressPages || pdev->CompressEntireFile) {
+ 		/*  When CompressEntireFile is true and ASCII85EncodePages is false,
+ 		    the ASCII85Encode filter is applied, rather one may expect the opposite.
+@@ -975,7 +976,10 @@ pdf_print_resource_statistics(gx_device_pdf * pdev)
+ long
+ pdf_open_separate(gx_device_pdf * pdev, long id)
+ {
+-    pdf_open_document(pdev);
++    int code;
++    code = pdf_open_document(pdev);
++    if (code < 0)
++	return code;
+     pdev->asides.save_strm = pdev->strm;
+     pdev->strm = pdev->asides.strm;
+     return pdf_open_obj(pdev, id);
+@@ -1214,7 +1218,7 @@ pdf_write_and_free_all_resource_objects(gx_device_pdf *pdev)
+  * Sets page->{procsets, resource_ids[]}.
+  */
+ int
+-pdf_store_page_resources(gx_device_pdf *pdev, pdf_page_t *page)
++pdf_store_page_resources(gx_device_pdf *pdev, pdf_page_t *page, bool clear_usage)
+ {
+     int i;
+ 
+@@ -1243,7 +1247,8 @@ pdf_store_page_resources(gx_device_pdf *pdev, pdf_page_t *page)
+ 		    }
+ 		    pprints1(s, "/%s\n", pres->rname);
+ 		    pprintld1(s, "%ld 0 R", id);
+-		    pres->where_used -= pdev->used_mask;
++		    if (clear_usage)
++			pres->where_used -= pdev->used_mask;
+ 		}
+ 	    }
+ 	}
+@@ -1418,8 +1423,10 @@ pdf_unclip(gx_device_pdf * pdev)
+ void
+ pdf_store_default_Producer(char buf[PDF_MAX_PRODUCER])
+ {
+-    sprintf(buf, ((gs_revision % 100) == 0 ? "(%s %1.1f)" : "(%s %1.2f)"),
+-	    gs_product, gs_revision / 100.0);
++    if ((gs_revision % 100) == 0)
++	sprintf(buf, "(%s %1.1f)", gs_product, gs_revision / 100.0);
++    else
++	sprintf(buf, "(%s %1.2f)", gs_product, gs_revision / 100.0);
+ }
+ 
+ /* Write matrix values. */
+diff --git a/base/gdevpdfv.c b/base/gdevpdfv.c
+--- a/base/gdevpdfv.c
++++ b/base/gdevpdfv.c
+@@ -426,8 +426,8 @@ pdf_put_colored_pattern(gx_device_pdf *pdev, const gx_drawing_color *pdc,
+      * We don't have to worry about color space scaling: the color
+      * space is always a Device space.
+      */
+-    code = pdf_color_space(pdev, &cs_value, NULL, pcs_Device,
+-			   &pdf_color_space_names, true);
++    code = pdf_color_space_named(pdev, &cs_value, NULL, pcs_Device,
++			   &pdf_color_space_names, true, NULL, 0);
+     if (code < 0)
+ 	return code;
+     if (!have_pattern_streams) {
+@@ -494,8 +494,8 @@ pdf_put_shading_common(cos_dict_t *pscd, const gs_shading_t *psh,
+     if (code < 0 ||
+ 	(psh->params.AntiAlias &&
+ 	 (code = cos_dict_put_c_strings(pscd, "/AntiAlias", "true")) < 0) ||
+-	(code = pdf_color_space(pscd->pdev, &cs_value, ppranges, pcs,
+-				&pdf_color_space_names, false)) < 0 ||
++	(code = pdf_color_space_named(pscd->pdev, &cs_value, ppranges, pcs,
++				&pdf_color_space_names, false, NULL, 0)) < 0 ||
+ 	(code = cos_dict_put_c_key(pscd, "/ColorSpace", &cs_value)) < 0
+ 	)
+ 	return code;
+diff --git a/base/gdevpdfx.h b/base/gdevpdfx.h
+--- a/base/gdevpdfx.h
++++ b/base/gdevpdfx.h
+@@ -653,6 +653,8 @@ struct gx_device_pdf_s {
+     bool SetPageSize;
+     bool RotatePages;
+     bool FitPages;
++    bool CenterPages;
++    bool DoNumCopies;
+ };
+ 
+ #define is_in_page(pdev)\
+@@ -887,7 +889,7 @@ int pdf_write_and_free_all_resource_objects(gx_device_pdf *pdev);
+  * Store the resource sets for a content stream (page or XObject).
+  * Sets page->{procsets, resource_ids[], fonts_id}.
+  */
+-int pdf_store_page_resources(gx_device_pdf *pdev, pdf_page_t *page);
++int pdf_store_page_resources(gx_device_pdf *pdev, pdf_page_t *page, bool clear_usage);
+ 
+ /* Copy data from a temporary file to a stream. */
+ void pdf_copy_data(stream *s, FILE *file, long count, stream_arcfour_state *ss);
+diff --git a/base/gdevpdtb.c b/base/gdevpdtb.c
+--- a/base/gdevpdtb.c
++++ b/base/gdevpdtb.c
+@@ -15,7 +15,6 @@
+ /* BaseFont implementation for pdfwrite */
+ #include "memory_.h"
+ #include "ctype_.h"
+-#include "string_.h"
+ #include "gx.h"
+ #include "gserrors.h"
+ #include "gsutil.h"		/* for bytes_compare */
+@@ -27,7 +26,6 @@
+ #include "gdevpdfx.h"
+ #include "gdevpdfo.h"
+ #include "gdevpdtb.h"
+-#include "gdevpdfg.h"
+ #include "gdevpdtf.h"
+ #include "smd5.h"
+ 
+@@ -38,7 +36,7 @@
+  * TrueType are subsetted.  We do the latter, except that we always
+  * subset large TrueType fonts.
+  */
+-#define MAX_NO_SUBSET_GLYPHS 500	/* arbitrary */
++#define MAX_NO_SUBSET_GLYPHS 4096	/* arbitrary */
+ 
+ /* ---------------- Private ---------------- */
+ 
+@@ -632,17 +630,6 @@ pdf_write_embedded_font(gx_device_pdf *pdev, pdf_base_font_t *pbfont, font_type
+ 	    return code;
+ 	}
+ 	code = pdf_end_fontfile(pdev, &writer);
+-	if (pdev->PDFA && code >= 0) {
+-	    gs_id metadata_object_id;
+-
+-	    code = pdf_font_metadata(pdev, pbfont, digest, sizeof(digest), &metadata_object_id);
+-	    if (metadata_object_id && code >= 0) {
+-		char buf[20];
+-
+-		sprintf(buf, "%ld 0 R", metadata_object_id);
+-		code = cos_dict_put_string_copy(*ppcd, "/Metadata", buf);
+-	    }
+-	}
+ 	break;
+ 
+     default:
+diff --git a/base/gdevpdtc.c b/base/gdevpdtc.c
+--- a/base/gdevpdtc.c
++++ b/base/gdevpdtc.c
+@@ -14,7 +14,6 @@
+ /* $Id$ */
+ /* Composite and CID-based text processing for pdfwrite. */
+ #include "memory_.h"
+-#include "string_.h"
+ #include "gx.h"
+ #include "gserrors.h"
+ #include "gxfcmap.h"
+@@ -254,6 +253,10 @@ attach_cmap_resource(gx_device_pdf *pdev, pdf_font_resource_t *pdfont,
+     pdf_resource_t *pcmres = 0;	/* CMap */
+     int code;
+ 
++    /* Make sure cmap names is properly initialised. Silences Coverity warning */
++    if (!pcmn)
++	return_error(gs_error_unknownerror);
++
+     /*
+      * If the CMap isn't standard, write it out if necessary.
+      */
+@@ -324,6 +327,12 @@ attach_cmap_resource(gx_device_pdf *pdev, pdf_font_resource_t *pdfont,
+ 	pdfont->u.type0.CMapName.data = chars;
+ 	pdfont->u.type0.CMapName.size = size;
+     } else {
++	if (!*pcmn)
++	    /* Should not be possible, if *pcmn is NULL then either 
++	     * is_identity is true or we create pcmres.
++	     */ 
++	    return_error(gs_error_invalidfont);
++
+ 	sprintf(pdfont->u.type0.Encoding_name, "/%s", *pcmn);
+ 	pdfont->u.type0.CMapName.data = (const byte *)*pcmn;
+ 	pdfont->u.type0.CMapName.size = strlen(*pcmn);
+@@ -626,6 +635,10 @@ scan_cmap_text(pdf_text_enum_t *pte, void *vbuf)
+ 		pte->text.operation = save_op;
+ 	    }
+ 	    pte->current_font = subfont0;
++	    if (!subfont0 || !pdsubf0)
++		/* This should be impossible */
++		return_error(gs_error_invalidfont);
++
+ 	    code = gs_matrix_multiply(&subfont0->FontMatrix, &font->FontMatrix, &m3); 
+ 	    /* We thought that it should be gs_matrix_multiply(&font->FontMatrix, &subfont0->FontMatrix, &m3); */
+ 	    if (code < 0) 
+diff --git a/base/gdevpdte.c b/base/gdevpdte.c
+--- a/base/gdevpdte.c
++++ b/base/gdevpdte.c
+@@ -16,7 +16,6 @@
+ 
+ #include "math_.h"
+ #include "memory_.h"
+-#include "string_.h"
+ #include "gx.h"
+ #include "gserrors.h"
+ #include "gsutil.h"
+diff --git a/base/gdevpdtf.c b/base/gdevpdtf.c
+--- a/base/gdevpdtf.c
++++ b/base/gdevpdtf.c
+@@ -14,7 +14,6 @@
+ /* $Id$ */
+ /* Font and CMap resource implementation for pdfwrite text */
+ #include "memory_.h"
+-#include "string_.h"
+ #include "gx.h"
+ #include "gserrors.h"
+ #include "gsutil.h"		/* for bytes_compare */
+diff --git a/base/gdevpdti.c b/base/gdevpdti.c
+--- a/base/gdevpdti.c
++++ b/base/gdevpdti.c
+@@ -14,7 +14,6 @@
+ /* $Id$ */
+ /* Bitmap font implementation for pdfwrite */
+ #include "memory_.h"
+-#include "string_.h"
+ #include "gx.h"
+ #include "gxpath.h"
+ #include "gserrors.h"
+diff --git a/base/gdevpdtt.c b/base/gdevpdtt.c
+--- a/base/gdevpdtt.c
++++ b/base/gdevpdtt.c
+@@ -328,13 +328,19 @@ gdev_pdf_text_begin(gx_device * dev, gs_imager_state * pis,
+     /* Track the dominant text rotation. */
+     {
+ 	gs_matrix tmat;
++	gs_point p;
+ 	int i;
+ 
+-	gs_matrix_multiply(&font->FontMatrix, &ctm_only(pis), &tmat);
+-	if (is_xxyy(&tmat))
+-	    i = (tmat.xx >= 0 ? 0 : 2);
+-	else if (is_xyyx(&tmat))
+-	    i = (tmat.xy >= 0 ? 1 : 3);
++ 	gs_matrix_multiply(&font->FontMatrix, &ctm_only(pis), &tmat);
++	gs_distance_transform(1, 0, &tmat, &p);
++	if (p.x > fabs(p.y))
++	    i = 0;
++	else if (p.x < -fabs(p.y))
++	    i = 2;
++	else if (p.y > fabs(p.x))
++	    i = 1;
++	else if (p.y < -fabs(p.x))
++	    i = 3;
+ 	else
+ 	    i = 4;
+ 	pdf_current_page(pdev)->text_rotation.counts[i] += text->size;
+@@ -734,7 +740,7 @@ pdf_check_encoding_compatibility(const pdf_font_resource_t *pdfont,
+ }
+ 
+ /* 
+- * Check öðóåðóê the Encoding has listed glyphs.
++ * Check whether the Encoding has listed glyphs.
+  */
+ static bool
+ pdf_check_encoding_has_glyphs(const pdf_font_resource_t *pdfont, 
+@@ -945,7 +951,9 @@ pdf_obtain_cidfont_resource(gx_device_pdf *pdev, gs_font *subfont,
+ {
+     int code = 0;
+ 
+-    pdf_attached_font_resource(pdev, subfont, ppdsubf, NULL, NULL, NULL, NULL);
++    code = pdf_attached_font_resource(pdev, subfont, ppdsubf, NULL, NULL, NULL, NULL);
++    if (code < 0)
++	return code;
+     if (*ppdsubf != NULL) {
+ 	const gs_font_base *cfont = pdf_font_resource_font(*ppdsubf, false);
+ 
+@@ -1636,7 +1644,9 @@ pdf_obtain_font_resource_encoded(gx_device_pdf *pdev, gs_font *font,
+ 	    same_encoding = ((base_font->procs.same_font(base_font, font, 
+ 	                      FONT_SAME_ENCODING) & FONT_SAME_ENCODING) != 0);
+ 	/* Find or make font resource. */
+-	pdf_attached_font_resource(pdev, base_font, ppdfont, NULL, NULL, NULL, NULL);
++	code = pdf_attached_font_resource(pdev, base_font, ppdfont, NULL, NULL, NULL, NULL);
++	if (code < 0)
++	    return code;
+ 	if (*ppdfont != NULL && base_font != font) {
+ 	    if (pdfont_not_allowed == *ppdfont)
+ 		*ppdfont = NULL;	
+diff --git a/base/gdevpdtw.c b/base/gdevpdtw.c
+--- a/base/gdevpdtw.c
++++ b/base/gdevpdtw.c
+@@ -510,6 +510,12 @@ pdf_write_contents_cid2(gx_device_pdf *pdev, pdf_font_resource_t *pdfont)
+ 	}
+     }
+ 
++    if (map_id == 0 && pdev->PDFA) {
++	code = stream_puts(pdev->strm, "/CIDToGIDMap /Identity\n");
++	if (code < 0)
++	    return code;
++    }
++
+     code = write_contents_cid_common(pdev, pdfont, 2);
+     if (code < 0)
+ 	return code;
+diff --git a/base/gdevprn.c b/base/gdevprn.c
+--- a/base/gdevprn.c
++++ b/base/gdevprn.c
+@@ -973,9 +973,7 @@ gdev_prn_colors_used(gx_device *dev, int y, int height,
+     gx_device_clist_writer *cldev;
+ 
+     /* If this isn't a banded device, return default values. */
+-    if (dev_proc(dev, get_bits_rectangle) !=
+-	  gs_clist_device_procs.get_bits_rectangle
+-	) {
++    if (dev_proc(dev, open_device) != gs_clist_device_procs.open_device) {
+ 	*range_start = 0;
+ 	colors_used->or = ((gx_color_index)1 << dev->color_info.depth) - 1;
+ 	return dev->height;
+diff --git a/base/gdevprn.h b/base/gdevprn.h
+--- a/base/gdevprn.h
++++ b/base/gdevprn.h
+@@ -406,10 +406,24 @@ extern const gx_device_procs prn_std_procs;
+ 	  (float)((rm) * 72.0), (float)((tm) * 72.0)\
+ 	),\
+ 	prn_device_body_rest_(print_page)
++#define prn_device_margins_stype_body(dtype, procs, dname, stype, w10, h10, xdpi, ydpi, lo, to, lm, bm, rm, tm, ncomp, depth, mg, mc, dg, dc, print_page)\
++	std_device_full_body_type(dtype, &procs, dname, stype,\
++	  (int)((float)(w10) * (xdpi) / 10 + 0.5),\
++	  (int)((float)(h10) * (ydpi) / 10 + 0.5),\
++	  xdpi, ydpi,\
++	  ncomp, depth, mg, mc, dg, dc,\
++	  (float)(-(lo) * (xdpi)), (float)(-(to) * (ydpi)),\
++	  (float)((lm) * 72.0), (float)((bm) * 72.0),\
++	  (float)((rm) * 72.0), (float)((tm) * 72.0)\
++	),\
++	prn_device_body_rest_(print_page)
+ 
+ #define prn_device_body(dtype, procs, dname, w10, h10, xdpi, ydpi, lm, bm, rm, tm, ncomp, depth, mg, mc, dg, dc, print_page)\
+   prn_device_margins_body(dtype, procs, dname, w10, h10, xdpi, ydpi,\
+     lm, tm, lm, bm, rm, tm, ncomp, depth, mg, mc, dg, dc, print_page)
++#define prn_device_stype_body(dtype, procs, dname, stype, w10, h10, xdpi, ydpi, lm, bm, rm, tm, ncomp, depth, mg, mc, dg, dc, print_page)\
++  prn_device_margins_stype_body(dtype, procs, dname, stype, w10, h10, xdpi, ydpi,\
++    lm, tm, lm, bm, rm, tm, ncomp, depth, mg, mc, dg, dc, print_page)
+ 
+ #define prn_device_margins_body_extended(dtype, procs, dname, w10, h10, xdpi, ydpi, lo, to, lm, bm, rm, tm, mcomp, ncomp, pol, depth, gi, mg, mc, dg, dc, ef, cn, print_page)\
+ 	std_device_full_body_type_extended(dtype, &procs, dname, &st_device_printer,\
+diff --git a/base/gdevps.c b/base/gdevps.c
+--- a/base/gdevps.c
++++ b/base/gdevps.c
+@@ -15,7 +15,6 @@
+ /* PostScript-writing driver */
+ #include "math_.h"
+ #include "memory_.h"
+-#include "string_.h"
+ #include "time_.h"
+ #include "gx.h"
+ #include "gserrors.h"
+diff --git a/base/gdevpsdi.c b/base/gdevpsdi.c
+--- a/base/gdevpsdi.c
++++ b/base/gdevpsdi.c
+@@ -132,50 +132,52 @@ choose_DCT_params(gx_device *pdev, const gs_color_space *pcs,
+     set_linear_color_bits_mask_shift((gx_device *)&mdev);
+     mdev.color_info.separable_and_linear = GX_CINFO_SEP_LIN;
+ 
+-    /* Check for an RGB-like color space.  
+-       To recognize that we make a matrix as it were a linear operator,
+-       suppress an ununiformity by subtracting the image of {0,0,0},
+-       and then check for giagonal domination.  */
+-    cc.paint.values[0] = cc.paint.values[1] = cc.paint.values[2] = MIN_FLOAT;
+-    convert_color((gx_device *)&mdev, pcs, pis, &cc, c[3]);
+-    cc.paint.values[0] = MAX_FLOAT; cc.paint.values[1] = MIN_FLOAT; cc.paint.values[2] = MIN_FLOAT;
+-    convert_color((gx_device *)&mdev, pcs, pis, &cc, c[0]);
+-    cc.paint.values[0] = MIN_FLOAT; cc.paint.values[1] = MAX_FLOAT; cc.paint.values[2] = MIN_FLOAT;
+-    convert_color((gx_device *)&mdev, pcs, pis, &cc, c[1]);
+-    cc.paint.values[0] = MIN_FLOAT; cc.paint.values[1] = MIN_FLOAT; cc.paint.values[2] = MAX_FLOAT;
+-    convert_color((gx_device *)&mdev, pcs, pis, &cc, c[2]);
+-    c[0][0] -= c[3][0]; c[0][1] -= c[3][1]; c[0][2] -= c[3][2];
+-    c[1][0] -= c[3][0]; c[1][1] -= c[3][1]; c[1][2] -= c[3][2];
+-    c[2][0] -= c[3][0]; c[2][1] -= c[3][1]; c[2][2] -= c[3][2];
+-    c[0][0] = any_abs(c[0][0]); c[0][1] = any_abs(c[0][1]); c[0][2] = any_abs(c[0][2]);
+-    c[1][0] = any_abs(c[1][0]); c[1][1] = any_abs(c[1][1]); c[1][2] = any_abs(c[1][2]);
+-    c[2][0] = any_abs(c[2][0]); c[2][1] = any_abs(c[2][1]); c[2][2] = any_abs(c[2][2]);
+-    if (c[0][0] * domination > c[0][1] && c[0][0] * domination > c[0][2] &&
+-	c[1][1] * domination > c[1][0] && c[1][1] * domination > c[1][2] &&
+-	c[2][2] * domination > c[2][0] && c[2][2] * domination > c[2][1]) {
+-	/* Yes, it looks like an RGB color space. 
+-	   Replace ColorTransform with 1. */
+-	code = param_write_int((gs_param_list *)list, "ColorTransform", &one);
+-	if (code < 0)
+-	    return code;
+-	goto done;
+-    }
++    if (pis) {
++	/* Check for an RGB-like color space.  
++	   To recognize that we make a matrix as it were a linear operator,
++	   suppress an ununiformity by subtracting the image of {0,0,0},
++	   and then check for giagonal domination.  */
++	cc.paint.values[0] = cc.paint.values[1] = cc.paint.values[2] = MIN_FLOAT;
++	convert_color((gx_device *)&mdev, pcs, pis, &cc, c[3]);
++	cc.paint.values[0] = MAX_FLOAT; cc.paint.values[1] = MIN_FLOAT; cc.paint.values[2] = MIN_FLOAT;
++	convert_color((gx_device *)&mdev, pcs, pis, &cc, c[0]);
++	cc.paint.values[0] = MIN_FLOAT; cc.paint.values[1] = MAX_FLOAT; cc.paint.values[2] = MIN_FLOAT;
++	convert_color((gx_device *)&mdev, pcs, pis, &cc, c[1]);
++	cc.paint.values[0] = MIN_FLOAT; cc.paint.values[1] = MIN_FLOAT; cc.paint.values[2] = MAX_FLOAT;
++	convert_color((gx_device *)&mdev, pcs, pis, &cc, c[2]);
++	c[0][0] -= c[3][0]; c[0][1] -= c[3][1]; c[0][2] -= c[3][2];
++	c[1][0] -= c[3][0]; c[1][1] -= c[3][1]; c[1][2] -= c[3][2];
++	c[2][0] -= c[3][0]; c[2][1] -= c[3][1]; c[2][2] -= c[3][2];
++	c[0][0] = any_abs(c[0][0]); c[0][1] = any_abs(c[0][1]); c[0][2] = any_abs(c[0][2]);
++	c[1][0] = any_abs(c[1][0]); c[1][1] = any_abs(c[1][1]); c[1][2] = any_abs(c[1][2]);
++	c[2][0] = any_abs(c[2][0]); c[2][1] = any_abs(c[2][1]); c[2][2] = any_abs(c[2][2]);
++	if (c[0][0] * domination > c[0][1] && c[0][0] * domination > c[0][2] &&
++	    c[1][1] * domination > c[1][0] && c[1][1] * domination > c[1][2] &&
++	    c[2][2] * domination > c[2][0] && c[2][2] * domination > c[2][1]) {
++	    /* Yes, it looks like an RGB color space. 
++	       Replace ColorTransform with 1. */
++	    code = param_write_int((gs_param_list *)list, "ColorTransform", &one);
++	    if (code < 0)
++		return code;
++	    goto done;
++	}
+ 
+-    /* Check for a Lab-like color space.
+-       Colors {v,0,0} should map to grays. */
+-    cc.paint.values[0] = MAX_FLOAT; cc.paint.values[1] = cc.paint.values[2] = 0;
+-    convert_color((gx_device *)&mdev, pcs, pis, &cc, c[0]);
+-    cc.paint.values[0] /= 2;
+-    convert_color((gx_device *)&mdev, pcs, pis, &cc, c[1]);
+-    cc.paint.values[0] /= 2;
+-    convert_color((gx_device *)&mdev, pcs, pis, &cc, c[2]);
+-    c[0][1] -= c[0][0]; c[0][2] -= c[0][0];
+-    c[1][1] -= c[1][0]; c[1][2] -= c[1][0];
+-    c[2][1] -= c[2][0]; c[2][2] -= c[2][0];
+-    c[0][1] = any_abs(c[0][1]); c[0][2] = any_abs(c[0][2]);
+-    c[1][1] = any_abs(c[1][1]); c[1][2] = any_abs(c[1][2]);
+-    c[2][1] = any_abs(c[2][1]); c[2][2] = any_abs(c[2][2]);
+-    if (c[0][0] * domination > c[0][1] && c[0][0] * domination > c[0][2] &&
++	/* Check for a Lab-like color space.
++	   Colors {v,0,0} should map to grays. */
++	cc.paint.values[0] = MAX_FLOAT; cc.paint.values[1] = cc.paint.values[2] = 0;
++	convert_color((gx_device *)&mdev, pcs, pis, &cc, c[0]);
++	cc.paint.values[0] /= 2;
++	convert_color((gx_device *)&mdev, pcs, pis, &cc, c[1]);
++	cc.paint.values[0] /= 2;
++	convert_color((gx_device *)&mdev, pcs, pis, &cc, c[2]);
++	c[0][1] -= c[0][0]; c[0][2] -= c[0][0];
++	c[1][1] -= c[1][0]; c[1][2] -= c[1][0];
++	c[2][1] -= c[2][0]; c[2][2] -= c[2][0];
++	c[0][1] = any_abs(c[0][1]); c[0][2] = any_abs(c[0][2]);
++	c[1][1] = any_abs(c[1][1]); c[1][2] = any_abs(c[1][2]);
++	c[2][1] = any_abs(c[2][1]); c[2][2] = any_abs(c[2][2]);
++    }
++    if (pis && c[0][0] * domination > c[0][1] && c[0][0] * domination > c[0][2] &&
+ 	c[1][0] * domination > c[1][1] && c[1][0] * domination > c[1][2] &&
+ 	c[2][0] * domination > c[2][1] && c[2][0] * domination > c[2][2]) {
+ 	/* Yes, it looks like an Lab color space. 
+diff --git a/base/gdevpsdp.c b/base/gdevpsdp.c
+--- a/base/gdevpsdp.c
++++ b/base/gdevpsdp.c
+@@ -487,22 +487,22 @@ psdf_DCT_put_params(gs_param_list * plist, stream_state * st)
+ }
+ 
+ /* Put [~](Always|Never)Embed parameters. */
++/* Returns 0 = OK, 1 = no paramewter specified, <0 = error. */
+ static int
+ param_read_embed_array(gs_param_list * plist, gs_param_name pname,
+-		       gs_param_string_array * psa, int ecode)
++		       gs_param_string_array * psa)
+ {
+     int code;
+ 
+     psa->data = 0, psa->size = 0;
+     switch (code = param_read_name_array(plist, pname, psa)) {
+ 	default:
+-	    ecode = code;
+-	    param_signal_error(plist, pname, ecode);
++	    param_signal_error(plist, pname, code);
+ 	case 0:
+ 	case 1:
+ 	    break;
+     }
+-    return ecode;
++    return code;
+ }
+ static bool
+ param_string_eq(const gs_param_string *ps1, const gs_param_string *ps2)
+@@ -563,88 +563,83 @@ delete_embed(gs_param_string_array *prsa, const gs_param_string_array *pnsa,
+     }
+     prsa->size = count;
+ }
++static int merge_embed(gs_param_string_array * psa, gs_param_string_array * asa, 
++		     gs_memory_t *mem)
++{
++    gs_param_string_array rsa;
++    gs_param_string *rdata;
++    int code;
++
++    rdata = gs_alloc_struct_array(mem, psa->size + asa->size,
++				  gs_param_string,
++				  &st_param_string_element,
++				  "psdf_put_embed_param(update)");
++    if (rdata == 0)
++	return_error(gs_error_VMerror);
++    memcpy(rdata, psa->data, psa->size * sizeof(*psa->data));
++    rsa.data = rdata;
++    rsa.size = psa->size;
++    rsa.persistent = false;
++    code = add_embed(&rsa, asa, mem);
++    if (code < 0) {
++	gs_free_object(mem, rdata, "psdf_put_embed_param(update)");
++	return code;
++    }
++    gs_free_const_object(mem, psa->data, "psdf_put_embed_param(free)");
++    *psa = rsa;
++    return 0;
++}
++
+ static int
+ psdf_put_embed_param(gs_param_list * plist, gs_param_name notpname,
+-		     gs_param_name allpname, gs_param_string_array * psa,
++		     gs_param_name pname, gs_param_string_array * psa,
+ 		     gs_memory_t *mem, int ecode)
+ {
+-    gs_param_name pname = notpname + 1;
++    gs_param_name allpname = pname + 1;
+     gs_param_string_array sa, nsa, asa;
+-    bool replace;
+-    gs_param_string *rdata;
+-    gs_param_string_array rsa;
+-    int code = 0;
++    int code;
+ 
+     mem = gs_memory_stable(mem);
+-    ecode = param_read_embed_array(plist, pname, &sa, ecode);
+-    ecode = param_read_embed_array(plist, notpname, &nsa, ecode);
+-    ecode = param_read_embed_array(plist, allpname, &asa, ecode);
+-    if (ecode < 0)
+-	return ecode;
+-    /*
+-     * Figure out whether we're replacing (sa == asa or asa and no sa,
+-     * no nsa) or updating (all other cases).
+-     */
+-    if (asa.data == 0 || nsa.data != 0)
+-	replace = false;
+-    else if (sa.data == 0)
+-	replace = true;
+-    else if (sa.size != asa.size)
+-	replace = false;
+-    else {
+-	/* Test whether sa == asa. */
+-	uint i;
++    code  = param_read_embed_array(plist, pname, &sa);
++    if (code < 0)
++	return code;
++    if (code == 0) {
++	/* Optimize for sa == *psa. */
++	int i;
+ 
+-	replace = true;
+-	for (i = 0; i < sa.size; ++i)
+-	    if (!param_string_eq(&sa.data[i], &asa.data[i])) {
+-		replace = false;
+-		break;
+-	    }
+-	if (replace)
+-	    return 0;		/* no-op */
+-    }
+-    if (replace) {
+-	/* Wholesale replacement, only asa is relevant. */
+-	rdata = gs_alloc_struct_array(mem, asa.size, gs_param_string,
+-				      &st_param_string_element,
+-				      "psdf_put_embed_param(replace)");
+-	if (rdata == 0)
+-	    return_error(gs_error_VMerror);
+-	rsa.data = rdata;
+-	rsa.size = 0;
+-	if ((code = add_embed(&rsa, &asa, mem)) < 0) {
+-	    gs_free_object(mem, rdata, "psdf_put_embed_param(replace)");
+-	    ecode = code;
++	if (sa.size == psa->size) {
++	    for (i = 0; i < sa.size; ++i) {
++		if (!param_string_eq(&sa.data[i], &psa->data[i]))
++		    break;
++     }
+ 	} else
+-	    delete_embed(psa, psa, mem);
+-    } else if (sa.data || nsa.data) {
+-	/* Incremental update, sa and nsa are relevant, asa is not. */
+-	rdata = gs_alloc_struct_array(mem, psa->size + sa.size,
+-				      gs_param_string,
+-				      &st_param_string_element,
+-				      "psdf_put_embed_param(update)");
+-	if (rdata == 0)
+-	    return_error(gs_error_VMerror);
+-	memcpy(rdata, psa->data, psa->size * sizeof(*psa->data));
+-	rsa.data = rdata;
+-	rsa.size = psa->size;
+-	if ((code = add_embed(&rsa, &sa, mem)) < 0) {
+-	    gs_free_object(mem, rdata, "psdf_put_embed_param(update)");
+-	    ecode = code;
++	    i = -1;
++	if (i == sa.size) {
++	    /* equal, no-op. */
+ 	} else {
+-	    delete_embed(&rsa, &nsa, mem);
+-	    rsa.data = gs_resize_object(mem, rdata, rsa.size,
++	    delete_embed(psa, psa, mem);
++	    code = merge_embed(psa, &sa, mem);
++	    if (code < 0)
++		return code;
++	}
++    }
++    code = param_read_embed_array(plist, notpname, &nsa);
++    if (code < 0)
++	return code;
++    if (nsa.data != 0)
++	delete_embed(psa, &nsa, mem);
++    code = param_read_embed_array(plist, allpname, &asa);
++    if (code < 0)
++	return code;
++    if (asa.data != 0) {
++	code = merge_embed(psa, &asa, mem);
++	if (code < 0)
++	    return code;
++    }
++    if (psa->data)
++	psa->data = gs_resize_object(mem, (gs_param_string *)psa->data, psa->size,
+ 					"psdf_put_embed_param(resize)");
+-	}
+-    } else
+-	return 0;		/* no-op */
+-    if (code >= 0) {
+-	gs_free_const_object(mem, psa->data, "psdf_put_embed_param(free)");
+-	rsa.persistent = false;
+-	*psa = rsa;
+-    }
+-    return ecode;
++    return 0;
+ }
+ 
+ /* Put an image Dict parameter. */
+diff --git a/base/gdevpsf2.c b/base/gdevpsf2.c
+--- a/base/gdevpsf2.c
++++ b/base/gdevpsf2.c
+@@ -28,7 +28,6 @@
+ #include "gxfont1.h"
+ #include "gxfcid.h"
+ #include "stream.h"
+-#include "sfilter.h"
+ #include "gdevpsf.h"
+ 
+ /* Define additional opcodes used in Dicts, but not in CharStrings. */
+@@ -1534,15 +1533,15 @@ psf_write_cid0_font(stream *s, gs_font_cid0 *pfont, int options,
+      */
+     uint
+ 	Top_size = 0x7fffff,
+-	GSubrs_offset = 0x7fffff,
+-	charset_offset = 0x7fffff,
+-	FDSelect_offset = 0x7fffff,
+-	CharStrings_offset = 0x7fffff,
+-	Font_offset = 0x7fffff,
++	GSubrs_offset = 0x1ffffff,
++	charset_offset = 0x1ffffff,
++	FDSelect_offset = 0x1ffffff,
++	CharStrings_offset = 0x1ffffff,
++	Font_offset = 0x1ffffff,
+ 	FDArray_offsets[257],
+ 	Private_offsets[257],
+ 	Subrs_offsets[257],
+-	End_offset = 0x7fffff;
++	End_offset = 0x1ffffff;
+     int j;
+     psf_glyph_enum_t genum;
+     gs_font_info_t info;
+@@ -1639,8 +1638,11 @@ psf_write_cid0_font(stream *s, gs_font_cid0 *pfont, int options,
+     fdselect_size = cff_FDSelect_size(&writer, &genum, &fdselect_format);
+ 
+     /* Compute the size of the CharStrings Index. */
+-    charstrings_size =
+-	cff_write_CharStrings_offsets(&writer, &genum, &charstrings_count);
++    /* Compute the size of the CharStrings Index. */
++    code = cff_write_CharStrings_offsets(&writer, &genum, &charstrings_count);
++    if (code < 0)
++	return code;
++    charstrings_size = (uint)code;
+ 
+     /* Compute the size of the (local) Subrs Indexes. */
+     for (j = 0; j < num_fonts; ++j) {
+diff --git a/base/gdevpsfm.c b/base/gdevpsfm.c
+--- a/base/gdevpsfm.c
++++ b/base/gdevpsfm.c
+@@ -20,7 +20,6 @@
+ #include "spprint.h"
+ #include "spsdf.h"
+ #include "gdevpsf.h"
+-#include "memory_.h"
+ 
+ /* ---------------- Utilities ---------------- */
+ 
+diff --git a/base/gdevpsft.c b/base/gdevpsft.c
+--- a/base/gdevpsft.c
++++ b/base/gdevpsft.c
+@@ -711,6 +711,30 @@ write_post(stream *s, gs_font *font, post_t *post)
+     return 0;
+ }
+ 
++static inline bool check_position(int pos1, int pos2)
++{ 
++    if (pos1 == pos2)
++	return false;
++    eprintf2("Actual TT subtable offset %d differs from one in the TT header %d.\n", pos1, pos2);
++    return true;
++}
++
++void remove_table(byte *tables, char *tag, uint *numTables)
++{
++    /* Not a high performance implementation because it is called seldom. */
++    int i;
++
++    for (i = 0; i < *numTables;) {
++	byte *tab = tables + i * 16;
++
++	if (!memcmp(tab, tag, 4)) {
++	    memmove(tab, tab + 16, 16 * (*numTables - i - 1));
++	    --*numTables;
++	} else
++	    ++i;
++    }
++}
++
+ /* ---------------- Main program ---------------- */
+ 
+ /* Write the definition of a TrueType font. */
+@@ -758,8 +782,15 @@ psf_write_truetype_data(stream *s, gs_font_type42 *pfont, int options,
+     uint cmap_length = 0;
+     ulong OS_2_start = 0;
+     uint OS_2_length = OS_2_LENGTH1;
++    ulong maxp_start = 0;
++    uint maxp_length = 0;
++    struct { int glyf, loca, cmap, name, os_2, mtx[2], post, head; 
++           } subtable_positions;
++    int start_position = stell(s);
++    int enlarged_numGlyphs = 0;
+     int code;
+ 
++    memset(&subtable_positions, 0, sizeof(subtable_positions));
+     have_hvhea[0] = have_hvhea[1] = 0;
+     if (alt_font_name)
+ 	font_name = *alt_font_name;
+@@ -814,6 +845,8 @@ psf_write_truetype_data(stream *s, gs_font_type42 *pfont, int options,
+ 	case W('m','a','x','p'):
+ 	    READ_SFNTS(pfont, start, length, data);
+ 	    numGlyphs = U16(data + 4);
++	    maxp_start = start;
++	    maxp_length = length;
+ 	    break;
+ 	case W('n','a','m','e'):
+ 	    if (writing_cid)
+@@ -849,6 +882,10 @@ psf_write_truetype_data(stream *s, gs_font_type42 *pfont, int options,
+ 	case W('k','e','r','n'):
+ 	case W('p','r','e','p'):
+ 	    break;		/* always copy these if present */
++	case W('E','B','D','T'):
++	case W('E','B','L','C'):
++	case W('E','B','S','C'):
++	    continue;
+ 	default:
+ 	    if (writing_cid)
+ 		continue;
+@@ -888,19 +925,30 @@ psf_write_truetype_data(stream *s, gs_font_type42 *pfont, int options,
+ 	    gs_glyph_data_free(&glyph_data, "psf_write_truetype_data");
+ 	}
+     }
+-    /*
+-     * For subset fonts, we should trim the loca table so that it only
+-     * contains entries through max_glyph.  Unfortunately, this would
+-     * require changing numGlyphs in maxp, which in turn would affect hdmx,
+-     * hhea, hmtx, vdmx, vhea, vmtx, and possibly other tables.  This is way
+-     * more work than we want to do right now.
+-     */
+     if (writing_stripped) {
+ 	glyf_length = 0;
+ 	loca_length = 0;
+     } else {
+-	/*loca_length = (max_glyph + 2) << 2;*/
+-	loca_length = (numGlyphs + 1) << 2;
++	if (max_glyph + 1 > numGlyphs) {
++	    /* Either original font is wrong,
++	       or we added glyphs to it due to font merge. 
++	       Need to adjust maxp, hmtx, vmtx, vdmx, hdmx,
++	       assuming that the merge doesn't change hhea
++	       and other tables.
++	       Since changing hdmx, vdmx is too difficult,
++	       and since they're not required for PDF,
++	       we'll simply skip them.
++	     */
++	    enlarged_numGlyphs = max_glyph + 1;
++	    if (enlarged_numGlyphs > 0xFFFF) {
++		eprintf1("The number of glyphs %d exceeds capability of True Type format.\n", enlarged_numGlyphs);
++		return_error(gs_error_unregistered);
++	    }
++	    loca_length = (enlarged_numGlyphs + 1) << 2;
++	    remove_table(tables, "hdmx", &numTables);
++	    remove_table(tables, "vdmx", &numTables);
++	} else
++	    loca_length = (numGlyphs + 1) << 2;
+ 	indexToLocFormat = (glyf_length > 0x1fffc);
+ 	if (!indexToLocFormat)
+ 	    loca_length >>= 1;
+@@ -962,10 +1010,11 @@ psf_write_truetype_data(stream *s, gs_font_type42 *pfont, int options,
+ 	byte *tab = &tables[numTables * 16];
+ 
+ 	if (!writing_stripped) {
++	    subtable_positions.glyf = offset;
+ 	    offset = put_table(tab, "glyf", glyf_checksum,
+ 			       offset, glyf_length);
+ 	    tab += 16;
+-
++	    subtable_positions.loca = offset;
+ 	    offset = put_table(tab, "loca", loca_checksum[indexToLocFormat],
+ 			       offset, loca_length);
+ 	    tab += 16;
+@@ -974,18 +1023,21 @@ psf_write_truetype_data(stream *s, gs_font_type42 *pfont, int options,
+ 	if (!have_cmap) {
+ 	    cmap_length = size_cmap(font, TT_BIAS, 256,
+ 				    GS_MIN_GLYPH_INDEX + max_glyph, options);
++	    subtable_positions.cmap = offset;
+ 	    offset = put_table(tab, "cmap", 0L /****** NO CHECKSUM ******/,
+ 			       offset, cmap_length);
+ 	    tab += 16;
+ 	}
+ 
+ 	if (!have_name) {
++	    subtable_positions.name = offset;
+ 	    offset = put_table(tab, "name", 0L /****** NO CHECKSUM ******/,
+ 			       offset, size_name(&font_name));
+ 	    tab += 16;
+ 	}
+ 
+ 	if (!no_generate) {
++	    subtable_positions.os_2 = offset;
+ 	    offset = put_table(tab, "OS/2", 0L /****** NO CHECKSUM ******/,
+ 			       offset, OS_2_length);
+ 	    tab += 16;
+@@ -994,6 +1046,7 @@ psf_write_truetype_data(stream *s, gs_font_type42 *pfont, int options,
+ 	if (generate_mtx)
+ 	    for (i = 0; i < 2; ++i)
+ 		if (have_hvhea[i]) {
++		    subtable_positions.mtx[i] = offset;
+ 		    offset = put_table(tab, (i ? "vmtx" : "hmtx"),
+ 				       0L /****** NO CHECKSUM ******/,
+ 				       offset,
+@@ -1002,6 +1055,7 @@ psf_write_truetype_data(stream *s, gs_font_type42 *pfont, int options,
+ 		}
+ 
+ 	if (!have_post) {
++	    subtable_positions.post = offset;
+ 	    offset = put_table(tab, "post", 0L /****** NO CHECKSUM ******/,
+ 			       offset, post.length);
+ 	    tab += 16;
+@@ -1011,6 +1065,7 @@ psf_write_truetype_data(stream *s, gs_font_type42 *pfont, int options,
+ 	 * Note that the 'head' table must have length 54, even though
+ 	 * it occupies 56 bytes on the file.
+ 	 */
++	subtable_positions.head = offset;
+ 	offset = put_table(tab, "head", head_checksum, offset, 54);
+ 	tab += 16;
+     }
+@@ -1082,6 +1137,19 @@ psf_write_truetype_data(stream *s, gs_font_type42 *pfont, int options,
+ 		    put_pad(s, OS_2_length);
+ 		}
+ 	    break;
++	    case W('m','a','x','p'):
++		if (enlarged_numGlyphs) {
++		    /* Must keep the table size. */
++		    byte buf[6];
++
++		    READ_SFNTS(pfont, maxp_start, sizeof(buf), buf);
++		    put_u16(buf + 4, enlarged_numGlyphs);
++		    stream_write(s, buf, min(length, sizeof(buf)));
++		    if (length > sizeof(buf)) /* Paranoid Safety */
++			write_range(s, pfont, start + sizeof(buf), length - sizeof(buf));
++		} else
++		    write_range(s, pfont, start, length);
++		break;
+ 	    case W('h','h','e','a'):
+ 	    case W('v','h','e','a'):
+ 		if (generate_mtx) {
+@@ -1098,9 +1166,12 @@ psf_write_truetype_data(stream *s, gs_font_type42 *pfont, int options,
+     }
+ 
+     if (!writing_stripped) {
++	int n = max(numGlyphs, enlarged_numGlyphs) + 1;
+ 
+ 	/* Write glyf. */
+ 
++	if (check_position(subtable_positions.glyf + start_position, stell(s)))
++	    return_error(gs_error_unregistered);
+ 	psf_enumerate_glyphs_reset(penum);
+ 	for (offset = 0; psf_enumerate_glyphs_next(penum, &glyph) != 1; ) {
+ 	    gs_glyph_data_t glyph_data;
+@@ -1131,6 +1202,8 @@ psf_write_truetype_data(stream *s, gs_font_type42 *pfont, int options,
+ 
+ 	/* Write loca. */
+ 
++	if (check_position(subtable_positions.loca + start_position, stell(s)))
++	    return_error(gs_error_unregistered);
+ 	psf_enumerate_glyphs_reset(penum);
+ 	glyph_prev = 0;
+ 	for (offset = 0; psf_enumerate_glyphs_next(penum, &glyph) != 1; ) {
+@@ -1153,25 +1226,36 @@ psf_write_truetype_data(stream *s, gs_font_type42 *pfont, int options,
+ 
+ 	}
+ 	/* Pad to numGlyphs + 1 entries (including the trailing entry). */
+-	for (; glyph_prev <= numGlyphs; ++glyph_prev)
++	for (; glyph_prev < n; ++glyph_prev)
+ 	    put_loca(s, offset, indexToLocFormat);
+ 	put_pad(s, loca_length);
+ 
+ 	/* If necessary, write cmap, name, and OS/2. */
+ 
+-	if (!have_cmap)
++	if (!have_cmap) {
++	    if (check_position(subtable_positions.cmap + start_position, stell(s)))
++		return_error(gs_error_unregistered);
+ 	    write_cmap(s, font, TT_BIAS, 256, GS_MIN_GLYPH_INDEX + max_glyph,
+ 		       options, cmap_length);
+-	if (!have_name)
++	}
++	if (!have_name) {
++	    if (check_position(subtable_positions.name + start_position, stell(s)))
++		return_error(gs_error_unregistered);
+ 	    write_name(s, &font_name);
+-	if (!have_OS_2)
++	}
++	if (!have_OS_2) {
++	    if (check_position(subtable_positions.os_2 + start_position, stell(s)))
++		return_error(gs_error_unregistered);
+ 	    write_OS_2(s, font, TT_BIAS, 256);
++	}
+ 
+ 	/* If necessary, write [hv]mtx. */
+ 
+ 	if (generate_mtx)
+ 	    for (i = 0; i < 2; ++i)
+ 		if (have_hvhea[i]) {
++		    if (check_position(subtable_positions.mtx[i] + start_position, stell(s)))
++			return_error(gs_error_unregistered);
+ 		    write_mtx(s, pfont, &mtx[i], i);
+ 		    put_pad(s, mtx[i].length);
+ 		}
+@@ -1179,6 +1263,8 @@ psf_write_truetype_data(stream *s, gs_font_type42 *pfont, int options,
+ 	/* If necessary, write post. */
+ 
+ 	if (!have_post) {
++	    if (check_position(subtable_positions.post + start_position, stell(s)))
++		return_error(gs_error_unregistered);
+ 	    if (options & WRITE_TRUETYPE_POST) {
+ 		code = write_post(s, font, &post);
+ 		if (code < 0)
+@@ -1207,6 +1293,8 @@ psf_write_truetype_data(stream *s, gs_font_type42 *pfont, int options,
+ #endif
+     put_u32(head + 8, HEAD_MAGIC - file_checksum); /* per spec */
+ #undef HEAD_MAGIC
++    if (check_position(subtable_positions.head + start_position, stell(s)))
++	return_error(gs_error_unregistered);
+     stream_write(s, head, 56);
+ 
+     return 0;
+diff --git a/base/gdevpsfx.c b/base/gdevpsfx.c
+--- a/base/gdevpsfx.c
++++ b/base/gdevpsfx.c
+@@ -464,8 +464,8 @@ psf_convert_type1_to_type2(stream *s, const gs_glyph_data_t *pgd,
+   END
+     fixed mx0 = 0, my0 = 0; /* See ce1_setcurrentpoint. */
+ 
+-    /* Quiet a Coverity uninitialsed variable warning */
+-    cis.lsb.y = 0;
++    /* In case we do not get an sbw or hsbw op */
++    cis.lsb.x = cis.lsb.y = cis.width.x = cis.width.y = fixed_0;
+ 
+     /*
+      * Do a first pass to collect hints.  Note that we must also process
+@@ -508,6 +508,8 @@ psf_convert_type1_to_type2(stream *s, const gs_glyph_data_t *pgd,
+ 	case ce1_callothersubr:
+ 	    if (*csp == int2fixed(3))
+ 		replace_hints = true;
++	    if (*csp == int2fixed(12) || *csp == int2fixed(13))
++		cis.os_count -= fixed2int(csp[-1]);
+ 	    cis.os_count -= 2;
+ 	    continue;
+ 	case CE_OFFSET + ce1_dotsection:
+diff --git a/base/gdevpsu.c b/base/gdevpsu.c
+--- a/base/gdevpsu.c
++++ b/base/gdevpsu.c
+@@ -288,7 +288,7 @@ psw_write_page_header(stream *s, const gx_device *dev,
+     if (!pdpc->ProduceEPS)
+ 	pprintld2(s, "%%%%PageBoundingBox: 0 0 %ld %ld\n", width, height);
+ 
+-    stream_puts(s, "%%%%BeginPageSetup\n");
++    stream_puts(s, "%%BeginPageSetup\n");
+     /*
+      * Adobe's documentation says that page setup must be placed outside the
+      * save/restore that encapsulates the page contents, and that the
+@@ -307,7 +307,7 @@ psw_write_page_header(stream *s, const gx_device *dev,
+ 	} page_size;
+ 	static const page_size sizes[] = {
+ 	    {"/11x17", 792, 1224},
+-	    {"/a3", 842, 1190},
++	    {"/a3", 842, 1191},
+ 	    {"/a4", 595, 842},
+ 	    {"/b5", 501, 709},
+ 	    {"/ledger", 1224, 792},
+@@ -317,9 +317,16 @@ psw_write_page_header(stream *s, const gx_device *dev,
+ 	};
+ 	const page_size *p = sizes;
+ 
+-	while (p->size_name[0] == '/' &&
+-	       (p->width != width || p->height != height))
+-	    ++p;
++	while (p->size_name[0] == '/') {
++	    if((p->width - 5) <= width && (p->width + 5) >= width) {
++		if((p->height - 5) <= height && (p->height + 5) >= height) {
++		    break;
++		} else 
++		    ++p;
++	    }
++	    else
++		++p;
++	}
+ 	pprintd2(s, "%d %d ", width, height);
+ 	pprints1(s, "%s setpagesize\n", p->size_name);
+     }
+diff --git a/base/gdevpxen.h b/base/gdevpxen.h
+--- a/base/gdevpxen.h
++++ b/base/gdevpxen.h
+@@ -198,6 +198,7 @@ typedef enum {
+  * The arguments are:
+  *      media size code, resolution for width/height, width, height.
+  */
++
+ #define px_enumerate_media(m)\
+   m(eDefaultPaperSize, -1, -1, -1)\
+   m(eLetterPaper, 300, 2550, 3300)\
+@@ -210,18 +211,18 @@ typedef enum {
+   m(eMonarchEnvelope, 300, 1162, 2250)\
+   m(eC5Envelope, 300, 1913, 2704)\
+   m(eDLEnvelope, 300, 1299, 2598)\
+-  m(eJB4Paper, -1, -1, -1)\
++  m(eJB4Paper, 300, 3035, 4299)\
+   m(eJB5Paper, 300, 2150, 3035)\
+   m(eB5Envelope, 300, 2078, 2952)\
+   m(eB5Paper, 300, 2150, 3035)\
+-  m(eJPostcard,  300, 1181, 1748)\
+-  m(eJDoublePostcard, -1, -1, -1)\
++  m(eJPostcard, 300, 1181, 1748)\
++  m(eJDoublePostcard, 300, 2362, 1748)\
+   m(eA5Paper,300,1748, 2480)\
+-  m(eA6Paper,-1, -1, -1)\
+-  m(eJB6Paper,-1, -1, -1)\
+-  m(eJIS8K, -1, -1, -1)\
+-  m(eJIS16K, -1, -1, -1)\
+-  m(eJISExec, -1, -1, -1)
++  m(eA6Paper,300, 1240, 1748)\
++  m(eJB6Paper,300, 1512, 2150)\
++  m(eJIS8K, 300, 3154, 4606)\
++  m(eJIS16K, 300, 2303, 3154)\
++  m(eJISExec, 300, 2551, 3898)
+ 
+ typedef enum {
+     eDefaultSource = 0,
+diff --git a/base/gdevsgi.c b/base/gdevsgi.c
+--- a/base/gdevsgi.c
++++ b/base/gdevsgi.c
+@@ -65,18 +65,77 @@ typedef struct sgi_cursor_s {
+   int lnum;
+ } sgi_cursor;
+ 
++/* write a short int to disk as big-endean */
++static int putshort(unsigned int val, FILE *outf)
++{
++	unsigned char buf[2];
++
++	buf[0] = (val>>8);
++	buf[1] = val;
++	return fwrite(buf,2,1,outf);
++}
++
++/* write an int to disk as big-endean */
++static int putint(unsigned int val, FILE *outf)
++{
++	unsigned char buf[4];
++
++	buf[0] = (val>>24);
++	buf[1] = (val>>16);
++	buf[2] = (val>>8);
++	buf[3] = val;
++	return fwrite(buf,4,1,outf);
++}
++
++/* write the header field by field in big-endian */
++static void putheader(IMAGE *header, FILE *outf)
++{
++	int i;
++	char filler= '\0';
++
++	putshort(header->imagic, outf);
++	fputc(1, outf); /* RLE */
++	fputc(1, outf); /* bpp */
++	putshort(header->dim, outf);
++	putshort(header->xsize, outf);
++	putshort(header->ysize, outf);
++	putshort(header->zsize, outf);
++
++	putint(header->min_color, outf);
++	putint(header->max_color, outf);
++	putint(header->wastebytes, outf);
++
++	fwrite(header->name,80,1,outf);
++
++	putint(header->colormap, outf);
++
++   /* put the filler for the rest */
++    for (i=0; i<404; i++)
++        fputc(filler,outf);
++ }
++
+ static int
+ sgi_begin_page(gx_device_printer *bdev, FILE *pstream, sgi_cursor *pcur)
+ {
+-     uint line_size = gdev_mem_bytes_per_scan_line((gx_device_printer*)bdev);
+-     byte *data = (byte*)gs_malloc(bdev->memory, line_size, 1, "sgi_begin_page");
+-     IMAGE *header= (IMAGE*)gs_malloc(bdev->memory, sizeof(IMAGE),1,"sgi_begin_page");
+-     char filler= '\0';
+-     int i;
++     uint line_size;
++     byte *data;
++     IMAGE *header;
+ 
+-     if ((data == (byte*)0)||(header == (IMAGE*)0)) return -1;
++     if (bdev->PageCount >= 1 && !bdev->file_is_new) { /* support single page only */
++          eprintf("sgi rgb format only supports one page per file.\n"
++                  "Please use the '%%d' OutputFile option to create one file for each page.\n");
++	  return_error(gs_error_rangecheck);
++     }
++     line_size = gdev_mem_bytes_per_scan_line((gx_device_printer*)bdev);
++     data = (byte*)gs_malloc(bdev->memory, line_size, 1, "sgi_begin_page");
++     header= (IMAGE*)gs_malloc(bdev->memory, sizeof(IMAGE),1,"sgi_begin_page");
+ 
+-     bzero(header,sizeof(IMAGE));
++     if ((data == (byte*)0)||(header == (IMAGE*)0)) {
++        gs_free(bdev->memory, data, line_size, 1, "sgi_begin_page");
++        gs_free(bdev->memory, header, sizeof(IMAGE),1,"sgi_begin_page");
++	return_error(gs_error_VMerror);
++     }
++     memset(header,0, sizeof(IMAGE));
+      header->imagic = IMAGIC;
+      header->type = RLE(1);
+      header->dim = 3;
+@@ -89,8 +148,7 @@ sgi_begin_page(gx_device_printer *bdev, FILE *pstream, sgi_cursor *pcur)
+      strncpy(header->name,"gs picture",80);
+      header->colormap = CM_NORMAL;
+      header->dorev=0;
+-     fwrite(header,sizeof(IMAGE),1,pstream);
+-     for (i=0; i<512-sizeof(IMAGE); i++) fputc(filler,pstream);
++     putheader(header,pstream);
+      pcur->dev = bdev;
+      pcur->bpp = bdev->color_info.depth;
+      pcur->line_size = line_size;
+@@ -115,16 +173,24 @@ sgi_print_page(gx_device_printer *pdev, FILE *pstream)
+        int code = sgi_begin_page(bdev, pstream, &cur);
+        uint bpe, mask;
+        int separation;
+-       long *rowsizes=(long*)gs_malloc(pdev->memory, 4,3*bdev->height,"sgi_print_page");
++       int *rowsizes;
+        byte *edata ;
+        long lastval;
+        int rownumber;
+-#define aref2(a,b) a*bdev->height+b
++
++       if (pdev->PageCount >= 1 && !pdev->file_is_new)
++	  return_error(gs_error_rangecheck);  /* support single page only, can't happen */
++
++#define aref2(a,b) (a)*bdev->height+(b)
++	   rowsizes=(int*)gs_malloc(pdev->memory, sizeof(int),3*bdev->height,"sgi_print_page");
+        edata =  (byte*)gs_malloc(pdev->memory, cur.line_size, 1, "sgi_begin_page");
+-       if((code<0)||(rowsizes==(long*)NULL)||(edata==(byte*)NULL)) return(-1);
+-       fwrite(rowsizes,sizeof(long),3*bdev->height,pstream); /* rowstarts */
+-       fwrite(rowsizes,sizeof(long),3*bdev->height,pstream); /* rowsizes */
+-       lastval = 512+sizeof(long)*6*bdev->height;
++
++       if((code<0)||(rowsizes==(int*)NULL)||(edata==(byte*)NULL)) {
++           code = gs_note_error(gs_error_VMerror);
++           goto free_mem;
++       }
++
++       lastval = 512+4*6*bdev->height; /* skip offset table */
+        fseek(pstream,lastval,0);
+        for (separation=0; separation < 3; separation++)
+ 	 {
+@@ -144,11 +210,11 @@ sgi_print_page(gx_device_printer *pdev, FILE *pstream)
+ 	       for (bp = cur.data, x=0, shift = 8 - cur.bpp;
+ 		    x < bdev->width;
+ 		    )
+-		 { ulong pixel = 0;
++		 { uint pixel = 0;
+ 		   uint r, g, b;
+ 		   switch (cur.bpp >> 3)
+ 		     {
+-		     case 3: pixel = (ulong)*bp << 16; bp++;
++		     case 3: pixel = (uint)*bp << 16; bp++;
+ 		     case 2: pixel += (uint)*bp << 8; bp++;
+ 		     case 1: pixel += *bp; bp++; break;
+ 		     case 0: pixel = *bp >> shift;
+@@ -197,24 +263,22 @@ sgi_print_page(gx_device_printer *pdev, FILE *pstream)
+ 	       }
+                *optr++ = 0;
+ 	       rowsizes[aref2(separation,rownumber++)] = optr-startcol;
+-	       fwrite(startcol,1,optr-startcol,pstream);
++	       if (fwrite(startcol,1,optr-startcol,pstream) != optr-startcol) {
++                   code = gs_note_error(gs_error_ioerror);
++                   goto free_mem;
++               }
+ 	     }
+ 	 }
+        fseek(pstream,512L,0);
+        for(separation=0; separation<3; separation++)
+ 	 for(rownumber=0; rownumber<bdev->height; rownumber++)
+-	   {fputc((char)(lastval>>24),pstream);
+-	    fputc((char)(lastval>>16),pstream);
+-	    fputc((char)(lastval>>8),pstream);
+-	    fputc((char)(lastval),pstream);
++	   {putint(lastval,pstream);
+ 	    lastval+=rowsizes[aref2(separation,rownumber)];}
+        for(separation=0; separation<3; separation++)
+ 	 for(rownumber=0; rownumber<bdev->height; rownumber++)
+ 	   {lastval=rowsizes[aref2(separation,rownumber)];
+-	    fputc((char)(lastval>>24),pstream);
+-	    fputc((char)(lastval>>16),pstream);
+-	    fputc((char)(lastval>>8),pstream);
+-	    fputc((char)(lastval),pstream);}
++	    putint(lastval,pstream);}
++     free_mem:
+        gs_free(pdev->memory, (char*)cur.data, cur.line_size, 1,
+ 		 "sgi_print_page(done)");
+        gs_free(pdev->memory, (char*)edata, cur.line_size, 1, "sgi_print_page(done)");
+diff --git a/base/gdevsgi.h b/base/gdevsgi.h
+--- a/base/gdevsgi.h
++++ b/base/gdevsgi.h
+@@ -46,11 +46,11 @@ typedef struct {
+     unsigned short 	xsize;
+     unsigned short 	ysize;
+     unsigned short 	zsize;
+-    unsigned long 	min_color;
+-    unsigned long 	max_color;
+-    unsigned long	wastebytes;	
++    unsigned int 	min_color;
++    unsigned int 	max_color;
++    unsigned int	wastebytes;
+     char 		name[80];
+-    unsigned long	colormap;
++    unsigned int	colormap;
+ 
+     long 		file;		/* stuff used in core only */
+     unsigned short 	flags;
+diff --git a/base/gdevtfax.c b/base/gdevtfax.c
+--- a/base/gdevtfax.c
++++ b/base/gdevtfax.c
+@@ -38,6 +38,7 @@ struct gx_device_tfax_s {
+     long MaxStripSize;		/* 0 = no limit, other is UNCOMPRESSED limit */
+                                 /* The type and range of FillOrder follows TIFF 6 spec  */
+     int  FillOrder;             /* 1 = lowest column in the high-order bit, 2 = reverse */
++    bool  BigEndian;            /* true = big endian; false = little endian*/
+     gdev_tiff_state tiff;	/* for TIFF output only */
+ };
+ typedef struct gx_device_tfax_s gx_device_tfax;
+@@ -51,7 +52,8 @@ static const gx_device_procs gdev_tfax_std_procs =
+ {\
+     FAX_DEVICE_BODY(gx_device_tfax, gdev_tfax_std_procs, dname, print_page),\
+     0				/* unlimited strip size byte count */,\
+-    1                           /* lowest column in the high-order bit */\
++    1                           /* lowest column in the high-order bit */,\
++    arch_is_big_endian          /* default to native endian (i.e. use big endian iff the platform is so*/\
+ }
+ 
+ const gx_device_tfax gs_tiffcrle_device =
+@@ -78,6 +80,8 @@ tfax_get_params(gx_device * dev, gs_param_list * plist)
+         ecode = code;
+     if ((code = param_write_int(plist, "FillOrder", &tfdev->FillOrder)) < 0)
+         ecode = code;
++    if ((code = param_write_bool(plist, "BigEndian", &tfdev->BigEndian)) < 0)
++        ecode = code;
+     return ecode;
+ }
+ static int
+@@ -89,6 +93,7 @@ tfax_put_params(gx_device * dev, gs_param_list * plist)
+     long mss = tfdev->MaxStripSize;
+     int fill_order = tfdev->FillOrder;
+     const char *param_name;
++    bool big_endian = tfdev->BigEndian;
+ 
+     switch (code = param_read_long(plist, (param_name = "MaxStripSize"), &mss)) {
+         case 0:
+@@ -119,6 +124,16 @@ tfax_put_params(gx_device * dev, gs_param_list * plist)
+ 	case 1:
+ 	    break;
+     }
++    
++    /* Read BigEndian option as bool */ 
++    switch (code = param_read_bool(plist, (param_name = "BigEndian"), &big_endian)) {
++	default:
++	    ecode = code;
++	    param_signal_error(plist, param_name, ecode);
++        case 0:
++	case 1:
++	    break;
++    }
+ 
+     if (ecode < 0)
+ 	return ecode;
+@@ -128,6 +143,7 @@ tfax_put_params(gx_device * dev, gs_param_list * plist)
+ 
+     tfdev->MaxStripSize = mss;
+     tfdev->FillOrder = fill_order;
++    tfdev->BigEndian = big_endian;
+     return code;
+ }
+ 
+@@ -195,19 +211,27 @@ static dev_proc_print_page(tifflzw_print_page);
+ static dev_proc_print_page(tiffpack_print_page);
+ 
+ const gx_device_tfax gs_tifflzw_device = {
+-    prn_device_std_body(gx_device_tfax, prn_std_procs, "tifflzw",
++    prn_device_std_body(gx_device_tfax, gdev_tfax_std_procs, "tifflzw",
+ 			DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
+ 			X_DPI, Y_DPI,
+ 			0, 0, 0, 0,	/* margins */
+-			1, tifflzw_print_page)
++			1, tifflzw_print_page),
++    1				/* AdjustWidth, not used */,
++    0				/* unlimited strip size byte count */,
++    1                           /* lowest column in the high-order bit, not used */,
++    arch_is_big_endian          /* default to native endian (i.e. use big endian iff the platform is so*/
+ };
+ 
+ const gx_device_tfax gs_tiffpack_device = {
+-    prn_device_std_body(gx_device_tfax, prn_std_procs, "tiffpack",
++    prn_device_std_body(gx_device_tfax, gdev_tfax_std_procs, "tiffpack",
+ 			DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
+ 			X_DPI, Y_DPI,
+ 			0, 0, 0, 0,	/* margins */
+-			1, tiffpack_print_page)
++			1, tiffpack_print_page),
++    1				/* AdjustWidth, not used */,
++    0				/* unlimited strip size byte count */,
++    1                           /* lowest column in the high-order bit, not used */,
++    arch_is_big_endian          /* default to native endian (i.e. use big endian iff the platform is so*/
+ };
+ 
+ /* Define the TIFF directory we use, beyond the standard entries. */
+@@ -249,7 +273,7 @@ tifff_print_page(gx_device_printer * dev, FILE * prn_stream,
+     tfax_begin_page(tfdev, prn_stream, pdir, pstate->Columns);
+     pstate->FirstBitLowOrder = tfdev->FillOrder == 2;
+     code = gdev_fax_print_page_stripped(dev, prn_stream, pstate, tfdev->tiff.rows);
+-    gdev_tiff_end_page(&tfdev->tiff, prn_stream);
++    gdev_tiff_end_page(&tfdev->tiff, prn_stream, tfdev->BigEndian != arch_is_big_endian);
+     return code;
+ }
+ static int
+@@ -332,7 +356,7 @@ tifflzw_print_page(gx_device_printer * dev, FILE * prn_stream)
+     state.EarlyChange = 1;	/* PLRM is sort of confusing, but this is correct */
+     code = gdev_stream_print_page(dev, prn_stream, &s_LZWE_template,
+ 				  (stream_state *) & state);
+-    gdev_tiff_end_page(&tfdev->tiff, prn_stream);
++    gdev_tiff_end_page(&tfdev->tiff, prn_stream, tfdev->BigEndian != arch_is_big_endian);
+     return code;
+ }
+ 
+@@ -353,7 +377,7 @@ tiffpack_print_page(gx_device_printer * dev, FILE * prn_stream)
+     state.record_size = gdev_mem_bytes_per_scan_line((gx_device *) dev);
+     code = gdev_stream_print_page(dev, prn_stream, &s_RLE_template,
+ 				  (stream_state *) & state);
+-    gdev_tiff_end_page(&tfdev->tiff, prn_stream);
++    gdev_tiff_end_page(&tfdev->tiff, prn_stream, tfdev->BigEndian != arch_is_big_endian);
+     return code;
+ }
+ 
+@@ -371,7 +395,7 @@ tfax_begin_page(gx_device_tfax * tfdev, FILE * fp,
+ 				&tfdev->tiff, fp,
+ 				(const TIFF_dir_entry *)pdir,
+ 				sizeof(*pdir) / sizeof(TIFF_dir_entry),
+-				NULL, 0, tfdev->MaxStripSize);
++				NULL, 0, tfdev->MaxStripSize, tfdev->BigEndian != arch_is_big_endian);
+     tfdev->width = save_width;
+     return code;
+ }
+diff --git a/base/gdevtfnx.c b/base/gdevtfnx.c
+--- a/base/gdevtfnx.c
++++ b/base/gdevtfnx.c
+@@ -27,36 +27,34 @@
+ #define X_DPI 72
+ #define Y_DPI 72
+ 
+-typedef struct gx_device_tiff_s {
+-    gx_device_common;
+-    gx_prn_device_common;
+-    gdev_tiff_state tiff;
+-} gx_device_tiff;
+-
+ static dev_proc_print_page(tiff12_print_page);
+ static dev_proc_print_page(tiff24_print_page);
+ 
+ static const gx_device_procs tiff12_procs =
+-prn_color_procs(gdev_prn_open, gdev_prn_output_page, gdev_prn_close,
+-		gx_default_rgb_map_rgb_color, gx_default_rgb_map_color_rgb);
++prn_color_params_procs(gdev_prn_open, gdev_prn_output_page, gdev_prn_close,
++		gx_default_rgb_map_rgb_color, gx_default_rgb_map_color_rgb,
++		tiff_get_params, tiff_put_params);
+ static const gx_device_procs tiff24_procs =
+-prn_color_procs(gdev_prn_open, gdev_prn_output_page, gdev_prn_close,
+-		gx_default_rgb_map_rgb_color, gx_default_rgb_map_color_rgb);
++prn_color_params_procs(gdev_prn_open, gdev_prn_output_page, gdev_prn_close,
++		gx_default_rgb_map_rgb_color, gx_default_rgb_map_color_rgb,
++		tiff_get_params, tiff_put_params);
+ 
+-const gx_device_printer gs_tiff12nc_device = {
++const gx_device_tiff gs_tiff12nc_device = {
+     prn_device_std_body(gx_device_tiff, tiff12_procs, "tiff12nc",
+ 			DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
+ 			X_DPI, Y_DPI,
+ 			0, 0, 0, 0,
+-			24, tiff12_print_page)
++			24, tiff12_print_page),
++    arch_is_big_endian          /* default to native endian (i.e. use big endian iff the platform is so*/      
+ };
+ 
+-const gx_device_printer gs_tiff24nc_device = {
++const gx_device_tiff gs_tiff24nc_device = {
+     prn_device_std_body(gx_device_tiff, tiff24_procs, "tiff24nc",
+ 			DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
+ 			X_DPI, Y_DPI,
+ 			0, 0, 0, 0,
+-			24, tiff24_print_page)
++			24, tiff24_print_page),
++    arch_is_big_endian          /* default to native endian (i.e. use big endian iff the platform is so*/      
+ };
+ 
+ /* ------ Private definitions ------ */
+@@ -97,14 +95,21 @@ static int
+ tiff12_print_page(gx_device_printer * pdev, FILE * file)
+ {
+     gx_device_tiff *const tfdev = (gx_device_tiff *)pdev;
+-    int code;
+-
++    int code, i;
++    bool swap_bytes = tfdev->BigEndian != arch_is_big_endian;
++    tiff_rgb_values val_12_swapped = val_12_template;
++    if (swap_bytes)
++    {
++        for (i=0; i<3; i++)
++            SWAP_SHORT(val_12_swapped.bps[i]);
++    }
++    
+     /* Write the page directory. */
+     code = gdev_tiff_begin_page(pdev, &tfdev->tiff, file,
+ 				(const TIFF_dir_entry *)&dir_rgb_template,
+-			  sizeof(dir_rgb_template) / sizeof(TIFF_dir_entry),
+-				(const byte *)&val_12_template,
+-				sizeof(val_12_template), 0);
++			        sizeof(dir_rgb_template) / sizeof(TIFF_dir_entry),
++				(const byte *)&val_12_swapped,
++				sizeof(val_12_swapped), 0, swap_bytes);
+     if (code < 0)
+ 	return code;
+ 
+@@ -138,7 +143,7 @@ tiff12_print_page(gx_device_printer * pdev, FILE * file)
+ 	}
+ 
+ 	gdev_tiff_end_strip(&tfdev->tiff, file);
+-	gdev_tiff_end_page(&tfdev->tiff, file);
++	gdev_tiff_end_page(&tfdev->tiff, file, swap_bytes);
+ 	gs_free_object(pdev->memory, line, "tiff12_print_page");
+     }
+ 
+@@ -149,14 +154,21 @@ static int
+ tiff24_print_page(gx_device_printer * pdev, FILE * file)
+ {
+     gx_device_tiff *const tfdev = (gx_device_tiff *)pdev;
+-    int code;
++    int code, i;
++    bool swap_bytes = tfdev->BigEndian != arch_is_big_endian;
++    tiff_rgb_values val_24_swapped = val_24_template;
++    if (swap_bytes)
++    {
++        for (i=0; i<3; i++)
++            SWAP_SHORT(val_24_swapped.bps[i]);
++    }
+ 
+     /* Write the page directory. */
+     code = gdev_tiff_begin_page(pdev, &tfdev->tiff, file,
+ 				(const TIFF_dir_entry *)&dir_rgb_template,
+-			  sizeof(dir_rgb_template) / sizeof(TIFF_dir_entry),
+-				(const byte *)&val_24_template,
+-				sizeof(val_24_template), 0);
++			        sizeof(dir_rgb_template) / sizeof(TIFF_dir_entry),
++				(const byte *)&val_24_swapped,
++				sizeof(val_24_swapped), 0, swap_bytes);
+     if (code < 0)
+ 	return code;
+ 
+@@ -176,7 +188,7 @@ tiff24_print_page(gx_device_printer * pdev, FILE * file)
+ 	    fwrite((char *)row, raster, 1, file);
+ 	}
+ 	gdev_tiff_end_strip(&tfdev->tiff, file);
+-	gdev_tiff_end_page(&tfdev->tiff, file);
++	gdev_tiff_end_page(&tfdev->tiff, file, swap_bytes);
+ 	gs_free_object(pdev->memory, line, "tiff24_print_page");
+     }
+ 
+diff --git a/base/gdevtifs.c b/base/gdevtifs.c
+--- a/base/gdevtifs.c
++++ b/base/gdevtifs.c
+@@ -80,8 +80,49 @@ static const TIFF_std_directory_values std_values_initial =
+     {0, 0}
+ };
+ 
++/* Get/put the BigEndian parameter. */
++int
++tiff_get_params(gx_device * dev, gs_param_list * plist)
++{
++    gx_device_tiff *const tfdev = (gx_device_tiff *)dev;
++    int code = gdev_prn_get_params(dev, plist);
++    int ecode = code;
++    
++    if ((code = param_write_bool(plist, "BigEndian", &tfdev->BigEndian)) < 0)
++        ecode = code;
++    return ecode;
++}
++
++int
++tiff_put_params(gx_device * dev, gs_param_list * plist)
++{
++    gx_device_tiff *const tfdev = (gx_device_tiff *)dev;
++    int ecode = 0;
++    int code;
++    const char *param_name;
++    bool big_endian = tfdev->BigEndian;
++    
++    /* Read BigEndian option as bool */ 
++    switch (code = param_read_bool(plist, (param_name = "BigEndian"), &big_endian)) {
++	default:
++	    ecode = code;
++	    param_signal_error(plist, param_name, ecode);
++        case 0:
++	case 1:
++	    break;
++    }
++
++    if (ecode < 0)
++	return ecode;
++    code = gdev_prn_put_params(dev, plist);
++    if (code < 0)
++	return code;
++
++    tfdev->BigEndian = big_endian;
++    return code;
++}
++
+ /* Fix up tag values on big-endian machines if necessary. */
+-#if arch_is_big_endian
+ static void
+ tiff_fixup_tag(TIFF_dir_entry * dp)
+ {
+@@ -97,16 +138,55 @@ tiff_fixup_tag(TIFF_dir_entry * dp)
+ 	    break;
+     }
+ }
+-#else
+-#  define tiff_fixup_tag(dp) DO_NOTHING
+-#endif
++
++static size_t fwrite_short(TIFF_ushort nVal, FILE *stream, bool swap_bytes)
++{
++    TIFF_ushort v;
++    
++    if (swap_bytes)
++        v = nVal << 8 | nVal >> 8;
++    else
++        v = nVal;
++    return fwrite(&v, sizeof(v), 1, stream);
++}
++
++static size_t fwrite_long(TIFF_ulong nVal, FILE *stream, bool swap_bytes)
++{
++    TIFF_ulong v;
++    
++    if (swap_bytes)
++       v = nVal << 24 | nVal >> 24 | (nVal & 0xff0000) >> 8 | (nVal & 0xff00) << 8;
++    else
++       v = nVal;
++    return fwrite(&v, sizeof(v), 1, stream);
++ }
++
++static void fwrite_entry(TIFF_dir_entry *entry, FILE *stream, bool swap_bytes)
++{
++   fwrite_short(entry->tag, stream, swap_bytes);
++   fwrite_short(entry->type, stream, swap_bytes);
++   fwrite_long(entry->count, stream, swap_bytes);
++   fwrite_long(entry->value, stream, swap_bytes);
++}
++
++static void fwrite_std_values(TIFF_std_directory_values *std_values, FILE *stream, bool swap_bytes)
++{
++   fwrite_long(std_values->diroff, stream, swap_bytes);
++   fwrite_long(std_values->xresValue[0], stream, swap_bytes);
++   fwrite_long(std_values->xresValue[1], stream, swap_bytes);
++   fwrite_long(std_values->yresValue[0], stream, swap_bytes);
++   fwrite_long(std_values->yresValue[1], stream, swap_bytes);
++   fwrite(std_values->softwareValue, 1, maxSoftware, stream);
++   fwrite(std_values->dateTimeValue, 1, 20, stream);
++}
+ 
+ /* Begin a TIFF page. */
+ int
+ gdev_tiff_begin_page(gx_device_printer * pdev, gdev_tiff_state * tifs,
+ 		     FILE * fp,
+ 		     const TIFF_dir_entry * entries, int entry_count,
+-		     const byte * values, int value_size, long max_strip_size)
++		     const byte * values, int value_size, long max_strip_size,
++		     bool swap_bytes)
+ {
+     gs_memory_t *mem = pdev->memory;
+     TIFF_std_directory_entries std_entries;
+@@ -117,29 +197,26 @@ gdev_tiff_begin_page(gx_device_printer * pdev, gdev_tiff_state * tifs,
+   (sizeof(TIFF_std_directory_entries) / sizeof(TIFF_dir_entry))
+     int nse, nce, ntags;
+     TIFF_std_directory_values std_values;
++    bool big_endian = arch_is_big_endian ^ swap_bytes;
+ 
+ #define std_value_size sizeof(TIFF_std_directory_values)
+ 
+     tifs->mem = mem;
+     if (gdev_prn_file_is_new(pdev)) {
+ 	/* This is a new file; write the TIFF header. */
+-	static const TIFF_header hdr = {
+-#if arch_is_big_endian
+-	    TIFF_magic_big_endian,
+-#else
+-	    TIFF_magic_little_endian,
+-#endif
+-	    TIFF_version_value,
+-	    sizeof(TIFF_header)
+-	};
+-
+-	fwrite((const char *)&hdr, sizeof(hdr), 1, fp);
++	TIFF_header hdr;
++ 	hdr.magic = big_endian ? TIFF_magic_big_endian : TIFF_magic_little_endian;
++	hdr.version = TIFF_version_value;
++	hdr.diroff = sizeof(TIFF_header);
++	fwrite((char *)&hdr.magic, sizeof(hdr.magic), 1, fp);
++	fwrite_short(hdr.version, fp, swap_bytes);
++	fwrite_long(hdr.diroff, fp, swap_bytes);
+ 	tifs->prev_dir = 0;
+     } else {			/* Patch pointer to this directory from previous. */
+ 	TIFF_ulong offset = (TIFF_ulong) tifs->dir_off;
+ 
+ 	fseek(fp, tifs->prev_dir, SEEK_SET);
+-	fwrite((char *)&offset, sizeof(offset), 1, fp);
++	fwrite_long(offset, fp, swap_bytes);
+ 	fseek(fp, tifs->dir_off, SEEK_SET);
+     }
+ 
+@@ -163,8 +240,7 @@ gdev_tiff_begin_page(gx_device_printer * pdev, gdev_tiff_state * tifs,
+     /* Write count of tags in directory. */
+     {
+ 	TIFF_short dircount = ntags;
+-
+-	fwrite((char *)&dircount, sizeof(dircount), 1, fp);
++	fwrite_short(dircount, fp, swap_bytes);
+     }
+     tifs->dir_off = ftell(fp);
+ 
+@@ -254,7 +330,8 @@ gdev_tiff_begin_page(gx_device_printer * pdev, gdev_tiff_state * tifs,
+ 		    offset_of(TIFF_dir_entry, value);
+ 	    }
+ 	}
+-	tiff_fixup_tag(&entry);	/* don't fix up indirects */
++	if (big_endian)
++	    tiff_fixup_tag(&entry);	/* don't fix up indirects */
+ 	if (entry.type & TIFF_INDIRECT) {
+ 	    /* Fix up the offset for an indirect value. */
+ 	    entry.type -= TIFF_INDIRECT;
+@@ -262,12 +339,13 @@ gdev_tiff_begin_page(gx_device_printer * pdev, gdev_tiff_state * tifs,
+ 		tifs->dir_off + ntags * sizeof(TIFF_dir_entry) +
+ 		(std ? 0 : std_value_size);
+ 	}
+-	fwrite((char *)&entry, sizeof(entry), 1, fp);
++	fwrite_entry(&entry, fp, swap_bytes);
+     }
+ 
+     /* Write the indirect values. */
+-    fwrite((const char *)&std_values, sizeof(std_values), 1, fp);
+-    fwrite((const char *)values, value_size, 1, fp);
++    fwrite_std_values(&std_values, fp, swap_bytes);
++    if (values)
++        fwrite((const char *)values, value_size, 1, fp);
+     /* Write placeholders for the strip offsets. */
+     fwrite(tifs->StripOffsets, sizeof(TIFF_ulong), 2 * tifs->strip_count, fp);
+     tifs->strip_index = 0;
+@@ -299,21 +377,23 @@ gdev_tiff_end_strip(gdev_tiff_state * tifs, FILE * fp)
+ 
+ /* End a TIFF page. */
+ int
+-gdev_tiff_end_page(gdev_tiff_state * tifs, FILE * fp)
++gdev_tiff_end_page(gdev_tiff_state * tifs, FILE * fp, bool swap_bytes)
+ {
+     gs_memory_t *mem = tifs->mem;
+     long dir_off = tifs->dir_off;
+-    int tags_size = tifs->ntags * sizeof(TIFF_dir_entry);
+-
++    int tags_size = tifs->ntags * sizeof(TIFF_dir_entry), i;
++    
+     tifs->prev_dir =
+ 	dir_off + tags_size + offset_of(TIFF_std_directory_values, diroff);
+     tifs->dir_off = ftell(fp);
+     /* Patch strip byte counts and offsets values. */
+     /* The offset in the file was determined at begin_page and may be indirect */
+     fseek(fp, tifs->offset_StripOffsets, SEEK_SET);
+-    fwrite(tifs->StripOffsets, sizeof(TIFF_ulong), tifs->strip_count, fp);
++    for (i=0; i<tifs->strip_count; i++)
++        fwrite_long(tifs->StripOffsets[i], fp, swap_bytes);
+     fseek(fp, tifs->offset_StripByteCounts, SEEK_SET);
+-    fwrite(tifs->StripByteCounts, sizeof(TIFF_ulong), tifs->strip_count, fp);
++    for (i=0; i<tifs->strip_count; i++)
++        fwrite_long(tifs->StripByteCounts[i], fp, swap_bytes);
+     gs_free_object(mem, tifs->StripOffsets, "gdev_tiff_begin_page(StripOffsets)");
+     return 0;
+ }
+diff --git a/base/gdevtifs.h b/base/gdevtifs.h
+--- a/base/gdevtifs.h
++++ b/base/gdevtifs.h
+@@ -43,6 +43,9 @@ typedef unsigned long TIFF_ulong;
+ # endif
+ #endif
+ 
++#define SWAP_SHORT(x)\
++     x = x << 8 | x >> 8\
++
+ /*
+  * Define the TIFF file header.
+  */
+@@ -197,6 +200,16 @@ typedef struct gdev_tiff_state_s {
+     TIFF_ulong *StripByteCounts;
+ } gdev_tiff_state;
+ 
++typedef struct gx_device_tiff_s {
++    gx_device_common;
++    gx_prn_device_common;
++    bool  BigEndian;            /* true = big endian; false = little endian*/
++    gdev_tiff_state tiff;
++} gx_device_tiff;
++
++dev_proc_get_params(tiff_get_params);
++dev_proc_put_params(tiff_put_params);
++
+ /*
+  * Begin writing a TIFF page.  This procedure supplies a standard set of
+  * tags; the client can provide additional tags (pre-sorted) and
+@@ -206,7 +219,7 @@ int gdev_tiff_begin_page(gx_device_printer * pdev, gdev_tiff_state * tifs,
+ 			 FILE * fp,
+ 			 const TIFF_dir_entry * entries, int entry_count,
+ 			 const byte * values, int value_size,
+-			 long max_strip_size);
++			 long max_strip_size, bool swap_bytes);
+ 
+ /*
+  * Finish writing a TIFF strip.  All data written since begin or last
+@@ -218,6 +231,6 @@ int gdev_tiff_end_strip(gdev_tiff_state * tifs, FILE * fp);
+  * Finish writing a TIFF page.  StripOffsets and StripByteCounts are
+  * patched into the file.
+  */
+-int gdev_tiff_end_page(gdev_tiff_state * tifs, FILE * fp);
++int gdev_tiff_end_page(gdev_tiff_state * tifs, FILE * fp, bool swap_bytes);
+ 
+ #endif /* gdevtifs_INCLUDED */
+diff --git a/base/gdevtrac.c b/base/gdevtrac.c
+--- a/base/gdevtrac.c
++++ b/base/gdevtrac.c
+@@ -318,7 +318,6 @@ trace_stroke_path(gx_device * dev, const gs_imager_state * pis,
+ 
+ typedef struct trace_image_enum_s {
+     gx_image_enum_common;
+-    gs_memory_t *memory;
+     int rows_left;
+ } trace_image_enum_t;
+ gs_private_st_suffix_add0(st_trace_image_enum, trace_image_enum_t,
+diff --git a/base/gdevtsep.c b/base/gdevtsep.c
+--- a/base/gdevtsep.c
++++ b/base/gdevtsep.c
+@@ -38,24 +38,20 @@
+ 
+ /* ------ The tiffgray device ------ */
+ 
+-typedef struct gx_device_tiff_s {
+-    gx_device_common;
+-    gx_prn_device_common;
+-    gdev_tiff_state tiff;
+-} gx_device_tiff;
+-
+ static dev_proc_print_page(tiffgray_print_page);
+ 
+ static const gx_device_procs tiffgray_procs =
+-prn_color_procs(gdev_prn_open, gdev_prn_output_page, gdev_prn_close,
+-		gx_default_gray_map_rgb_color, gx_default_gray_map_color_rgb);
++prn_color_params_procs(gdev_prn_open, gdev_prn_output_page, gdev_prn_close,
++		gx_default_gray_map_rgb_color, gx_default_gray_map_color_rgb,
++		tiff_get_params, tiff_put_params);
+ 
+-const gx_device_printer gs_tiffgray_device = {
++const gx_device_tiff gs_tiffgray_device = {
+     prn_device_body(gx_device_tiff, tiffgray_procs, "tiffgray",
+ 			DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
+ 			X_DPI, Y_DPI,
+ 			0, 0, 0, 0,	/* Margins */
+-			1, 8, 255, 0, 256, 0, tiffgray_print_page)
++			1, 8, 255, 0, 256, 0, tiffgray_print_page),
++    arch_is_big_endian          /* default to native endian (i.e. use big endian iff the platform is so*/      
+ };
+ 
+ /* ------ Private definitions ------ */
+@@ -93,15 +89,19 @@ tiffgray_print_page(gx_device_printer * pdev, FILE * file)
+ {
+     gx_device_tiff *const tfdev = (gx_device_tiff *)pdev;
+     int code;
++    bool swap_bytes = tfdev->BigEndian != arch_is_big_endian;
++    tiff_gray_values val_gray_swapped = val_gray_template;
++    if (swap_bytes)
++        SWAP_SHORT(val_gray_swapped.bps[0]);
+ 
+     if (pdev->height > (max_long - ftell(file))/(pdev->width)) /* note width is never 0 in print_page */
+ 	return_error(gs_error_rangecheck);  /* this will overflow max_long */
+     /* Write the page directory. */
+     code = gdev_tiff_begin_page(pdev, &tfdev->tiff, file,
+ 				(const TIFF_dir_entry *)&dir_gray_template,
+-			  sizeof(dir_gray_template) / sizeof(TIFF_dir_entry),
+-				(const byte *)&val_gray_template,
+-				sizeof(val_gray_template), 0);
++			        sizeof(dir_gray_template) / sizeof(TIFF_dir_entry),
++				(const byte *)&val_gray_swapped,
++				sizeof(val_gray_swapped), 0, swap_bytes);
+     if (code < 0)
+ 	return code;
+ 
+@@ -121,7 +121,7 @@ tiffgray_print_page(gx_device_printer * pdev, FILE * file)
+ 	    fwrite((char *)row, raster, 1, file);
+ 	}
+ 	gdev_tiff_end_strip(&tfdev->tiff, file);
+-	gdev_tiff_end_page(&tfdev->tiff, file);
++	gdev_tiff_end_page(&tfdev->tiff, file, swap_bytes);
+ 	gs_free_object(pdev->memory, line, "tiffgray_print_page");
+     }
+ 
+@@ -135,7 +135,7 @@ static dev_proc_print_page(tiff32nc_print_page);
+ #define cmyk_procs(p_map_color_rgb, p_map_cmyk_color)\
+     gdev_prn_open, NULL, NULL, gdev_prn_output_page, gdev_prn_close,\
+     NULL, p_map_color_rgb, NULL, NULL, NULL, NULL, NULL, NULL,\
+-    gdev_prn_get_params, gdev_prn_put_params,\
++    tiff_get_params, tiff_put_params,\
+     p_map_cmyk_color, NULL, NULL, NULL, gx_page_device_get_page_device
+ 
+ /* 8-bit-per-plane separated CMYK color. */
+@@ -144,12 +144,13 @@ static const gx_device_procs tiff32nc_procs = {
+     cmyk_procs(cmyk_8bit_map_color_cmyk, cmyk_8bit_map_cmyk_color)
+ };
+ 
+-const gx_device_printer gs_tiff32nc_device = {
++const gx_device_tiff gs_tiff32nc_device = {
+     prn_device_body(gx_device_tiff, tiff32nc_procs, "tiff32nc",
+ 			DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS,
+ 			X_DPI, Y_DPI,
+ 			0, 0, 0, 0,	/* Margins */
+-			4, 32, 255, 255, 256, 256, tiff32nc_print_page)
++			4, 32, 255, 255, 256, 256, tiff32nc_print_page),
++    arch_is_big_endian          /* default to native endian (i.e. use big endian iff the platform is so*/      
+ };
+ 
+ /* ------ Private definitions ------ */
+@@ -189,15 +190,23 @@ tiff32nc_print_page(gx_device_printer * pdev, FILE * file)
+     gx_device_tiff *const tfdev = (gx_device_tiff *)pdev;
+     int code;
+     ulong cur_size = gdev_prn_file_is_new(pdev) ? 0 : tfdev->tiff.dir_off;
++    tiff_cmyk_values val_cmyk_swapped = val_cmyk_template;
++    bool swap_bytes = tfdev->BigEndian != arch_is_big_endian;
++    if (swap_bytes)
++    {
++        int i;
++        for (i=0; i<4; i++)
++            SWAP_SHORT(val_cmyk_swapped.bps[i]);
++    }
+ 
+     if (pdev->height > (max_long - cur_size)/(pdev->width*4)) /* note width is never 0 in print_page */
+ 	return_error(gs_error_rangecheck);  /* this will overflow max_long */
+     /* Write the page directory. */
+     code = gdev_tiff_begin_page(pdev, &tfdev->tiff, file,
+ 				(const TIFF_dir_entry *)&dir_cmyk_template,
+-			  sizeof(dir_cmyk_template) / sizeof(TIFF_dir_entry),
+-				(const byte *)&val_cmyk_template,
+-				sizeof(val_cmyk_template), 0);
++			        sizeof(dir_cmyk_template) / sizeof(TIFF_dir_entry),
++				(const byte *)&val_cmyk_swapped,
++				sizeof(val_cmyk_swapped), 0, swap_bytes);
+     if (code < 0)
+ 	return code;
+ 
+@@ -217,7 +226,7 @@ tiff32nc_print_page(gx_device_printer * pdev, FILE * file)
+ 	    fwrite((char *)row, raster, 1, file);
+ 	}
+ 	gdev_tiff_end_strip(&tfdev->tiff, file);
+-	gdev_tiff_end_page(&tfdev->tiff, file);
++	gdev_tiff_end_page(&tfdev->tiff, file, swap_bytes);
+ 	gs_free_object(pdev->memory, line, "tiff32nc_print_page");
+     }
+ 
+@@ -259,6 +268,7 @@ typedef struct tiffsep_device_s {
+ 				/* tiff state for separation files */
+     gdev_tiff_state tiff[GX_DEVICE_COLOR_MAX_COMPONENTS];
+     FILE * sep_file[GX_DEVICE_COLOR_MAX_COMPONENTS];
++    bool  BigEndian;            /* true = big endian; false = little endian */
+     gs_devn_params devn_params;		/* DeviceN generated parameters */
+     equivalent_cmyk_color_params equiv_cmyk_colors;
+ } tiffsep_device;
+@@ -392,7 +402,8 @@ gs_private_st_composite_final(st_tiffsep_device, tiffsep_device,
+ 	prn_device_body_rest_(tiffsep_print_page),\
+ 	{ 0 },			/* tiff state for comp file */\
+ 	{{ 0 }},		/* tiff state for separation files */\
+-	{ 0 }			/* separation files */
++	{ 0 },			/* separation files */\
++	arch_is_big_endian      /* true = big endian; false = little endian */
+ 
+ /*
+  * Select the default number of components based upon the number of bits
+@@ -579,12 +590,16 @@ static int
+ tiffsep_get_params(gx_device * pdev, gs_param_list * plist)
+ {
+     int code = gdev_prn_get_params(pdev, plist);
+-
+     if (code < 0)
+ 	return code;
+-    return devn_get_params(pdev, plist,
++	
++    code = devn_get_params(pdev, plist,
+ 	    	&(((tiffsep_device *)pdev)->devn_params),
+     		&(((tiffsep_device *)pdev)->equiv_cmyk_colors));
++    if (code < 0)
++	return code;
++    
++    return param_write_bool(plist, "BigEndian", &((tiffsep_device *)pdev)->BigEndian);
+ }
+ 
+ /* Set parameters.  We allow setting the number of bits per component. */
+@@ -592,7 +607,19 @@ static int
+ tiffsep_put_params(gx_device * pdev, gs_param_list * plist)
+ {
+     tiffsep_device * const pdevn = (tiffsep_device *) pdev;
+-
++    int code;
++    const char *param_name;
++   
++    /* Read BigEndian option as bool */ 
++    switch (code = param_read_bool(plist, (param_name = "BigEndian"), &pdevn->BigEndian)) {
++	default:
++	    param_signal_error(plist, param_name, code);
++	    return code;
++        case 0:
++	case 1:
++	    break;
++    }
++    
+     return devn_printer_put_params(pdev, plist,
+ 		&(pdevn->devn_params), &(pdevn->equiv_cmyk_colors));
+ }
+@@ -770,11 +797,18 @@ number_output_separations(int num_dev_comp, int num_std_colorants,
+ static void
+ build_comp_to_sep_map(tiffsep_device * pdev, short * map_comp_to_sep)
+ {
+-    int num_sep = pdev->devn_params.separations.num_separations;
++    int num_sep = pdev->devn_params.page_spot_colors;
+     int num_std_colorants = pdev->devn_params.num_std_colorant_names;
+     int sep_num;
++    int num_channels;
+ 
+-    for (sep_num = 0; sep_num < num_std_colorants + num_sep; sep_num++) {
++    /* since both proc colors and spot colors are packed in same encoded value we
++       need to have this limit */
++
++    num_channels = 
++        ( (num_std_colorants + num_sep) < (GX_DEVICE_COLOR_MAX_COMPONENTS) ? (num_std_colorants + num_sep) : (GX_DEVICE_COLOR_MAX_COMPONENTS) );
++
++    for (sep_num = 0; sep_num < num_channels; sep_num++) {
+ 	int comp_num = pdev->devn_params.separation_order_map[sep_num];
+     
+ 	if (comp_num >= 0 && comp_num < GX_DEVICE_COLOR_MAX_COMPONENTS)
+@@ -949,6 +983,14 @@ tiffsep_print_page(gx_device_printer * pdev, FILE * file)
+     const char *fmt;
+     gs_parsed_file_name_t parsed;
+     int non_encodable_count = 0;
++    tiff_cmyk_values val_cmyk_swapped = val_cmyk_template;
++    bool swap_bytes = tfdev->BigEndian != arch_is_big_endian;
++    if (swap_bytes)
++    {
++        int i;
++        for (i=0; i<4; i++)
++            SWAP_SHORT(val_cmyk_swapped.bps[i]);
++    }
+ 
+     build_comp_to_sep_map(tfdev, map_comp_to_sep);
+ 
+@@ -972,9 +1014,9 @@ tiffsep_print_page(gx_device_printer * pdev, FILE * file)
+ 	return_error(gs_error_rangecheck);  /* this will overflow max_long */
+     code = gdev_tiff_begin_page(pdev, &tfdev->tiff_comp, file,
+ 				(const TIFF_dir_entry *)&dir_cmyk_template,
+-			  sizeof(dir_cmyk_template) / sizeof(TIFF_dir_entry),
+-				(const byte *)&val_cmyk_template,
+-				sizeof(val_cmyk_template), 0);
++			        sizeof(dir_cmyk_template) / sizeof(TIFF_dir_entry),
++				(const byte *)&val_cmyk_swapped,
++				sizeof(val_cmyk_swapped), 0, swap_bytes);
+     pdev->color_info.depth = save_depth;
+     if (code < 0)
+ 	return code;
+@@ -1016,8 +1058,8 @@ tiffsep_print_page(gx_device_printer * pdev, FILE * file)
+ 			tfdev->sep_file[comp_num],
+ 		 	(const TIFF_dir_entry *)&dir_gray_template,
+ 			sizeof(dir_gray_template) / sizeof(TIFF_dir_entry),
+-			(const byte *)&val_gray_template,
+-			sizeof(val_gray_template), 0);
++			(const byte *)&val_cmyk_swapped,
++			sizeof(val_cmyk_swapped), 0, swap_bytes);
+ 	pdev->color_info.depth = save_depth;
+         if (code < 0)
+ 	    return code;
+@@ -1069,12 +1111,12 @@ tiffsep_print_page(gx_device_printer * pdev, FILE * file)
+ 	}
+ 	/* Update the strip data */
+ 	gdev_tiff_end_strip(&(tfdev->tiff_comp), file);
+-	gdev_tiff_end_page(&(tfdev->tiff_comp), file);
++	gdev_tiff_end_page(&(tfdev->tiff_comp), file, swap_bytes);
+         for (comp_num = 0; comp_num < num_comp; comp_num++ ) {
+ 	    gdev_tiff_end_strip(&(tfdev->tiff[comp_num]),
+ 					tfdev->sep_file[comp_num]);
+ 	    gdev_tiff_end_page(&(tfdev->tiff[comp_num]),
+-					tfdev->sep_file[comp_num]);
++					tfdev->sep_file[comp_num], swap_bytes);
+ 	}
+ 	gs_free_object(pdev->memory, line, "tiffsep_print_page");
+ 	gs_free_object(pdev->memory, sep_line, "tiffsep_print_page");
+diff --git a/base/gdevvec.c b/base/gdevvec.c
+--- a/base/gdevvec.c
++++ b/base/gdevvec.c
+@@ -247,7 +247,7 @@ void
+ gdev_vector_reset(gx_device_vector * vdev)
+ {
+     static const gs_imager_state state_initial =
+-    {gs_imager_state_initial(1)};
++    {gs_imager_state_initial(1, false)};
+ 
+     vdev->state = state_initial;
+     gx_hld_saved_color_init(&vdev->saved_fill_color);
+diff --git a/base/gsalloc.c b/base/gsalloc.c
+--- a/base/gsalloc.c
++++ b/base/gsalloc.c
+@@ -202,7 +202,7 @@ ialloc_alloc_state(gs_memory_t * parent, uint chunk_size)
+     iimem->large_size = ((chunk_size / 4) & -obj_align_mod) + 1;
+     iimem->is_controlled = false;
+     iimem->gc_status.vm_threshold = chunk_size * 3L;
+-    iimem->gc_status.max_vm = max_long;
++    iimem->gc_status.max_vm = 0x7fffffff;
+     iimem->gc_status.psignal = NULL;
+     iimem->gc_status.signal_value = 0;
+     iimem->gc_status.enabled = false;
+diff --git a/base/gsccolor.h b/base/gsccolor.h
+--- a/base/gsccolor.h
++++ b/base/gsccolor.h
+@@ -64,4 +64,19 @@ extern_st(st_client_color);
+     client_color_enum_ptrs, client_color_reloc_ptrs, pattern)
+ #define st_client_color_max_ptrs 1
+ 
++/* Define the color space for a transparency */
++/* Used to keep track of parent versus child */
++/* color space changes with Smask and for */
++/* blending */
++typedef enum {
++    GRAY_SCALE,
++    DEVICE_RGB,
++    DEVICE_CMYK,
++    CIE_XYZ,
++    DEVICEN,
++    UNKNOWN,
++    OTHER
++} gs_transparency_color_t;
++
++
+ #endif /* gsccolor_INCLUDED */
+diff --git a/base/gscdef.c b/base/gscdef.c
+--- a/base/gscdef.c
++++ b/base/gscdef.c
+@@ -43,7 +43,7 @@ const char *const gs_productfamily = GS_PRODUCTFAMILY;
+ 
+ #ifndef GS_PRODUCT
+ #  define GS_PRODUCT\
+-	GS_PRODUCTFAMILY ""
++	GS_PRODUCTFAMILY " SVN PRE-RELEASE"
+ #endif
+ const char *const gs_product = GS_PRODUCT;
+ 
+diff --git a/base/gscolor2.c b/base/gscolor2.c
+--- a/base/gscolor2.c
++++ b/base/gscolor2.c
+@@ -239,20 +239,10 @@ gx_final_Indexed(const gs_color_space * pcs)
+ 	rc_adjust_const(pcs->params.indexed.lookup.map, -1,
+ 			"gx_adjust_Indexed");
+     } else {
+-	/* Bug 689822 "Memory leaks during rendering clist." 
+-	*/
+-#if 0   /* Disabled due to bug 689990 "pcl6.exe crash with gs revision 8928".
+-           Rather this automatic freeing of pcs->params.indexed.lookup.table.data
+-	   complies to a fundamental change of Revision 7765 "Non-backwards compatible change: 
+-	   use consistent reference count allocation discipline for color spaces.",
+-	   some interpreters still don't fully comply to the discipline. 
+-	   It caused a crash in memory management due to dual attempt to free the string.
+-         */
+ 	byte *data = (byte *)pcs->params.indexed.lookup.table.data; /* Break 'const'. */
+ 
+ 	gs_free_string(pcs->rc.memory, data, 
+ 		pcs->params.indexed.lookup.table.size, "gx_final_Indexed");
+-#endif
+     }
+ }
+ 
+diff --git a/base/gscolorbuffer.c b/base/gscolorbuffer.c
+new file mode 100644
+--- /dev/null
++++ b/base/gscolorbuffer.c
+@@ -0,0 +1,270 @@
++/* Copyright (C) 2001-2009 Artifex Software, Inc.
++   All Rights Reserved.
++
++   This software is provided AS-IS with no warranty, either express or
++   implied.
++
++   This software is distributed under license and may not be copied, modified
++   or distributed except as expressly authorized under the terms of that
++   license.  Refer to licensing information at http://www.artifex.com/
++   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
++   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
++*/
++
++
++/* Simple operators and place holding support for doing conversions on buffers
++   of data.  These functions perform device (non CIE or ICC color conversions)
++   on buffers of data. Eventually these will be replaced with functions for
++   using the ICC based linked mappings with the external CMS. This is far from
++   efficient at this point, but gets the job done */
++
++#include "string_.h"
++#include "stdpre.h"
++#include "gstypes.h"
++#include "gsmemory.h"
++#include "gxblend.h"
++#include "gscolorbuffer.h"
++
++#define float_color_to_byte_color(float_color) ( \
++    (0.0 < (float_color) && (float_color) < 1.0) ? \
++	((unsigned char) ((float_color) * 255.0)) : \
++	(((float_color) <= 0.0) ? 0x00 : 0xFF) \
++    )
++
++/* We could use the conversions that are defined in gxdcconv.c,
++   however for now we will use something even easier. This is
++   temporary until we get the proper ICC flows in place */
++
++static void
++rgb_to_cmyk(byte rgb[],byte cmyk[])
++{
++
++    /* Real sleazy min black generation */
++
++    cmyk[0] = 255 - rgb[0];
++    cmyk[1] = 255 - rgb[1];
++    cmyk[2] = 255 - rgb[2];
++
++    cmyk[3] = (cmyk[0] < cmyk[1]) ?
++	min(cmyk[0], cmyk[2]) : min(cmyk[1], cmyk[2]);
++
++}
++
++static void
++rgb_to_gray(byte rgb[], byte gray[])
++{
++
++    float temp_value;
++
++    /* compute a luminance component */
++    temp_value = rgb[0]*0.3 + rgb[1]*0.59 + rgb[2]*0.11;
++    temp_value = temp_value * (1.0 / 255.0 );  /* May need to be optimized */
++    gray[0] = float_color_to_byte_color(temp_value);
++
++}
++
++static void
++cmyk_to_rgb(byte cmyk[], byte rgb[])
++{
++
++    /* real ugly, but temporary */
++
++    rgb[0] = 255 - min(cmyk[0] + cmyk[3],255);
++    rgb[1] = 255 - min(cmyk[1] + cmyk[3],255);
++    rgb[2] = 255 - min(cmyk[2] + cmyk[3],255);
++
++}
++
++static void
++cmyk_to_gray(byte cmyk[], byte gray[])
++{
++
++    float temp_value;
++
++    temp_value = ((255 - cmyk[0])*0.3 +
++	          (255 - cmyk[1])*0.59 +
++                  (255 - cmyk[2]) * 0.11) * (255 - cmyk[3]);
++    temp_value = temp_value * (1.0 / 65025.0 );
++
++    gray[0] = float_color_to_byte_color(temp_value);
++
++}
++
++static void
++gray_to_cmyk(byte gray[], byte cmyk[])
++{
++
++    /* Just do black. */
++    cmyk[0] = 0;
++    cmyk[1] = 0;
++    cmyk[2] = 0;
++    cmyk[3] = 255 - gray[0];
++
++}
++
++static void
++gray_to_rgb(byte gray[], byte rgb[])
++{
++
++    rgb[0] = gray[0];
++    rgb[1] = gray[0];
++    rgb[2] = gray[0];
++
++}
++
++
++void
++gs_transform_color_buffer_generic(byte *inputbuffer,
++	    int row_stride, int plane_stride,
++            int input_num_color, gs_int_rect rect, byte *outputbuffer,
++	    int output_num_color, int num_noncolor_planes)
++
++{
++    int num_rows, num_cols, x, y, z;
++    void (* color_remap)(byte input[],byte output[]) = NULL;
++    byte input_vector[4],output_vector[4];
++    int plane_offset[PDF14_MAX_PLANES],alpha_offset_in,max_num_channels;
++
++    num_rows = rect.q.y - rect.p.y;
++    num_cols = rect.q.x - rect.p.x;
++
++    /* Check for spot + cmyk case */
++
++    if (output_num_color > 4)
++    {
++
++        /* To CMYK always */
++        switch (input_num_color) {
++
++            case 1:
++                color_remap = gray_to_cmyk;
++                break;
++
++            case 3:
++                color_remap = rgb_to_cmyk;
++                break;
++
++            case 4:
++                color_remap = NULL;        /* Copy data */
++                break;
++
++            default:
++
++                /* Should never be here.  Groups must
++                   be gray, rgb or CMYK.   Exception
++                   may be ICC with XPS */
++
++                break;
++
++        }
++
++    } else {
++
++        /* Pick the mapping to use */
++
++        switch (input_num_color) {
++
++            case 1:
++                if (output_num_color == 3)
++                    color_remap = gray_to_rgb;
++                else
++                    color_remap = gray_to_cmyk;
++                break;
++
++            case 3:
++                if (output_num_color == 1)
++                    color_remap = rgb_to_gray;
++                else
++                    color_remap = rgb_to_cmyk;
++                break;
++
++            case 4:
++                if (output_num_color == 1)
++                    color_remap = cmyk_to_gray;
++                else
++                    color_remap = cmyk_to_rgb;
++                break;
++
++            default:
++
++                /* Should never be here.  Groups must
++                   be gray, rgb or CMYK.   Until we
++                   have ICC working here with XPS */
++
++                break;
++
++        }
++
++    }
++
++    /* data is planar */
++
++    max_num_channels = max(input_num_color, output_num_color) +
++	num_noncolor_planes;
++
++    for (z = 0; z < max_num_channels; z++)
++       plane_offset[z] = z * plane_stride;
++
++    if (color_remap == NULL) {
++
++        /* Blending group was CMYK, output is CMYK + spot */
++
++        memcpy(outputbuffer, inputbuffer, 4*plane_stride);
++
++        /* Add any data that are beyond the standard color data (e.g. alpha) */
++
++        if (num_noncolor_planes > 0)
++            memcpy(&(outputbuffer[plane_offset[output_num_color]]),
++                &(inputbuffer[plane_offset[input_num_color]]),
++                num_noncolor_planes*plane_stride);
++
++    } else {
++
++        /* Have to remap */
++
++        alpha_offset_in = input_num_color*plane_stride;
++
++        for (y = 0; y < num_rows; y++) {
++
++           for (x = 0; x < num_cols; x++) {
++
++                /* If the source alpha is transparent, then move on */
++
++                if (inputbuffer[x + alpha_offset_in] != 0x00) {
++
++                    /* grab the input */
++
++                    for (z = 0; z<input_num_color; z++)
++                        input_vector[z] = inputbuffer[x+plane_offset[z]];
++
++                    /* convert */
++
++                   color_remap(input_vector,output_vector);
++
++                   /* store the output */
++
++                   for (z = 0; z < output_num_color; z++)
++                        outputbuffer[x+plane_offset[z]] = output_vector[z];
++
++                   /* Add any that are beyond the standard color data */
++
++                    for(z = 0; z < num_noncolor_planes; z++)
++                        outputbuffer[x + plane_offset[output_num_color+z]] =
++                            inputbuffer[x + plane_offset[input_num_color+z]];
++
++                }
++
++            }
++
++            /* update our positions */
++
++            for (z = 0; z < max_num_channels; z++)
++                plane_offset[z] += row_stride;
++
++            alpha_offset_in += row_stride;
++
++        }
++
++    }
++
++}
+diff --git a/base/gscolorbuffer.h b/base/gscolorbuffer.h
+new file mode 100644
+--- /dev/null
++++ b/base/gscolorbuffer.h
+@@ -0,0 +1,25 @@
++/* Copyright (C) 2001-2006 Artifex Software, Inc.
++   All Rights Reserved.
++
++   This software is provided AS-IS with no warranty, either express or
++   implied.
++
++   This software is distributed under license and may not be copied, modified
++   or distributed except as expressly authorized under the terms of that
++   license.  Refer to licensing information at http://www.artifex.com/
++   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
++   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
++*/
++
++/* Client color structure definition */
++
++/* Simple operators and place holding support for doing conversions on buffers
++   of data.  These functions perform device (non CIE or ICC color conversions)
++   on buffers of data.  Eventually these will be replaced with functions for
++   using the ICC based linked mappings with the external CMS.  */
++
++/* This just does planar data for now */
++void gs_transform_color_buffer_generic(byte *inputbuffer,
++	    int rowstride, int planestride,
++	    int input_num_color, gs_int_rect rect,byte *outputbuffer,
++	    int output_num_color,int num_noncolor_planes);
+diff --git a/base/gscspace.c b/base/gscspace.c
+--- a/base/gscspace.c
++++ b/base/gscspace.c
+@@ -193,6 +193,12 @@ bool gs_color_space_is_CIE(const gs_color_space * pcs)
+ 
+ }
+ 
++/* See if the space is ICC based */
++bool gs_color_space_is_ICC(const gs_color_space * pcs)
++{
++    return(gs_color_space_get_index(pcs) == gs_color_space_index_CIEICC);
++}
++
+ 
+ /* Get the number of components in a color space. */
+ int
+diff --git a/base/gscspace.h b/base/gscspace.h
+--- a/base/gscspace.h
++++ b/base/gscspace.h
+@@ -289,8 +289,9 @@ gs_color_space *gs_cspace_new_DeviceCMYK(gs_memory_t *mem);
+ /* Get the index of a color space. */
+ gs_color_space_index gs_color_space_get_index(const gs_color_space *);
+ 
+-/* Tell if the space is CIE based */
++/* Tell if the space is CIE or ICC based */
+ bool gs_color_space_is_CIE(const gs_color_space * pcs);
++bool gs_color_space_is_ICC(const gs_color_space * pcs);
+ 
+ /* Get the number of components in a color space. */
+ int gs_color_space_num_components(const gs_color_space *);
+diff --git a/base/gserror.h b/base/gserror.h
+--- a/base/gserror.h
++++ b/base/gserror.h
+@@ -60,7 +60,7 @@ int gs_throw_imp(const char *func, const char *file, int line,
+ /* Use throw at origin of error
+ */
+ #define gs_throw_code(code) \
+-    gs_throw((code), gs_errstr((code)))
++    gs_throw1((code), "%s", gs_errstr((code)))
+ 
+ #define gs_throw(code, fmt) \
+     gs_throw_imp(__func__, __FILE__, __LINE__, 0, code, fmt)
+@@ -87,7 +87,7 @@ int gs_throw_imp(const char *func, const char *file, int line,
+ /* Bubble the code up the stack
+ */
+ #define gs_rethrow_code(code) \
+-    gs_rethrow((code), gs_errstr((code)))
++    gs_rethrow1((code), "%s", gs_errstr((code)))
+ 
+ #define gs_rethrow(code, fmt) \
+     gs_throw_imp(__func__, __FILE__, __LINE__, 1, code, fmt)
+diff --git a/base/gsfont.c b/base/gsfont.c
+--- a/base/gsfont.c
++++ b/base/gsfont.c
+@@ -269,6 +269,7 @@ gs_font_dir_alloc2_limits(gs_memory_t * struct_mem, gs_memory_t * bits_mem,
+     pdir->san = 0;
+     pdir->global_glyph_code = NULL;
+     pdir->text_enum_id = 0;
++    pdir->hash = 42;  /* initialize the hash to a randomly picked number */
+     return pdir;
+ }
+ 
+diff --git a/base/gsht1.c b/base/gsht1.c
+--- a/base/gsht1.c
++++ b/base/gsht1.c
+@@ -344,8 +344,10 @@ process_transfer(gx_ht_order * porder, gs_state * pgs,
+     pmap->proc = proc;		/* 0 => use closure */
+     pmap->closure = *pmc;
+     pmap->id = gs_next_ids(mem, 1);
+-    load_transfer_map(pgs, pmap, 0.0);
+     porder->transfer = pmap;
++    if (proc == gs_mapped_transfer)
++        return 0; /* nothing to load, the source is uninitialzed */
++    load_transfer_map(pgs, pmap, 0.0);
+     return 0;
+ }
+ 
+diff --git a/base/gsicc.c b/base/gsicc.c
+--- a/base/gsicc.c
++++ b/base/gsicc.c
+@@ -1,6 +1,6 @@
+ /* Copyright (C) 2001-2006 Artifex Software, Inc.
+    All Rights Reserved.
+-  
++
+    This software is provided AS-IS with no warranty, either express or
+    implied.
+ 
+@@ -95,7 +95,7 @@ RELOC_PTRS_END
+  * Color space methods for ICCBased color spaces.
+  *
+  * As documented, ICCBased color spaces may be used as both base and
+- * alternative color spaces. Futhermore,, they can themselves contain paint
++ * alternative color spaces. Futhermore, they can themselves contain paint
+  * color spaces as alternative color space. In this implementation we allow
+  * them to be used as base and alternative color spaces, but only to contain
+  * "small" base color spaces (CIEBased or smaller). This arrangement avoids
+@@ -104,9 +104,9 @@ RELOC_PTRS_END
+  *
+  * Several of the methods used by ICCBased color space apply as well to
+  * DeviceN color spaces, in that they are generic to color spaces having
+- * a variable number of components. We have elected not to attempt to 
++ * a variable number of components. We have elected not to attempt to
+  * extract and combine these operations, because this would save only a
+- * small amount of code, and much more could be saved by intorducing certain
++ * small amount of code, and much more could be saved by introducing certain
+  * common elements (ranges, number of components, etc.) into the color space
+  * root class.
+  */
+@@ -141,7 +141,7 @@ static const gs_color_space_type gs_color_space_type_CIEICC = {
+     gx_spot_colors_set_overprint,   /* set_overprint */
+     gx_final_CIEICC,                /* final */
+     gx_no_adjust_color_count,       /* adjust_color_count */
+-    gx_serialize_CIEICC,		    /* serialize */
++    gx_serialize_CIEICC,            /* serialize */
+     gx_cspace_is_linear_default
+ };
+ 
+@@ -192,11 +192,11 @@ gx_restrict_CIEICC(gs_client_color * pcc, const gs_color_space * pcs)
+ }
+ 
+ /*
+- * Return the conrecte space to which this color space will map. If the
++ * Return the concrete space to which this color space will map. If the
+  * ICCBased color space is being used in native mode, the concrete space
+  * will be dependent on the current color rendering dictionary, as it is
+  * for all CIE bases. If the alternate color space is being used, then
+- * this question is passed on the the appropriate method of that space.
++ * this question is passed on to the appropriate method of that space.
+  */
+ static const gs_color_space *
+ gx_concrete_space_CIEICC(const gs_color_space * pcs, const gs_imager_state * pis)
+@@ -253,8 +253,9 @@ gx_concretize_CIEICC(
+     gx_restrict_CIEICC(&lcc, pcs);
+     for (i = 0; i < ncomps; i++)
+         inv[i] = lcc.paint.values[i];
+-		
+-	/* Since the original limits were wrong for this case, We need to adjust things a bit different */
++
++    /* Since the original limits were wrong for this case,
++       we need to adjust things a bit different */
+ 
+     /* For input Lab color space massage the values into Lab range */
+ 
+@@ -262,7 +263,7 @@ gx_concretize_CIEICC(
+ 
+         inv[0] *= 100;
+         inv[1] = inv[1]*255 - 128;
+-        inv[2] = inv[2]*255 - 128; 
++        inv[2] = inv[2]*255 - 128;
+ 
+     } */
+ 
+@@ -441,7 +442,7 @@ gx_load_icc_profile(gs_cie_icc *picc_info)
+     FILE *fid;
+ 
+ #endif
+-	
++
+     /* verify that the file is legitimate */
+     if (picc_info->file_id != (instrp->read_id | instrp->write_id))
+ 	return_error(gs_error_ioerror);
+@@ -449,7 +450,7 @@ gx_load_icc_profile(gs_cie_icc *picc_info)
+      * Load the top-level ICC profile.
+      *
+      * If an ICC profile fails to load, generate an error.
+-     * 
++     *
+      * Testing demonstrates, however, Acrobat Reader silently
+      * ignores the error and uses the alternate color space.
+      * This behaviour is implemented by catching the error using
+@@ -467,7 +468,7 @@ gx_load_icc_profile(gs_cie_icc *picc_info)
+ 	gs_vector3 *            ppt;
+ 
+ 	pfile = gx_wrap_icc_stream (instrp);
+-      
++
+ 	if ((picc->read(picc, pfile, 0)) != 0)
+ 	    goto return_rangecheck;
+ 
+@@ -483,8 +484,8 @@ gx_load_icc_profile(gs_cie_icc *picc_info)
+         free(iccbuffer);
+ 
+ #endif
+-        
+-            
++
++
+ 	/* verify the profile type */
+ 	profile_class = picc->header->deviceClass;
+ 	if ( profile_class != icSigInputClass     &&
+@@ -540,7 +541,7 @@ gx_load_icc_profile(gs_cie_icc *picc_info)
+ 	 * If absolute colorimetry is employed, the XYZ or L*a*b* values
+ 	 * generated will be absolute in the chromatic sense (they are
+ 	 * not literally "absolute", as we still must have overall
+-	 * intensity information inorder to determine weighted spectral
++	 * intensity information in order to determine weighted spectral
+ 	 * power levels). To achieve relative colorimetry for the output,
+ 	 * these colors must be evaluated relative to the source white
+ 	 * and black points. Hence, in this case, the appropriate white
+@@ -575,7 +576,7 @@ gx_load_icc_profile(gs_cie_icc *picc_info)
+ 	if (plu == NULL)
+ 	    goto return_rangecheck;
+ 
+-	/* 
++	/*
+ 	 * Get the appropriate white and black points. See the note on
+ 	 * rendering intent above for a discussion of why we are using
+ 	 * the profile space illuminant and pure black. (Pure black need
+@@ -673,7 +674,7 @@ gs_cspace_build_CIEICC(
+      * valid WhitepPoint since PostScript always requires this, but ICC
+      * assumes a D50 WhitePoint as a default
+      */
+-    picc_info->common.points.WhitePoint.u = (float)0.9642;		/* Profile illuminant - D50 */
++    picc_info->common.points.WhitePoint.u = (float)0.9642; /* Profile illuminant - D50 */
+     picc_info->common.points.WhitePoint.v = 1.0000;
+     picc_info->common.points.WhitePoint.w = (float)0.8249;
+     picc_info->common.install_cspace = gx_install_CIEICC;
+@@ -692,7 +693,7 @@ gs_cspace_build_CIEICC(
+ 
+ /* ---------------- Serialization. -------------------------------- */
+ 
+-static int 
++static int
+ gx_serialize_CIEICC(const gs_color_space * pcs, stream * s)
+ {
+     const gs_icc_params * p = &pcs->params.icc;
+diff --git a/base/gsiodev.c b/base/gsiodev.c
+--- a/base/gsiodev.c
++++ b/base/gsiodev.c
+@@ -20,6 +20,7 @@
+ #include "gserrors.h"
+ #include "gp.h"
+ #include "gscdefs.h"
++#include "gsfname.h"
+ #include "gsparam.h"
+ #include "gsstruct.h"
+ #include "gxiodev.h"
+@@ -351,3 +352,84 @@ gs_fopen_errno_to_code(int eno)
+ 	    return_error(gs_error_ioerror);
+     }
+ }
++
++/* Generic interface for filesystem enumeration given a path that may	*/
++/* include a %iodev% prefix */
++
++typedef struct gs_file_enum_s gs_file_enum;
++struct gs_file_enum_s {
++    gs_memory_t *memory;
++    gx_io_device *piodev;	/* iodev's are static, so don't need GC tracing */
++    file_enum *pfile_enum;
++    int prepend_iodev_name;
++};
++
++gs_private_st_ptrs1(st_gs_file_enum, gs_file_enum, "gs_file_enum",
++		    gs_file_enum_enum_ptrs, gs_file_enum_reloc_ptrs, pfile_enum);
++
++file_enum *
++gs_enumerate_files_init(const char *pat, uint patlen, gs_memory_t * mem)
++{
++    file_enum *pfen;
++    gs_file_enum *pgs_file_enum;
++    gx_io_device *iodev = NULL;
++    gs_parsed_file_name_t pfn;
++    int code = 0;
++
++    /* Get the iodevice */
++    code = gs_parse_file_name(&pfn, pat, patlen);
++    if (code < 0)
++	return NULL;
++    iodev = (pfn.iodev == NULL) ? iodev_default : pfn.iodev;
++
++    /* Check for several conditions that just cause us to return success */
++    if (pfn.len == 0 || iodev->procs.enumerate_files == iodev_no_enumerate_files) {
++        return NULL;	/* no pattern, or device not found -- just return */
++    }
++    pfen = iodev->procs.enumerate_files(iodev, (const char *)pfn.fname,
++    		pfn.len, mem);
++    if (pfen == 0)
++	return NULL;
++    pgs_file_enum = gs_alloc_struct(mem, gs_file_enum, &st_gs_file_enum,
++			   "gs_enumerate_files_init");
++    if (pgs_file_enum == 0)
++	return NULL;
++    pgs_file_enum->memory = mem;
++    pgs_file_enum->piodev = iodev;
++    pgs_file_enum->pfile_enum = pfen;
++    pgs_file_enum->prepend_iodev_name = (pfn.iodev != NULL);
++    return (file_enum *)pgs_file_enum;
++}
++
++uint
++gs_enumerate_files_next(file_enum * pfen, char *ptr, uint maxlen)
++{
++    gs_file_enum *pgs_file_enum = (gs_file_enum *)pfen;
++    int iodev_name_len = pgs_file_enum->prepend_iodev_name ?
++			strlen(pgs_file_enum->piodev->dname) : 0;
++    uint return_len;
++
++    if (iodev_name_len > maxlen)
++	return maxlen + 1;	/* signal overflow error */
++    if (iodev_name_len > 0)
++	memcpy(ptr, pgs_file_enum->piodev->dname, iodev_name_len);
++    return_len = pgs_file_enum->piodev->procs.enumerate_next(pgs_file_enum->pfile_enum,
++				ptr + iodev_name_len, maxlen - iodev_name_len);
++    if (return_len == ~0) {
++        gs_memory_t *mem = pgs_file_enum->memory;
++
++        gs_free_object(mem, pgs_file_enum, "gs_enumerate_files_close");
++	return ~0;
++    }
++    return return_len+iodev_name_len;
++}
++
++void
++gs_enumerate_files_close(file_enum * pfen)
++{
++    gs_file_enum *pgs_file_enum = (gs_file_enum *)pfen;
++    gs_memory_t *mem = pgs_file_enum->memory;
++
++    pgs_file_enum->piodev->procs.enumerate_close(pgs_file_enum->pfile_enum);
++    gs_free_object(mem, pgs_file_enum, "gs_enumerate_files_close");
++}
+diff --git a/base/gsiorom.c b/base/gsiorom.c
+--- a/base/gsiorom.c
++++ b/base/gsiorom.c
+@@ -148,6 +148,7 @@ s_block_read_seek(register stream * s, long pos)
+ 	s->position = pos - offset;
+ 	pw.ptr = s->cbuf - 1;
+ 	pw.limit = pw.ptr + s->cbsize;
++	s->srptr = s->srlimit = s->cbuf - 1;
+ 	if ((s->end_status = s_block_read_process((stream_state *)s, NULL, &pw, 0)) == ERRC)
+ 	    return ERRC;
+ 	if (s->end_status == 1)
+@@ -181,41 +182,58 @@ s_block_read_process(stream_state * st, stream_cursor_read * ignore_pr,
+     int status = 1;
+     int compression = ((get_u32_big_endian(node) & 0x80000000) != 0) ? 1 : 0;
+     uint32_t filelen = get_u32_big_endian(node) & 0x7fffffff;	/* ignore compression bit */
+-    uint32_t blocks = (filelen+ROMFS_BLOCKSIZE-1)/ ROMFS_BLOCKSIZE;
+-    int iblock = (s->position + s->file_offset + pw->ptr + 1 - s->cbuf) / ROMFS_BLOCKSIZE;
+-    unsigned long block_length = get_u32_big_endian(node+1+(2*iblock));
+-    unsigned const long block_offset = get_u32_big_endian(node+2+(2*iblock));
++    uint32_t blocks = (filelen+ROMFS_BLOCKSIZE-1) / ROMFS_BLOCKSIZE;
++    uint32_t iblock = (s->position + s->file_offset + (s->srlimit + 1 - s->cbuf)) / ROMFS_BLOCKSIZE;
++    uint32_t block_length = get_u32_big_endian(node+1+(2*iblock));
++    uint32_t block_offset = get_u32_big_endian(node+2+(2*iblock));
+     unsigned const char *block_data = ((unsigned char *)node) + block_offset;
+     int count = iblock < (blocks - 1) ? ROMFS_BLOCKSIZE : filelen - (ROMFS_BLOCKSIZE * iblock);
+ 
+-    if (count > max_count) {
+-	return ERRC;			/* should not happen */
+-    }
+-    if (block_data == NULL) {
+-	return EOFC;
+-    }
++    if (s->position == filelen || block_data == NULL)
++	return EOFC;			/* at EOF */
+     if (s->file_limit < max_long) {
+-	long limit_count = s->file_offset + s->file_limit - s->position;
++	/* Adjust count for subfile limit */
++	uint32_t limit_count = s->file_offset + s->file_limit - s->position;
+ 
+ 	if (count > limit_count)
+ 	    count = limit_count;
+     }
+-
+-    if (count < ROMFS_BLOCKSIZE || iblock == (blocks - 1))
+-	status = EOFC;			/* at EOF when not filling entire buffer */
+     /* get the block into the buffer */
+     if (compression) {
+ 	unsigned long buflen = ROMFS_BLOCKSIZE;
++	const byte *dest = (pw->ptr + 1);	/* destination for unpack */
++	int need_copy = false;
+ 
++	/* If the dest is not in our buffer, we can only use it if there */
++	/* is enough space in it					 */
++	if ((dest < s->cbuf) || (dest >= (s->cbuf + s->cbsize))) {
++	    /* the destination is _not_ in our buffer. If the area isn't */
++	    /* big enough we need to ucompress to our buffer, then copy  */
++	    /* the data afterward. INVARIANT: if the buffer is outside   */
++	    /* the cbuf, then the cbuf must be empty.			 */
++	    if (max_count < count) {
++#ifdef DEBUG
++		if ((sbufptr(s)) != s->srlimit)
++		    eprintf("cbuf not empty as expected\n.");
++#endif
++		dest = s->cbuf;
++		need_copy = true;
++	    }
++	}
+ 	/* Decompress the data into this block */
+-	code = uncompress (pw->ptr+1, &buflen, block_data, block_length);
+-	if (count != buflen) {
++	code = uncompress (dest, &buflen, block_data, block_length);
++	if (count != buflen)
+ 	    return ERRC;
++	if (need_copy) {
++	    memcpy(pw->ptr+1, dest, max_count);
++	    count = max_count;
+ 	}
+     } else {
+ 	/* not compressed -- just copy it */
+-	memcpy(pw->ptr+1, block_data, block_length);
+ 	count = block_length;
++	if (count > max_count)
++	    count = max_count;
++	memcpy(pw->ptr+1, block_data, count);
+     }
+     if (count < 0)
+ 	count = 0;
+@@ -353,7 +371,7 @@ romfs_enumerate_next(file_enum *pfen, char *ptr, uint maxlen)
+     while (gs_romfs[penum->list_index] != 0) {
+ 	const uint32_t *node = gs_romfs[penum->list_index];
+ 	uint32_t filelen = get_u32_big_endian(node) & 0x7fffffff;	/* ignore compression bit */
+-	long blocks = (filelen+ROMFS_BLOCKSIZE-1)/ ROMFS_BLOCKSIZE;
++	uint32_t blocks = (filelen+ROMFS_BLOCKSIZE-1)/ ROMFS_BLOCKSIZE;
+ 	char *filename = (char *)(&(node[1+(2*blocks)]));
+ 
+ 	penum->list_index++;		/* bump to next unconditionally */
+diff --git a/base/gsistate.c b/base/gsistate.c
+--- a/base/gsistate.c
++++ b/base/gsistate.c
+@@ -63,7 +63,8 @@ ENUM_PTRS_BEGIN(imager_state_enum_ptrs)
+     ENUM_SUPER(gs_imager_state, st_line_params, line_params, st_imager_state_num_ptrs - st_line_params_num_ptrs);
+     ENUM_PTR(0, gs_imager_state, client_data);
+     ENUM_PTR(1, gs_imager_state, transparency_stack);
+-#define E1(i,elt) ENUM_PTR(i+2,gs_imager_state,elt);
++    ENUM_PTR(2, gs_imager_state, trans_device); 
++#define E1(i,elt) ENUM_PTR(i+3,gs_imager_state,elt);
+     gs_cr_state_do_ptrs(E1)
+ #undef E1
+ ENUM_PTRS_END
+@@ -72,6 +73,7 @@ static RELOC_PTRS_BEGIN(imager_state_reloc_ptrs)
+     RELOC_SUPER(gs_imager_state, st_line_params, line_params);
+     RELOC_PTR(gs_imager_state, client_data);
+     RELOC_PTR(gs_imager_state, transparency_stack);
++    RELOC_PTR(gs_imager_state, trans_device);
+ #define R1(i,elt) RELOC_PTR(gs_imager_state,elt);
+     gs_cr_state_do_ptrs(R1)
+ #undef R1
+@@ -93,6 +95,7 @@ gs_imager_state_initialize(gs_imager_state * pis, gs_memory_t * mem)
+     pis->memory = mem;
+     pis->client_data = 0;
+     pis->transparency_stack = 0;
++    pis->trans_device = 0;
+     /* Color rendering state */
+     pis->halftone = 0;
+     {
+diff --git a/base/gsmchunk.c b/base/gsmchunk.c
+--- a/base/gsmchunk.c
++++ b/base/gsmchunk.c
+@@ -362,8 +362,13 @@ chunk_obj_alloc(gs_memory_t *mem, uint size, gs_memory_type_ptr_t type, client_n
+     }
+     if (current == NULL) {
+ 	/* No chunks with enough space, allocate one */
+-	if (chunk_mem_node_add(cmem, newsize, &current) < 0)
++	if (chunk_mem_node_add(cmem, newsize, &current) < 0) {
++#ifdef DEBUG
++	if (gs_debug_c('a'))
++	    dlprintf1("[a+]chunk_obj_alloc(chunk_mem_node_add)(%u) Failed.\n", size);
++#endif
+ 	    return NULL;
++	}
+     }
+     /* Find the first free area in the current chunk that is big enough */
+     /* LATER: might be better to find the 'best fit' */
+@@ -423,6 +428,11 @@ chunk_obj_alloc(gs_memory_t *mem, uint size, gs_memory_type_ptr_t type, client_n
+     }
+ 
+     /* return the client area of the object we allocated */
++#ifdef DEBUG
++    if (gs_debug_c('A'))
++	dlprintf3("[a+]chunk_obj_alloc (%s)(%u) = 0x%lx: OK.\n",
++		  client_name_string(cname), size, (ulong) newobj);
++#endif
+     return (byte *)(newobj) + sizeof(chunk_obj_node_t);
+ }
+ 
+@@ -484,13 +494,21 @@ chunk_alloc_struct_array(gs_memory_t * mem, uint num_elements,
+ static void *
+ chunk_resize_object(gs_memory_t * mem, void *ptr, uint new_num_elements, client_name_t cname)
+ {
+-    /* get the type from the old object */
+-    chunk_obj_node_t *obj = ((chunk_obj_node_t *)ptr) - 1;
+-    uint new_size = (obj->type->ssize * new_num_elements);
+-
+     /* This isn't particularly efficient, but it is rarely used */
++    chunk_obj_node_t *obj = ((chunk_obj_node_t *)ptr) - 1;
++    ulong new_size = (obj->type->ssize * new_num_elements);
++    ulong old_size = obj->size;
++    /* get the type from the old object */
++    gs_memory_type_ptr_t type = obj->type;
++    void *new_ptr;
++
++    if (new_size == old_size)
++	return ptr;
++    if ((new_ptr = chunk_obj_alloc(mem, new_size, type, cname)) == 0)
++	return 0;
++    memcpy(new_ptr, ptr, min(old_size, new_size));
+     chunk_free_object(mem, ptr, cname);
+-    return chunk_obj_alloc(mem, new_size, obj->type, cname);
++    return new_ptr;
+ }
+ 	
+ static void
+@@ -542,6 +560,9 @@ chunk_free_object(gs_memory_t * mem, void *ptr, client_name_t cname)
+ 	else 
+ 	    prev_obj->next = obj->next;
+ 
++	if_debug3('A', "[a-]chunk_free_object(%s) 0x%lx(%u)\n",
++		  client_name_string(cname), (ulong) ptr, obj->size);
++
+ 	/* Add this object's space (including the header) to the free list */
+ 
+ 	/* Scan free list to find where this element goes */
+diff --git a/base/gsovrc.c b/base/gsovrc.c
+--- a/base/gsovrc.c
++++ b/base/gsovrc.c
+@@ -82,7 +82,8 @@ read_color_index(gx_color_index * pcindex, const byte * data, uint size)
+         if (++nbytes > size)
+             return_error(gs_error_rangecheck);
+         else {
+-            int     c = *data;
++            unsigned char byte = *data;
++            gx_color_index c = byte;
+ 
+             cindex += (c & 0x7f) << shift;
+             if ((c & 0x80) == 0)
+diff --git a/base/gsparam2.c b/base/gsparam2.c
+--- a/base/gsparam2.c
++++ b/base/gsparam2.c
+@@ -373,7 +373,7 @@ sget_bytes(stream *src, byte *data, uint size)
+ 
+     int status = sgets(src, data, size, &ignore_count);
+ 
+-    if (status < 0 && status != EOFC)
++    if (status < 0 && status != EOFC) {
+ 	return_error(gs_error_ioerror);
+     };
+ 
+diff --git a/base/gsptype1.c b/base/gsptype1.c
+--- a/base/gsptype1.c
++++ b/base/gsptype1.c
+@@ -111,6 +111,7 @@ void
+ gs_pattern1_init(gs_pattern1_template_t * ppat)
+ {
+     gs_pattern_common_init((gs_pattern_template_t *)ppat, &gs_pattern1_type);
++    ppat->uses_transparency = 0;	/* false */
+ }
+ 
+ /* Make an instance of a PatternType 1 pattern. */
+@@ -169,8 +170,8 @@ gs_pattern1_make_pattern(gs_client_color * pcc,
+     if_debug6('t', "[t]step_matrix=[%g %g %g %g %g %g]\n",
+ 	      inst.step_matrix.xx, inst.step_matrix.xy, inst.step_matrix.yx, 
+ 	      inst.step_matrix.yy, inst.step_matrix.tx, inst.step_matrix.ty);
+-    if_debug4('t', "[t]bbox=(%g,%g),(%g,%g)\n",
+-	      bbox.p.x, bbox.p.y, bbox.q.x, bbox.q.y);
++    if_debug5('t', "[t]bbox=(%g,%g),(%g,%g), uses_transparency=%d\n",
++	      bbox.p.x, bbox.p.y, bbox.q.x, bbox.q.y, inst.template.uses_transparency);
+     {
+ 	float bbw = bbox.q.x - bbox.p.x;
+ 	float bbh = bbox.q.y - bbox.p.y;
+@@ -1471,7 +1472,7 @@ gx_dc_pattern_read_raster(gx_color_tile *ptile, const gx_dc_serialized_tile_t *b
+ 	dp += l;
+     }
+     if (left == 0)
+-	return 0;
++	return size;	/* we've consumed it all */
+     if (offset1 <= sizeof(gx_dc_serialized_tile_t) + size_b) {
+ 	int l = min(sizeof(gx_dc_serialized_tile_t) + size_b - offset1, left);
+ 
+@@ -1495,7 +1496,7 @@ gx_dc_pattern_read_raster(gx_color_tile *ptile, const gx_dc_serialized_tile_t *b
+ 	dp += l;
+     }
+     if (left == 0)
+-	return 0;
++	return size;
+     if (offset1 <= sizeof(gx_dc_serialized_tile_t) + size_b + size_c) {
+ 	int l = min(sizeof(gx_dc_serialized_tile_t) + size_b + size_c - offset1, left);
+ 
+diff --git a/base/gsptype1.h b/base/gsptype1.h
+--- a/base/gsptype1.h
++++ b/base/gsptype1.h
+@@ -41,6 +41,7 @@ typedef struct gs_pattern1_template_s {
+     gs_pattern_template_common;
+     int PaintType;
+     int TilingType;
++    bool uses_transparency;
+     gs_rect BBox;
+     float XStep;
+     float YStep;
+diff --git a/base/gsshade.c b/base/gsshade.c
+--- a/base/gsshade.c
++++ b/base/gsshade.c
+@@ -306,8 +306,6 @@ gs_shading_FfGt_init(gs_shading_t ** ppsh,
+ 	return code;
+     if (bpf < 0)
+ 	return bpf;
+-    if (params->Decode != 0 && params->Decode[0] == params->Decode[1])
+-	return_error(gs_error_rangecheck);
+     ALLOC_SHADING(&st_shading_FfGt, shading_type_Free_form_Gouraud_triangle,
+ 		  shading_FfGt_procs, "gs_shading_FfGt_init");
+     psh->params.BitsPerFlag = bpf;
+diff --git a/base/gsstate.c b/base/gsstate.c
+--- a/base/gsstate.c
++++ b/base/gsstate.c
+@@ -192,7 +192,7 @@ gstate_copy_client_data(gs_state * pgs, void *dto, void *dfrom,
+ 
+ /* Define the initial value of the graphics state. */
+ static const gs_imager_state gstate_initial = {
+-    gs_imager_state_initial(1.0)
++    gs_imager_state_initial(1.0, true)		/* is_gstate == true */
+ };
+ 
+ /*
+@@ -218,7 +218,7 @@ gs_state_alloc(gs_memory_t * mem)
+     if (pgs == 0)
+ 	return 0;
+     pgs->saved = 0;
+-    *(gs_imager_state *)pgs = gstate_initial;
++    *(gs_imager_state *)pgs = gstate_initial;	/* this sets is_gstate == true */
+ 
+     /*
+      * Just enough of the state is initialized at this point
+diff --git a/base/gstparam.h b/base/gstparam.h
+--- a/base/gstparam.h
++++ b/base/gstparam.h
+@@ -85,6 +85,8 @@ typedef struct gs_transparency_group_params_s {
+     bool image_with_SMask;
+     bool idle;
+     uint mask_id;
++    int group_color_numcomps;
++    gs_transparency_color_t group_color;
+ } gs_transparency_group_params_t;
+ 
+ /* Define the parameter structure for a transparency mask. */
+@@ -99,6 +101,7 @@ typedef enum {
+ /* See the gx_transparency_mask_params_t type below */
+ /* (Update gs_trans_mask_params_init if these change.) */
+ typedef struct gs_transparency_mask_params_s {
++    const gs_color_space *ColorSpace;
+     gs_transparency_mask_subtype_t subtype;
+     int Background_components;
+     float Background[GS_CLIENT_COLOR_MAX_COMPONENTS];
+@@ -113,6 +116,9 @@ typedef struct gs_transparency_mask_params_s {
+ /* The post clist version of transparency mask parameters */
+ typedef struct gx_transparency_mask_params_s {
+     gs_transparency_mask_subtype_t subtype;
++    bool SMask_is_CIE;
++    int group_color_numcomps;
++    gs_transparency_color_t group_color;
+     int Background_components;
+     float Background[GS_CLIENT_COLOR_MAX_COMPONENTS];
+     float GrayBackground;
+diff --git a/base/gstrans.c b/base/gstrans.c
+--- a/base/gstrans.c
++++ b/base/gstrans.c
+@@ -24,6 +24,7 @@
+ #include "gdevdevn.h"
+ #include "gxblend.h"
+ #include "gdevp14.h"
++#include "gscspace.h"
+ 
+ #define PUSH_TS 0
+ 
+@@ -183,24 +184,10 @@ gs_begin_transparency_group(gs_state *pgs,
+ 			    const gs_rect *pbbox)
+ {
+     gs_pdf14trans_params_t params = { 0 };
++    const gs_color_space *blend_color_space;
++    gs_imager_state * pis = (gs_imager_state *)pgs;
+ 
+-#ifdef DEBUG
+-    if (gs_debug_c('v')) {
+-	static const char *const cs_names[] = {
+-	    GS_COLOR_SPACE_TYPE_NAMES
+-	};
+ 
+-	dlprintf5("[v](0x%lx)begin_transparency_group [%g %g %g %g]\n",
+-		  (ulong)pgs, pbbox->p.x, pbbox->p.y, pbbox->q.x, pbbox->q.y);
+-	if (ptgp->ColorSpace)
+-	    dprintf1("     CS = %s",
+-		cs_names[(int)gs_color_space_get_index(ptgp->ColorSpace)]);
+-	else
+-	    dputs("     (no CS)");
+-	dprintf2("  Isolated = %d  Knockout = %d\n",
+-		 ptgp->Isolated, ptgp->Knockout);
+-    }
+-#endif
+     /*
+      * Put parameters into a compositor parameter and then call the
+      * create_compositor.  This will pass the data to the PDF 1.4
+@@ -213,11 +200,98 @@ gs_begin_transparency_group(gs_state *pgs,
+     params.opacity = pgs->opacity;
+     params.shape = pgs->shape;
+     params.blend_mode = pgs->blend_mode;
+-    /*
+-     * We are currently doing nothing with the colorspace.  Currently
+-     * the blending colorspace is based upon the processs color model
+-     * of the output device.
+-     */
++
++    /* The blending procs must be based upon the current color space */
++    /* Note:  This function is called during the c-list writer side. 
++       Store some information so that we know what the color space is
++       so that we can adjust according later during the clist reader */ 
++
++    /* Note that we currently will use the concrete space for any space other than a 
++        device space.  However, if the device is a sep device it will blend
++        in DeviceN color space as required.  */
++
++    if (gs_color_space_get_index(pgs->color_space) <= gs_color_space_index_DeviceCMYK) {
++
++        blend_color_space = pgs->color_space;
++
++    } else {
++
++       /* ICC and CIE based color space.  Problem right now is that the 
++       current code does a concretization to the color space
++       defined by the CRD.  This is not the space that we want
++       to blend in.  Instead we want all colors to be mapped TO
++       the ICC color space.  Then when the group is popped they
++       should be converted to the parent space. 
++       That I will need to fix another day with the color changes.  
++       For now we will punt and set our blending space as the 
++       concrete space for the ICC space, which is defined by
++       the output (or default) CRD. */
++
++        blend_color_space = cs_concrete_space(pgs->color_space, pis);
++
++    }
++
++    /* Note that if the /CS parameter was not present in the push 
++       of the transparency group, then we must actually inherent 
++       the previous group color space, or the color space of the
++       target device (process color model).  Note here we just want
++       to set it as a unknown type for clist writing, as we .  We will later 
++       during clist reading 
++       */
++
++    if (ptgp->ColorSpace == NULL) {
++
++        params.group_color = UNKNOWN;
++        params.group_color_numcomps = 0;
++    
++    } else {
++
++        switch (cs_num_components(blend_color_space)) {
++            case 1:				
++                params.group_color = GRAY_SCALE;       
++                params.group_color_numcomps = 1;  /* Need to check */
++                break;
++            case 3:				
++                params.group_color = DEVICE_RGB;       
++                params.group_color_numcomps = 3; 
++                break;
++            case 4:				
++                params.group_color = DEVICE_CMYK;       
++                params.group_color_numcomps = 4; 
++            break;
++            default:
++                
++                /* We can end up here if we are in
++                   a deviceN color space and 
++                   we have a sep output device */
++
++                params.group_color = DEVICEN;
++                params.group_color_numcomps = cs_num_components(blend_color_space);
++
++            break;
++
++         }  
++
++    }
++
++#ifdef DEBUG
++    if (gs_debug_c('v')) {
++	static const char *const cs_names[] = {
++	    GS_COLOR_SPACE_TYPE_NAMES
++	};
++
++	dlprintf6("[v](0x%lx)begin_transparency_group [%g %g %g %g] Num_grp_clr_comp = %d\n",
++		  (ulong)pgs, pbbox->p.x, pbbox->p.y, pbbox->q.x, pbbox->q.y,params.group_color_numcomps);
++	if (ptgp->ColorSpace)
++	    dprintf1("     CS = %s",
++		cs_names[(int)gs_color_space_get_index(ptgp->ColorSpace)]);
++	else
++	    dputs("     (no CS)");
++	dprintf2("  Isolated = %d  Knockout = %d\n",
++		 ptgp->Isolated, ptgp->Knockout);
++    }
++#endif
++
+     params.bbox = *pbbox;
+     return gs_state_update_pdf14trans(pgs, &params);
+ }
+@@ -236,6 +310,11 @@ gx_begin_transparency_group(gs_imager_state * pis, gx_device * pdev,
+     tgp.Knockout = pparams->Knockout;
+     tgp.idle = pparams->idle;
+     tgp.mask_id = pparams->mask_id;
++
++    /* Needed so that we do proper blending */
++    tgp.group_color = pparams->group_color;
++    tgp.group_color_numcomps = pparams->group_color_numcomps;
++
+     pis->opacity.alpha = pparams->opacity.alpha;
+     pis->shape.alpha = pparams->shape.alpha;
+     pis->blend_mode = pparams->blend_mode;
+@@ -246,8 +325,8 @@ gx_begin_transparency_group(gs_imager_state * pis, gx_device * pdev,
+ 	    GS_COLOR_SPACE_TYPE_NAMES
+ 	};
+ 
+-	dlprintf5("[v](0x%lx)gx_begin_transparency_group [%g %g %g %g]\n",
+-		  (ulong)pis, bbox.p.x, bbox.p.y, bbox.q.x, bbox.q.y);
++	dlprintf6("[v](0x%lx)gx_begin_transparency_group [%g %g %g %g] Num_grp_clr_comp = %d\n",
++		  (ulong)pis, bbox.p.x, bbox.p.y, bbox.q.x, bbox.q.y,pparams->group_color_numcomps);
+ 	if (tgp.ColorSpace)
+ 	    dprintf1("     CS = %s",
+ 		cs_names[(int)gs_color_space_get_index(tgp.ColorSpace)]);
+@@ -298,6 +377,7 @@ void
+ gs_trans_mask_params_init(gs_transparency_mask_params_t *ptmp,
+ 			  gs_transparency_mask_subtype_t subtype)
+ {
++    ptmp->ColorSpace = 0;
+     ptmp->subtype = subtype;
+     ptmp->Background_components = 0;
+     ptmp->TransferFunction = mask_transfer_identity;
+@@ -313,16 +393,14 @@ gs_begin_transparency_mask(gs_state * pgs,
+     gs_pdf14trans_params_t params = { 0 };
+     const int l = sizeof(params.Background[0]) * ptmp->Background_components;
+     int i;
++    const gs_color_space *blend_color_space;
++    gs_imager_state * pis = (gs_imager_state *)pgs;
+ 
+-    if_debug8('v', "[v](0x%lx)gs_begin_transparency_mask [%g %g %g %g]\n\
+-      subtype = %d  Background_components = %d  %s\n",
+-	      (ulong)pgs, pbbox->p.x, pbbox->p.y, pbbox->q.x, pbbox->q.y,
+-	      (int)ptmp->subtype, ptmp->Background_components,
+-	      (ptmp->TransferFunction == mask_transfer_identity ? "no TR" :
+-	       "has TR"));
+     params.pdf14_op = PDF14_BEGIN_TRANS_MASK;
+     params.bbox = *pbbox;
+     params.subtype = ptmp->subtype;
++   /* params.SMask_is_CIE = gs_color_space_is_CIE(pgs->color_space); */  /* See comments in gs_begin_transparency_mask */
++    params.SMask_is_CIE = false; 
+     params.Background_components = ptmp->Background_components;
+     memcpy(params.Background, ptmp->Background, l);
+     params.GrayBackground = ptmp->GrayBackground;
+@@ -331,6 +409,18 @@ gs_begin_transparency_mask(gs_state * pgs,
+ 	    (ptmp->TransferFunction == mask_transfer_identity);
+     params.mask_is_image = mask_is_image;
+     params.replacing = ptmp->replacing;
++    /* Note that the SMask buffer may have a different 
++       numcomps than the device buffer */
++    params.group_color_numcomps = cs_num_components(pgs->color_space);
++
++    if_debug9('v', "[v](0x%lx)gs_begin_transparency_mask [%g %g %g %g]\n\
++      subtype = %d  Background_components = %d Num_grp_clr_comp = %d  %s\n",
++	      (ulong)pgs, pbbox->p.x, pbbox->p.y, pbbox->q.x, pbbox->q.y,
++	      (int)ptmp->subtype, ptmp->Background_components,
++              params.group_color_numcomps,
++	      (ptmp->TransferFunction == mask_transfer_identity ? "no TR" :
++	       "has TR"));
++
+     /* Sample the transfer function */
+     for (i = 0; i < MASK_TRANSFER_FUNCTION_SIZE; i++) {
+ 	float in = (float)(i * (1.0 / (MASK_TRANSFER_FUNCTION_SIZE - 1)));
+@@ -339,9 +429,115 @@ gs_begin_transparency_mask(gs_state * pgs,
+ 	ptmp->TransferFunction(in, &out, ptmp->TransferFunction_data);
+ 	params.transfer_fn[i] = (byte)floor((double)(out * 255 + 0.5));
+     }
++
++    /* If we have a CIE space & a luminosity subtype
++       we will need to do our concretization
++       to CIEXYZ so that we can obtain the proper 
++       luminance value.  This is what SHOULD happen
++       according to the spec.  However AR does not 
++       follow this.  It always seems to do the soft mask
++       creation in the device space.  For this reason
++       we will do that too. SMask_is_CIE is always false for now */
++
++    /* The blending procs are currently based upon the device type.
++       We need to have them based upon the current color space */
++
++    /* Note:  This function is called during the c-list writer side. */ 
++
++
++    if ( params.SMask_is_CIE && params.subtype == TRANSPARENCY_MASK_Luminosity ){
++
++        /* Install Color Space to go to CIEXYZ */
++        
++        /* int ok;
++        ok = gx_cie_to_xyz_alloc2(pgs->color_space,pgs); */  /* quite compiler */
++        params.group_color_numcomps = 3;  /* CIEXYZ */
++
++        /* Mark the proper spaces so that we make
++         * the appropriate changes in the device */
++
++        params.group_color = CIE_XYZ;
++
++    } else {
++
++    /* Set the group color type, which may be 
++     *  different than the device type.  Note
++        we want to check the concrete space due
++        to the fact that things are done
++        in device space always. */
++
++
++        if(!gs_color_space_is_CIE(pgs->color_space)){
++
++            blend_color_space = pgs->color_space;
++
++        } else {
++
++           /* ICC or CIE based color space.  Problem right now is that the 
++           current code does a concretization to the color space
++           defined by the CRD.  This is not the space that we want
++           to blend in.  Instead we want all colors to be mapped TO
++           the ICC color space.  Then when the group is popped they
++           should be converted to the parent space. 
++           That I will need to fix another day with the color changes.  
++           For now we will punt and set our blending space as the 
++           concrete space for the ICC space, which is defined by
++           the output (or default) CRD. */
++
++            blend_color_space = cs_concrete_space(pgs->color_space, pis);
++
++        }
++
++
++        /* Note that if the /CS parameter was not present in the push 
++        of the transparency group, then we must actually inherent 
++        the previous group color space, or the color space of the
++        target device (process color model).  Note here we just want
++        to set it as a unknown type for clist writing, as we .  We will later 
++        during clist reading 
++        */
++
++        if (ptmp->ColorSpace == NULL) {
++
++            params.group_color = UNKNOWN;
++            params.group_color_numcomps = 0;
++
++        } else {
++
++
++            switch (cs_num_components(blend_color_space)) {
++
++                case 1:				
++                    params.group_color = GRAY_SCALE;       
++                    params.group_color_numcomps = 1;  /* Need to check */
++                    break;
++                case 3:				
++                    params.group_color = DEVICE_RGB;       
++                    params.group_color_numcomps = 3; 
++                    break;
++                case 4:				
++                    params.group_color = DEVICE_CMYK;       
++                    params.group_color_numcomps = 4; 
++	            break;
++                default:
++                    /* Transparency soft mask spot
++                       colors are NEVER available. 
++                       We must use the alternate tint
++                       transform */
++	            return_error(gs_error_rangecheck);
++	            break;
++
++             }    
++
++        }
++
++    }
++
+     return gs_state_update_pdf14trans(pgs, &params);
+ }
+ 
++/* This occurs on the c-list reader side */
++
+ int
+ gx_begin_transparency_mask(gs_imager_state * pis, gx_device * pdev,
+ 				const gs_pdf14trans_params_t * pparams)
+@@ -349,7 +545,10 @@ gx_begin_transparency_mask(gs_imager_state * pis, gx_device * pdev,
+     gx_transparency_mask_params_t tmp;
+     const int l = sizeof(pparams->Background[0]) * pparams->Background_components;
+ 
++    tmp.group_color = pparams->group_color;
+     tmp.subtype = pparams->subtype;
++    tmp.SMask_is_CIE = pparams->SMask_is_CIE;
++    tmp.group_color_numcomps = pparams->group_color_numcomps;
+     tmp.Background_components = pparams->Background_components;
+     memcpy(tmp.Background, pparams->Background, l);
+     tmp.GrayBackground = pparams->GrayBackground;
+@@ -358,11 +557,12 @@ gx_begin_transparency_mask(gs_imager_state * pis, gx_device * pdev,
+     tmp.replacing = pparams->replacing;
+     tmp.mask_id = pparams->mask_id;
+     memcpy(tmp.transfer_fn, pparams->transfer_fn, size_of(tmp.transfer_fn));
+-    if_debug8('v', "[v](0x%lx)gx_begin_transparency_mask [%g %g %g %g]\n\
+-      subtype = %d  Background_components = %d  %s\n",
++    if_debug9('v', "[v](0x%lx)gx_begin_transparency_mask [%g %g %g %g]\n\
++      subtype = %d  Background_components = %d  Num_grp_clr_comp = %d %s\n",
+ 	      (ulong)pis, pparams->bbox.p.x, pparams->bbox.p.y,
+ 	      pparams->bbox.q.x, pparams->bbox.q.y,
+ 	      (int)tmp.subtype, tmp.Background_components,
++              tmp.group_color_numcomps,
+ 	      (tmp.function_is_identity ? "no TR" :
+ 	       "has TR"));
+     if (dev_proc(pdev, begin_transparency_mask) != 0)
+@@ -392,8 +592,9 @@ gx_end_transparency_mask(gs_imager_state * pis, gx_device * pdev,
+ {
+     if_debug2('v', "[v](0x%lx)gx_end_transparency_mask(%d)\n", (ulong)pis,
+ 	      (int)pparams->csel);
++
+     if (dev_proc(pdev, end_transparency_mask) != 0)
+-	return (*dev_proc(pdev, end_transparency_mask)) (pdev, NULL);
++	return (*dev_proc(pdev, end_transparency_mask)) (pdev, pis, NULL);
+     else
+ 	return 0;
+ }
+diff --git a/base/gstrans.h b/base/gstrans.h
+--- a/base/gstrans.h
++++ b/base/gstrans.h
+@@ -20,6 +20,7 @@
+ #include "gstparam.h"
+ #include "gxcomp.h"
+ #include "gsmatrix.h"
++#include "gxblend.h"
+ 
+ /*
+  * Define the operations for the PDF 1.4 transparency compositor.
+@@ -95,6 +96,9 @@ struct gs_pdf14trans_params_s {
+ 	bool overprint_mode;
+     bool idle; /* For clist reader.*/
+     uint mask_id; /* For clist reader.*/
++    bool SMask_is_CIE;
++    int group_color_numcomps;
++    gs_transparency_color_t group_color;
+ };
+ 
+ #ifndef gs_pdf14trans_params_DEFINED
+diff --git a/base/gstype1.c b/base/gstype1.c
+--- a/base/gstype1.c
++++ b/base/gstype1.c
+@@ -283,6 +283,19 @@ gs_type1_interpret(gs_type1_state * pcis, const gs_glyph_data_t *pgd,
+ 		goto cc;
+ 	    case cx_endchar:
+                 if (pcis->seac_accent < 0) {
++		    if(!pcis->sb_set && !pcis->width_set) {
++			/* No sbw/hsbw op, error condition but Adobe interpreters ignore it.
++			   Rewind the data pointer to the beginning of the glyph, re-initialise
++			   the hinter, execute a '0' sbw op, and then carry on as if we had
++			   actually received one. */
++			cip = pgd->bits.data;
++			t1_hinter__init(h, pcis->path);
++			code = t1_hinter__sbw(h, fixed_0, fixed_0, fixed_0, fixed_0);
++			if (code < 0)
++			    return code;
++			gs_type1_sbw(pcis, fixed_0, fixed_0, fixed_0, fixed_0);
++			goto rsbw;
++		    }
+                     code = t1_hinter__endglyph(h);
+ 		    if (code < 0)
+ 			return code;
+diff --git a/base/gstype42.c b/base/gstype42.c
+--- a/base/gstype42.c
++++ b/base/gstype42.c
+@@ -258,8 +258,23 @@ gs_type42_font_init(gs_font_type42 * pfont, int subfontID)
+ 	   the bug 688467 fails otherwise.
+ 	 */
+ 	/* pfont->key_name.chars is ASCIIZ due to copy_font_name. */
++	char buf[gs_font_name_max + 2];
++
++	if (pfont->key_name.size) {
++	    int l = min(sizeof(buf) - 1, pfont->key_name.size);
++
++	    memcpy(buf, pfont->key_name.chars, l);
++	    buf[l] = 0;
++	} else if (pfont->font_name.size) {
++	    int l = min(sizeof(buf) - 1, pfont->font_name.size);
++
++	    memcpy(buf, pfont->font_name.chars, l);
++	    buf[l] = 0;
++	} else
++	    buf[0] = 0;
++
+ 	eprintf3("Warning: 'loca' length %d is greater than numGlyphs %d in the font %s.\n", 
+-		pfont->data.numGlyphs + 1, pfont->data.trueNumGlyphs, pfont->key_name.chars);
++		pfont->data.numGlyphs + 1, pfont->data.trueNumGlyphs, buf);
+ 	if (loca_size > pfont->data.trueNumGlyphs + 1) {
+ 	    /* Bug 689516 demonstrates a font, in which numGlyps is smaller than loca size,
+ 	       and there are useful glyphs behind maxp.numGlyphs. */
+diff --git a/base/gxblend.c b/base/gxblend.c
+--- a/base/gxblend.c
++++ b/base/gxblend.c
+@@ -17,13 +17,203 @@
+ #include "gx.h"
+ #include "gstparam.h"
+ #include "gxblend.h"
++#include "gxcolor2.h"
+ 
+ typedef int art_s32;
+ 
+ #if RAW_DUMP
+-extern unsigned char global_index;
++extern unsigned int global_index;
++extern unsigned int clist_band_count;
+ #endif
+ 
++/* This function is used for mapping the SMask source to a
++   monochrome luminosity value which basically is the alpha value 
++   Note, that separation colors are not allowed here.  Everything
++   must be in CMYK, RGB or monochrome.  */
++
++/* Note, data is planar */
++
++void 
++Smask_Luminosity_Mapping(int num_rows, int num_cols, int n_chan, int row_stride, 
++                         int plane_stride, byte *dst, const byte *src, bool isadditive,
++                         bool SMask_is_CIE, gs_transparency_mask_subtype_t SMask_SubType)
++{
++
++    int x,y;
++    int mask_alpha_offset,mask_C_offset,mask_M_offset,mask_Y_offset,mask_K_offset;
++    int mask_R_offset,mask_G_offset,mask_B_offset;
++    byte *dstptr;
++
++#if RAW_DUMP
++
++    dump_raw_buffer(num_rows, row_stride, n_chan,
++                plane_stride, row_stride, 
++                "Raw_Mask", src);
++
++    global_index++;
++
++#endif
++
++    dstptr = dst;
++
++    /* If we are CIE AND subtype is Luminosity then we should just grab the Y channel */
++
++    if ( SMask_is_CIE && SMask_SubType == TRANSPARENCY_MASK_Luminosity ){
++
++ 
++        memcpy(dst, &(src[plane_stride]), plane_stride);
++        return;
++
++    }
++
++    /* If we are alpha type, then just grab that */ 
++    /* We need to optimize this so that we are only drawing alpha in the rect fills */
++
++    if ( SMask_SubType == TRANSPARENCY_MASK_Alpha ){
++
++        mask_alpha_offset = (n_chan - 1) * plane_stride;
++        memcpy(dst, &(src[mask_alpha_offset]), plane_stride);
++        return;
++
++    }
++
++    /* To avoid the if statement inside this loop, 
++    decide on additive or subractive now */
++
++    if (isadditive || n_chan == 2)
++    {
++
++        /* Now we need to split Gray from RGB */
++
++        if( n_chan == 2 )
++        {
++            /* Gray Scale case */
++
++           mask_alpha_offset = (n_chan - 1) * plane_stride;
++           mask_R_offset = 0;
++
++            for ( y = 0; y < num_rows; y++ )
++            {
++     
++                for ( x = 0; x < num_cols; x++ ){
++
++                    /* With the current design this will indicate if 
++                    we ever did a fill at this pixel. if not then move on.
++                    This could have some serious optimization */
++                               
++	            if (src[x + mask_alpha_offset] != 0x00) {
++
++                        dstptr[x] = src[x + mask_R_offset];
++
++                    } 
++
++                }
++
++               dstptr += row_stride;
++               mask_alpha_offset += row_stride;
++               mask_R_offset += row_stride;
++
++            }
++
++        } else {
++
++
++
++            /* RGB case */
++
++           mask_R_offset = 0;
++           mask_G_offset = plane_stride;
++           mask_B_offset = 2 * plane_stride;
++           mask_alpha_offset = (n_chan - 1) * plane_stride;
++
++            for ( y = 0; y < num_rows; y++ )
++            {
++     
++               for ( x = 0; x < num_cols; x++ ){
++
++                    /* With the current design this will indicate if 
++                    we ever did a fill at this pixel. if not then move on */
++                               
++	            if (src[x + mask_alpha_offset] != 0x00) {
++
++	                /* Get luminosity of Device RGB value */
++
++                        float temp;
++
++                        temp = ( 0.30 * src[x + mask_R_offset] + 
++                            0.59 * src[x + mask_G_offset] + 
++                            0.11 * src[x + mask_B_offset] );
++     
++                        temp = temp * (1.0 / 255.0 );  /* May need to be optimized */
++	                dstptr[x] = float_color_to_byte_color(temp);
++
++                    } 
++
++                }
++
++               dstptr += row_stride;
++               mask_alpha_offset += row_stride;
++               mask_R_offset += row_stride;
++               mask_G_offset += row_stride;
++               mask_B_offset += row_stride;
++
++            }
++            
++        }
++
++    } else {
++
++       /* CMYK case */
++
++       mask_alpha_offset = (n_chan - 1) * plane_stride;
++       mask_C_offset = 0;
++       mask_M_offset = plane_stride;
++       mask_Y_offset = 2 * plane_stride;
++       mask_K_offset = 3 * plane_stride;
++
++       for ( y = 0; y < num_rows; y++ ){
++
++            for ( x = 0; x < num_cols; x++ ){
++
++                /* With the current design this will indicate if 
++                we ever did a fill at this pixel. if not then move on */
++                            
++	        if (src[x + mask_alpha_offset] != 0x00){
++
++                  /* PDF spec says to use Y = 0.30 (1 - C)(1 - K) + 
++                  0.59 (1 - M)(1 - K) + 0.11 (1 - Y)(1 - K) */
++                    /* For device CMYK */
++
++                    float temp;
++
++                    temp = ( 0.30 * ( 0xff - src[x + mask_C_offset]) + 
++                        0.59 * ( 0xff - src[x + mask_M_offset]) + 
++                        0.11 * ( 0xff - src[x + mask_Y_offset]) ) * 
++                        ( 0xff - src[x + mask_K_offset]);
++
++                    temp = temp * (1.0 / 65025.0 );  /* May need to be optimized */
++
++	            dstptr[x] = float_color_to_byte_color(temp);
++
++                } 
++ 
++            }
++
++           dstptr += row_stride;
++           mask_alpha_offset += row_stride;
++           mask_C_offset += row_stride;
++           mask_M_offset += row_stride;
++           mask_Y_offset += row_stride;
++           mask_K_offset += row_stride;
++
++        }
++
++
++    }
++
++
++}
++
+ void
+ art_blend_luminosity_rgb_8(int n_chan, byte *dst, const byte *backdrop,
+ 			   const byte *src)
+@@ -1236,13 +1426,20 @@ dump_raw_buffer(int num_rows, int width, int n_chan,
+     FILE *fid;
+     int z,y;
+     byte *buff_ptr;
++    int max_bands;
++
++   /* clist_band_count is incremented at every pdf14putimage */
++   /* Useful for catching this thing and only dumping */
++   /* during a particular band if we have a large file */
++   /* if (clist_band_count != 80) return; */
+ 
+     buff_ptr = Buffer;
+ 
+-    sprintf(full_file_name,"%d)%s_%dx%dx%d.raw",global_index,filename,width,num_rows,n_chan);
++    max_bands = ( n_chan < 57 ? n_chan : 56);   /* Photoshop handles at most 56 bands */
++    sprintf(full_file_name,"%d)%s_%dx%dx%d.raw",global_index,filename,width,num_rows,max_bands);
+     fid = fopen(full_file_name,"wb");
+ 
+-    for (z = 0; z < n_chan; ++z) {
++    for (z = 0; z < max_bands; ++z) {
+ 
+         /* grab pointer to the next plane */
+ 
+diff --git a/base/gxblend.h b/base/gxblend.h
+--- a/base/gxblend.h
++++ b/base/gxblend.h
+@@ -19,12 +19,13 @@
+ #include "gxcindex.h"
+ #include "gxcvalue.h"
+ #include "gxfrac.h"
++#include "gxdevcli.h"
+ 
+ #define RAW_DUMP 0
+ 
+ /* #define DUMP_TO_PNG */
+ 
+-#define	PDF14_MAX_PLANES (GX_DEVICE_COLOR_MAX_COMPONENTS + 1)	/* one extra for alpha channel */
++#define	PDF14_MAX_PLANES GX_DEVICE_COLOR_MAX_COMPONENTS+3  /* Needed for alpha channel, shape, group alpha */
+ 
+ typedef bits16 ArtPixMaxDepth;
+ 
+@@ -75,6 +76,27 @@ typedef struct {
+ typedef pdf14_nonseparable_blending_procs_s
+ 		pdf14_nonseparable_blending_procs_t;
+ 
++
++/* This is used to so that we can change procedures based
++ * upon the Smask color space. previously we always
++ *  went to the device space */
++
++typedef struct {
++
++    pdf14_nonseparable_blending_procs_t device_procs;
++    gx_device_procs color_mapping_procs;
++
++} pdf14_parent_cs_params_s;
++
++typedef pdf14_parent_cs_params_s pdf14_parent_cs_params_t;
++
++/* This function is used for mapping Smask CMYK or RGB data to a monochrome alpha buffer */
++
++void Smask_Luminosity_Mapping(int num_rows, int num_cols, int n_chan, int row_stride, 
++                         int plane_stride, byte *dst, const byte *src, bool isadditive,
++                            bool SMask_is_CIE, gs_transparency_mask_subtype_t SMask_SubType);
++
++
+ /**
+  * art_blend_pixel: Compute PDF 1.4 blending function.
+  * @dst: Where to store resulting pixel.
+@@ -340,6 +362,12 @@ void pdf14_compose_group(pdf14_buf *tos, pdf14_buf *nos, pdf14_buf *maskbuf,
+ 	      int x0, int x1, int y0, int y1, int n_chan, bool additive,
+ 	      const pdf14_nonseparable_blending_procs_t * pblend_procs);
+ 
++gx_color_index pdf14_encode_smask_color(gx_device *dev, 
++             const gx_color_value colors[], int ncomp);
++
++int pdf14_decode_smask_color(gx_device * dev, gx_color_index color, 
++                             gx_color_value * out, int ncomp);
++
+ 
+ gx_color_index pdf14_encode_color(gx_device *dev, const gx_color_value colors[]);
+ 
+diff --git a/base/gxblend1.c b/base/gxblend1.c
+--- a/base/gxblend1.c
++++ b/base/gxblend1.c
+@@ -24,6 +24,7 @@
+ #include "gdevdevn.h"
+ #include "gdevp14.h"
+ #include "vdtrace.h"
++#include "gxdcconv.h"
+ 
+ #ifdef DUMP_TO_PNG
+ #include "png_.h"
+@@ -32,8 +33,7 @@
+ /*
+  * Unpack a device color.  This routine is similar to the device's
+  * decode_color procedure except for two things.  The procedure produces 1
+- * byte values instead of gx_color_values (2 bytes) and the output values
+- * are inverted for subtractive color spaces (like CMYK).  A separate
++ * byte values instead of gx_color_values (2 bytes).  A separate
+  * procedure is used instead of the decode_color to minimize execution time.
+  */
+ void
+@@ -138,11 +138,14 @@ pdf14_unpack_custom(int num_comp, gx_color_index color,
+ 	out[i] = 0xff - gx_color_value_to_byte(cm_values[i]);
+ }
+ 
+-
++#if RAW_DUMP
++extern unsigned int global_index;
++#endif
+ 
+ void
+ pdf14_preserve_backdrop(pdf14_buf *buf, pdf14_buf *tos, bool has_shape)
+ {
++
+     /* make copy of backdrop for compositing */
+     int x0 = max(buf->rect.p.x, tos->rect.p.x);
+     int x1 = min(buf->rect.q.x, tos->rect.q.x);
+@@ -154,7 +157,8 @@ pdf14_preserve_backdrop(pdf14_buf *buf, pdf14_buf *tos, bool has_shape)
+ 	byte *buf_plane = buf->data + x0 - buf->rect.p.x + (y0 - buf->rect.p.y) * buf->rowstride;
+ 	byte *tos_plane = tos->data + x0 - tos->rect.p.x + (y0 - tos->rect.p.y) * tos->rowstride;
+ 	int i;
+-	int n_chan_copy = buf->n_chan + (tos->has_shape ? 1 : 0);
++	/*int n_chan_copy = buf->n_chan + (tos->has_shape ? 1 : 0);*/
++	int n_chan_copy = tos->n_chan + (tos->has_shape ? 1 : 0);
+ 
+ 	for (i = 0; i < n_chan_copy; i++) {
+ 		byte *buf_ptr = buf_plane;
+@@ -172,8 +176,29 @@ pdf14_preserve_backdrop(pdf14_buf *buf, pdf14_buf *tos, bool has_shape)
+ 	if (has_shape && !tos->has_shape)
+ 	    memset (buf_plane, 0, buf->planestride);
+     }
++
++
++#if RAW_DUMP
++
++    if (x0 < x1 && y0 < y1) {
++        
++        byte *buf_plane = buf->data + x0 - buf->rect.p.x + 
++            (y0 - buf->rect.p.y) * buf->rowstride;
++
++        dump_raw_buffer(y1-y0, x1 - x0, buf->n_planes,
++                    buf->planestride, buf->rowstride, 
++                    "BackDropInit",buf_plane);
++
++        global_index++;
++
++    }
++
++#endif
++
+ }
+ 
++
++
+ void
+ pdf14_compose_group(pdf14_buf *tos, pdf14_buf *nos, pdf14_buf *maskbuf, 
+ 	      int x0, int x1, int y0, int y1, int n_chan, bool additive,
+@@ -206,6 +231,9 @@ pdf14_compose_group(pdf14_buf *tos, pdf14_buf *nos, pdf14_buf *maskbuf,
+     int nos_shape_offset = n_chan * nos_planestride;
+     bool nos_has_shape = nos->has_shape;
+     byte *mask_tr_fn = NULL; /* Quiet compiler. */
++#if RAW_DUMP
++    byte *composed_ptr = NULL;
++#endif
+ 
+     rect_merge(nos->bbox, tos->bbox);
+ 
+@@ -224,6 +252,28 @@ pdf14_compose_group(pdf14_buf *tos, pdf14_buf *nos, pdf14_buf *maskbuf,
+ 	mask_tr_fn = maskbuf->transfer_fn;
+     }
+ 
++#if RAW_DUMP
++
++    composed_ptr = nos_ptr;
++
++    dump_raw_buffer(y1-y0, width, tos->n_planes,
++            tos_planestride, tos->rowstride, 
++            "ImageTOS",tos_ptr);
++
++    dump_raw_buffer(y1-y0, width, nos->n_planes,
++                nos_planestride, nos->rowstride, 
++                "ImageNOS",nos_ptr);
++
++    if(maskbuf != NULL){
++
++        dump_raw_buffer(y1-y0, width, maskbuf->n_planes,
++                        maskbuf->planestride, maskbuf->rowstride, 
++                        "Mask",mask_ptr);
++    }
++
++#endif
++
++
+     for (y = y0; y < y1; ++y) {
+ 	for (x = 0; x < width; ++x) {
+ 	    byte pix_alpha = alpha;
+@@ -244,28 +294,9 @@ pdf14_compose_group(pdf14_buf *tos, pdf14_buf *nos, pdf14_buf *maskbuf,
+ 	    }
+ 
+ 	    if (mask_ptr != NULL) {
+-		int mask_alpha = mask_ptr[x + num_comp * mask_planestride];
++
++                byte mask = mask_ptr[x];
+ 		int tmp;
+-		byte mask;
+-
+-		    /*
+-		    * The mask data is really monochrome.  Thus for additive (RGB)
+-		    * we use the R channel for alpha since R = G = B.  For
+-		    * subtractive (CMYK) we use the K channel.
+-		    */
+-		if (mask_alpha == 255) {
+-		    /* todo: rgba->mask */
+-		    mask = additive ? mask_ptr[x]
+-				    : 255 - mask_ptr[x + 3 * mask_planestride];
+-		} else if (mask_alpha == 0)
+-		    mask = mask_bg_alpha;
+-		else {
+-		    int t2 = additive ? mask_ptr[x]
+-				    : 255 - mask_ptr[x + 3 * mask_planestride];
+-
+-		    t2 = (t2 - mask_bg_alpha) * mask_alpha + 0x80;
+-		    mask = mask_bg_alpha + ((t2 + (t2 >> 8)) >> 8);
+-		}
+ 		mask = mask_tr_fn[mask];
+ 		tmp = pix_alpha * mask + 0x80;
+ 		pix_alpha = (tmp + (tmp >> 8)) >> 8;
+@@ -332,9 +363,62 @@ pdf14_compose_group(pdf14_buf *tos, pdf14_buf *nos, pdf14_buf *maskbuf,
+ 	if (mask_ptr != NULL)
+ 	    mask_ptr += maskbuf->rowstride;
+     }
++
++
++    /* Lets look at composed result */
++
++
++#if RAW_DUMP
++
++	/* The group alpha should disappear */
++    dump_raw_buffer(y1-y0, width, tos->n_planes - tos->has_alpha_g,
++                nos_planestride, nos->rowstride, 
++                "Composed",composed_ptr);
++
++    global_index++;
++
++
++#endif
++
+ }
+ 
+ /*
++ * Encode a list of smask colorant values into a gx_color_index_value.
++ * This has its own encoder as it may have a different number of colorants
++ * compared to the actual device.
++ */
++gx_color_index
++pdf14_encode_smask_color(gx_device *dev, const gx_color_value	colors[],int ncomp)
++{
++    int drop = sizeof(gx_color_value) * 8 - 8;
++    gx_color_index color = 0;
++    int i;
++
++    for (i = 0; i < ncomp; i++) {
++	color <<= 8;
++	color |= (colors[i] >> drop);
++    }
++    return (color == gx_no_color_index ? color ^ 1 : color);
++}
++
++/*
++ * Decode a gx_color_index value back to a list of colorant values.
++  * This has its own decoder as it may have a different number of colorants
++ * compared to the actual device.*/
++int
++pdf14_decode_smask_color(gx_device * dev, gx_color_index color, gx_color_value * out, int ncomp)
++{
++    int i;
++
++    for (i = 0; i < ncomp; i++) {
++	out[ncomp - i - 1] = (gx_color_value) ((color & 0xff) * 0x101);
++	color >>= 8;
++    }
++    return 0;
++}
++
++
++/*
+  * Encode a list of colorant values into a gx_color_index_value.
+  */
+ gx_color_index
+diff --git a/base/gxccman.c b/base/gxccman.c
+--- a/base/gxccman.c
++++ b/base/gxccman.c
+@@ -333,9 +333,8 @@ gx_add_fm_pair(register gs_font_dir * dir, gs_font * font, const gs_uid * puid,
+ 	return code;
+     }
+     pair->FontType = font->FontType;
+-    /* The OSF/1 compiler doesn't like casting a pointer to */
+-    /* a shorter int.... */
+-    pair->hash = (uint) (ulong) pair % 549;	/* scramble bits */
++    pair->hash = (uint) (dir->hash % 549);	/* scramble bits */
++    dir->hash += 371;
+     pair->mxx = mxx, pair->mxy = mxy;
+     pair->myx = myx, pair->myy = myy;
+     pair->num_chars = 0;
+diff --git a/base/gxchar.c b/base/gxchar.c
+--- a/base/gxchar.c
++++ b/base/gxchar.c
+@@ -33,10 +33,6 @@
+ #include "gzpath.h"
+ #include "gxfcid.h"
+ 
+-/* Define whether or not to cache characters rotated by angles other than */
+-/* multiples of 90 degrees. */
+-static const bool CACHE_ROTATED_CHARS = true;
+-
+ /* Define the maximum size of a full temporary bitmap when rasterizing, */
+ /* in bits (not bytes). */
+ static const uint MAX_TEMP_BITMAP_BITS = 80000;
+@@ -1429,22 +1425,6 @@ gs_show_current_font(const gs_show_enum * penum)
+ 
+ /* ------ Internal routines ------ */
+ 
+-static inline bool
+-is_matrix_good_for_caching(const gs_matrix_fixed *m)
+-{
+-    /* Skewing or non-rectangular rotation are not supported,
+-       but we ignore a small noise skew. */
+-    const float axx = any_abs(m->xx), axy = any_abs(m->xy);
+-    const float ayx = any_abs(m->yx), ayy = any_abs(m->yy);
+-    const float thr = 5000; /* examples/alphabet.ps */
+-
+-    if (ayx * thr < axx || axy * thr < ayy)
+-	return true;
+-    if (axx * thr < ayx || ayy * thr < axy)
+-	return true;
+-    return false;
+-}
+-
+ /* Initialize the gstate-derived parts of a show enumerator. */
+ /* We do this both when starting the show operation, */
+ /* and when returning from the kshow callout. */
+@@ -1476,9 +1456,6 @@ show_state_setup(gs_show_enum * penum)
+ 	gs_setcharmatrix(pgs, &mat);
+     }
+     penum->current_font = pfont;
+-    /* Skewing or non-rectangular rotation are not supported. */
+-    if (!CACHE_ROTATED_CHARS && is_matrix_good_for_caching(&pgs->char_tm))
+-	penum->can_cache = 0;
+     if (penum->can_cache >= 0 &&
+ 	gx_effective_clip_path(pgs, &pcpath) >= 0
+ 	) {
+@@ -1532,10 +1509,8 @@ show_set_scale(const gs_show_enum * penum, gs_log2_scale_point *log2_scale)
+ 
+     if ((penum->charpath_flag == cpm_show ||
+ 	 penum->charpath_flag == cpm_charwidth) &&
+-	SHOW_USES_OUTLINE(penum) &&
+-	/* gx_path_is_void_inline(pgs->path) && */
+-    /* Oversampling rotated characters doesn't work well. */
+-	is_matrix_good_for_caching(&pgs->char_tm)
++	SHOW_USES_OUTLINE(penum)  
++	/* && gx_path_is_void_inline(pgs->path) */
+ 	) {
+ 	const gs_font_base *pfont = (const gs_font_base *)penum->current_font;
+ 	gs_fixed_point extent;
+diff --git a/base/gxcie.h b/base/gxcie.h
+--- a/base/gxcie.h
++++ b/base/gxcie.h
+@@ -52,6 +52,10 @@ extern	int	gx_cie_to_xyz_alloc(gs_imager_state **,
+ 				    const gs_color_space *, gs_memory_t *);
+ extern	void	gx_cie_to_xyz_free(gs_imager_state *);
+ 
++
++extern int gx_cie_to_xyz_alloc2(gs_color_space * pcs, gs_state * pgs);
++
++
+ /* Defined in gsciemap.c */
+ 
+ /*
+diff --git a/base/gxclimag.c b/base/gxclimag.c
+--- a/base/gxclimag.c
++++ b/base/gxclimag.c
+@@ -475,7 +475,7 @@ clist_begin_typed_image(gx_device * dev,
+ 	 * worthwhile.
+ 	 */
+ 	gx_color_index all =
+-	    ((gx_color_index)1 << dev->color_info.depth) - 1;
++	    ((gx_color_index)1 << cdev->clist_color_info.depth) - 1;
+ 
+ 	if (bits_per_pixel > 4 || pim->Interpolate || num_components > 1)
+ 	    colors_used = all;
+@@ -536,13 +536,22 @@ clist_begin_typed_image(gx_device * dev,
+     return 0;
+ 
+     /*
+-     * We couldn't handle the image.  Use the default algorithms, which
++     * We couldn't handle the image.  It is up to the caller to
++     * use the default algorithms, which
+      * break the image up into rectangles or small pixmaps.
++     * If we are doing the PDF14 transparency device
++     * then we want to make sure we do NOT use the target 
++     * device.  In this case we return -1.
+      */
+ use_default:
+     gs_free_object(mem, pie, "clist_begin_typed_image");
+-    return gx_default_begin_typed_image(dev, pis, pmat, pic, prect,
+-					pdcolor, pcpath, mem, pinfo);
++
++    if (pis->has_transparency){
++        return -1;
++    } else {
++        return gx_default_begin_typed_image(dev, pis, pmat, pic, prect,
++					    pdcolor, pcpath, mem, pinfo);
++    }
+ }
+ 
+ /* Error cleanup for clist_image_plane_data. */
+@@ -1488,7 +1497,7 @@ cmd_image_plane_data(gx_device_clist_writer * cldev, gx_clist_state * pcls,
+ 	code = cmd_put_set_data_x(cldev, pcls, data_x);
+ 	if (code < 0)
+ 	    return code;
+-	offset = ((data_x & ~7) * cldev->color_info.depth) >> 3;
++	offset = ((data_x & ~7) * cldev->clist_color_info.depth) >> 3;
+     }
+     code = set_cmd_put_op(dp, cldev, pcls, cmd_opv_image_data, len);
+     if (code < 0)
+diff --git a/base/gxclist.c b/base/gxclist.c
+--- a/base/gxclist.c
++++ b/base/gxclist.c
+@@ -190,7 +190,7 @@ clist_init_io_procs(gx_device_clist *pclist_dev, bool in_memory)
+ /* Initialization for imager state. */
+ /* The initial scale is arbitrary. */
+ const gs_imager_state clist_imager_state_initial =
+-{gs_imager_state_initial(300.0 / 72.0)};
++{gs_imager_state_initial(300.0 / 72.0, false)};
+ 
+ /*
+  * The buffer area (data, data_size) holds a bitmap cache when both writing
+@@ -358,6 +358,16 @@ clist_init_data(gx_device * dev, byte * init_data, uint data_size)
+     gx_device *pbdev = (gx_device *)&bdev;
+     int code;
+ 
++    /* the clist writer has its own color info that depends upon the 
++       transparency group color space (if transparency exists).  The data that is
++       used in the clist writing. Here it is initialized with 
++       the target device color info.  The values will be pushed and popped
++       in a stack if we have changing color spaces in the transparency groups. */
++
++    cdev->clist_color_info.depth = dev->color_info.depth;
++    cdev->clist_color_info.polarity = dev->color_info.polarity;
++    cdev->clist_color_info.num_components = dev->color_info.num_components;
++    
+     /* Call create_buf_device to get the memory planarity set up. */
+     cdev->buf_procs.create_buf_device(&pbdev, target, 0, NULL, NULL, clist_get_band_complexity(0, 0));
+     /* HACK - if the buffer device can't do copy_alpha, disallow */
+diff --git a/base/gxclist.h b/base/gxclist.h
+--- a/base/gxclist.h
++++ b/base/gxclist.h
+@@ -281,6 +281,14 @@ struct gx_device_clist_writer_s {
+     uint mask_id;
+     uint temp_mask_id; /* Mask id of a mask of an image with SMask. */
+     bool is_fillpage;
++    gx_device_color_info clist_color_info; /* color information to be used during clist writing.  
++                                           It may be different than the target device if we 
++                                           are in a transparency group.  Since the fill rect 
++                                           commands use the forward procs and we have no 
++                                           access to the graphic state information in those
++                                           routines, this is the logical place to put this
++                                           information */
++
+ };
+ #ifndef gx_device_clist_writer_DEFINED
+ #define gx_device_clist_writer_DEFINED
+diff --git a/base/gxclpath.c b/base/gxclpath.c
+--- a/base/gxclpath.c
++++ b/base/gxclpath.c
+@@ -55,7 +55,7 @@ colored_halftone_colors_used(gx_device_clist_writer *cldev,
+      * standard CMYK color mapping function.
+      */
+     if (dev_proc(cldev, map_cmyk_color) != cmyk_1bit_map_cmyk_color)
+-	return ((gx_color_index)1 << cldev->color_info.depth) - 1;
++	return ((gx_color_index)1 << cldev->color_info.depth) - 1;  /* What about tranparency?  Need to check this */
+     /*
+      * Note that c_base[0], and the low-order bit of plane_mask,
+      * correspond to cyan: this requires reversing the bit order of
+@@ -186,7 +186,7 @@ cmd_put_drawing_color(gx_device_clist_writer * cldev, gx_clist_state * pcls,
+ 	}
+     }
+ 
+-    while (left) {
++    do {
+ 	prefix_size = 2 + 1 + (offset > 0 ? enc_u_sizew(offset) : 0);
+ 	req_size = left + prefix_size + enc_u_sizew(left);
+ 	code = cmd_get_buffer_space(cldev, pcls, req_size);
+@@ -223,10 +223,10 @@ cmd_put_drawing_color(gx_device_clist_writer * cldev, gx_clist_state * pcls,
+ 	}
+ 	offset += portion_size;
+ 	left -= portion_size;
+-    }
++    } while (left);
+ 
+     /* should properly calculate colors_used, but for now just punt */
+-    pcls->colors_used.or = ((gx_color_index)1 << cldev->color_info.depth) - 1;
++    pcls->colors_used.or = ((gx_color_index)1 << cldev->clist_color_info.depth) - 1;
+ 
+     /* Here we can't know whether a pattern paints colors besides 
+        black and white, so assume that it does.
+@@ -273,7 +273,7 @@ cmd_drawing_colors_used(gx_device_clist_writer *cldev,
+     else if (gx_dc_is_colored_halftone(pdcolor))
+ 	return colored_halftone_colors_used(cldev, pdcolor);
+     else
+-	return ((gx_color_index)1 << cldev->color_info.depth) - 1;
++	return ((gx_color_index)1 << cldev->clist_color_info.depth) - 1;
+ }
+ 
+ 
+diff --git a/base/gxclrast.c b/base/gxclrast.c
+--- a/base/gxclrast.c
++++ b/base/gxclrast.c
+@@ -172,6 +172,12 @@ top_up_cbuf(command_buf_t *pcb, const byte **pcbp)
+     pcb->end_status = sgets(pcb->s, cb_top, nread, &nread);
+     if ( nread == 0 ) {
+ 	/* No data for this band at all. */
++	if (cb_top >= pcb->end) {
++	    /* should not happen */
++	    *pcbp = pcb->data;
++	    pcb->data[0] = cmd_opv_end_run;
++	    return_error(gs_error_ioerror);
++	}
+ 	*cb_top = cmd_opv_end_run;
+ 	nread = 1;
+     }
+@@ -619,7 +625,7 @@ in:				/* Initialize for a new page. */
+ 	/* Make sure the buffer contains a full command. */
+ 	if (cbp >= cbuf.limit) {
+ 	    if (cbuf.end_status < 0) {	/* End of file or error. */
+-		if (cbp == cbuf.end) {
++		if (cbp >= cbuf.end) {
+ 		    code = (cbuf.end_status == EOFC ? 0 :
+ 			    gs_note_error(gs_error_ioerror));
+ 		    break;
+diff --git a/base/gxclrect.c b/base/gxclrect.c
+--- a/base/gxclrect.c
++++ b/base/gxclrect.c
+@@ -166,7 +166,7 @@ cmd_write_page_rect_cmd(gx_device_clist_writer * cldev, int op)
+ static inline byte * 
+ cmd_put_frac31_color(gx_device_clist_writer * cldev, const frac31 *c, byte *dp)
+ {
+-    int num_components = cldev->color_info.num_components;
++    int num_components = cldev->clist_color_info.num_components;
+     int j;
+ 
+     for (j = 0; j < num_components; j++)
+@@ -178,7 +178,7 @@ static inline int
+ cmd_size_frac31_color(gx_device_clist_writer * cldev, const frac31 *c)
+ {
+     int j, s = 0;
+-    int num_components = cldev->color_info.num_components;
++    int num_components = cldev->clist_color_info.num_components;
+ 
+     for (j = 0; j < num_components; j++)
+ 	s += cmd_size_frac31(c[j]);
+@@ -494,7 +494,7 @@ clist_strip_tile_rectangle(gx_device * dev, const gx_strip_bitmap * tile,
+ 	&((gx_device_clist *)dev)->writer;
+     int depth =
+ 	(color1 == gx_no_color_index && color0 == gx_no_color_index ?
+-	 dev->color_info.depth : 1);
++	 cdev->clist_color_info.depth : 1);
+     gx_color_index colors_used =
+ 	(color1 == gx_no_color_index && color0 == gx_no_color_index ?
+ 	 /* We can't know what colors will be used: assume the worst. */
+@@ -695,7 +695,8 @@ clist_copy_color(gx_device * dev,
+ {
+     gx_device_clist_writer * const cdev =
+ 	&((gx_device_clist *)dev)->writer;
+-    int depth = dev->color_info.depth;
++    int depth = cdev->clist_color_info.depth; /* Could be different than target
++                                                 if 1.4 device */
+     int y0;
+     int data_x_bit;
+     /* We can't know what colors will be used: assume the worst. */
+@@ -946,8 +947,8 @@ clist_strip_copy_rop(gx_device * dev,
+     const gx_strip_bitmap *tiles = textures;
+     int y0;
+     /* Compute the set of possible colors that this operation can generate. */
+-    gx_color_index all = ((gx_color_index)1 << dev->color_info.depth) - 1;
+-    bool subtractive = dev->color_info.num_components == 4; /****** HACK ******/
++    gx_color_index all = ((gx_color_index)1 << cdev->clist_color_info.depth) - 1;
++    bool subtractive = dev->color_info.num_components >= 4; /****** HACK ******/
+     gx_color_index S =
+ 	(scolors ? scolors[0] | scolors[1] : sdata ? all : 0);
+     gx_color_index T =
+@@ -1017,7 +1018,7 @@ clist_strip_copy_rop(gx_device * dev,
+ 		    do {
+ 			code = clist_change_tile(cdev, re.pcls, tiles,
+ 						 (tcolors != 0 ? 1 :
+-						  dev->color_info.depth));
++						  cdev->clist_color_info.depth));
+ 		    } while (RECT_RECOVER(code));
+ 		    if (code < 0 && !(code == gs_error_limitcheck) && SET_BAND_CODE(code))
+ 			goto error_in_rect;
+@@ -1062,7 +1063,7 @@ clist_strip_copy_rop(gx_device * dev,
+ 			       when tile_space_phase < rep_width && tile_space_phase + rwidth > rep_width, 
+ 			       each line to be converted into 2 ones.
+ 			    */
+-			    int depth = dev->color_info.depth;
++			    int depth = cdev->clist_color_info.depth;
+ 
+ #			    if 0
+ 			    /* Align bitmap data : */
+diff --git a/base/gxclutil.c b/base/gxclutil.c
+--- a/base/gxclutil.c
++++ b/base/gxclutil.c
+@@ -500,7 +500,8 @@ cmd_put_color(gx_device_clist_writer * cldev, gx_clist_state * pcls,
+ 	    return code;
+     } else {
+ 	/* Check if the "delta" mode command can be used. */
+-	int num_bytes = (cldev->color_info.depth + 7) >> 3;
++	int num_bytes = (cldev->clist_color_info.depth + 7) >> 3;  /* clist_color_info may be different than target device
++                                                                      due to transparency group during clist writing phase */
+ 	int delta_bytes = (num_bytes + 1) / 2;
+ 	gx_color_index delta_offset = cmd_delta_offsets[num_bytes];
+ 	gx_color_index delta_mask = cmd_delta_masks[num_bytes];
+diff --git a/base/gxcpath.c b/base/gxcpath.c
+--- a/base/gxcpath.c
++++ b/base/gxcpath.c
+@@ -782,6 +782,7 @@ gx_cpath_enum_init(gs_cpath_enum * penum, const gx_clip_path * pcpath)
+     if ((penum->using_path = pcpath->path_valid)) {
+ 	gx_path_enum_init(&penum->path_enum, &pcpath->path);
+ 	penum->rp = penum->visit = 0;
++	penum->first_visit = visit_left;
+     } else {
+ 	gx_path empty_path;
+ 	gx_clip_list *clp = gx_cpath_list_private(pcpath);
+@@ -791,6 +792,7 @@ gx_cpath_enum_init(gs_cpath_enum * penum, const gx_clip_path * pcpath)
+ 	/* Initialize the pointers in the path_enum properly. */
+ 	gx_path_init_local(&empty_path, pcpath->path.memory);
+ 	gx_path_enum_init(&penum->path_enum, &empty_path);
++	penum->first_visit = visit_left;
+ 	penum->visit = head;
+ 	for (rp = head; rp != 0; rp = rp->next)
+ 	    rp->to_visit =
+diff --git a/base/gxdcolor.c b/base/gxdcolor.c
+--- a/base/gxdcolor.c
++++ b/base/gxdcolor.c
+@@ -717,11 +717,14 @@ gx_dc_write_color(
+     uint *              psize )
+ {
+     int                 depth = dev->color_info.depth;
+-    int                 num_bytes = (depth + 8) >> 3;   /* NB: +8, not +7 */
++    int                 num_bytes;   /* NB: +8, not +7 */
+ 
+     /* gx_no_color_index is encoded as a single byte */
+-    if (color == gx_no_color_index)
++    if (color == gx_no_color_index) {
+         num_bytes = 1;
++    } else {
++        num_bytes = sizeof(gx_color_index) + 1;
++    }
+ 
+     /* check for adequate space */
+     if (*psize < num_bytes) {
+@@ -735,8 +738,6 @@ gx_dc_write_color(
+         *psize = 1;
+         *pdata = 0xff;
+     } else {
+-        if (depth < 8 * arch_sizeof_color_index)
+-            color &= ((gx_color_index)1 << depth) - 1;
+         while (--num_bytes >= 0) {
+             pdata[num_bytes] = color & 0xff;
+             color >>= 8;
+@@ -763,6 +764,7 @@ gx_dc_write_color(
+  *
+  * Returns: # of bytes read, or < 0 in the event of an error
+  */
++
+ int
+ gx_dc_read_color(
+     gx_color_index *    pcolor,
+@@ -771,21 +773,22 @@ gx_dc_read_color(
+     int                 size )
+ {
+     gx_color_index      color = 0;
+-    int                 depth = dev->color_info.depth;
+-    int                 i, num_bytes = (depth + 8) >> 3;   /* NB: +8, not +7 */
++    int                 i, num_bytes;
+ 
+     /* check that enough data has been provided */
+-    if (size < 1 || (pdata[0] != 0xff && size < num_bytes))
++    if (size < 1 || (pdata[0] != 0xff && size < sizeof(gx_color_index)))
+         return_error(gs_error_rangecheck);
+ 
+     /* check of gx_no_color_index */
+     if (pdata[0] == 0xff) {
+         *pcolor = gx_no_color_index;
+         return 1;
++    } else {
++        num_bytes = sizeof(gx_color_index) + 1;
+     }
+ 
+     /* num_bytes > arch_sizeof_color_index, discard first byte */
+-    for (i = (num_bytes >= arch_sizeof_color_index ? 1 : 0); i < num_bytes; i++)
++    for (i = 0; i < num_bytes; i++)
+         color = (color << 8) | pdata[i];
+     *pcolor = color;
+     return num_bytes;
+diff --git a/base/gxdevcli.h b/base/gxdevcli.h
+--- a/base/gxdevcli.h
++++ b/base/gxdevcli.h
+@@ -1198,6 +1198,7 @@ typedef struct gs_param_list_s gs_param_list;
+ */
+ #define dev_t_proc_end_transparency_mask(proc, dev_t)\
+   int proc(gx_device *dev,\
++    gs_imager_state *pis,\
+     gs_transparency_mask_t **pptm)
+ #define dev_proc_end_transparency_mask(proc)\
+   dev_t_proc_end_transparency_mask(proc, gx_device)
+diff --git a/base/gxfapiu.c b/base/gxfapiu.c
+--- a/base/gxfapiu.c
++++ b/base/gxfapiu.c
+@@ -31,7 +31,7 @@
+ 
+ /* -------------------- UFST callback dispatcher ------------- */
+ 
+-/*  This code provides dispatching UFST callbacks to the PDL */
++/* This code provides dispatching UFST callbacks to the PDL */
+ 
+ struct IF_STATE;
+ 
+diff --git a/base/gxfapiu.h b/base/gxfapiu.h
+--- a/base/gxfapiu.h
++++ b/base/gxfapiu.h
+@@ -20,7 +20,7 @@
+ #include "gp.h"
+ 
+ /* Set UFST callbacks. */
+-/* Warning : the language switch progect doesn't guarantee
++/* Warning : the language switch project doesn't guarantee
+    that this function is called when switching
+    to another interpreter. Therefore each interpreter must take
+    care for its own callback methods before they 
+@@ -29,7 +29,7 @@
+  /* Warning : this function may cause a reentrancy problem
+     due to a modification of static variables.
+     Nevertheless this problem isn't important in a
+-    sngle interpreter build because the values
++    single interpreter build because the values
+     really change on the first demand only.
+     See also a comment in gs_fapiufst_finit.
+   */
+diff --git a/base/gxfcache.h b/base/gxfcache.h
+--- a/base/gxfcache.h
++++ b/base/gxfcache.h
+@@ -300,6 +300,8 @@ struct gs_font_dir_s {
+     uint enum_index;		/* index (N) */
+     uint enum_offset;		/* ccache.table[offset] is N'th non-zero entry */
+ 
++    uint hash;
++
+     /* User parameter AlignToPixels. */
+     bool align_to_pixels;
+ 
+diff --git a/base/gxfcopy.c b/base/gxfcopy.c
+--- a/base/gxfcopy.c
++++ b/base/gxfcopy.c
+@@ -1976,7 +1976,11 @@ gs_copy_font(gs_font *font, const gs_matrix *orig_matrix, gs_memory_t *mem, gs_f
+     memset(&info, 0, sizeof(info));
+     info.Flags_requested = ~0;
+     code = font->procs.font_info(font, NULL, ~0, &info);
+-    if (code < 0)
++
++    /* We can ignore a lack of FontInfo for TrueType fonts which 
++     * are descendants of CID fonts
++     */
++    if (code < 0 && !(font->FontType == ft_CID_TrueType))
+ 	return code;
+ 
+     /* Allocate the generic copied information. */
+diff --git a/base/gxfixed.h b/base/gxfixed.h
+--- a/base/gxfixed.h
++++ b/base/gxfixed.h
+@@ -22,12 +22,23 @@
+  * quantities: integers lose accuracy in crucial places,
+  * and floating point arithmetic is slow.
+  */
++#if ARCH_SIZEOF_INT == 4
++typedef int fixed;
++typedef uint ufixed;		/* only used in a very few places */
++# define ARCH_SIZEOF_FIXED ARCH_SIZEOF_INT
++# define max_fixed max_int
++# define min_fixed min_int
++#else
++# if ARCH_SIZEOF_LONG == 4
+ typedef long fixed;
+ typedef ulong ufixed;		/* only used in a very few places */
+-#define ARCH_SIZEOF_FIXED ARCH_SIZEOF_LONG
++#  define ARCH_SIZEOF_FIXED ARCH_SIZEOF_LONG
++#  define max_fixed max_long
++#  define min_fixed min_long
++# endif
++#endif
++
+ 
+-#define max_fixed max_long
+-#define min_fixed min_long
+ #define fixed_0 0L
+ #define fixed_epsilon 1L
+ /*
+@@ -119,13 +130,9 @@ typedef ulong ufixed;		/* only used in a very few places */
+ #define fixed_truncated(x) ((x) < 0 ? fixed_ceiling(x) : fixed_floor(x))
+ 
+ /* Define the largest and smallest integer values that fit in a fixed. */
+-#if arch_sizeof_int == arch_sizeof_long
+-#  define max_int_in_fixed fixed2int(max_fixed)
+-#  define min_int_in_fixed fixed2int(min_fixed)
+-#else
+-#  define max_int_in_fixed max_int
+-#  define min_int_in_fixed min_int
+-#endif
++#define max_int_in_fixed fixed2int(max_fixed)
++#define min_int_in_fixed fixed2int(min_fixed)
++
+ /*
+  * Define a macro for checking for overflow of the sum of two fixed values
+  * and and setting the result to the sum if no overflow.
+diff --git a/base/gxhldevc.c b/base/gxhldevc.c
+--- a/base/gxhldevc.c
++++ b/base/gxhldevc.c
+@@ -44,10 +44,9 @@ void gx_hld_saved_color_init(gx_hl_saved_color * psc)
+  */
+ const gs_state * gx_hld_get_gstate_ptr(const gs_imager_state * pis)
+ {
+-    extern_st(st_gs_state);		/* only for testing */
+ 
+-    /* Check to verify the structure type is really st_gs_state */
+-    if (pis == NULL || gs_object_type(pis->memory, pis) != &st_gs_state)
++    /* Check to verify the structure type is really (gs_state *) */
++    if (pis == NULL || pis->is_gstate == false)
+ 	return NULL;
+ 
+     return (const gs_state *) pis;
+diff --git a/base/gximag3x.c b/base/gximag3x.c
+--- a/base/gximag3x.c
++++ b/base/gximag3x.c
+@@ -599,8 +599,20 @@ gx_image3x_plane_data(gx_image_enum_common_t * info,
+     h = min(height, h1);
+     /* Initialized rows_used in case we get an error. */
+     *rows_used = 0;
++
++/* FIX_ME.  In the soft mask branch
++   the file associated with bug 689290
++   gets into an endless loop.  This
++   is related to the size mismatch of the 
++   soft mask which is 1x1 and the 
++   image size */
++
+     if (h <= 0)
++#ifdef ENDLESS_LOOP     
+ 	return 0;
++#else
++        return 1;
++#endif
+ 
+     /* Handle masks from separate sources. */
+     for (i = 0; i < NUM_MASKS; ++i)
+diff --git a/base/gxiodev.h b/base/gxiodev.h
+--- a/base/gxiodev.h
++++ b/base/gxiodev.h
+@@ -175,6 +175,12 @@ int gs_putdevparams(gx_io_device *, gs_param_list *);
+ /* if opening a file fails. */
+ int gs_fopen_errno_to_code(int);
+ 
++/* Interface functions for clients that want iodev independent access to */
++/* the gp_enumerate functions */
++file_enum *gs_enumerate_files_init(const char *pat, uint patlen, gs_memory_t * mem);
++uint gs_enumerate_files_next(file_enum * pfen, char *ptr, uint maxlen);
++void gs_enumerate_files_close(file_enum * pfen);
++
+ /* Test whether a string is equal to a character. */
+ /* (This is used for access testing in file_open procedures.) */
+ #define streq1(str, chr)\
+diff --git a/base/gxistate.h b/base/gxistate.h
+--- a/base/gxistate.h
++++ b/base/gxistate.h
+@@ -215,6 +215,7 @@ typedef struct gs_devicen_color_map_s {
+  * than &pis->ctm.
+  */
+ #define gs_imager_state_common\
++	bool is_gstate;	/* is this imager state part of gstate ? */\
+ 	gs_memory_t *memory;\
+ 	void *client_data;\
+ 	gx_line_params line_params;\
+@@ -231,6 +232,8 @@ typedef struct gs_devicen_color_map_s {
+ 	bool text_knockout;\
+ 	uint text_rendering_mode;\
+ 	gs_transparency_state_t *transparency_stack;\
++        bool has_transparency;   /* used to keep from doing shading fills in device color space */\
++        gx_device *trans_device;  /* trans device has all mappings to group color space */\
+ 	bool overprint;\
+ 	int overprint_mode;\
+ 	int effective_overprint_mode;\
+@@ -246,7 +249,7 @@ typedef struct gs_devicen_color_map_s {
+ 	  (*get_cmap_procs)(const gs_imager_state *, const gx_device *);\
+ 	gs_color_rendering_state_common
+ #define st_imager_state_num_ptrs\
+-  (st_line_params_num_ptrs + st_cr_state_num_ptrs + 2)
++  (st_line_params_num_ptrs + st_cr_state_num_ptrs + 3)
+ /* Access macros */
+ #define ctm_only(pis) (*(const gs_matrix *)&(pis)->ctm)
+ #define ctm_only_writable(pis) (*(gs_matrix *)&(pis)->ctm)
+@@ -267,12 +270,12 @@ struct gs_imager_state_s {
+ };
+ 
+ /* Initialization for gs_imager_state */
+-#define gs_imager_state_initial(scale)\
+-  0, 0, { gx_line_params_initial },\
++#define gs_imager_state_initial(scale, is_gstate)\
++  is_gstate, 0, 0, { gx_line_params_initial },\
+    { (float)(scale), 0.0, 0.0, (float)(-(scale)), 0.0, 0.0 },\
+   false, {0, 0}, {0, 0}, false, \
+   lop_default, gx_max_color_value, BLEND_MODE_Compatible,\
+-  { 1.0 }, { 1.0 }, 0, 0/*false*/, 0, 0, 0/*false*/, 0, 0, 1.0,  \
++  { 1.0 }, { 1.0 }, 0, 0/*false*/, 0, 0, 0, 0, 0/*false*/, 0, 0, 1.0,  \
+    { fixed_half, fixed_half }, 0/*false*/, 0/*false*/, 0/*false*/, 1.0,\
+   1, INIT_CUSTOM_COLOR_PTR	/* 'Custom color' callback pointer */  \
+   gx_default_get_cmap_procs
+diff --git a/base/gxpcmap.c b/base/gxpcmap.c
+--- a/base/gxpcmap.c
++++ b/base/gxpcmap.c
+@@ -886,13 +886,24 @@ gx_pattern_load(gx_device_color * pdc, const gs_imager_state * pis,
+     if (saved->pattern_cache == 0)
+ 	saved->pattern_cache = pis->pattern_cache;
+     gs_setdevice_no_init(saved, (gx_device *)adev);
++    if (pinst->template.uses_transparency) {
++        /*  This should not occur from PS or PDF, but is provided for other clients (XPS) */
++	if_debug0('v', "gx_pattern_load: pushing the pdf14 compositor device into this graphics state\n");
++	if ((code = gs_push_pdf14trans_device(saved)) < 0)
++	    return code;
++    }
+     code = (*pinst->template.PaintProc)(&pdc->ccolor, saved);
+     if (code < 0) {
+ 	dev_proc(adev, close_device)((gx_device *)adev);
+-	/* Freeing the state will free the device. */
++	/* Freeing the state will free the device and the pdf14 compositor (if any). */
+ 	gs_state_free(saved);
+ 	return code;
+     }
++    if (pinst->template.uses_transparency) {
++	if_debug0('v', "gx_pattern_load: popping the pdf14 compositor device from this graphics state\n");
++	if ((code = gs_pop_pdf14trans_device(saved)) < 0)
++	    return code;
++    }
+     /* We REALLY don't like the following cast.... */
+     code = gx_pattern_cache_add_entry((gs_imager_state *)pis, 
+ 		adev, &ctile);
+diff --git a/base/gxshade6.c b/base/gxshade6.c
+--- a/base/gxshade6.c
++++ b/base/gxshade6.c
+@@ -190,6 +190,8 @@ is_linear_color_applicable(const patch_fill_state_t *pfs)
+ 	return false;
+     if (pfs->dev->color_info.separable_and_linear != GX_CINFO_SEP_LIN)
+ 	return false;
++    if (pfs->pis->has_transparency == true)
++        return false; /* set in pdf14 dev if we are in a trans group */
+     if (gx_get_cmap_procs(pfs->pis, pfs->dev)->is_halftoned(pfs->pis, pfs->dev))
+ 	return false;
+     return true;
+diff --git a/base/gxtype1.c b/base/gxtype1.c
+--- a/base/gxtype1.c
++++ b/base/gxtype1.c
+@@ -573,7 +573,12 @@ gs_type1_glyph_info(gs_font *font, gs_glyph glyph, const gs_matrix *pmat,
+ 	code = pdata->interpret(&cis, &gdata, &value);
+ 	switch (code) {
+ 	case 0:		/* done with no [h]sbw, error */
+-	    code = gs_note_error(gs_error_invalidfont);
++	                /* Adobe interpreters ignore the error! */
++	    info->width[wmode].x = 0;
++	    info->width[wmode].y = 0;
++	    info->v.x = 0;
++	    info->v.y = 0;
++	    break;
+ 	default:		/* code < 0, error */
+ 	    return code;
+ 	case type1_result_callothersubr:	/* unknown OtherSubr */
+diff --git a/base/lib.mak b/base/lib.mak
+--- a/base/lib.mak
++++ b/base/lib.mak
+@@ -450,6 +450,7 @@ gxpcolor_h=$(GLSRC)gxpcolor.h\
+ gscolor_h=$(GLSRC)gscolor.h $(gxtmap_h)
+ gsstate_h=$(GLSRC)gsstate.h\
+  $(gscolor_h) $(gscpm_h) $(gscsel_h) $(gsdevice_h) $(gsht_h) $(gsline_h)
++gscolorbuffer_h=$(GLSRC)gscolorbuffer.h
+ 
+ gzacpath_h=$(GLSRC)gzacpath.h $(GLSRC)gxcpath.h
+ gzcpath_h=$(GLSRC)gzcpath.h $(gxcpath_h) $(gzpath_h)
+@@ -1314,7 +1315,7 @@ $(GLOBJ)sdcte.$(OBJ) : $(GLSRC)sdcte.c $(AK)\
+ $(GLOBJ)sjpege.$(OBJ) : $(GLSRC)sjpege.c $(AK)\
+  $(stdio__h) $(string__h) $(gx_h)\
+  $(jerror__h) $(jpeglib__h)\
+- $(gserrors_h) $(sjpeg_h) $(sdct_h) $(strimpl_h)
++ $(sjpeg_h) $(sdct_h) $(strimpl_h)
+ 	$(GLJCC) $(GLO_)sjpege.$(OBJ) $(C_) $(GLSRC)sjpege.c
+ 
+ # sdeparam is used by the filter operator and the PS/PDF writer.
+@@ -1344,7 +1345,7 @@ $(GLOBJ)sdctd.$(OBJ) : $(GLSRC)sdctd.c $(AK)\
+ $(GLOBJ)sjpegd.$(OBJ) : $(GLSRC)sjpegd.c $(AK)\
+  $(stdio__h) $(string__h) $(gx_h)\
+  $(jerror__h) $(jpeglib__h)\
+- $(gserrors_h) $(sjpeg_h) $(sdct_h) $(strimpl_h)
++ $(sjpeg_h) $(sdct_h) $(strimpl_h)
+ 	$(GLJCC) $(GLO_)sjpegd.$(OBJ) $(C_) $(GLSRC)sjpegd.c
+ 
+ # sddparam is used by the filter operator.
+@@ -1471,7 +1472,7 @@ $(GLD)sjpx_jasper.dev : $(LIB_MAK) $(ECHOGS_XE) \
+ # jasper.dev is created in jasper.mak
+ 
+ $(GLOBJ)sjpx.$(OBJ) : $(GLSRC)sjpx.c $(AK) \
+- $(memory__h) $(gsmalloc_h) $(gserror_h) $(gserrors_h) \
++ $(memory__h) $(gsmalloc_h) $(gserror_h) \
+  $(gdebug_h) $(strimpl_h) $(sjpx_h)
+ 	$(GLJASCC) $(GLO_)sjpx.$(OBJ) $(C_) $(GLSRC)sjpx.c
+ 
+@@ -2477,6 +2478,12 @@ $(GLOBJ)gsncdummy.$(OBJ) : $(GLSRC)gsncdummy.c $(GXERR) $(math__h)\
+ 	$(memory__h) $(gscdefs_h) $(gscspace_h) $(gscie_h) $(gsicc_h)\
+ 	$(gxdevice_h) $(gzstate_h) $(gsutil_h) $(gxcie_h) $(gsncdummy_h)
+ 	$(GLCC) $(GLO_)gsncdummy.$(OBJ) $(C_) $(GLSRC)gsncdummy.c
++	
++# ---------------- Color Buffer Proc. Support Used In Trans. ---------------- #
++
++$(GLOBJ)gscolorbuffer.$(OBJ) : $(GLSRC)gscolorbuffer.c $(GXERR)\
++	$(stdpre_h) $(gstypes_h) $(gsmemory_h) $(gxblend_h)
++	$(GLCC) $(GLO_)gscolorbuffer.$(OBJ) $(C_) $(GLSRC)gscolorbuffer.c
+ 
+ # ================ Display Postscript extensions ================ #
+ 
+@@ -2560,15 +2567,15 @@ $(GLD)traplib.dev : $(LIB_MAK) $(ECHOGS_XE) $(traplib_)
+ 
+ # ---------------- Transparency ---------------- #
+ 
+-gstrans_h=$(GLSRC)gstrans.h $(gstparam_h) $(gxcomp_h) $(gsmatrix_h)
++gstrans_h=$(GLSRC)gstrans.h $(gstparam_h) $(gxcomp_h) $(gsmatrix_h) $(gxblend_h)
+ gsipar3x_h=$(GLSRC)gsipar3x.h $(gsiparam_h) $(gsiparm3_h)
+ gximag3x_h=$(GLSRC)gximag3x.h $(gsipar3x_h) $(gxiparam_h)
+-gxblend_h=$(GLSRC)gxblend.h $(gxcindex_h) $(gxcvalue_h) $(gxxfrac_h)
++gxblend_h=$(GLSRC)gxblend.h $(gxcindex_h) $(gxcvalue_h) $(gxxfrac_h) $(gxdevcli_h)
+ gdevp14_h=$(GLSRC)gdevp14.h $(GLSRC)gxcmap.h
+ 
+ $(GLOBJ)gstrans.$(OBJ) : $(GLSRC)gstrans.c $(GXERR)\
+- $(math__h) $(memory__h) $(gdevp14_h)\
+- $(gstrans_h) $(gsutil_h) $(gxdevcli_h) $(gzstate_h)
++ $(math__h) $(memory__h) $(gdevp14_h) $(gstrans_h)\
++ $(gsutil_h) $(gxdevcli_h) $(gzstate_h) $(gscspace_h)
+ 	$(GLCC) $(GLO_)gstrans.$(OBJ) $(C_) $(GLSRC)gstrans.c
+ 
+ $(GLOBJ)gximag3x.$(OBJ) : $(GLSRC)gximag3x.c $(GXERR) $(math__h) $(memory__h)\
+@@ -2578,24 +2585,25 @@ $(GLOBJ)gximag3x.$(OBJ) : $(GLSRC)gximag3x.c $(GXERR) $(math__h) $(memory__h)\
+ 	$(GLCC) $(GLO_)gximag3x.$(OBJ) $(C_) $(GLSRC)gximag3x.c
+ 
+ $(GLOBJ)gxblend.$(OBJ) : $(GLSRC)gxblend.c $(GX) $(memory__h)\
+- $(gstparam_h) $(gxblend_h)
++ $(gstparam_h) $(gxblend_h) $(gxcolor2_h) 
+ 	$(GLCC) $(GLO_)gxblend.$(OBJ) $(C_) $(GLSRC)gxblend.c
+ 
+ $(GLOBJ)gxblend1.$(OBJ) : $(GLSRC)gxblend1.c $(GX) $(memory__h)\
+  $(gstparam_h) $(gxrect_h) $(gxdcconv_h) $(gxblend_h) $(gxdevcli_h) $(gxistate_h)\
+- $(gdevdevn_h) $(gdevp14_h) $(vdtrace_h)
++ $(gdevdevn_h) $(gdevp14_h) $(vdtrace_h) $(gxdcconv_h)
+ 	$(GLCC) $(GLO_)gxblend1.$(OBJ) $(C_) $(GLSRC)gxblend1.c
+ 
+ $(GLOBJ)gdevp14.$(OBJ) : $(GLSRC)gdevp14.c $(GXERR) $(math__h) $(memory__h)\
+  $(gscdefs_h) $(gxdevice_h) $(gsdevice_h) $(gsstruct_h) $(gscoord_h) $(gxistate_h) $(gxdcolor_h)\
+  $(gxiparam_h) $(gstparam_h) $(gxblend_h) $(gxtext_h) $(gsdfilt_h) $(gsimage_h)\
+  $(gsrect_h) $(gzstate_h) $(gdevdevn_h) $(gdevp14_h) $(gsovrc_h) $(gxcmap_h) $(gscolor1_h)\
+- $(gstrans_h) $(gsutil_h) $(gxcldev_h) $(gxclpath_h) $(gxdcconv_h) $(vdtrace_h)
++ $(gstrans_h) $(gsutil_h) $(gxcldev_h) $(gxclpath_h) $(gxdcconv_h) $(vdtrace_h)\
++ $(gscolorbuffer_h) $(gsptype2_h)
+ 	$(GLCC) $(GLO_)gdevp14.$(OBJ) $(C_) $(GLSRC)gdevp14.c
+ 
+ translib_=$(GLOBJ)gstrans.$(OBJ) $(GLOBJ)gximag3x.$(OBJ)\
+  $(GLOBJ)gxblend.$(OBJ) $(GLOBJ)gxblend1.$(OBJ) $(GLOBJ)gdevp14.$(OBJ) $(GLOBJ)gdevdevn.$(OBJ)\
+- $(GLOBJ)gdevdcrd.$(OBJ)
++ $(GLOBJ)gdevdcrd.$(OBJ) $(GLOBJ)gscolorbuffer.$(OBJ)
+ $(GLD)translib.dev : $(LIB_MAK) $(ECHOGS_XE) $(translib_)\
+  $(GLD)cspixlib.dev $(GLD)bboxutil.dev $(GLD)cielib.dev
+ 	$(SETMOD) $(GLD)translib $(translib_)
+diff --git a/base/lwf_jp2.mak b/base/lwf_jp2.mak
+--- a/base/lwf_jp2.mak
++++ b/base/lwf_jp2.mak
+@@ -171,7 +171,6 @@ lwf_jp2_HDRS = \
+ 	$(LWF_JP2_SRC)jp2t_memory.h			\
+ 	$(LWF_JP2_SRC)jp2t_progression.h		\
+ 	$(LWF_JP2_SRC)jp2t_transcoder.h			\
+-	$(LWF_JP2_SRC)lwf_jp2_geo.h			\
+ 	$(LWF_JP2_SRC)lwf_jp2.h
+ 
+ # switch in the selected library .dev
+diff --git a/base/saes.h b/base/saes.h
+--- a/base/saes.h
++++ b/base/saes.h
+@@ -47,8 +47,9 @@ int s_aes_set_key(stream_aes_state * state,
+ /* state declaration macro;
+    should be updated for the aes_context finalization */
+ #define private_st_aes_state()	\
+-  gs_private_st_simple(st_aes_state, stream_aes_state,\
+-    "aes filter state")
++  gs_private_st_ptrs1(st_aes_state, stream_aes_state, "aes filter state",\
++  aes_state_enum_ptrs, aes_state_reloc_ptrs, ctx)
++
+ extern const stream_template s_aes_template;
+ 
+ /* (de)crypt a section of text in a buffer -- the procedure is the same
+diff --git a/base/sfxcommon.c b/base/sfxcommon.c
+--- a/base/sfxcommon.c
++++ b/base/sfxcommon.c
+@@ -75,8 +75,13 @@ file_open_stream(const char *fname, uint len, const char *file_access,
+ 	return 0;		/* so this is the same as len == 0, so return NULL */
+     code = (*fopen_proc)(iodev, (char *)(*ps)->cbuf, fmode, &file,
+ 			 (char *)(*ps)->cbuf, (*ps)->bsize);
+-    if (code < 0)
++    if (code < 0) {
++	/* discard the stuff we allocated to keep from accumulating stuff needing GC */
++	gs_free_object(mem, (*ps)->cbuf, "file_close(buffer)");
++	gs_free_object(mem, *ps, "file_prepare_stream(stream)");
++	*ps = NULL;
+ 	return code;
++    }
+     file_init_stream(*ps, file, fmode, (*ps)->cbuf, (*ps)->bsize);
+     return 0;
+ }
+@@ -181,6 +186,7 @@ file_prepare_stream(const char *fname, uint len, const char *file_access,
+ 	buffer[0] = 0;	/* safety */
+     s->cbuf = buffer;
+     s->bsize = s->cbsize = buffer_size;
++    s->save_close = 0;	    /* in case this stream gets disabled before init finishes */
+     *ps = s;
+     return 0;
+ }
+diff --git a/base/sjpegd.c b/base/sjpegd.c
+--- a/base/sjpegd.c
++++ b/base/sjpegd.c
+@@ -18,7 +18,6 @@
+ #include "jpeglib_.h"
+ #include "jerror_.h"
+ #include "gx.h"
+-#include "gserrors.h"
+ #include "strimpl.h"
+ #include "sdct.h"
+ #include "sjpeg.h"
+diff --git a/base/sjpege.c b/base/sjpege.c
+--- a/base/sjpege.c
++++ b/base/sjpege.c
+@@ -18,7 +18,6 @@
+ #include "jpeglib_.h"
+ #include "jerror_.h"
+ #include "gx.h"
+-#include "gserrors.h"
+ #include "strimpl.h"
+ #include "sdct.h"
+ #include "sjpeg.h"
+diff --git a/base/sjpx.c b/base/sjpx.c
+--- a/base/sjpx.c
++++ b/base/sjpx.c
+@@ -15,7 +15,6 @@
+ /* JPXDecode filter implementation -- hooks in libjasper */
+ 
+ #include "memory_.h"
+-#include "gserrors.h"
+ #include "gserror.h"
+ #include "gdebug.h"
+ #include "strimpl.h"
+diff --git a/base/stream.c b/base/stream.c
+--- a/base/stream.c
++++ b/base/stream.c
+@@ -1259,9 +1259,9 @@ s_close_disable(stream *s)
+ int
+ file_close_disable(stream * s)
+ {
+-    int code = (*s->save_close)(s);
+-
+-    if (code)
++    int code;
++    
++    if ((*s->save_close != NULL) && ((code = (*s->save_close)(s)) != 0))
+ 	return code;
+     s_close_disable(s);
+     return file_close_finish(s);
+diff --git a/base/ttinterp.c b/base/ttinterp.c
+--- a/base/ttinterp.c
++++ b/base/ttinterp.c
+@@ -1836,6 +1836,10 @@ static int nInstrCount=0;
+     {
+       CUR.IP      += (Int)(args[0]);
+       CUR.step_ins = FALSE;
++
++      /* See JMPR below */
++      if(CUR.code[CUR.IP] != 0x2D && CUR.code[CUR.IP - 1] == 0x2D)
++        CUR.IP -= 1;
+     }
+   }
+ 
+@@ -1848,6 +1852,16 @@ static int nInstrCount=0;
+   {
+     CUR.IP      += (Int)(args[0]);
+     CUR.step_ins = FALSE;
++
++    if(CUR.code[CUR.IP] != 0x2D && CUR.code[CUR.IP - 1] == 0x2D)
++    /* The JPMR is meant to stop at the ENDF instruction to finish
++     * the function. However the programmer made a mistake, and ended
++     * up one byte too far. I suspect that some TT interpreters handle this
++     * by detecting that the IP has gone off the end of the function. We can 
++     * allow for simple cases here by just checking the preceding byte.
++     * Fonts with this problem are not uncommon.
++     */
++      CUR.IP -= 1;
+   }
+ 
+ 
+@@ -1861,6 +1875,10 @@ static int nInstrCount=0;
+     {
+       CUR.IP      += (Int)(args[0]);
+       CUR.step_ins = FALSE;
++
++      /* See JMPR above */
++      if(CUR.code[CUR.IP] != 0x2D && CUR.code[CUR.IP - 1] == 0x2D)
++        CUR.IP -= 1;
+     }
+   }
+ 
+@@ -3856,7 +3874,11 @@ static int nInstrCount=0;
+     if ( BOUNDS( args[0], CUR.zp0.n_points ) ||
+          BOUNDS( args[1], CUR.cvtSize )      )
+     {
+-      CUR.error = TT_Err_Invalid_Reference;
++	/* Ignore these errors, abort the instruction
++	 * and continue. This restores the FreeType 
++	 * behaviour when pedantic_hinting is false. For bug
++	 * #689471, see also Ins_SHC above and bug #688501.
++	 */
+       return;
+     }
+ 
+diff --git a/base/winlib.mak b/base/winlib.mak
+--- a/base/winlib.mak
++++ b/base/winlib.mak
+@@ -80,7 +80,11 @@ UFST_LIB_EXT=.lib
+ # Define conditinal name for FreeType bridge :
+ !ifdef FT_ROOT
+ FT_BRIDGE = 1
+-FT_LIB_EXT=.lib
++FT_CFLAGS=$(I_)$(FT_ROOT)$(D)include$(_I)
++!ifndef FT_LIB
++FT_LIB = freetype238MT_D
++!endif
++FT_LIBS=$(FT_ROOT)$(D)objs$(D)$(FT_LIB).lib
+ !endif
+ 
+ # Define the files to be removed by `make clean'.
+diff --git a/base/wrfont.c b/base/wrfont.c
+--- a/base/wrfont.c
++++ /dev/null
+@@ -1,78 +0,0 @@
+-/* Copyright (C) 2001-2006 Artifex Software, Inc.
+-   All Rights Reserved.
+-  
+-   This software is provided AS-IS with no warranty, either express or
+-   implied.
+-
+-   This software is distributed under license and may not be copied, modified
+-   or distributed except as expressly authorized under the terms of that
+-   license.  Refer to licensing information at http://www.artifex.com/
+-   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
+-   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
+-*/
+-
+-/* $Id: wrfont.c 8022 2007-06-05 22:23:38Z giles $ */
+-/*
+-Support functions to serialize fonts as PostScript code that can
+-then be passed to FreeType via the FAPI FreeType bridge.
+-Started by Graham Asher, 9th August 2002.
+-*/
+-
+-#include "wrfont.h"
+-#include "stdio_.h"
+-
+-#define EEXEC_KEY 55665
+-#define EEXEC_FACTOR 52845
+-#define EEXEC_OFFSET 22719
+-
+-void WRF_init(WRF_output* a_output,unsigned char* a_buffer,long a_buffer_size)
+-	{
+-	a_output->m_pos = a_buffer;
+-	a_output->m_limit = a_buffer_size;
+-	a_output->m_count = 0;
+-	a_output->m_encrypt = false;
+-	a_output->m_key = EEXEC_KEY;
+-	}
+-
+-void WRF_wbyte(WRF_output* a_output,unsigned char a_byte)
+-	{
+-	if (a_output->m_count < a_output->m_limit)
+-		{
+-		if (a_output->m_encrypt)
+-			{
+-			a_byte ^= (a_output->m_key >> 8);
+-			a_output->m_key = (unsigned short)((a_output->m_key + a_byte) * EEXEC_FACTOR + EEXEC_OFFSET);
+-			}
+-		*a_output->m_pos++ = a_byte;
+-		}
+-	a_output->m_count++;
+-	}
+-
+-void WRF_wtext(WRF_output* a_output,const unsigned char* a_string,long a_length)
+-	{
+-	while (a_length > 0)
+-		{
+-		WRF_wbyte(a_output,*a_string++);
+-		a_length--;
+-		}
+-	}
+-
+-void WRF_wstring(WRF_output* a_output,const char* a_string)
+-	{
+-	while (*a_string)
+-		WRF_wbyte(a_output,*a_string++);
+-	}
+-
+-void WRF_wfloat(WRF_output* a_output,double a_float)
+-	{
+-	char buffer[32];
+-	sprintf(buffer,"%f",a_float);
+-	WRF_wstring(a_output,buffer);
+-	}
+-
+-void WRF_wint(WRF_output* a_output,long a_int)
+-	{
+-	char buffer[32];
+-	sprintf(buffer,"%ld",a_int);
+-	WRF_wstring(a_output,buffer);
+-	}
+diff --git a/base/wrfont.h b/base/wrfont.h
+--- a/base/wrfont.h
++++ /dev/null
+@@ -1,42 +0,0 @@
+-/* Copyright (C) 2001-2006 Artifex Software, Inc.
+-   All Rights Reserved.
+-  
+-   This software is provided AS-IS with no warranty, either express or
+-   implied.
+-
+-   This software is distributed under license and may not be copied, modified
+-   or distributed except as expressly authorized under the terms of that
+-   license.  Refer to licensing information at http://www.artifex.com/
+-   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
+-   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
+-*/
+-
+-/* $Id: wrfont.h 8022 2007-06-05 22:23:38Z giles $ */
+-/*
+-Header for support functions to serialize fonts as PostScript code that can
+-then be passed to FreeType via the FAPI FreeType bridge.
+-Started by Graham Asher, 9th August 2002.
+-*/
+-
+-#ifndef wrfont_INCLUDED
+-#define wrfont_INCLUDED
+-
+-#include "stdpre.h"
+-
+-typedef struct WRF_output_
+-	{
+-	unsigned char* m_pos;
+-	long m_limit;
+-	long m_count;
+-	bool m_encrypt;
+-	unsigned short m_key;
+-	} WRF_output;
+-
+-void WRF_init(WRF_output* a_output,unsigned char* a_buffer,long a_buffer_size);
+-void WRF_wbyte(WRF_output* a_output,unsigned char a_byte);
+-void WRF_wtext(WRF_output* a_output,const unsigned char* a_string,long a_length);
+-void WRF_wstring(WRF_output* a_output,const char* a_string);
+-void WRF_wfloat(WRF_output* a_output,double a_float);
+-void WRF_wint(WRF_output* a_output,long a_int);
+-
+-#endif
+diff --git a/base/write_t1.c b/base/write_t1.c
+--- a/base/write_t1.c
++++ /dev/null
+@@ -1,193 +0,0 @@
+-/* Copyright (C) 2001-2006 Artifex Software, Inc.
+-   All Rights Reserved.
+-  
+-   This software is provided AS-IS with no warranty, either express or
+-   implied.
+-
+-   This software is distributed under license and may not be copied, modified
+-   or distributed except as expressly authorized under the terms of that
+-   license.  Refer to licensing information at http://www.artifex.com/
+-   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
+-   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
+-*/
+-
+-/* $Id: write_t1.c 8022 2007-06-05 22:23:38Z giles $ */
+-
+-/*
+-Functions to serialize a type 1 font as PostScript code that can then be
+-passed to FreeType via the FAPI FreeType bridge.
+-Started by Graham Asher, 26th July 2002.
+-*/
+-
+-#include "wrfont.h"
+-#include "write_t1.h"
+-
+-/*
+-Public structures and functions in this file are prefixed with FF_ because they are part of
+-the FAPI FreeType implementation.
+-*/
+-
+-static void write_word_entry(FAPI_font* a_fapi_font,WRF_output* a_output,const char* a_name,int a_index,int a_divisor)
+-	{
+-	short x;
+-	WRF_wbyte(a_output,'/');
+-	WRF_wstring(a_output,a_name);
+-	WRF_wbyte(a_output,' ');
+-	/* Get the value and convert it from unsigned to signed by assigning it to a short. */
+-	x = a_fapi_font->get_word(a_fapi_font,a_index,0);
+-	/* Divide by the divisor to bring it back to font units. */
+-	x = (short)(x / a_divisor);
+-	WRF_wint(a_output,x);
+-	WRF_wstring(a_output," def\n");
+-	}
+-
+-static void write_array_entry_with_count(FAPI_font* a_fapi_font,WRF_output* a_output,const char* a_name,int a_index,int a_count,int a_divisor)
+-	{
+-	int i;
+-
+-	if (a_count <= 0)
+-		return;
+-
+-	WRF_wbyte(a_output,'/');
+-	WRF_wstring(a_output,a_name);
+-	WRF_wstring(a_output," [");
+-	for (i = 0; i < a_count; i++)
+-		{
+-		/* Get the value and convert it from unsigned to signed by assigning it to a short. */
+-		short x = a_fapi_font->get_word(a_fapi_font,a_index,i);
+-		/* Divide by the divisor to bring it back to font units. */
+-		x = (short)(x / a_divisor);
+-		WRF_wint(a_output,x);
+-		WRF_wbyte(a_output,(byte)(i == a_count - 1 ? ']' : ' '));
+-		}
+-	WRF_wstring(a_output," def\n");
+-	}
+-
+-
+-static void write_array_entry(FAPI_font* a_fapi_font,WRF_output* a_output,const char* a_name,int a_index,int a_divisor)
+-	{
+-	/* NOTE that the feature index must be preceded by the count index for this to work. */
+-	int count = a_fapi_font->get_word(a_fapi_font,a_index - 1,0);
+-	write_array_entry_with_count(a_fapi_font,a_output,a_name,a_index,count,a_divisor);
+-	}
+-
+-static void write_subrs(FAPI_font* a_fapi_font,WRF_output* a_output)
+-	{
+-	int i;
+-	int count = a_fapi_font->get_word(a_fapi_font,FAPI_FONT_FEATURE_Subrs_count,0);
+-	if (count <= 0)
+-		return;
+-
+-	WRF_wstring(a_output,"/Subrs ");
+-	WRF_wint(a_output,count);
+-	WRF_wstring(a_output," array\n");
+-
+-	for (i = 0; i < count; i++)
+-		{
+-		long length = a_fapi_font->get_subr(a_fapi_font,i,0,0);
+-		long buffer_size;
+-		WRF_wstring(a_output,"dup ");
+-		WRF_wint(a_output,i);
+-		WRF_wbyte(a_output,' ');
+-		WRF_wint(a_output,length);
+-		WRF_wstring(a_output," RD ");
+-		
+-		/* Get the subroutine into the buffer and encrypt it in place. */
+-		buffer_size = a_output->m_limit - a_output->m_count;
+-		if (buffer_size >= length)
+-			{
+-			a_fapi_font->get_subr(a_fapi_font,i,a_output->m_pos,(ushort)length);
+-			WRF_wtext(a_output,a_output->m_pos,length);
+-			}
+-		else
+-			a_output->m_count += length;
+-
+-		WRF_wstring(a_output," NP\n");
+-		}
+-
+-	WRF_wstring(a_output,"ND\n");
+-	}
+-
+-static void write_private_dictionary(FAPI_font* a_fapi_font,WRF_output* a_output)
+-	{
+-	a_output->m_encrypt = true;
+-
+-	/* Write 4 bytes that must encrypt to at least one character that cannot be a valid hexadecimal character. */
+-	WRF_wstring(a_output,"XXXX");
+-
+-	/*+ to do: correct size of dictionary from 8. */	
+-	WRF_wstring(a_output,"dup /Private 8 dict dup begin\n");
+-
+-	WRF_wstring(a_output,"/MinFeature {16 16} def\n");
+-	WRF_wstring(a_output,"/password 5839 def\n");
+-	WRF_wstring(a_output,"/lenIV -1 def\n"); /* indicate that /subrs are not encoded. */
+-	write_word_entry(a_fapi_font,a_output,"BlueFuzz",FAPI_FONT_FEATURE_BlueFuzz,16);
+-
+-	WRF_wstring(a_output,"/BlueScale ");
+-	WRF_wfloat(a_output,a_fapi_font->get_long(a_fapi_font,FAPI_FONT_FEATURE_BlueScale,0) / 65536.0);
+-	WRF_wstring(a_output," def\n");
+-
+-	write_word_entry(a_fapi_font,a_output,"BlueShift",FAPI_FONT_FEATURE_BlueShift,16);
+-	write_array_entry(a_fapi_font,a_output,"BlueValues",FAPI_FONT_FEATURE_BlueValues,16);
+-	write_array_entry(a_fapi_font,a_output,"OtherBlues",FAPI_FONT_FEATURE_OtherBlues,16);
+-	write_array_entry(a_fapi_font,a_output,"FamilyBlues",FAPI_FONT_FEATURE_FamilyBlues,16);
+-	write_array_entry(a_fapi_font,a_output,"FamilyOtherBlues",FAPI_FONT_FEATURE_FamilyOtherBlues,16);
+-	write_word_entry(a_fapi_font,a_output,"ForceBold",FAPI_FONT_FEATURE_ForceBold,1);
+-	write_array_entry_with_count(a_fapi_font,a_output,"StdHW",FAPI_FONT_FEATURE_StdHW,1,16);
+-	write_array_entry_with_count(a_fapi_font,a_output,"StdVW",FAPI_FONT_FEATURE_StdVW,1,16);
+-	write_array_entry(a_fapi_font,a_output,"StemSnapH",FAPI_FONT_FEATURE_StemSnapH,16);
+-	write_array_entry(a_fapi_font,a_output,"StemSnapV",FAPI_FONT_FEATURE_StemSnapV,16);
+-
+-	write_subrs(a_fapi_font,a_output);
+-	}
+-
+-static void write_main_dictionary(FAPI_font* a_fapi_font,WRF_output* a_output)
+-	{
+-	int i;
+-	WRF_wstring(a_output,"5 dict begin\n");
+-
+-    WRF_wstring(a_output,"/FontType 1 def\n");
+-
+-	WRF_wstring(a_output,"/FontMatrix [");
+-	for (i = 0; i < 6; i++)
+-		{
+-		WRF_wfloat(a_output,a_fapi_font->get_float(a_fapi_font,FAPI_FONT_FEATURE_FontMatrix,i));
+-		WRF_wbyte(a_output,(byte)(i == 5 ? ']' : ' '));
+-		}
+-	WRF_wbyte(a_output,'\n');
+-
+-	/* For now, specify standard encoding - I think GS will pass glyph indices so doesn't matter. */
+-	WRF_wstring(a_output,"/Encoding StandardEncoding def\n");
+-
+-	WRF_wstring(a_output,"/FontBBox {");
+-	for (i = 0; i < 4; i++)
+-		{
+-		short x = a_fapi_font->get_word(a_fapi_font,FAPI_FONT_FEATURE_FontBBox,i);
+-		WRF_wint(a_output,x);
+-		WRF_wbyte(a_output,(byte)(i == 3 ? '}' : ' '));
+-		}
+-	WRF_wbyte(a_output,'\n');
+-	WRF_wstring(a_output,"currentdict end\ncurrentfile eexec\n");
+-	write_private_dictionary(a_fapi_font,a_output);
+-	}
+-	
+-/**
+-Write a Type 1 font in textual format and return its length in bytes.
+-If a_buffer_size is less than the total length, only a_buffer_size bytes are written, but the total
+-length is returned correctly.
+-
+-The PostScript is non-standard. The main dictionary contains no /Charstrings dictionary. This
+-is supplied to FreeType using the incremental interface, There is also no /PaintType entry. This is required
+-by PostScript but FreeType doesn't use it.
+-*/
+-long FF_serialize_type1_font(FAPI_font* a_fapi_font,unsigned char* a_buffer,long a_buffer_size)
+-	{
+-	WRF_output output;
+-	WRF_init(&output,a_buffer,a_buffer_size);
+-	
+-	/* Leading comment identifying a Type 1 font. */
+-	WRF_wstring(&output,"%!PS-AdobeFont-1\n");
+-
+-	write_main_dictionary(a_fapi_font,&output);
+-	return output.m_count;
+-	}
+diff --git a/base/write_t1.h b/base/write_t1.h
+--- a/base/write_t1.h
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/* Copyright (C) 2001-2006 Artifex Software, Inc.
+-   All Rights Reserved.
+-  
+-   This software is provided AS-IS with no warranty, either express or
+-   implied.
+-
+-   This software is distributed under license and may not be copied, modified
+-   or distributed except as expressly authorized under the terms of that
+-   license.  Refer to licensing information at http://www.artifex.com/
+-   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
+-   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
+-*/
+-
+-/* $Id: write_t1.h 8022 2007-06-05 22:23:38Z giles $ */
+-/*
+-Header for functions to serialize a type 1 font as PostScript code that can
+-then be passed to FreeType via the FAPI FreeType bridge.
+-Started by Graham Asher, 26th July 2002.
+-*/
+-
+-#ifndef write_t1_INCLUDED
+-#define write_t1_INCLUDED
+-
+-#include "ifapi.h"
+-
+-long FF_serialize_type1_font(FAPI_font* a_fapi_font,unsigned char* a_buffer,long a_buffer_size);
+-
+-#endif
+diff --git a/base/write_t2.c b/base/write_t2.c
+--- a/base/write_t2.c
++++ /dev/null
+@@ -1,378 +0,0 @@
+-/* Copyright (C) 2001-2006 Artifex Software, Inc.
+-   All Rights Reserved.
+-  
+-   This software is provided AS-IS with no warranty, either express or
+-   implied.
+-
+-   This software is distributed under license and may not be copied, modified
+-   or distributed except as expressly authorized under the terms of that
+-   license.  Refer to licensing information at http://www.artifex.com/
+-   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
+-   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
+-*/
+-
+-/* $Id: write_t2.c 8022 2007-06-05 22:23:38Z giles $ */
+-
+-/*
+-Functions to serialize a type 1 font so that it can then be
+-passed to FreeType via the FAPI FreeType bridge.
+-Started by Graham Asher, 9th August 2002.
+-*/
+-
+-#include "wrfont.h"
+-#include "write_t2.h"
+-#include "ghost.h"
+-#include "gxfont.h"
+-#include "gxfont1.h"
+-
+-/*
+-Public structures and functions in this file are prefixed with FF_ because they are part of
+-the FAPI FreeType implementation.
+-*/
+-
+-static void write_4_byte_int(unsigned char* a_output,long a_int)
+-	{
+-	a_output[0] = (unsigned char)(a_int >> 24);
+-	a_output[1] = (unsigned char)(a_int >> 16);
+-	a_output[2] = (unsigned char)(a_int >> 8);
+-	a_output[3] = (unsigned char)(a_int & 0xFF);
+-	}
+-
+-static void write_type2_int(WRF_output* a_output,long a_int)
+-	{
+-	if (a_int >= -107 && a_int <= 107)
+-		WRF_wbyte(a_output,(unsigned char)(a_int + 139));
+-	else if (a_int >= -32768 && a_int <= 32767)
+-		{
+-		if (a_int >= 108 && a_int <= 1131)
+-			a_int += 63124;
+-		else if (a_int >= -1131 && a_int <= -108)
+-			a_int = -a_int + 64148;
+-		else
+-			WRF_wbyte(a_output,28);
+-		WRF_wbyte(a_output,(unsigned char)(a_int >> 8));
+-		WRF_wbyte(a_output,(unsigned char)(a_int & 0xFF));
+-		}
+-	else
+-		{
+-		unsigned char buffer[4];
+-		WRF_wbyte(a_output,29);
+-		write_4_byte_int(buffer,a_int);
+-		WRF_wtext(a_output,buffer,4);
+-		}
+-	}
+-
+-static void write_type2_float(WRF_output* a_output,double a_float)
+-	{
+-	char buffer[32];
+-	const char* p = buffer;
+-	int high = true;
+-	char c = 0;
+-	sprintf(buffer,"%f",a_float);
+-	WRF_wbyte(a_output,30);
+-	for (;;)
+-		{
+-		char n = 0;
+-		if (*p >= '0' && *p <= '9')
+-			n = (char)(*p - '0');
+-		else if (*p == '.')
+-			n = 0xA;
+-		else if (*p == 'e' || *p == 'E')
+-			{
+-			if (p[1] == '-')
+-				{
+-				p++;
+-				n = 0xC;
+-				}
+-			else
+-				n = 0xB;
+-			}
+-		else if (*p == '-')
+-			n = 0xE;
+-		else if (*p == 0)
+-			n = 0xF;
+-		if (high)
+-			{
+-			if (*p == 0)
+-				WRF_wbyte(a_output,0xFF);
+-			else
+-				c = (char)(n << 4);
+-			}
+-		else
+-			{
+-			c |= n;
+-			WRF_wbyte(a_output,c);
+-			}
+-
+-		if (*p == 0)
+-			break;
+-
+-		high = !high;
+-		p++;
+-		}
+-	}
+-
+-static void write_header(WRF_output* a_output)
+-	{
+-	WRF_wtext(a_output,(const unsigned char*)"\x1\x0\x4\x1",4);
+-	}
+-
+-static void write_name_index(WRF_output* a_output)
+-	{
+-	/* Write a dummy name of 'x'. */
+-	WRF_wtext(a_output,(const unsigned char*)"\x0\x1\x1\x1\x2""x",6);
+-	}
+-
+-static void write_word_entry(FAPI_font* a_fapi_font,WRF_output* a_output,int a_feature_id,
+-							 int a_feature_count,bool a_two_byte_op,int a_op,int a_divisor)
+-	{
+-	if (a_feature_count > 0)
+-		{
+-		int i;
+-		for (i = 0; i < a_feature_count; i++)
+-			{
+-			/* Get the value and convert it from unsigned to signed. */
+-			short x = a_fapi_font->get_word(a_fapi_font,a_feature_id,i);
+-			/* Divide by the divisor to bring it back to font units. */
+-			x = (short)(x / a_divisor);
+-			write_type2_int(a_output,x);
+-			}
+-		if (a_two_byte_op)
+-			WRF_wbyte(a_output,12);
+-		WRF_wbyte(a_output,(unsigned char)a_op);
+-		}
+-	}
+-
+-static void write_delta_array_entry(FAPI_font* a_fapi_font,WRF_output* a_output,int a_feature_id,
+-									bool a_two_byte_op,int a_op,int a_divisor)
+-	{
+-	int i;
+-	/* NOTE that the feature index (a_feature_id) must be preceded by the count index for this to work. */
+-	int count = a_fapi_font->get_word(a_fapi_font,a_feature_id - 1,0);
+-	if (count > 0)
+-		{
+-		short prev_value = 0;
+-		for (i = 0; i < count; i++)
+-			{
+-			/* Get the value and convert it from unsigned to signed. */
+-			short value = a_fapi_font->get_word(a_fapi_font,a_feature_id,i); 
+-			/* Divide by the divisor to bring it back to font units. */
+-			value = (short)(value / a_divisor);
+-			write_type2_int(a_output,value - prev_value);
+-			prev_value = value;
+-			}
+-		if (a_two_byte_op)
+-			WRF_wbyte(a_output,12);
+-		WRF_wbyte(a_output,(unsigned char)a_op);
+-		}
+-	}
+-
+-static void write_float_entry(FAPI_font* a_fapi_font,WRF_output* a_output,int a_feature_id,int a_feature_count,bool a_two_byte_op,int a_op)
+-	{
+-	if (a_feature_count > 0)
+-		{
+-		int i;
+-		for (i = 0; i < a_feature_count; i++)
+-			{
+-			double x = a_fapi_font->get_float(a_fapi_font,a_feature_id,i);
+-			write_type2_float(a_output,x);
+-			}
+-		if (a_two_byte_op)
+-			WRF_wbyte(a_output,12);
+-		WRF_wbyte(a_output,(unsigned char)a_op);
+-		}
+-	}
+-
+-static void write_font_dict_index(FAPI_font* a_fapi_font,WRF_output* a_output,
+-		unsigned char** a_charset_offset_ptr,
+-		unsigned char** a_charstrings_offset_ptr,
+-		unsigned char** a_private_dict_length_ptr)
+-	{
+-	unsigned char* data_start = 0;
+-	WRF_wtext(a_output,(const unsigned char *)"\x0\x1\x2\x0\x1\x0\x0",7); /* count = 1, offset size = 2, first offset = 1, last offset = 0 (to be filled in later). */
+-	if (a_output->m_pos)
+-		data_start = a_output->m_pos;
+-	write_word_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_FontBBox,4,false,5,1);
+-	write_float_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_FontMatrix,6,true,7);
+-	write_type2_int(a_output,0); /* 0 = Standard Encoding. */
+-	WRF_wbyte(a_output,16); /* 16 = opcode for 'encoding'. */
+-	*a_charset_offset_ptr = a_output->m_pos;
+-	WRF_wtext(a_output,(const unsigned char *)"\x1d""xxxx",5); /* placeholder for the offset to the charset, which will be a 5-byte integer. */
+-	WRF_wbyte(a_output,15); /* opcode for 'charset' */
+-	*a_charstrings_offset_ptr = a_output->m_pos;
+-	WRF_wtext(a_output,(const unsigned char *)"\x1d""xxxx",5); /* placeholder for the offset to the Charstrings index, which will be a 5-byte integer. */
+-	WRF_wbyte(a_output,17); /* opcode for 'Charstrings' */
+-	*a_private_dict_length_ptr = a_output->m_pos;
+-	WRF_wtext(a_output,(const unsigned char *)"\x1d""xxxx\x1d""yyyy",10); /* placeholder for size and offset of Private dictionary, which will be 5-byte integers. */
+-	WRF_wbyte(a_output,18); /* opcode for 'Private' */
+-	if (a_output->m_pos)
+-		{
+-		int last_offset = a_output->m_pos - data_start + 1;
+-		data_start[-2] = (unsigned char)(last_offset >> 8);
+-		data_start[-1] = (unsigned char)(last_offset & 0xFF);
+-		}
+-	}
+-
+-/**
+-Write the character set. Return the number of characters.
+-For the moment this is always 1. The number cannot be obtained
+-via the FAPI interface, and FreeType doesn't need to know anything more
+-than the fact that there is at least one character.
+-*/
+-static int write_charset(WRF_output* a_output,unsigned char* a_charset_offset_ptr)
+-	{
+-	const int characters = 1;
+-	int i = 0;
+-
+-	/* Write the offset to the start of the charset to the top dictionary. */
+-	if (a_output->m_pos)
+-		write_4_byte_int(a_charset_offset_ptr + 1,a_output->m_count);
+-
+-	/*
+-	Write the charset. Write one less than the number of characters,
+-	because the first one is assumed to be .notdef. For the moment
+-	write all the others as .notdef (SID = 0) because we don't actually
+-	need the charset at the moment.
+-	*/
+-	WRF_wbyte(a_output,0); /* format = 0 */
+-	for (i = 1; i < characters; i++)
+-		{
+-		WRF_wbyte(a_output,0);
+-		WRF_wbyte(a_output,0);
+-		}
+-
+-	return characters;
+-	}
+-
+-/**
+-Write a set of empty charstrings. The only reason for the existence of the charstrings index is to tell
+-FreeType how many glyphs there are.
+-*/
+-static void write_charstrings_index(WRF_output* a_output,int a_characters,unsigned char* a_charstrings_offset_ptr)
+-	{
+-	/* Write the offset to the charstrings index to the top dictionary. */
+-	if (a_output->m_pos)
+-		write_4_byte_int(a_charstrings_offset_ptr + 1,a_output->m_count);
+-
+-	/* Write the index. */
+-	WRF_wbyte(a_output,(unsigned char)(a_characters >> 8));
+-	WRF_wbyte(a_output,(unsigned char)(a_characters & 0xFF));
+-	WRF_wbyte(a_output,1); /* offset size = 1. */
+-	while (a_characters-- >= 0)
+-		WRF_wbyte(a_output,1); /* offset = 1 */
+-	}
+-
+-static void write_subrs_index(FAPI_font* a_fapi_font,WRF_output* a_output)
+-	{
+-	unsigned char* cur_offset = 0;
+-	unsigned char* data_start = 0;
+-	int i;
+-	int count = a_fapi_font->get_word(a_fapi_font,FAPI_FONT_FEATURE_Subrs_count,0);
+-
+-	WRF_wbyte(a_output,(unsigned char)(count >> 8));
+-	WRF_wbyte(a_output,(unsigned char)(count & 0xFF));
+-
+-	if (count <= 0)
+-		return;
+-
+-	WRF_wbyte(a_output,4); /* offset size = 4 bytes */
+-	WRF_wtext(a_output,(const unsigned char *)"\x0\x0\x0\x1",4); /* first offset = 1 */
+-
+-	if (a_output->m_pos)
+-		cur_offset = a_output->m_pos;
+-
+-	/* Write dummy bytes for the offsets at the end of each data item. */
+-	for (i = 0; i < count; i++)
+-		WRF_wtext(a_output,(const unsigned char *)"xxxx",4);
+-
+-	if (a_output->m_pos)
+-		data_start = a_output->m_pos;
+-
+-	for (i = 0; i < count; i++)
+-		{
+-		long buffer_size = a_output->m_limit - a_output->m_count;
+-		long length = a_fapi_font->get_subr(a_fapi_font,i,a_output->m_pos,(ushort)buffer_size);
+-		if (a_output->m_pos)
+-			WRF_wtext(a_output,a_output->m_pos,length);
+-		else
+-			a_output->m_count += length;
+-		if (cur_offset)
+-			{
+-			long pos = a_output->m_pos - data_start + 1;
+-			write_4_byte_int(cur_offset,pos);
+-			cur_offset += 4;
+-			}
+-		}
+-	}
+-
+-static void write_private_dict(FAPI_font* a_fapi_font,WRF_output* a_output,unsigned char* a_private_dict_length_ptr)
+-	{
+-	/* Write the offset to the start of the private dictionary to the top dictionary. */
+-	unsigned char* start = a_output->m_pos;
+-	if (a_output->m_pos)
+-		write_4_byte_int(a_private_dict_length_ptr + 6,a_output->m_count);
+-
+-	write_word_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_BlueFuzz,1,true,11,16);
+-
+-	write_type2_float(a_output,a_fapi_font->get_long(a_fapi_font,FAPI_FONT_FEATURE_BlueScale,0) / 65536.0);
+-	WRF_wbyte(a_output,12);
+-	WRF_wbyte(a_output,9);
+-	
+-	write_word_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_BlueShift,1,true,10,16);
+-	write_delta_array_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_BlueValues,false,6,16);
+-	write_delta_array_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_OtherBlues,false,7,16);
+-	write_delta_array_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_FamilyBlues,false,8,16);
+-	write_delta_array_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_FamilyOtherBlues,false,9,16);
+-	write_word_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_ForceBold,1,true,14,1);
+-	write_word_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_StdHW,1,false,10,16);
+-	write_word_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_StdVW,1,false,11,16);
+-	write_delta_array_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_StemSnapH,true,12,16);
+-	write_delta_array_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_StemSnapV,true,13,16);
+-
+-	/*
+-	Write the default width and the nominal width. These values are not available via
+-	the FAPI interface so we have to get a pointer to the Type 1 font structure and
+-	extract them directly.
+-	*/
+-	{
+-	gs_font_type1* t1 = (gs_font_type1*)a_fapi_font->client_font_data;
+-    write_type2_float(a_output,fixed2float(t1->data.defaultWidthX));
+-	WRF_wbyte(a_output,20);
+-    write_type2_float(a_output,fixed2float(t1->data.nominalWidthX));
+-	WRF_wbyte(a_output,21);
+-	}
+-
+-	/* Write the length in bytes of the private dictionary to the top dictionary. */	
+-	if (a_output->m_pos)
+-		write_4_byte_int(a_private_dict_length_ptr + 1,a_output->m_pos - start);
+-	}
+-
+-/**
+-Write a Type 2 font in binary format and return its length in bytes.
+-If a_buffer_size is less than the total length, only a_buffer_size bytes are written, but the total
+-length is returned correctly.
+-*/
+-long FF_serialize_type2_font(FAPI_font* a_fapi_font,unsigned char* a_buffer,long a_buffer_size)
+-	{
+-	unsigned char* charset_offset_ptr = NULL;
+-	unsigned char* charstrings_offset_ptr = NULL;
+-	unsigned char* private_dict_length_ptr = NULL;
+-	int characters = 0;
+-
+-	WRF_output output;
+-	WRF_init(&output,a_buffer,a_buffer_size);
+-
+-	write_header(&output);
+-	write_name_index(&output);
+-	write_font_dict_index(a_fapi_font,&output,&charset_offset_ptr,&charstrings_offset_ptr,&private_dict_length_ptr);
+-
+-  	/* Write an empty string index. */
+-  	WRF_wtext(&output,(const unsigned char *)"\x0\x0",2);
+-
+-	write_subrs_index(a_fapi_font,&output);
+-	characters = write_charset(&output,charset_offset_ptr);
+-	write_charstrings_index(&output,characters,charstrings_offset_ptr);
+-	write_private_dict(a_fapi_font,&output,private_dict_length_ptr);
+-
+-	return output.m_count;
+-	}
+diff --git a/base/write_t2.h b/base/write_t2.h
+--- a/base/write_t2.h
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/* Copyright (C) 2001-2006 Artifex Software, Inc.
+-   All Rights Reserved.
+-  
+-   This software is provided AS-IS with no warranty, either express or
+-   implied.
+-
+-   This software is distributed under license and may not be copied, modified
+-   or distributed except as expressly authorized under the terms of that
+-   license.  Refer to licensing information at http://www.artifex.com/
+-   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
+-   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
+-*/
+-
+-/* $Id: write_t2.h 8022 2007-06-05 22:23:38Z giles $ */
+-/*
+-Header for functions to serialize a type 2 (CFF) font so that it can
+-then be passed to FreeType via the FAPI FreeType bridge.
+-Started by Graham Asher, 9th August 2002.
+-*/
+-
+-#ifndef write_t2_INCLUDED
+-#define write_t2_INCLUDED
+-
+-#include "ifapi.h"
+-
+-long FF_serialize_type2_font(FAPI_font* a_fapi_font,unsigned char* a_buffer,long a_buffer_size);
+-
+-#endif
+diff --git a/contrib/contrib.mak b/contrib/contrib.mak
+--- a/contrib/contrib.mak
++++ b/contrib/contrib.mak
+@@ -50,6 +50,7 @@ CONTRIBSRC=$(CONTRIBDIR)$(D)
+ #       cdj880   HP DeskJet 880
+ #       cdj890   HP DeskJet 890
+ #       cdj970   HP DeskJet 970
++#	cdnj500  HP DesignJet 500
+ #	chp2200  HP Business Inkjet 2200
+ #       dl2100   DEC DL2100
+ #	dmprt	 dot matrix printer driver for Ghostscript (it can use 
+@@ -232,6 +233,14 @@ $(GLOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h)
+ 	$(GLCC) $(GLO_)gdevdj9.$(OBJ) $(C_) $(CONTRIBSRC)gdevdj9.c
+  
+ 
++### -------------- cdnj500 - HP DesignJet 500 ------------- ###
++
++### NOTE:  Same as chp2200 (some PJL and CRD changes).
++
++$(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev
++	$(SETPDEV2) $(DD)cdnj500 $(cdeskjet8_)
++
++
+ ### -------------- chp2200 - HP Business Inkjet 2200 ------------- ###
+ 
+ ### NOTE:  Depends on the presence of the cdj850 section.
+diff --git a/contrib/gdevcd8.c b/contrib/gdevcd8.c
+--- a/contrib/gdevcd8.c
++++ b/contrib/gdevcd8.c
+@@ -34,6 +34,7 @@
+ 
+    A printer driver for the HP670, HP690, HP850, HP855
+    HP870, HP890, HP1100, HP1600 and HP2200 color printers.
++   Also work with HP DesignJet 500 large-format color printer.
+    To be used with the Ghostscript printing system.
+    
+    CREDITS: Much of the driver is based on ideas derived
+@@ -44,6 +45,8 @@
+ 
+ 	    The support for the hp2200 was added by Siow-Kiat Tan.
+ 
++	    The support for the dnj500 was added by Timur Maximov.
++
+ -------------------------------------------------------------------*/
+ 
+ /* Note: Depending on how you transfered the files, 
+@@ -459,7 +462,7 @@ typedef enum {
+ 
+ /* Printer types */
+ typedef enum {
+-    DJ670C, DJ850C, DJ880C, DJ890C, DJ1600C, HP2200C
++    DJ670C, DJ850C, DJ880C, DJ890C, DJ1600C, HP2200C, DNJ500C
+ } cdj_printer_type_t;
+ 
+ 
+@@ -492,6 +495,7 @@ static dev_proc_put_params(cdj850_put_params);
+ 
+ static dev_proc_print_page(cdj850_print_page);
+ static dev_proc_print_page(chp2200_print_page);
++static dev_proc_print_page(cdnj500_print_page);
+ 
+ /* The device descriptors */
+ 
+@@ -636,7 +640,7 @@ typedef struct {
+     (bpp > 8 ? 5 : 2), (bpp > 8 ? 5 : bpp > 1 ? 2 : 0),\
+     print_page, -1 /* cmyk */, correct)
+ 
+-/* The prn_rgb_color_device is used by the HP2200 */
++/* The prn_rgb_color_device is used by the HP2200 and DNJ500 */
+ #define prn_rgb_colour_device(dtype, procs, dev_name, x_dpi, y_dpi, bpp, print_page, correct)\
+     prn_colour_device_body(dtype, procs, dev_name,\
+     DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, x_dpi, y_dpi, 0, 0, 0, 0,\
+@@ -683,7 +687,7 @@ typedef struct {
+     terminate_page\
+ }
+ 
+-/* HP2200 is a RGB printer */
++/* HP2200 and DNJ500 is a RGB printer */
+ #define chp_2200_device(procs, dev_name, x_dpi, y_dpi, bpp, print_page, correction, quality, papertype, intensities,ptype,compression,mastergamma,gammavalc,gammavalm,gammavaly,gammavalk,blackcorrect,start_raster_mode,print_non_blank_line,terminate_page)\
+ { prn_rgb_colour_device(gx_device_cdj850, procs, dev_name, x_dpi, y_dpi, bpp, print_page, correction),\
+     quality,\
+@@ -783,6 +787,14 @@ static void
+ static void
+      chp2200_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
+ 
++/*  Functions for the DNJ500C */
++static void
++     cdnj500_start_raster_mode(gx_device_printer * pdev,
++			       int papersize, FILE * prn_stream);
++
++static void
++     cdnj500_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
++
+ 
+ static const gx_device_procs cdj670_procs =
+ cmyk_colour_procs(hp_colour_open, cdj850_get_params, cdj850_put_params,
+@@ -804,7 +816,7 @@ static const gx_device_procs cdj1600_procs =
+ cmyk_colour_procs(hp_colour_open, cdj850_get_params, cdj850_put_params,
+ 		  gdev_pcl_map_rgb_color, gdev_pcl_map_color_rgb, NULL);
+ 
+-/* HP2200 is a RGB printer */
++/* HP2200 and DNJ500 is a RGB printer */
+ static const gx_device_procs chp2200_procs =
+ cmyk_colour_procs(hp_colour_open, cdj850_get_params, cdj850_put_params,
+ 		  gx_default_rgb_map_rgb_color, gx_default_rgb_map_color_rgb, NULL);
+@@ -853,6 +865,14 @@ chp_2200_device(chp2200_procs, "chp2200", 300, 300, 24, chp2200_print_page, 0,
+ 	       chp2200_start_raster_mode, NULL /*unused*/,
+ 	       chp2200_terminate_page);
+ 
++/* DNJ500 does not need color matching and halftoning parameters */
++const gx_device_cdj850 gs_cdnj500_device =
++chp_2200_device(chp2200_procs, "cdnj500", 300, 300, 24, cdnj500_print_page, 0,
++	       NORMAL, PLAIN_PAPER, 0 /*unused*/, DNJ500C, 10,
++	       0.0, 0.0, 0.0, 0.0, 0.0, 0.0, /*all unused*/
++	       cdnj500_start_raster_mode, NULL /*unused*/,
++	       cdnj500_terminate_page);
++
+ /* Forward references */
+ static int cdj_put_param_int(gs_param_list *, gs_param_name,
+ 			      int *, int, int, int);
+@@ -892,6 +912,11 @@ hp_colour_open(gx_device * pdev)
+ 	0.25, 0.46, 0.25, 0.08
+     };
+ 
++    /* margins for DNJ500C */
++    static const float cdnj500[4] = {
++	0.00, 0.00, 0.00, 0.00
++    };
++
+     const float *m = (float *)0;
+ 
+     /* Set up colour params if put_params has not already done so */
+@@ -1011,6 +1036,20 @@ hp_colour_open(gx_device * pdev)
+ 	}
+ 	m = (gdev_pcl_paper_size(pdev) == PAPER_SIZE_A4 ? chp2200_a4 : chp2200_letter);
+ 	break;
++    /* DNJ500 supports 300dpi and 600dpi with any combinations */
++    case DNJ500C:
++        cdj850->xscal = 0; /* unused */
++        cdj850->yscal = 0; /* unused */
++        cdj850->intensities = 0; /* unused */
++	if (cdj850->quality == DRAFT) {
++	    gx_device_set_resolution(pdev, 300.0, 300.0);
++	} else if (cdj850->quality == NORMAL) {
++	    gx_device_set_resolution(pdev, 600.0, 600.0);
++	} else {  /* quality == PRESENTATION */
++	    gx_device_set_resolution(pdev, 600.0, 600.0);
++	}
++	m = cdnj500;
++	break;
+     default:
+ 	assert(0);
+     }
+@@ -1205,6 +1244,14 @@ chp2200_terminate_page(gx_device_printer * pdev, FILE * prn_stream)
+     fputs("\033%-12345X@PJL EOJ\012\033%-12345X", prn_stream); /* Send the PJL EOJ */
+ }
+ 
++/* DNJ500 terminate page routine */
++static void
++cdnj500_terminate_page(gx_device_printer * pdev, FILE * prn_stream)
++{
++    fputs("\033*rC", prn_stream);  /* End graphics */
++    fputs("\033%-12345X@PJL EOJ \n", prn_stream); /* Send the PJL EOJ */
++}
++
+ /* Here comes the hp850 output routine -------------------- */
+ static int
+ cdj850_print_page(gx_device_printer * pdev, FILE * prn_stream)
+@@ -1781,6 +1828,149 @@ chp2200_print_page(gx_device_printer * pdev, FILE * prn_stream)
+     return 0;
+ }
+ 
++#define HIBYTE(w)	((byte)(((unsigned int) (w) >> 8) & 0xFF))
++#define LOBYTE(w)	((byte)(w))
++
++/* DNJ500 output routine -------------------- */
++static int
++cdnj500_print_page(gx_device_printer * pdev, FILE * prn_stream)
++{
++    byte  CRD_SeqC[]     = {0x1b, 0x2a, 0x67, 0x31, 0x32, 0x57, 0x06, 0x1F, 0x00, 0x01,
++    /*                      Esc   *     |g    |# of bytes |W    |frmt |SP   |# of cmpnts*/
++                            0x00, 0x00, 0x00, 0x00, 0x0a, 0x01, 0x20, 0x01};
++    /*                      |Horz Res   |Vert Rez   |compr|orien|bits |planes*/
++
++    /* x,y resolution for color planes, assume x=y */
++    int xres = cdj850->x_pixels_per_inch;
++    int yres = cdj850->y_pixels_per_inch;
++
++    gs_memory_t *mem = pdev->memory;
++    int width_in_pixels = pdev->width;
++    int width_in_bytes = width_in_pixels * 3; /* assume 24 bits (3 bytes per pixel) */
++    byte *lbuf = gs_alloc_bytes(mem, width_in_bytes,
++				"(input)cdnj500_print_page");
++    byte *lseedbuf = gs_alloc_bytes(mem, width_in_bytes,
++				"(seed)cdnj500_print_page");
++    /* allocate twice the input size for worse case compressed output*/
++    byte *loutputbuf = gs_alloc_bytes(mem, width_in_bytes*2,	
++				"(output)cdnj500_print_page");
++
++    int lnum = 0;
++    int iEmptyRows = 0;
++    int iBlock = 0;
++    bool begin = true;
++    byte *data = lbuf;
++
++    if ((lbuf == 0) || (lseedbuf == 0) || (loutputbuf == 0))
++	    return_error(gs_error_VMerror);
++
++    /* Start Raster mode */
++    (*cdj850->start_raster_mode) (pdev,
++                                  gdev_pcl_paper_size((gx_device *)pdev),
++                                  prn_stream);
++
++    /* This will configure the raster-mode */
++    CRD_SeqC[10] = HIBYTE(xres);
++    CRD_SeqC[11] = LOBYTE(xres);
++    CRD_SeqC[12] = HIBYTE(yres);
++    CRD_SeqC[13] = LOBYTE(yres);
++
++    for (lnum = 0; lnum < pdev->height; ++lnum)
++    {
++        int result = -1;
++
++    	/*gdev_prn_get_bits(pdev, lnum, lbuf, &data);*/
++        result = gdev_prn_copy_scan_lines(pdev, lnum, data, width_in_bytes);
++
++        if ((result == 1) && IsScanlineDirty(data, width_in_bytes))
++        {
++            unsigned int OutputLen = 0;
++
++            /*
++             * Printers with low memory (64 MB or less) can run out of memory during decompressing
++             * the image data and will abort the job. To prevent this, restart raster command.
++             * Raghu (hpijs)
++             */
++            if (iBlock == 448) /* from DesignJet 500 winNT driver */
++            {
++                /* terminate the scanline */
++                fputs("0Y", prn_stream);
++
++                /* End graphics */
++                fputs("\033*rC", prn_stream);
++
++                /* Reset in block lines counter */
++                iBlock = 0;
++            }
++            if (iBlock == 0)
++            {
++                /* Send CRD */
++                fwrite(CRD_SeqC, sizeof(byte), sizeof(CRD_SeqC), prn_stream);
++            
++                /* Raster mode */
++                fputs("\033*r1A", prn_stream);
++
++                /* start the scanline */
++                fputs("\033*b", prn_stream);
++
++                /* reset seed buffer */
++                INIT_WHITE(lseedbuf, width_in_bytes);
++            }
++            iBlock++;
++
++            if (iEmptyRows)
++            {
++             	/* send vertical Y move */
++	        	fprintf(prn_stream, "%dy", iEmptyRows);
++
++                /* reset empty row count */
++                iEmptyRows = 0;
++
++                /* reset seed buffer */
++                INIT_WHITE(lseedbuf, width_in_bytes);
++            }
++
++            OutputLen = Mode10(width_in_pixels,
++                               data,
++                               lseedbuf,
++                               loutputbuf);
++
++            if (OutputLen)
++            {
++                fprintf(prn_stream, "%dw", OutputLen);
++        		fwrite(loutputbuf, sizeof(byte), OutputLen, prn_stream);
++
++                /* save the current scanline as the seed for the next scanline*/
++                memcpy((void*)lseedbuf, (const void*)data, width_in_bytes);
++            }
++            else
++            {
++		        fputs("0w", prn_stream);
++            }
++
++            /* Content printing already started */
++            begin = false;
++        }
++        else
++        {
++            /* Skip empty area on top page */
++            if (begin == false) iEmptyRows++;
++        }
++    }
++
++    /* terminate the scanline */
++    fputs("0Y", prn_stream);
++
++    /* terminate page and eject paper */
++    (*cdj850->terminate_page) (pdev, prn_stream);
++
++    gs_free_object(mem, lbuf, "(input)cdnj500_print_page");
++    gs_free_object(mem, lseedbuf, "(seed)cdnj500_print_page");
++    gs_free_object(mem, loutputbuf, "(output)cdnj500_print_page");
++
++    return 0;
++}
++
+ 
+ #define odd(i) ((i & 01) != 0)
+ 
+@@ -3084,9 +3274,6 @@ cdj880_start_raster_mode(gx_device_printer * pdev, int paper_size,
+     return;
+ }				/* end configure raster-mode */
+ 
+-#define HIBYTE(w)	((byte)(((unsigned int) (w) >> 8) & 0xFF))
+-#define LOBYTE(w)	((byte)(w))
+-
+ /* Start Raster mode for HP2200 */
+ static void
+ chp2200_start_raster_mode(gx_device_printer * pdev, int paper_size,
+@@ -3153,6 +3340,70 @@ chp2200_start_raster_mode(gx_device_printer * pdev, int paper_size,
+     return;
+ }				/* end configure raster-mode */
+ 
++/* Start Raster mode for DNJ500 */
++static void
++cdnj500_start_raster_mode(gx_device_printer * pdev, int paper_size,
++			 FILE * prn_stream)
++{
++    /* x,y resolution for color planes, assume x=y */
++    int xres = cdj850->x_pixels_per_inch;
++    int yres = cdj850->y_pixels_per_inch;
++    float x = pdev->width  / pdev->x_pixels_per_inch * 10;
++    float y = pdev->height / pdev->y_pixels_per_inch * 10;
++
++    /* Exit from any previous language */
++    fprintf(prn_stream, "\033%%-12345X");
++
++    /* send @PJL JOB NAME before entering the language
++     * this will be matched by a @PJL EOJ after leaving the language
++     */
++    fprintf(prn_stream, "@PJL JOB NAME=\"GS %.2fx%.2f\" \n", x * 2.54, y * 2.54);
++
++    /* Color use */
++    fprintf(prn_stream, "@PJL SET RENDERMODE = COLOR \n");
++//    fprintf(prn_stream, "@PJL SET RENDERMODE = TRUEBLACK \n");
++
++    /* Color correction */
++    fprintf(prn_stream, "@PJL SET COLORSPACE = SRGB \n");
++//    fprintf(prn_stream, "@PJL SET COLORSPACE = DEVICERGB \n");
++
++    /* Predef qual set (TODO: need add options) */
++    if (cdj850->quality == DRAFT) {
++        fprintf(prn_stream, "@PJL SET RENDERINTENT = PERCEPTUAL \n");
++        fprintf(prn_stream, "@PJL SET RET = ON \n");
++        fprintf(prn_stream, "@PJL SET MAXDETAIL = OFF \n");
++    } else if (cdj850->quality == NORMAL) {
++        fprintf(prn_stream, "@PJL SET RENDERINTENT = PERCEPTUAL \n");
++        fprintf(prn_stream, "@PJL SET RET = ON \n");
++        fprintf(prn_stream, "@PJL SET MAXDETAIL = ON \n");
++    } else {  /* quality == PRESENTATION */
++        fprintf(prn_stream, "@PJL SET RENDERINTENT = SATURATION \n");
++        fprintf(prn_stream, "@PJL SET RET = OFF \n");
++        fprintf(prn_stream, "@PJL SET MAXDETAIL = ON \n");
++    }
++
++    /* Set "remove margins between pages" (need not separated pages) */
++//    fprintf(prn_stream, "@PJL SET NESTMODE = OFF \n");
++
++    /* Disable automatic cutter */
++//    fprintf(prn_stream, "@PJL SET CUTTER = OFF \n");
++
++    /* Set page size (useful for standart format cutting) */
++//    fprintf(prn_stream, "@PJL SET PAPERLENGTH = %d \n", (int)(y * 72.0));
++//    fprintf(prn_stream, "@PJL SET PAPERWIDTH = %d \n" , (int)(x * 72.0));
++
++    /* Set the language to PCL3 enhanced */
++    fprintf(prn_stream, "@PJL ENTER LANGUAGE=PCL3GUI \n");
++
++    /* Print Quality, -1 = draft, 0 = normal, 1 = presentation */
++    fprintf(prn_stream, "\033*o%dM", cdj850->quality);
++
++    /* Unit of Measure*/
++    fprintf(prn_stream, "\033&u%dD", (int)xres);
++
++    return;
++}   /* end configure raster-mode */
++
+ static int near
+ cdj_put_param_int(gs_param_list * plist, gs_param_name pname, int *pvalue,
+ 		  int minval, int maxval, int ecode)
+diff --git a/contrib/pcl3/eprn/gdeveprn.c b/contrib/pcl3/eprn/gdeveprn.c
+--- a/contrib/pcl3/eprn/gdeveprn.c
++++ b/contrib/pcl3/eprn/gdeveprn.c
+@@ -314,7 +314,7 @@ static void print_flags(ms_MediaCode flags, const ms_Flag *user_flags)
+   if (user_flags != NULL) {
+     while (user_flags->code != ms_none) {
+       if (user_flags->code & flags) {
+-	errprintf(user_flags->name);
++	errprintf("%s", user_flags->name);
+ 	flags &= ~user_flags->code;
+       }
+       user_flags++;
+diff --git a/contrib/pcl3/src/gdevpcl3.c b/contrib/pcl3/src/gdevpcl3.c
+--- a/contrib/pcl3/src/gdevpcl3.c
++++ b/contrib/pcl3/src/gdevpcl3.c
+@@ -1315,7 +1315,7 @@ static int pcl3_open_device(gx_device *device)
+ 	"%s  page setup requested by the document as being for `",
+ 	epref, epref);
+       if (ms_find_name_from_code(buffer, sizeof(buffer),
+-	  dev->eprn.code, flag_description) == 0) eprintf(buffer);
++	  dev->eprn.code, flag_description) == 0) eprintf1("%s", buffer);
+       else eprintf("UNKNOWN");	/* should never happen */
+       eprintf3("' (%.0f x %.0f bp).\n"
+ 	"%s  The driver does not know how to do this in PCL.\n",
+diff --git a/cups/cups.mak b/cups/cups.mak
+--- a/cups/cups.mak
++++ b/cups/cups.mak
+@@ -33,6 +33,7 @@ cups_=	$(GLOBJ)gdevcups.$(OBJ)
+ # CUPSSERVERBIN=`cups-config --serverbin`
+ # CUPSSERVERROOT=`cups-config --serverroot`
+ # CUPSDATA=`cups-config --datadir`
++# CUPSPDFTORASTER= 1 if CUPS is new enough (cups-config --version)
+ 
+ $(DD)cups.dev : $(CUPS_MAK) $(cups_) $(GLD)page.dev
+ 	$(SETPDEV2) $(DD)cups $(cups_)
+@@ -49,18 +50,24 @@ pdftoraster: $(PDFTORASTER_XE)
+ pdftoraster_=cups/pdftoraster.c
+ 
+ $(PDFTORASTER_XE): $(pdftoraster_)
+-	$(GLCC) `cups-config --image --libs` -DBINDIR='"$(bindir)"' -DGS='"$(GS)"' -o $@ $(pdftoraster_)
++	if [ "$(CUPSPDFTORASTER)" = "1" ]; then \
++	    $(GLCC) $(LDFLAGS) -DBINDIR='"$(bindir)"' -DGS='"$(GS)"' -o $@ $(pdftoraster_) `cups-config --image --libs`; \
++	fi
+ 
+ install:	install-cups
+ 
+ install-cups: cups
+ 	-mkdir -p $(DESTDIR)$(CUPSSERVERBIN)/filter
+ 	$(INSTALL_PROGRAM) cups/pstoraster $(DESTDIR)$(CUPSSERVERBIN)/filter
+-	$(INSTALL_PROGRAM) $(PDFTORASTER_XE) $(DESTDIR)$(CUPSSERVERBIN)/filter
++	if [ "$(CUPSPDFTORASTER)" = "1" ]; then \
++	    $(INSTALL_PROGRAM) $(PDFTORASTER_XE) $(DESTDIR)$(CUPSSERVERBIN)/filter; \
++	fi
+ 	$(INSTALL_PROGRAM) cups/pstopxl $(DESTDIR)$(CUPSSERVERBIN)/filter
+ 	-mkdir -p $(DESTDIR)$(CUPSSERVERROOT)
+ 	$(INSTALL_DATA) cups/pstoraster.convs $(DESTDIR)$(CUPSSERVERROOT)
+-	$(INSTALL_DATA) cups/pdftoraster.convs $(DESTDIR)$(CUPSSERVERROOT)
++	if [ "$(CUPSPDFTORASTER)" = "1" ]; then \
++	    $(INSTALL_DATA) cups/pdftoraster.convs $(DESTDIR)$(CUPSSERVERROOT); \
++	fi
+ 	-mkdir -p $(DESTDIR)$(CUPSDATA)/model
+ 	$(INSTALL_DATA) cups/pxlcolor.ppd $(DESTDIR)$(CUPSDATA)/model
+ 	$(INSTALL_DATA) cups/pxlmono.ppd $(DESTDIR)$(CUPSDATA)/model
+diff --git a/cups/gdevcups.c b/cups/gdevcups.c
+--- a/cups/gdevcups.c
++++ b/cups/gdevcups.c
+@@ -252,9 +252,7 @@ private gx_device_procs	cups_procs =
+    NULL,				/* image_data */
+    NULL,				/* end_image */
+    NULL,				/* strip_tile_rectangle */
+-   NULL					/* strip_copy_rop */
+-#ifdef dev_t_proc_encode_color
+-   ,
++   NULL,				/* strip_copy_rop */
+    NULL,				/* get_clipping_box */
+    NULL,				/* begin_typed_image */
+    NULL,				/* get_bits_rectangle */
+@@ -268,11 +266,26 @@ private gx_device_procs	cups_procs =
+    NULL,				/* begin_transparency_mask */
+    NULL,				/* end_transparency_mask */
+    NULL,				/* discard_transparency_layer */
++#ifdef dev_t_proc_encode_color
+    cups_get_color_mapping_procs,
+-   NULL,				/* get_color_comp_index */
++   gx_error_get_color_comp_index,	/* Dummy to avoid segfault */
+    cups_encode_color,
+-   cups_decode_color
++   cups_decode_color,
++#else
++   NULL,                                /* get_color_mapping_procs */
++   NULL,                                /* get_color_comp_index */
++   NULL,                                /* encode_color */
++   NULL,                                /* decode_color */
+ #endif /* dev_t_proc_encode_color */
++   NULL,				/* pattern_manage */
++   NULL,				/* fill_rectangle_hl_color */
++   NULL,				/* include_color_space */
++   NULL,				/* fill_linear_color_scanline */
++   NULL,				/* fill_linear_color_trapezoid */
++   NULL,				/* fill_linear_color_triangle */
++   NULL,				/* update_spot_equivalent_colors */
++   NULL,				/* ret_devn_params */
++   NULL 				/* fillpage */
+ };
+ 
+ #define prn_device_body_copies(dtype, procs, dname, w10, h10, xdpi, ydpi, lo, to, lm, bm, rm, tm, ncomp, depth, mg, mc, dg, dc, print_pages)\
+@@ -365,9 +378,10 @@ gx_device_cups	gs_cups_device =
+                                         /* cupsString */
+     "",                                 /* cupsMarkerType */
+     "",                                 /* cupsRenderingIntent */
+-    "Letter"                            /* cupsPageSizeName */
++    ""                                  /* cupsPageSizeName */
+ #endif /* CUPS_RASTER_SYNCv1 */
+-  }
++  },
++  0                                     /* landscape */
+ };
+ 
+ /*
+@@ -414,7 +428,6 @@ static unsigned char	cupsRevLower1[16] =
+ 			  0x20, 0x60, 0xa0, 0xe0, 0x30, 0x70, 0xb0, 0xf0
+ 			};
+ 
+-
+ /*
+  * Local functions...
+  */
+@@ -592,6 +605,8 @@ private void
+ cups_get_matrix(gx_device *pdev,	/* I - Device info */
+                 gs_matrix *pmat)	/* O - Physical transform matrix */
+ {
++  ppd_attr_t *backside = NULL;
++
+   dprintf2("DEBUG2: cups_get_matrix(%p, %p)\n", pdev, pmat);
+ 
+  /*
+@@ -610,7 +625,12 @@ cups_get_matrix(gx_device *pdev,	/* I - Device info */
+ 
+   if (cupsPPD)
+   {
++    backside = ppdFindAttr(cupsPPD, "cupsBackSide", NULL); 
+     dprintf1("DEBUG2: cupsPPD = %p\n", cupsPPD);
++    if (backside) {
++       dprintf1("DEBUG2: cupsBackSide = %s\n", backside->value);
++       cupsPPD->flip_duplex = 0;
++    }
+     dprintf1("DEBUG2: cupsPPD->flip_duplex = %d\n", cupsPPD->flip_duplex);
+   }
+ 
+@@ -620,36 +640,96 @@ cups_get_matrix(gx_device *pdev,	/* I - Device info */
+     * Do landscape orientation...
+     */
+ 
+-    if (cups->header.Duplex && !cups->header.Tumble &&
+-	cupsPPD && cupsPPD->flip_duplex && !(cups->page & 1))
++    if (cups->header.Duplex && cupsPPD &&
++	(cups->header.Tumble &&
++	 (backside && !strcasecmp(backside->value, "Flipped"))) &&
++	!(cups->page & 1))
+     {
+       pmat->xx = 0.0;
+-      pmat->xy = (float)cups->header.HWResolution[0] / 72.0;
+-      pmat->yx = -(float)cups->header.HWResolution[1] / 72.0;
++      pmat->xy = (float)cups->header.HWResolution[1] / 72.0;
++      pmat->yx = (float)cups->header.HWResolution[0] / 72.0;
+       pmat->yy = 0.0;
+-      pmat->tx = -(float)cups->header.HWResolution[0] * pdev->HWMargins[2] / 72.0;
++      pmat->tx = -(float)cups->header.HWResolution[0] * pdev->HWMargins[1] / 72.0;
++      pmat->ty = -(float)cups->header.HWResolution[1] * pdev->HWMargins[0] / 72.0;
++    }
++    else if (cups->header.Duplex && cupsPPD &&
++	     (!cups->header.Tumble &&
++	      (backside && !strcasecmp(backside->value, "Flipped"))) &&
++	     !(cups->page & 1))
++    {
++      pmat->xx = 0.0;
++      pmat->xy = -(float)cups->header.HWResolution[1] / 72.0;
++      pmat->yx = (float)cups->header.HWResolution[0] / 72.0;
++      pmat->yy = 0.0;
++      pmat->tx = -(float)cups->header.HWResolution[0] * pdev->HWMargins[1] / 72.0;
++      pmat->ty = (float)cups->header.HWResolution[1] *
++	         ((float)cups->header.PageSize[0] - pdev->HWMargins[2]) / 72.0;
++    }
++    else if (cups->header.Duplex && cupsPPD &&
++	     ((!cups->header.Tumble &&
++	       (cupsPPD->flip_duplex ||
++		(backside && !strcasecmp(backside->value, "Rotated")))) ||
++	      (cups->header.Tumble &&
++	       (backside && !strcasecmp(backside->value, "ManualTumble")))) &&
++	   !(cups->page & 1))
++    {
++      pmat->xx = 0.0;
++      pmat->xy = -(float)cups->header.HWResolution[1] / 72.0;
++      pmat->yx = (float)cups->header.HWResolution[0] / 72.0;
++      pmat->yy = 0.0;
++      pmat->tx = -(float)cups->header.HWResolution[0] * pdev->HWMargins[1] / 72.0;
+       pmat->ty = (float)cups->header.HWResolution[1] *
+-                 ((float)cups->header.PageSize[0] - pdev->HWMargins[3]) / 72.0;
++	         ((float)cups->header.PageSize[0] - pdev->HWMargins[2]) / 72.0;
+     }
+     else
+     {
+       pmat->xx = 0.0;
+-      pmat->xy = (float)cups->header.HWResolution[0] / 72.0;
+-      pmat->yx = (float)cups->header.HWResolution[1] / 72.0;
++      pmat->xy = (float)cups->header.HWResolution[1] / 72.0;
++      pmat->yx = (float)cups->header.HWResolution[0] / 72.0;
+       pmat->yy = 0.0;
+-      pmat->tx = -(float)cups->header.HWResolution[0] * pdev->HWMargins[0] / 72.0;
+-      pmat->ty = -(float)cups->header.HWResolution[1] * pdev->HWMargins[1] / 72.0;
++      pmat->tx = -(float)cups->header.HWResolution[0] * pdev->HWMargins[1] / 72.0;
++      pmat->ty = -(float)cups->header.HWResolution[1] * pdev->HWMargins[0] / 72.0;
+     }
+   }
+-  else if (cups->header.Duplex && !cups->header.Tumble &&
+-           cupsPPD && cupsPPD->flip_duplex && !(cups->page & 1))
++  else if (cups->header.Duplex && cupsPPD &&
++	   (cups->header.Tumble &&
++	    (backside && !strcasecmp(backside->value, "Flipped"))) &&
++	   !(cups->page & 1))
++  {
++    pmat->xx = (float)cups->header.HWResolution[0] / 72.0;
++    pmat->xy = 0.0;
++    pmat->yx = 0.0;
++    pmat->yy = -(float)cups->header.HWResolution[1] / 72.0;
++    pmat->tx = -(float)cups->header.HWResolution[0] * pdev->HWMargins[0] / 72.0;
++    pmat->ty = (float)cups->header.HWResolution[1] *
++               ((float)cups->header.PageSize[1] - pdev->HWMargins[3]) / 72.0;
++  }
++  else if (cups->header.Duplex && cupsPPD &&
++	   (!cups->header.Tumble &&
++	    (backside && !strcasecmp(backside->value, "Flipped"))) &&
++	   !(cups->page & 1))
++  {
++    pmat->xx = (float)cups->header.HWResolution[0] / 72.0;
++    pmat->xy = 0.0;
++    pmat->yx = 0.0;
++    pmat->yy = (float)cups->header.HWResolution[1] / 72.0;
++    pmat->tx = -(float)cups->header.HWResolution[0] * pdev->HWMargins[0] / 72.0;
++    pmat->ty = -(float)cups->header.HWResolution[1] * pdev->HWMargins[1] / 72.0;
++  }
++  else if (cups->header.Duplex && cupsPPD &&
++	   ((!cups->header.Tumble &&
++	     (cupsPPD->flip_duplex ||
++	     (backside && !strcasecmp(backside->value, "Rotated")))) ||
++	    (cups->header.Tumble &&
++	     (backside && !strcasecmp(backside->value, "ManualTumble")))) &&
++	   !(cups->page & 1))
+   {
+     pmat->xx = (float)cups->header.HWResolution[0] / 72.0;
+     pmat->xy = 0.0;
+     pmat->yx = 0.0;
+     pmat->yy = (float)cups->header.HWResolution[1] / 72.0;
+-    pmat->tx = -(float)cups->header.HWResolution[0] * pdev->HWMargins[2] / 72.0;
+-    pmat->ty = -(float)cups->header.HWResolution[1] * pdev->HWMargins[3] / 72.0;
++    pmat->tx = -(float)cups->header.HWResolution[0] * pdev->HWMargins[0] / 72.0;
++    pmat->ty = -(float)cups->header.HWResolution[1] * pdev->HWMargins[1] / 72.0;
+   }
+   else
+   {
+@@ -1556,14 +1636,16 @@ cups_map_rgb(gx_device             *pdev,
+ private gx_color_index			/* O - Color index */
+ cups_map_cmyk_color(gx_device      *pdev,
+ 					/* I - Device info */
+-                    gx_color_value c,	/* I - Cyan value */
+-                    gx_color_value m,	/* I - Magenta value */
+-                    gx_color_value y,	/* I - Yellow value */
+-		    gx_color_value k)	/* I - Black value */
++                    const gx_color_value cv[4])/* I - CMYK color values */
+ {
+   gx_color_index	i;		/* Temporary index */
++  gx_color_value	c, m, y, k;
+   gx_color_value	ic, im, iy, ik;	/* Integral CMYK values */
+ 
++  c = cv[0];
++  m = cv[1];
++  y = cv[2];
++  k = cv[3];
+ 
+ #ifdef DEBUG
+   dprintf5("DEBUG2: cups_map_cmyk_color(%p, %d, %d, %d, %d)\n", pdev,
+@@ -1722,7 +1804,7 @@ cups_map_color_rgb(gx_device      *pdev,/* I - Device info */
+ 					/* O - RGB values */
+ {
+   unsigned char		c0, c1, c2, c3;	/* Color index components */
+-  gx_color_value	k, divk;	/* Black & divisor */
++  gx_color_value	c, m, y, k, divk; /* Colors, Black & divisor */
+ 
+ 
+ #ifdef DEBUG
+@@ -1966,11 +2048,10 @@ cups_map_color_rgb(gx_device      *pdev,/* I - Device info */
+ 
+ private gx_color_index			/* O - Color index */
+ cups_map_rgb_color(gx_device      *pdev,/* I - Device info */
+-                   gx_color_value r,	/* I - Red value */
+-                   gx_color_value g,	/* I - Green value */
+-                   gx_color_value b)	/* I - Blue value */
++                   const gx_color_value cv[3])/* I - RGB color values */
+ {
+   gx_color_index	i;		/* Temporary index */
++  gx_color_value        r, g, b;
+   gx_color_value	ic, im, iy, ik;	/* Integral CMYK values */
+   gx_color_value	mk;		/* Maximum K value */
+   int			tc, tm, ty;	/* Temporary color values */
+@@ -1981,6 +2062,9 @@ cups_map_rgb_color(gx_device      *pdev,/* I - Device info */
+ 			ciel, ciea, cieb;
+ 					/* CIE Lab colors */
+ 
++  r = cv[0];
++  g = cv[1];
++  b = cv[2];
+ 
+ #ifdef DEBUG
+   dprintf4("DEBUG2: cups_map_rgb_color(%p, %d, %d, %d)\n", pdev, r, g, b);
+@@ -2709,7 +2793,12 @@ cups_put_params(gx_device     *pdev,	/* I - Device info */
+   gdev_prn_space_params	sp;		/* Space parameter data */
+   int			width,		/* New width of page */
+ 			height;		/* New height of page */
+-
++  ppd_attr_t            *backside = NULL,
++                        *backsiderequiresflippedmargins = NULL;
++  float                 swap;
++  int                   xflip = 0,
++                        yflip = 0;
++  int                   found = 0;
+ 
+   dprintf2("DEBUG2: cups_put_params(%p, %p)\n", pdev, plist);
+ 
+@@ -2921,6 +3010,87 @@ cups_put_params(gx_device     *pdev,	/* I - Device info */
+ 
+     if (cupsPPD != NULL)
+     {
++      dprintf1("DEBUG2: cups->header.Duplex = %d\n", cups->header.Duplex);
++      dprintf1("DEBUG2: cups->page = %d\n", cups->page);
++      dprintf1("DEBUG2: cupsPPD = %p\n", cupsPPD);
++
++      backside = ppdFindAttr(cupsPPD, "cupsBackSide", NULL); 
++      if (backside) {
++	dprintf1("DEBUG2: cupsBackSide = %s\n", backside->value);
++	cupsPPD->flip_duplex = 0;
++      }
++      dprintf1("DEBUG2: cupsPPD->flip_duplex = %d\n", cupsPPD->flip_duplex);
++
++      backsiderequiresflippedmargins =
++	ppdFindAttr(cupsPPD, "APDuplexRequiresFlippedMargin", NULL);
++      if (backsiderequiresflippedmargins)
++	dprintf1("DEBUG2: APDuplexRequiresFlippedMargin = %s\n",
++		 backsiderequiresflippedmargins->value);
++
++      if (cups->header.Duplex &&
++	  (cups->header.Tumble &&
++	   (backside && !strcasecmp(backside->value, "Flipped"))) &&
++	  !(cups->page & 1))
++      {
++	xflip = 1;
++	if (backsiderequiresflippedmargins &&
++	    !strcasecmp(backsiderequiresflippedmargins->value, "False"))
++	  yflip = 0;
++	else
++	  yflip = 1;
++      }
++      else if (cups->header.Duplex &&
++	       (!cups->header.Tumble &&
++		(backside && !strcasecmp(backside->value, "Flipped"))) &&
++	       !(cups->page & 1))
++      {
++	xflip = 0;
++	if (backsiderequiresflippedmargins &&
++	    !strcasecmp(backsiderequiresflippedmargins->value, "False"))
++	  yflip = 1;
++	else
++	  yflip = 0;
++      }
++      else if (cups->header.Duplex &&
++	       ((!cups->header.Tumble &&
++		 (cupsPPD->flip_duplex ||
++		  (backside && !strcasecmp(backside->value, "Rotated")))) ||
++		(cups->header.Tumble &&
++		 (backside && !strcasecmp(backside->value, "ManualTumble")))) &&
++	       !(cups->page & 1))
++      { 
++	xflip = 1;
++	if (backsiderequiresflippedmargins &&
++	    !strcasecmp(backsiderequiresflippedmargins->value, "True"))
++	  yflip = 0;
++	else
++	  yflip = 1;
++      }
++      else
++      {
++	xflip = 0;
++	yflip = 0;
++      }
++
++#ifdef CUPS_RASTER_SYNCv1
++     /*
++      * Chack whether cupsPageSizeName has a valid value
++      */
++
++      if (strlen(cups->header.cupsPageSizeName) != 0) {
++	found = 0;
++	for (i = cupsPPD->num_sizes, size = cupsPPD->sizes;
++	     i > 0;
++	     i --, size ++)
++	  if (strcasecmp(cups->header.cupsPageSizeName, size->name) == 0) {
++	    found = 1;
++	    break;
++	  }
++	if (found == 0) cups->header.cupsPageSizeName[0] = '\0';
++      }
++      dprintf1("DEBUG2: cups->header.cupsPageSizeName = %s\n", cups->header.cupsPageSizeName);
++#endif
++
+      /*
+       * Find the matching page size...
+       */
+@@ -2930,6 +3100,10 @@ cups_put_params(gx_device     *pdev,	/* I - Device info */
+            i --, size ++)
+ 	if (fabs(cups->MediaSize[1] - size->length) < 5.0 &&
+             fabs(cups->MediaSize[0] - size->width) < 5.0 &&
++#ifdef CUPS_RASTER_SYNCv1
++	    ((strlen(cups->header.cupsPageSizeName) == 0) ||
++	     (strcasecmp(cups->header.cupsPageSizeName, size->name) == 0)) &&
++#endif
+ 	    (!margins_set ||
+ 	     (fabs(cups->HWMargins[0] - size->left) < 1.0 &&
+ 	      fabs(cups->HWMargins[1] - size->bottom) < 1.0)))
+@@ -2949,6 +3123,14 @@ cups_put_params(gx_device     *pdev,	/* I - Device info */
+ 	margins[1] = size->bottom / 72.0;
+ 	margins[2] = (size->width - size->right) / 72.0;
+ 	margins[3] = (size->length - size->top) / 72.0;
++	if (xflip == 1)
++	{
++	  swap = margins[0]; margins[0] = margins[2]; margins[2] = swap;
++	}
++	if (yflip == 1)
++	{
++	  swap = margins[1]; margins[1] = margins[3]; margins[3] = swap;
++	}
+       }
+       else
+       {
+@@ -2962,6 +3144,10 @@ cups_put_params(gx_device     *pdev,	/* I - Device info */
+              i --, size ++)
+ 	  if (fabs(cups->MediaSize[0] - size->length) < 5.0 &&
+               fabs(cups->MediaSize[1] - size->width) < 5.0 &&
++#ifdef CUPS_RASTER_SYNCv1
++	      ((strlen(cups->header.cupsPageSizeName) == 0) ||
++	       (strcasecmp(cups->header.cupsPageSizeName, size->name) == 0)) &&
++#endif
+ 	      (!margins_set ||
+ 	       (fabs(cups->HWMargins[0] - size->left) < 1.0 &&
+ 		fabs(cups->HWMargins[1] - size->bottom) < 1.0)))
+@@ -2979,10 +3165,18 @@ cups_put_params(gx_device     *pdev,	/* I - Device info */
+ 
+           cups->landscape = 1;
+ 
+-	  margins[0] = size->left / 72.0;
+-	  margins[1] = size->bottom / 72.0;
+-	  margins[2] = (size->width - size->right) / 72.0;
+-	  margins[3] = (size->length - size->top) / 72.0;
++	  margins[0] = (size->length - size->top) / 72.0;
++	  margins[1] = size->left / 72.0;
++	  margins[2] = size->bottom / 72.0;
++	  margins[3] = (size->width - size->right) / 72.0;
++	  if (xflip == 1)
++	  {
++	    swap = margins[1]; margins[1] = margins[3]; margins[3] = swap;
++	  }
++	  if (yflip == 1)
++	  {
++	    swap = margins[0]; margins[0] = margins[2]; margins[2] = swap;
++	  }
+ 	}
+ 	else
+ 	{
+@@ -2994,6 +3188,14 @@ cups_put_params(gx_device     *pdev,	/* I - Device info */
+ 
+ 	  for (i = 0; i < 4; i ++)
+             margins[i] = cupsPPD->custom_margins[i] / 72.0;
++	  if (xflip == 1)
++	  {
++	    swap = margins[0]; margins[0] = margins[2]; margins[2] = swap;
++	  }
++	  if (yflip == 1)
++	  {
++	    swap = margins[1]; margins[1] = margins[3]; margins[3] = swap;
++	  }
+ 	}
+       }
+ 
+@@ -3020,9 +3222,9 @@ cups_put_params(gx_device     *pdev,	/* I - Device info */
+   cups->header.cupsPageSize[1] = pdev->MediaSize[1];
+ 
+   cups->header.cupsImagingBBox[0] = pdev->HWMargins[0];
+-  cups->header.cupsImagingBBox[1] = pdev->HWMargins[3];
++  cups->header.cupsImagingBBox[1] = pdev->HWMargins[1];
+   cups->header.cupsImagingBBox[2] = pdev->MediaSize[0] - pdev->HWMargins[2];
+-  cups->header.cupsImagingBBox[3] = pdev->MediaSize[1] - pdev->HWMargins[1];
++  cups->header.cupsImagingBBox[3] = pdev->MediaSize[1] - pdev->HWMargins[3];
+ 
+   if ((sf = cups->header.cupsBorderlessScalingFactor) < 1.0)
+     sf = 1.0;
+@@ -3034,11 +3236,11 @@ cups_put_params(gx_device     *pdev,	/* I - Device info */
+   cups->header.PageSize[1] = pdev->MediaSize[1] * sf;
+ 
+   cups->header.ImagingBoundingBox[0] = pdev->HWMargins[0] * sf;
+-  cups->header.ImagingBoundingBox[1] = pdev->HWMargins[3] * sf;
++  cups->header.ImagingBoundingBox[1] = pdev->HWMargins[1] * sf;
+   cups->header.ImagingBoundingBox[2] = (pdev->MediaSize[0] -
+                                         pdev->HWMargins[2]) * sf;
+   cups->header.ImagingBoundingBox[3] = (pdev->MediaSize[1] -
+-                                        pdev->HWMargins[1]) * sf;
++                                        pdev->HWMargins[3]) * sf;
+ #else
+   cups->header.Margins[0] = pdev->HWMargins[0];
+   cups->header.Margins[1] = pdev->HWMargins[1];
+@@ -3065,9 +3267,9 @@ cups_put_params(gx_device     *pdev,	/* I - Device info */
+ 
+     if (cups->landscape)
+     {
+-      width  = (pdev->MediaSize[1] - pdev->HWMargins[0] - pdev->HWMargins[2]) *
++      width  = (pdev->MediaSize[1] - pdev->HWMargins[1] - pdev->HWMargins[3]) *
+                pdev->HWResolution[0] / 72.0f + 0.499f;
+-      height = (pdev->MediaSize[0] - pdev->HWMargins[1] - pdev->HWMargins[3]) *
++      height = (pdev->MediaSize[0] - pdev->HWMargins[0] - pdev->HWMargins[2]) *
+                pdev->HWResolution[1] / 72.0f + 0.499f;
+     }
+     else
+@@ -3568,10 +3770,21 @@ cups_print_chunked(gx_device_printer *pdev,
+ 		*dstptr;		/* Pointer to bits */
+   int		count;			/* Count for loop */
+   int		flip;			/* Flip scanline? */
++  ppd_attr_t    *backside = NULL;
+ 
+-
+-  if (cups->header.Duplex && !cups->header.Tumble &&
+-      cupsPPD && cupsPPD->flip_duplex && !(cups->page & 1))
++  if (cupsPPD) {
++    backside = ppdFindAttr(cupsPPD, "cupsBackSide", NULL);
++    if (backside)
++      cupsPPD->flip_duplex = 0;
++  }
++  if (cups->header.Duplex && cupsPPD &&
++      ((!cups->header.Tumble &&
++	(cupsPPD->flip_duplex ||
++	 (backside && !strcasecmp(backside->value, "Rotated")))) ||
++       (cups->header.Tumble &&
++	(backside && (!strcasecmp(backside->value, "Flipped") ||
++		      !strcasecmp(backside->value, "ManualTumble"))))) &&
++      !(cups->page & 1))
+     flip = 1;
+   else
+     flip = 0;
+@@ -3751,10 +3964,21 @@ cups_print_banded(gx_device_printer *pdev,
+   unsigned char	*cptr, *mptr, *yptr,	/* Pointer to components */
+ 		*kptr, *lcptr, *lmptr;	/* ... */
+   int		flip;			/* Flip scanline? */
++  ppd_attr_t    *backside = NULL;
+ 
+-
+-  if (cups->header.Duplex && !cups->header.Tumble &&
+-      cupsPPD && cupsPPD->flip_duplex && !(cups->page & 1))
++  if (cupsPPD) {
++    backside = ppdFindAttr(cupsPPD, "cupsBackSide", NULL);
++    if (backside)
++      cupsPPD->flip_duplex = 0;
++  }
++  if (cups->header.Duplex && cupsPPD &&
++      ((!cups->header.Tumble &&
++	(cupsPPD->flip_duplex ||
++	 (backside && !strcasecmp(backside->value, "Rotated")))) ||
++       (cups->header.Tumble &&
++	(backside && (!strcasecmp(backside->value, "Flipped") ||
++		      !strcasecmp(backside->value, "ManualTumble"))))) &&
++      !(cups->page & 1))
+     flip = 1;
+   else
+     flip = 0;
+diff --git a/cups/pstoraster.in b/cups/pstoraster.in
+--- a/cups/pstoraster.in
++++ b/cups/pstoraster.in
+@@ -52,10 +52,10 @@ else
+ fi
+ 
+ echo INFO: Starting GPL Ghostscript `$bindir/@GS@ --version`... 1>&2
+-echo DEBUG: Running $bindir/@GS@ $gsopts -sOUTPUTFILE="%stdout" -c"$profile" "$ifile" 1>&2
++echo DEBUG: Running $bindir/@GS@ $gsopts -sOUTPUTFILE="%stdout" -c "$profile" -f "$ifile" 1>&2
+ 
+ # Now run Ghostscript...
+-exec $bindir/@GS@ $gsopts -sOUTPUTFILE="%stdout" -c"$profile" "$ifile"
++exec $bindir/@GS@ $gsopts -sOUTPUTFILE="%stdout" -c "$profile" -f "$ifile"
+ 
+ #
+ # End of "$Id$".
+diff --git a/doc/C-style.htm b/doc/C-style.htm
+--- a/doc/C-style.htm
++++ b/doc/C-style.htm
+@@ -661,8 +661,7 @@ indent&nbsp;-bad&nbsp;-nbap&nbsp;-nsob&nbsp;-br&nbsp;-ce&nbsp;-cli4&nbsp;-npcs&n
+ <p>
+ does a 98% accurate job of producing our preferred style.  Unfortunately,
+ there are bugs in all versions of GNU <code>indent</code>, requiring
+-both pre- and post-processing of the code.  The <code>gsindent</code>
+-script in the Ghostscript fileset contains the necessary workarounds.
++both pre- and post-processing of the code.
+ 
+ <p>
+ Put indentation points every 4 spaces, with 8 spaces = 1 tab stop.
+diff --git a/doc/Develop.htm b/doc/Develop.htm
+--- a/doc/Develop.htm
++++ b/doc/Develop.htm
+@@ -4666,8 +4666,8 @@ Macintosh files:
+ <a href="../base/macos_carbon_d_pre.h">base/macos_carbon_d_pre.h</a>,
+ <a href="../base/macos_classic_d_pre.h">base/macos_classic_d_pre.h</a>,
+ 
+-<a href="../base/dmmain.c">base/dmmain.c</a>,
+-<a href="../base/dmmain.r">base/dmmain.r</a>.
++<a href="../psi/dmmain.c">psi/dmmain.c</a>,
++<a href="../psi/dmmain.r">psi/dmmain.r</a>.
+ 
+ <dt>
+ VMS files:
+diff --git a/doc/Language.htm b/doc/Language.htm
+--- a/doc/Language.htm
++++ b/doc/Language.htm
+@@ -1227,10 +1227,25 @@ at the beginning of the procedure.
+ 
+ <dl>
+ <dt><code>&lt;string&gt; &lt;boolean&gt; .setdebug -</code>
+-<dd>If the Ghostscript interpreter was built with the <code>DEBUG</code>
+-flag set, sets or resets any subset of the debugging flags normally
+-controlled by <code>-Z</code> in the command line.  Has no effect
+-otherwise.
++<dd>Sets or clears any subset of the debugging flags included in
++<code>&lt;string&gt;</code> based on the value of
++<code>&lt;boolean&gt;</code>. These correspond to the debug
++flags set by <code>-Z</code> on the command line and enable
++debug and tracing output from various internal modules.
++
++<p>Note that most tracing output is only produced if the Ghostscript
++interpreter was built with the <code>DEBUG</code> preprocessor
++symbol defined.
++
++<p>The <code>zsetdebug()</code> C function, which implements this
++operator, is a useful breakpoint for debuggers.
++Inserting '<code>() true .setdebug</code>' in the interpreted code will
++trigger a breakpoint at that location without side effects. The
++current  flag state is available in C as the <code>gs_debug[]</code>
++array, indexed by character value. The <code>zsetdebug</code> function will
++be entered, and <code>gs_debug[]</code> updated, whether or not Ghostscript
++is built with the <code>DEBUG</code> preprocessor symbol defined, so this
++is useful even with release builds.
+ </dl>
+ 
+ <dl>
+diff --git a/doc/Make.htm b/doc/Make.htm
+--- a/doc/Make.htm
++++ b/doc/Make.htm
+@@ -112,7 +112,7 @@
+ <li><a href="#QNX">QNX</a>
+ </ul>
+ <li><a href="#UFST_build">How to build Ghostscript with UFST</a>
+-<li><a href="#FT_build">How to build Ghostscript with Free Type</a>
++<li><a href="#FT_build">How to build Ghostscript with FreeType</a>
+ </ul></blockquote>
+ 
+ <!-- [1.2 end table of contents] =========================================== -->
+@@ -662,31 +662,38 @@ memory requirements, and may be essential if you are planning on putting
+ Ghostscript into ROM.
+ 
+ <p>
+-To compile the initialization files (<code>lib/gs_init.ps</code>, etc.)
+-into the executable, change the <code>0</code> to a <b><tt>1</tt></b> in
+-the line
++By default, most top level make files now default to compiling the initialization
++files (<code>lib/gs_init.ps</code>, etc.) into the executable. To disable this,
++change the <code>1</code> to a <b><tt>0</tt></b> in the line
+ 
+ <blockquote><code>
+-COMPILE_INITS=0
++COMPILE_INITS=1
+ </code></blockquote>
+ 
+ <p>
+-Compiled initialization includes the default font map.
+-It is used only if Ghostscript cannot find or open the default font
+-map file at run time. 
++Files are now compiled into the executable as a %rom% file system that can
++be searched, opened, etc. as with the normal (%os%) file system. The data
++is (mostly) compressed. The set of files built into the %rom% file system
++is specified in the <code>psi/psromfs.mak</code> file. Refer to the file
++<code>base/mkromfs.c</code> for a description of the parameters that
++control source and destination pathnames, file enumeration exclusion,
++compression, etc.
+ 
+ <p>
+-To compile fonts into the executable, see <a
+-href="Fonts.htm#Precompiling">Precompiling fonts</a>. 
++While fonts normally are compiled into the executable using <code>mkromfs</code>
++(above) from the Resource/Font/ directory, it is possible to compile Type 1 fonts
++into the executable using an older method that converts Type 1 fonts into C code.
++See <a href="Fonts.htm#Precompiling">Precompiling fonts</a>. 
+ 
+ <p>
+-To compile threshold-array halftones into the executable, see the "Compiled
+-halftone" section of <code>int.mak</code> for a sample makefile fragment,
+-<code>genht.c</code> for the syntax of halftone data files, and
+-<code>lib/ht_ccsto.ps</code> for a sample data file.  Note that even
+-though the data files use PostScript syntax, compiled halftones do not
+-require the PostScript interpreter and may be used with the graphics library
+-alone.
++Similarly, Halftone resources can be compiled into the executable using
++<code>mkromfs</code>, but also threshold-array halftones can be compiled
++into the executable. See the "Compiled halftone" section of <code>int.mak</code>
++for a sample makefile fragment, <code>genht.c</code> for the syntax of
++halftone data files, and <code>lib/ht_ccsto.ps</code> for a sample data file.
++ Note that even though the data files use PostScript syntax, compiled halftones
++do not require the PostScript interpreter and may be used with the graphics
++library alone.
+ 
+ <h4><a name="GNU_readline"></a>GNU readline</h4>
+ 
+@@ -2764,46 +2771,64 @@ msvc32.mak sets the other options automatically.
+ 
+ <p>
+ 
+-<h2><a name="FT_build"></a>How to build Ghostscript with Free Type</h2>
++<h2><a name="FT_build"></a>How to build Ghostscript with FreeType</h2>
+ 
+ <p>
+-<em>Note: This section is only for users who wish to use Ghostscript with Free Type font renderer.
++<em>Note: This section is only for users who wish to use Ghostscript with FreeType font renderer.
+ Other users please skip this section.
+ </em>
+ 
+ <p>
+-Ghostscript sources do not include Free Type sources. You need to obtain them from Free Type group.
+-Ghostscript includes only some source modules that provide a bridge to Free Type.
++Ghostscript sources do not include a copy of the FreeType sources.
++You need to obtain them from the 
++<a href="http://freetype.org/">FreeType Project</a>. 
++Ghostscript includes only some source modules that provide a 
++bridge to FreeType.
+ 
+ <p>
+-Ghostscript makefiles do not include any script for building Free Type libraries.
+-Refer to Free Type manual how to build them. Free Type object libraries must be built
+-before building Ghostscript with the Free Type bridge.
++Ghostscript makefiles do not include any script for building FreeType 
++libraries. Refer to FreeType manual how to build them. FreeType object 
++libraries must be built before building Ghostscript with the FreeType 
++bridge.
+ 
+ <p>
+-To build Ghostscript with Free Type, specify additional options for "make":
++Note that Ghostscript requires FreeType to be built with the optional 
++incremental font support. Check that FT_CONFIG_OPTION_INCREMENTAL is 
++defined in the headers for your FreeType build. 
++<p>
++To build Ghostscript with FreeType, specify these additional options for 
++"make" either on the command line, or in the top-level makefile:
+ 
+ <dl>
+ <dt><code>FT_BRIDGE=1</code>
+-<dd>forces the Free Type bridge to build.
++<dd>Enables the FreeType bridge.
+ 
+-<dt><code>FT_ROOT=path</code>
+-<dd>specifies the path to Free Type root directory or folder.
++<dt><code>FT_CFLAGS=<i>options</i></code>
++<dd>Specifies C compiler include directives and options for FreeType 
++library. Refer to the FreeType manual for information about them.
+ 
+-<dt><code>FT_CFLAGS=options</code>
+-<dd>specifies C compiler options for Free Type library. Refer to Free Type manual for information about them.
+-
+-<dt><code>FT_LIB_EXT=extension</code>
+-<dd>sets the file name extension for object libraries. You must use the appropriate one for your platform and linker.
++<dt><code>FT_LIBS=<i>link-options</i></code>
++<dd>Specifies the path the the object library or options for linking 
++with FreeType. You must use the appropriate one for your platform and 
++linker.
+ </dl>
+ 
+ <p>An example for Unix/GCC :
+ <blockquote>
+-<tt>FT_BRIDGE=1 FT_ROOT=../FreeType FT_CFLAGS=-DGCCx86 FT_LIB_EXT=.a</tt>
++<tt>make FT_BRIDGE=1 FT_CFLAGS=-Ifreetype/include FT_LIBS=freetype/objs/libfreetype.a</tt>
++</blockquote>
++or
++<blockquote>
++<tt>make FT_BRIDGE=1 FT_CFLAGS=`pkg-config --cflags freetype2` FT_LIBS=`pkg-config --libs freetype2`</tt>
+ </blockquote>
+ 
+-<p>For Windows/MSVC you need only specify FT_ROOT.
+-msvc32.mak sets the other options automatically.
++<p>For Windows/MSVC you need only specify FT_ROOT to be the path to the 
++top level source directory of your FreeType build.
++msvc32.mak sets the other options automatically. However,
++because the freetype project files for MSVC embed the version and build
++type in the library filename, it may be necessary to override the default
++library name, by passing for example FT_LIB=freetype241MT. FT_LIB only
++has an effect on the MSVC build, unlike FT_LIBS which is used by all the builds.
+ 
+ <p>
+ 
+diff --git a/doc/News.htm b/doc/News.htm
+--- a/doc/News.htm
++++ b/doc/News.htm
+@@ -55,35 +55,10 @@ overview</a>.
+ 
+ <!-- [2.0 begin contents] ================================================== -->
+ 
+-<h3><a name="Version8.64"></a>Version 8.64 (2009-02-03)</h3>
++<h3><a name="Version8.64"></a>Version 8.65 (SVN PRE-RELEASE)</h3>
+ 
+ <p>
+-This is the fifth scheduled release in the stable Ghostscript 8.6x 
+-series. 
+-
+-<p>
+-Approximately 100 bugs have been fixed since the 8.63 release.
+-
+-<p>
+-Of particular note in this release are improvements to overprint and 
+-spot color support in documents with transparency, improvements to PDF 
+-and PS output, proper handling of PDF-specific text rendering modes and 
+-support for reading AES-encrypted PDF documents.
+-
+-<p>
+-Also improved is handling of CJK text, especially in vertical writing 
+-modes, memory footprint processing some files at high resolution and 
+-support for using the system's default paper size on unix.
+-
+-<p>
+-The interpreter's handling of color spaces has been moved from 
+-PostScript code to C.
+-
+-<p>
+-A number of the included printer drivers and cups wrappers have been 
+-updated to support a PDF-based workflow. Also fixed are several 
+-long-standing bugs in the pcl drivers with respect to duplex, resolution 
+-and paper tray selection.
++This is an unreleased development snapshot.
+ 
+ <p> The following <a href="http://bugs.ghostscript.com/">bugs</a> were
+ open at the time of the last release: <blockquote>
+@@ -556,17 +531,7 @@ open at the time of the last release: <blockquote>
+ <h3><a name="8.64_Incompatible_changes"></a>Incompatible changes</h3>
+ 
+ <p>
+-In this release the C source files have been split into two new 
+-directories. Interpreter source files are now in <tt>psi</tt> and the 
+-graphics library and output devices are now in <tt>base</tt>. Previously 
+-everything was in <tt>src</tt>. This may cause problems with existing 
+-references in external build files or when applying patches generated 
+-against an older version.
+-
+-<p>
+-The compiled in font set in Resource/Fonts has been updated to the 
+-version from the 8.11 release. This is the same set which was 
+-recommended prior to the 8.63.
++No incompatible changes have been recorded.
+ 
+ <h3><a name="8.64_changelog"></a>Changelog</h3>
+ 
+@@ -593,7 +558,7 @@ or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
+ San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
+ 
+ <p>
+-<small>Ghostscript version 8.64, 3 February 2009
++<small>Ghostscript version 8.64, 4 February 2009
+ 
+ <!-- [3.0 end visible trailer] ============================================= -->
+ 
+diff --git a/doc/Ps2pdf.htm b/doc/Ps2pdf.htm
+--- a/doc/Ps2pdf.htm
++++ b/doc/Ps2pdf.htm
+@@ -59,12 +59,7 @@ to Portable Document Format (PDF) files.
+ <p>
+ <code>ps2pdf</code> is implemented as a very small command script (batch
+ file) that invokes Ghostscript, selecting a special "output device" called
+-<code>pdfwrite</code>.  In order to use <b><tt>ps2pdf</tt></b>, the
+-<code>pdfwrite</code> device must be included in the makefile when
+-Ghostscript was compiled; see the <a
+-href="Make.htm#Features_and_devices">documentation on building
+-Ghostscript</a> for details: this is currently the case on all platforms, in
+-Ghostscript as we distribute it.
++<code>pdfwrite</code>.
+ 
+ <hr>
+ 
+@@ -245,6 +240,14 @@ wide variety of uses, possibly at the expense of a larger output file.
+ 
+ </ul>
+ 
++<dt><code>-dNumCopies</code>
++<dd>When present, causes pdfwrite to use the #copies or /NumCopies entry in the page
++device dictionary to duplicate each page in the output PDF file as many times as
++the 'copies' value. This is intended for use by workflow applications like CUPS
++and should not be used for generating general purpose PDF files. In particular any
++pdfmark operations which rely on page numbers, such as Link or Outline annotations
++will not work correctly with this flag.
++
+ </dl>
+ 
+ <p>
+diff --git a/doc/Ps2ps2.htm b/doc/Ps2ps2.htm
+--- a/doc/Ps2ps2.htm
++++ b/doc/Ps2ps2.htm
+@@ -193,12 +193,17 @@ especially for fonts which Ghostscript had converted into bitmaps
+ See <a href="#Options">Options</a> about the <code>PageSize</code> entry of the <b><tt>Policies</tt></b>
+ dictionary while the conversion step). 
+ Default value : <em>false</em>.
+-Must be <em>false</em> if <code>-dSetPageSize=true</code>.
++Must be <em>false</em> if <code>-dSetPageSize=true</code> or <code>-dCenterPages=true</code>.
++
++<dt><code>-dCenterPages=</code><em>boolean</em>. 
++<dd>The printer will center the page image on the selected media. Compatible with <code>-dRotatePages=true</code>, which may rotate the image on the media if it fits better, and then center it. 
++Default value : <em>false</em>.
++Must be <em>false</em> if <code>-dSetPageSize=true</code> or <code>-dFitPages=true</code>.
+ 
+ <dt><code>-dSetPageSize=</code><em>boolean</em>. 
+ <dd>The printer will try to set page size from the job. 
+ Only use with printers which can handle random <em>PageSize</em>.
+-Must be <em>false</em> if <code>-dRotatePages=true</code> or <b><tt>-dFitPages=true</tt></b>.
++Must be <em>false</em> if <code>-dRotatePages=true</code>, <code>-dCenterPages=true</code> or <code>-dFitPages=true</code>.
+ 
+ </dl>
+ 
+diff --git a/doc/Psfiles.htm b/doc/Psfiles.htm
+--- a/doc/Psfiles.htm
++++ b/doc/Psfiles.htm
+@@ -833,6 +833,11 @@ information.
+ </dl>
+ 
+ <dl>
++<dt><a href="../lib/viewrgb.ps"><tt>viewrgb.ps</tt></a>
++<dd>A utility for displaying files created by -sDEVICE=bitrgb.
++</dl>
++
++<dl>
+ <dt><a href="../lib/waterfal.ps"><tt>waterfal.ps</tt></a>
+ <dd>A utility to print a "waterfall" of fonts at different sizes.
+ </dl>
+diff --git a/doc/Use.htm b/doc/Use.htm
+--- a/doc/Use.htm
++++ b/doc/Use.htm
+@@ -521,9 +521,6 @@ program by using the special file name '<code>-</code>' which is interpreted as
+ </blockquote>
+ 
+ <p>
+-<em>Ghostscript cannot read PDF files from standard input or a pipe because the PDF language inherently requires random access to the file. Thus '<tt>-</tt>' only works with PostScript documents.</em>
+-
+-<p>
+ When Ghostscript finishes reading from the pipe, it quits rather than
+ going into interactive mode.  Because of this, options and files after the '<tt>-</tt>' in the command line will be ignored.
+ 
+@@ -834,9 +831,12 @@ switches</a> in the command line, if any;
+ <li>The directories specified by the <code>GS_LIB</code>
+ environment variable, if any;
+ 
+-<li>The directories specified by the
+-<code>GS_LIB_DEFAULT</code> macro (if any) in the makefile
+-when this executable was built.
++<li>If built with COMPILE_INITS=1 (currently the default build) the files in the
++<code>%rom%Resource/Init/</code> and <code>%rom%lib/</code> file system built
++into the executable ;
++
++<li>The directories specified by the <code>GS_LIB_DEFAULT</code> macro
++(if any) in the makefile when this executable was built.
+ </ol>
+ 
+ <p>
+@@ -856,11 +856,9 @@ in the current directory first by using the
+ 
+ <p>
+ Note that Ghostscript does not use this file searching algorithm for the
+-<code>run</code> or <b><tt>file</tt></b>
+-operators: for these operators, it simply opens the file with the name
+-given.  To run a file using the searching algorithm, use
+-<code>runlibfile</code> instead of
+-<code>run</code>.
++<b><tt>run</tt></b> or <b><tt>file</tt></b> operators: for these operators, it
++simply opens the file with the name given.  To run a file using the searching
++algorithm, use <code>runlibfile</code> instead of <code>run</code>.
+ 
+ <h3><a name="PS_resources"></a>Finding PostScript Level 2 resources</h3>
+ 
+@@ -877,12 +875,16 @@ specifies an absolute path. The user may set it as explained in
+ 
+ <p>
+ If the user doesn't set the system parameter <code>GenericResourceDir</code>,
+-Ghostscript creates a default value for it with
+-attaching the string <code>../Resource</code>
+-to directory paths explained in 
+-<a href="#Finding_files">How Ghostscript finds files</a>,
+-except the current directory.
+-The first successful combination is used.
++or use the <code>-sGenericResourceDir=</code> command line option, Ghostscript
++creates a default value for it by looking on the directory paths explained in
++<a href="#Finding_files">How Ghostscript finds files</a>, excluding the current directory. 
++The first path with <code>Resource</code> in it is used, including any prefix
++up to the path separator character following the string <code>Resource</code>.
++For example, when COMPILE_INITS=1 (the current default build), if the first path
++is <code>%rom%Resource/Init/</code>, then the <code>GenericResourceDir</code>
++systemparam will be set to <code>%rom%Resource/</code> by default.
++
++
+ 
+ <p>
+ If the value of the system parameter <code>GenericResourceDir</code>
+@@ -2509,9 +2511,8 @@ another program is "driving" Ghostscript.
+ <dl>
+ <dt><code>-dNOPROMPT</code>
+ <dd>Disables the prompt printed by Ghostscript when it expects interactive
+-input, as well as the end-of-page prompt (<code>-dNOPAGEPROMPT</code>);
+-also disables the implicit <code>flushpage</code> that normally occurs
+-each time Ghostscript asks for more input.  This allows piping input
++input, as well as the end-of-page prompt (<code>-dNOPAGEPROMPT</code>).
++This allows piping input
+ directly into Ghostscript, as long as the data doesn't refer to
+ <code>currentfile</code>.
+ </dl>
+@@ -3244,6 +3245,8 @@ guide to international paper sizes can be found at
+         <td>&nbsp;<td align=right>8.5<td>&nbsp;<td align=right>13.0<td>&nbsp;<td align=right>216<td>&nbsp;<td align=right>330<td>&nbsp;<td align=right>612<td>&nbsp;<td align=right>936<td>&nbsp;<td>European foolscap
+ <tr>    <td>halfletter
+         <td>&nbsp;<td align=right>5.5<td>&nbsp;<td align=right>8.5<td>&nbsp;<td align=right>140<td>&nbsp;<td align=right>216<td>&nbsp;<td align=right>396<td>&nbsp;<td align=right>612<td>&nbsp;<td>&nbsp;
++<tr>    <td>hagaki
++        <td>&nbsp;<td align=right>3.9<td>&nbsp;<td align=right>5.8<td>&nbsp;<td align=right>100<td>&nbsp;<td align=right>148<td>&nbsp;<td align=right>283<td>&nbsp;<td align=right>420<td>&nbsp;<td>Japanese postcard
+ </table>
+ 
+ <p>
+diff --git a/lib/cat.ps b/lib/cat.ps
+new file mode 100644
+--- /dev/null
++++ b/lib/cat.ps
+@@ -0,0 +1,74 @@
++%    Copyright (C) 1996-2003 Artifex Software, Inc.  All rights reserved.

++% 

++% This software is provided AS-IS with no warranty, either express or

++% implied.

++% 

++% This software is distributed under license and may not be copied,

++% modified or distributed except as expressly authorized under the terms

++% of the license contained in the file LICENSE in this distribution.

++% 

++% For more information about licensing, please refer to

++% http://www.ghostscript.com/licensing/. For information on

++% commercial licensing, go to http://www.artifex.com/licensing/ or

++% contact Artifex Software, Inc., 101 Lucas Valley Road #110,

++% San Rafael, CA  94903, U.S.A., +1(415)492-9861.

++%

++% $Id: cat.ps 8331 2008-02-05 11:07:00Z kens $

++%

++% Appends one file to another. Primarily used to overcome the 

++% 'copy' limitation of Windows command shell for ps2epsi

++%

++% the files to be appended are given by the environament

++% variables %infile% and %outfile%. %infile% is appended to

++% %outfile%

++%

++

++/datastring 1024 string def

++

++{

++	(outfile) getenv 

++	{

++		/outfilename exch def

++		(infile) getenv

++		{

++			/infilename exch def

++	

++			infilename status 

++			{

++				pop pop pop pop outfilename status 

++				{ 

++					pop pop pop pop 

++					infilename (r) file /infile exch def 

++					outfilename (a+) file /outfile exch def 

++					{

++						infile datastring readstring

++						{

++							outfile exch writestring

++						}

++						{

++							dup length 0 gt

++							{outfile exch writestring} {pop} ifelse

++							exit

++						} ifelse

++					} loop

++					infile closefile

++					outfile closefile

++				} 

++				{

++					(Failed to find file ) print outfilename ==

++				} ifelse

++			}

++			{

++				(Failed to find file ) print infilename ==

++			} ifelse

++		}

++		{

++			(Couldn't find %infile% environment variable) ==

++		} ifelse

++	} 

++	{

++		(Couldn't find %outfile% environment variable) ==

++	}

++	ifelse

++} bind 

++exec

+diff --git a/lib/ps2ai.ps b/lib/ps2ai.ps
+--- a/lib/ps2ai.ps
++++ b/lib/ps2ai.ps
+@@ -25,7 +25,7 @@
+ % redefine it. This can be used by other programs to overwrite
+ % some settings from externally
+ %  
+-/cdef { 1 index where { pop pop pop } { def } ifelse } def
++/cdef { 1 index where { pop pop pop } { def } ifelse } bind def
+ %
+ %xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+ %
+@@ -131,18 +131,19 @@
+ %                  Nothing of Interest below here
+ %xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+ matrix identmatrix setmatrix %   make ctm [1 0 0 1 0 0]
++/bdef {bind def} bind def
+ /oldgsave {} def /oldgrestore {} def
+ /initgraphics {} def /initmatrix {} def 
+ % undefine PPD PageSizes to be more printer independant
+ /letter {} def /legal {} def /a4 {} def /b5 {} def /lettersmall {} def
+-/setpagedevice { pop } def % for level 2 PPD PageSizes
++/setpagedevice { pop } bdef % for level 2 PPD PageSizes
+ /Courier findfont 12 scalefont setfont % handle no setfont
+ /initclip {0 0 moveto 0 792 lineto 612 792 lineto 612 0 lineto closepath
+-           clip newpath } def
+-/xdef {exch def} def
+-/trx {transform exch} def
+-/cbdef {cvx bind def} def
+-/jltz {dup abs 0.0001 lt {pop 0} if} def % get rid of scientific notation bug
++           clip newpath } bdef
++/xdef {exch def} bdef
++/trx {transform exch} bdef
++/cbdef {cvx bind def} bdef
++/jltz {dup abs 0.0001 lt {pop 0} if} bdef % get rid of scientific notation bug
+ /clstate false def        % closepath state
+ /dpth false def           % destroy path (ie newpath)
+ /fclp false def           % first paint after clip
+@@ -165,7 +166,7 @@ matrix identmatrix setmatrix %   make ctm [1 0 0 1 0 0]
+    /green {1 mag blk ccomp sub} def
+    /blue {1 yel blk ccomp sub} def
+    red green blue setrgbcolor
+-  } def
++  } bdef
+ } ifelse
+ /currentcmykcolor where {pop}
+  {/currentcmykcolor {
+@@ -180,7 +181,7 @@ matrix identmatrix setmatrix %   make ctm [1 0 0 1 0 0]
+    /yel  rawY blk sub  def
+    /blk blk def
+    cyan mag yel blk
+-  } def
++  } bdef
+ } ifelse
+ % If using Mac Ghostscript 
+ jMacGS { 
+@@ -193,10 +194,9 @@ jout {joutput (w) file /joutput xdef} if
+ %
+ %              Output
+ %
+-jout {/jp { joutput exch writestring } bind def }{/jp {print}bind def} ifelse
+-/jpnum {jltz ( ) jp =string cvs jp } bind def
+-/jpmat { dup /jarry exch def length 1 sub /j_num exch def
+- (\[) jp 0 1 j_num {jarry exch get jpnum} for (\]) jp } def
++jout {/jp { joutput exch writestring } bdef }{/jp {print} bdef} ifelse
++/jpnum {jltz ( ) jp =string cvs jp } bdef
++/jpmat { (\[) jp { jpnum } forall (\]) jp } bdef
+ %
+ %              Stack to Paths converters
+ %
+@@ -207,20 +207,20 @@ jout {/jp { joutput exch writestring } bind def }{/jp {print}bind def} ifelse
+   spth 1 eq {clstate {(s\n) jp }{(S\n) jp } ifelse} if
+   spth 2 eq {clstate {(f\n) jp }{(F\n) jp } ifelse} if
+      } if
+-} def
++} bdef
+ /jpm {
+   ckpnt
+   /dpth true def
+-  transform 2 copy /yst xdef /xst xdef exch jpnum jpnum ( m\n) jp } bind def
+-/jpl { trx jpnum jpnum ( l\n) jp } bind def
++  transform 2 copy /yst xdef /xst xdef exch jpnum jpnum ( m\n) jp } bdef
++/jpl { trx jpnum jpnum ( l\n) jp } bdef
+ /jpc {  6 4 roll trx jpnum jpnum 4 2 roll trx jpnum jpnum trx
+-    jpnum jpnum ( c\n) jp } bind def
+-/jpp {xst jpnum yst jpnum ( l\n) jp /clstate true def} def
++    jpnum jpnum ( c\n) jp } bdef
++/jpp {xst jpnum yst jpnum ( l\n) jp /clstate true def} bdef
+ /cntpaths { % count paths on stack
+   oldgsave
+   {pop pop /jnump jnump 1 add def} {pop pop} {6 {pop} repeat}{} pathforall
+   oldgrestore
+-} def
++} bdef
+ /ppforall {
+  cntpaths % find out how many paths are on the stack
+  jnump 1 gt { (*u\n) jp } if
+@@ -229,34 +229,34 @@ jout {/jp { joutput exch writestring } bind def }{/jp {print}bind def} ifelse
+  jnump 1 gt { (*U\n) jp } if
+  /jnump 0 def /clstate false def /dpth false def /fclp false def
+   oldnewpath
+-} bind def
++} bdef
+ %
+ %              Painting Operators
+ %
+ /oldnewpath [/newpath load] cbdef
+-/newpath { (\n) jp /spth 0 def ppforall} def 
+-/stroke { (\n) jp /spth 1 def ppforall } def 
+-/fill   {(\n) jp /spth 2 def ppforall } def 
+-/eofill {(1 D\n) jp fill (0 D\n) jp} def
++/newpath { (\n) jp /spth 0 def ppforall} bdef 
++/stroke { (\n) jp /spth 1 def ppforall } bdef 
++/fill   {(\n) jp /spth 2 def ppforall } bdef 
++/eofill {(1 D\n) jp fill (0 D\n) jp} bdef
+ /clip {clarry gcnt get {(Q\nq\n) jp}{(q\n) jp} ifelse 
+-                   /fclp true def clarry gcnt true put} def
+-/eoclip {(1 D\n) jp clip (0 D\n) jp} def
++                   /fclp true def clarry gcnt true put} bdef
++/eoclip {(1 D\n) jp clip (0 D\n) jp} bdef
+ %
+ %               Text Operators
+ %
+ /oldshow [/show load] cbdef
+-/curpt {stringwidth pop jx add jy} def 
++/curpt {stringwidth pop jx add jy} bdef 
+ /jNN {dup 0 eq {pop oldgsave currentfont /FontMatrix get setmatrix kscl
+                 oldgrestore} if
+-} def
++} bdef
+ /curftmatrix {
+  currentfont /FontMatrix get dup 0 get jNN abs /norm exch def 
+  dup 0 get norm div exch dup
+  1 get norm div exch dup 2 get norm div exch dup 3 get norm div exch dup
+  4 get exch 5 get 6 array astore matrix currentmatrix matrix concatmatrix
+-} def
++} bdef
+ % AI does not support negitive font sizes
+-/curftsize {currentfont /FontMatrix get 0 get jNN abs 1000 mul} def
++/curftsize {currentfont /FontMatrix get 0 get jNN abs 1000 mul} bdef
+ /hstr (X) def
+ /vbar (|) 0 get def /undsc (_) 0 get def
+ /ftnamefix { % handle font names with |,_ (previously encoded)
+@@ -268,10 +268,10 @@ jstr cvs
+             } ifelse
+         } ifelse
+    } forall   flush
+-} bind def
+-%/curftname {currentfont /FontName get ftnamefix}def
++} bdef
++%/curftname {currentfont /FontName get ftnamefix} bdef
+ /curftname { currentfont /FontName known {currentfont /FontName get}
+-           { (Times-Roman)} ifelse ftnamefix } def
++           { (Times-Roman)} ifelse ftnamefix } bdef
+ /lftpar (\() 0 get def
+ /rhtpar (\)) 0 get def
+ /bckslsh (\\) 0 get def
+@@ -286,11 +286,11 @@ jstr cvs
+             } ifelse
+         } ifelse
+    } forall (\)) jp flush
+-} bind def
++} bdef
+ % AI 3 text format pieces
+ jtxt3 {
+ /j3txt { j3ftxt {(0 Ts 100 Tz 0 Tt 0 TA 0 0 5 TC 100 100 200 TW 0 0 0 Ti\n) jp
+-                (0 Ta 0 Tq 0 0 TI 0 Tc 0 Tw\n) jp} if } def
++                (0 Ta 0 Tq 0 0 TI 0 Tc 0 Tw\n) jp} if } bdef
+ /show {oldgsave  (0 To\n) jp 
+   currentpoint 2 copy /jy exch def /jx exch def translate 
+   curftmatrix /jitm exch def
+@@ -299,8 +299,8 @@ jtxt3 {
+   (0) jp j_ax  curftsize div 100 mul jpnum ( 100 TC\n) jp %  percent(?)
+   dup curpt moveto mark exch handft ( Tx\n) jp (TO\n) jp /j3ftxt false def
+   cleartomark currentpoint oldgrestore moveto
+-} def  
+-/ashow {exch pop exch /j_ax exch def show /j_ax {0} def } def
++} bdef  
++/ashow {exch pop exch /j_ax exch def show /j_ax {0} def } bdef
+ } 
+  {
+ /show {oldgsave (u\n) jp currentpoint 2 copy /jy exch def /jx exch def translate
+@@ -308,19 +308,19 @@ jtxt3 {
+   curftsize dup jpnum  jpnum ( 0 0 z\n) jp
+   curftmatrix jpmat ( e\n) jp
+   dup curpt moveto mark exch handft ( t T U\n) jp
+-  cleartomark currentpoint oldgrestore moveto} def
++  cleartomark currentpoint oldgrestore moveto} bdef
+ /ashow {oldgsave (u\n) jp currentpoint translate (\/) jp curftname jstr cvs jp
+   curftsize dup jpnum jpnum  exch kscl mul jpnum ( 0 z\n) jp
+   curftmatrix jpmat ( e\n) jp dup curpt moveto mark exch handft
+-  ( t T U\n) jp cleartomark currentpoint oldgrestore moveto} def
++  ( t T U\n) jp cleartomark currentpoint oldgrestore moveto} bdef
+ } ifelse
+-/widthshow { show pop pop pop} def
+-/awidthshow {ashow pop pop pop} def
+-/kshow {show pop} def
+-%/show {true charpath fill} bind def   % get outline of charactor
++/widthshow { show pop pop pop} bdef
++/awidthshow {ashow pop pop pop} bdef
++/kshow {show pop} bdef
++%/show {true charpath fill} bdef   % get outline of charactor
+ joutln {/show { true charpath currentpoint 
+-     /jy exch def /jx exch def fill jx jy moveto} bind def} if
+-%/show {oldshow} def    % do nothing different
++     /jy exch def /jx exch def fill jx jy moveto} bdef} if
++%/show {oldshow} bdef    % do nothing different
+ %
+ %               Color Operators
+ %
+@@ -328,11 +328,11 @@ joutln {/show { true charpath currentpoint
+ /setcmykcolor {oldsetcmykcolor 
+ currentcmykcolor 4 -1 roll jpnum 3 -1 roll jpnum 2 -1 roll jpnum jpnum ( k\n) jp
+ currentcmykcolor 4 -1 roll jpnum 3 -1 roll jpnum 2 -1 roll jpnum jpnum ( K\n) jp
+- } def
++ } bdef
+ /oldsetgray [/setgray load] cbdef
+-/setgray {0 0 0 4 -1 roll 1 exch sub setcmykcolor} def
++/setgray {0 0 0 4 -1 roll 1 exch sub setcmykcolor} bdef
+ /oldsethsbcolor [/sethsbcolor load] cbdef
+-/sethsbcolor {oldsethsbcolor currentcmykcolor setcmykcolor} def
++/sethsbcolor {oldsethsbcolor currentcmykcolor setcmykcolor} bdef
+ /oldsetrgbcolor [/setrgbcolor load] cbdef
+ /setrgbcolor {oldsetrgbcolor currentrgbcolor /bval xdef /gval xdef /rval xdef
+  /rawC 1 rval sub def /rawM 1 gval sub def /rawY 1 bval sub def
+@@ -344,24 +344,24 @@ currentcmykcolor 4 -1 roll jpnum 3 -1 roll jpnum 2 -1 roll jpnum jpnum ( K\n) jp
+  /mag  rawM blk sub  def
+  /yel  rawY blk sub  def
+  /blk blk def
+- cyan mag yel blk setcmykcolor } def
++ cyan mag yel blk setcmykcolor } bdef
+ %
+ %                State Operators
+ %
+ /oldsetlinewidth [/setlinewidth load] cbdef
+ /setlinewidth {kscl abs mul jltz  oldsetlinewidth
+- currentlinewidth jpnum ( w\n) jp } def
++ currentlinewidth jpnum ( w\n) jp } bdef
+ /oldsetlinecap [/setlinecap load] cbdef
+-/setlinecap {dup oldsetlinecap jpnum ( J\n) jp} def
++/setlinecap {dup oldsetlinecap jpnum ( J\n) jp} bdef
+ /oldsetlinejoin [/setlinejoin load] cbdef
+-/setlinejoin {dup oldsetlinejoin jpnum ( j\n) jp} def
++/setlinejoin {dup oldsetlinejoin jpnum ( j\n) jp} bdef
+ /oldsetmiterlimit [/setmiterlimit load] cbdef
+-/setmiterlimit {dup oldsetmiterlimit jpnum ( M\n) jp}def
++/setmiterlimit {dup oldsetmiterlimit jpnum ( M\n) jp}bdef
+ /oldsetdash [/setdash load] cbdef
+ /setdash {exch [ exch {kscl abs mul} forall ] exch kscl abs mul oldsetdash
+-  currentdash exch jpmat jpnum ( d\n) jp } def
++  currentdash exch jpmat jpnum ( d\n) jp } bdef
+ /oldsetflat [/setflat load] cbdef
+-/setflat {dup oldsetflat jpnum ( i\n) jp } def
++/setflat {dup oldsetflat jpnum ( i\n) jp } bdef
+ %
+ %                More State Operators
+ %
+@@ -372,12 +372,12 @@ currentcmykcolor 4 -1 roll jpnum 3 -1 roll jpnum 2 -1 roll jpnum jpnum ( K\n) jp
+  1 0 moveto currentpoint transform
+  dup mul exch dup mul add sqrt 10000 mul round 10000 div
+  oldgrestore
+-} def
++} bdef
+ /currentstate {currentcmykcolor setcmykcolor
+  currentflat jpnum ( i) jp currentlinecap jpnum ( J) jp
+  currentlinejoin jpnum ( j) jp currentlinewidth jpnum ( w) jp
+  currentmiterlimit jpnum ( M ) jp currentdash exch jpmat jpnum ( d\n) jp 
+-} def
++} bdef
+ /jdifG {
+  currentcmykcolor /jok xdef /joy xdef /jom xdef /joc xdef
+  currentflat /jof xdef currentlinecap /jolc xdef currentlinejoin /jolj xdef
+@@ -394,18 +394,18 @@ currentcmykcolor 4 -1 roll jpnum 3 -1 roll jpnum 2 -1 roll jpnum jpnum ( K\n) jp
+  false joad {true exit} forall {pop pop true}{false} ifelse
+  false jnad {true exit} forall {pop pop true}{false} ifelse ne
+  jood jnod ne 10 {or} repeat {currentstate} if
+-} def
++} bdef
+ /oldgsave [/gsave load] cbdef
+-/gsave {oldgsave /gcnt gcnt 1 add def } def % clarry gcnt false put} def
+-%  (%%Note:gsave ) jp gcnt jpnum (\n) jp} def
++/gsave {oldgsave /gcnt gcnt 1 add def } bdef % clarry gcnt false put} bdef
++%  (%%Note:gsave ) jp gcnt jpnum (\n) jp} bdef
+ /oldgrestore [/grestore load] cbdef
+ /grestore {dpth {newpath} if clarry gcnt get {(Q\n) jp clarry gcnt false put} if 
+- jdifG /gcnt gcnt 1 sub def } def
+-% oldgrestore currentstate } def
+-% (%%Note:grestore ) jp gcnt 1 add jpnum (\n) jp} def
++ jdifG /gcnt gcnt 1 sub def } bdef
++% oldgrestore currentstate } bdef
++% (%%Note:grestore ) jp gcnt 1 add jpnum (\n) jp} bdef
+ /oldrestore [/restore load] cbdef
+ % a kludgy way of saving the clipping path status information
+-/restore {clarry aload pop 11 -1 roll oldrestore clarry astore pop} def
++/restore {clarry aload pop 11 -1 roll oldrestore clarry astore pop} bdef
+ /showpage {  0 1 9 {clarry exch get {(Q\n) jp} if } for
+  (%%Note: If Error, make sure there are matched pairs of 'q's and 'Q's\n) jp
+  (%%Note: in the file. Add 'Q's before '%%Trailer' until equal\n) jp
+@@ -424,7 +424,7 @@ currentcmykcolor 4 -1 roll jpnum 3 -1 roll jpnum 2 -1 roll jpnum jpnum ( K\n) jp
+         (Adobe_packedarray /terminate get exec\n) jp 
+        } ifelse
+ ( showpage\n%EOF\n%%EndDocument\n) jp
+- jout {joutput closefile} if jMacGS not {quit} if /j3ftxt true def } def 
++ jout {joutput closefile} if jMacGS not {quit} if /j3ftxt true def } bdef 
+ %
+ %                Error handling
+ %
+@@ -432,13 +432,13 @@ errordict begin
+ % Attempt to handle the error caused by bitmap fonts (TeX,Windows.ps,etc)
+ % this is a big-time kludge
+ jbiterr {
+- /undefined {pop pop (Times-Roman)} def
+- /typecheck {pop pop} def
++ /undefined {pop pop (Times-Roman)} bdef
++ /typecheck {pop pop} bdef
+ } if
+ jerr {
+  /handleerror {
+   (%%Note: ps2ai error, aborting rest of conversion\n) jp showpage
+- } def
++ } bdef
+ } if
+ end
+ %
+@@ -447,22 +447,22 @@ end
+ /jmacimp { % stroked line instead of thin filled boxes
+  /@a {  3 -1 roll 2 div dup 3 -1 roll add exch 3 -1 roll add exch moveto
+       3 -1 roll 2 div dup 3 -1 roll add exch 3 -1 roll exch sub exch lineto
+-      abs setlinewidth  stroke pop pop} def
++      abs setlinewidth  stroke pop pop} bdef
+  /@b { 3 -1 roll 2 div dup 3 -1 roll add exch 3 -1 roll add exch moveto
+       pop
+       3 -1 roll 2 div dup 3 -1 roll add exch 3 -1 roll add exch lineto
+-      abs setlinewidth  stroke} def
+- /endp {showpage pm restore} def % because the restore stops clean up
+-} def
++      abs setlinewidth  stroke} bdef
++ /endp {showpage pm restore} bdef % because the restore stops clean up
++} bdef
+ %
+ %                Handle (some) PS Level 2
+ %
+ /rectstroke { 4 2 roll moveto 1 index 0 rlineto 0 exch rlineto neg 0 rlineto
+-  closepath stroke} def
++  closepath stroke} bdef
+ /rectfill { 4 2 roll moveto 1 index 0 rlineto 0 exch rlineto neg 0 rlineto
+-  fill } def
++  fill } bdef
+ /rectclip { 4 2 roll moveto 1 index 0 rlineto 0 exch rlineto neg 0 rlineto
+-  closepath clip newpath jMacfix {jmacimp} if } def
++  closepath clip newpath jMacfix {jmacimp} if } bdef
+ %
+ % Add a header prolog to the output file so it is still view/print-able
+ %
+diff --git a/lib/ps2epsi b/lib/ps2epsi
+--- a/lib/ps2epsi
++++ b/lib/ps2epsi
+@@ -50,6 +50,8 @@ else
+ 	outfile=$2
+ fi
+ 
++"$GS_EXECUTABLE" -q -dBATCH -dNOPAUSE -dSAFER -dDELAYSAFER -sDEVICE=bbox -sOutputFile=/dev/null "${infile}" 2>${outfile}
++
+ ls -l "${infile}" |
+ awk 'F==1	{
+ 		cd="%%CreationDate: " $6 " " $7 " " $8;
+@@ -70,12 +72,27 @@ awk 'F==1	{
+ 		print "/epsicreator (" c "\\n) def";
+ 		print "/epsicrdt (" cd "\\n) def";
+ 		print "/epsifor (" f "\\n) def";
+-		print "end";
+ 		exit(0);
+ 		}
+ 	' U="$USERNAME$LOGNAME"  F=1 - F=2 "${infile}" >"$tmpfile"
+ 
+-"$GS_EXECUTABLE" -q -sPAPERSIZE=a0 -dNOPAUSE -dSAFER -dDELAYSAFER -r72 -sDEVICE=bit -sOutputFile=/dev/null "$tmpfile" ps2epsi.ps "$tmpfile" <"${infile}" 1>&2
++ls -l "${outfile}" |
++awk 'F==1	{
++		b="%%BoundingBox: 0 0 0 0\\n";
++		}
++		/^%%BoundingBox:/	{b=$0; next;}
++		/^%%HiResBoundingBox:/	{ 
++		hb=$0;
++		print "ps2edict where {pop} {/ps2edict 30 dict def} ifelse";
++		print "ps2edict begin";
++		print "/BBoxString (" b "\\n) def";
++		print "/HiresBBoxString (" hb "\\n) def";
++		print "end";
++		exit(0);
++		}
++	' F=1 - F=2 "${outfile}" >>"$tmpfile"
++
++"$GS_EXECUTABLE" -q -dNOPAUSE -dSAFER -dDELAYSAFER -r72 -sDEVICE=bit -sOutputFile=/dev/null "$tmpfile" ps2epsi.ps "$tmpfile" <"${infile}" 1>&2
+ rm -f "$tmpfile"
+ rm -rf "$tmpdir"
+ 
+diff --git a/lib/ps2epsi.bat b/lib/ps2epsi.bat
+--- a/lib/ps2epsi.bat
++++ b/lib/ps2epsi.bat
+@@ -8,6 +8,10 @@ call gssetgs.bat
+ set infile=%1
+ set outfile=%2
+ 
++rem First we need to determine the bounding box. ps2epsi.ps below will pick
++rem the result up from %outfile%
++%GSC% -q -dNOPAUSE -dBATCH -dSAFER -dDELAYSAFER -sDEVICE=bbox -sOutputFile=NUL %infile% 2> %outfile%
++
+ rem Ghostscript uses %outfile% to define the output file
+ %GSC% -q -dNOPAUSE -dSAFER -dDELAYSAFER -sDEVICE=bit -sOutputFile=NUL ps2epsi.ps < %infile%
+ 
+@@ -18,7 +22,9 @@ echo /InitDictCount countdictstack def gsave save mark newpath >> %outfile%
+ echo userdict /setpagedevice /pop load put >> %outfile%
+ 
+ rem Append the original onto the preview header
+-copy %outfile% + %infile%
++rem cat.ps uses the %infile% and %outfile% environment variables for the filenames
++%GSC% -q -dNOPAUSE -dBATCH -dSAFER -dDELAYSAFER -sDEVICE=bit -sOutputFile=NUL cat.ps
++
+ 
+ echo %%%%EndDocument >> %outfile%
+ echo countdictstack InitDictCount sub { end } repeat >> %outfile%
+diff --git a/lib/ps2epsi.cmd b/lib/ps2epsi.cmd
+--- a/lib/ps2epsi.cmd
++++ b/lib/ps2epsi.cmd
+@@ -11,6 +11,10 @@ if %2/==/ goto usage
+ set infile=%1
+ set outfile=%2
+ 
++rem First we need to determine the bounding box. ps2epsi.ps below will pick
++rem the result up from %outfile%
++gsos2 -q -dNOPAUSE -dBATCH -dSAFER -dDELAYSAFER -sDEVICE=bbox -sOutputFile=NUL %infile% 2> %outfile%
++
+ rem Ghostscript uses %outfile% to define the output file
+ gsos2 -q -dNOPAUSE -dSAFER -dDELAYSAFER -sDEVICE=bit -sOutputFile=NUL ps2epsi.ps < %infile%
+ 
+diff --git a/lib/ps2epsi.ps b/lib/ps2epsi.ps
+--- a/lib/ps2epsi.ps
++++ b/lib/ps2epsi.ps
+@@ -1,3 +1,4 @@
++
+ %    Copyright (C) 1990, 2000 Aladdin Enterprises.  All rights reserved.
+ % 
+ % This software is provided AS-IS with no warranty, either express or
+@@ -53,7 +54,13 @@ ps2edict begin
+ 
+ 				% The main procedure
+   /ps2epsi
+-   {				% Open the file
++   {			
++	% bbox written to outfile by bbox device from ps2epsi command file
++	outfile (r) file /epsifile exch def
++	/BBoxString epsifile 256 string readline pop def
++	/HiresBBoxString epsifile 256 string readline pop def
++	epsifile closefile
++			% Open the file
+      outfile (w) file /epsifile exch def
+ 					% Get the device parameters
+      currentdevice getdeviceprops .dicttomark 
+@@ -160,18 +167,9 @@ ps2edict begin
+ 	  dup rm gt
+           % If the new index is greater, we save index and element
+           { /rm exch def } { pop } ifelse
+-	} {
+-          pop
+-        } ifelse
++	} if
+       } for
+ 
+-     % Calculate the bounding box values.
+-     % Note that these must be corrected to produce closed-open intervals.
+-     /llx lm def
+-     /lly devheight bm sub 1 sub def
+-     /urx rm 1 add def
+-     /ury devheight tm sub def
+-
+     % Write out the magic string and bounding box information
+      epsifile (%!PS-Adobe-2.0 EPSF-1.2\n) writestring
+ 	 /epsititle where { pop epsifile epsititle writestring } if
+@@ -195,11 +193,8 @@ ps2edict begin
+ 	 epsifile (\n) writestring
+      epsifile flushfile
+ 
+-     epsifile (%%BoundingBox: ) writestring
+-     epsifile llx write==only epsifile ( ) writestring
+-     epsifile lly write==only epsifile ( ) writestring
+-     epsifile urx write==only epsifile ( ) writestring
+-     epsifile ury write==
++	epsifile BBoxString writestring epsifile (\r) writestring
++	epsifile HiresBBoxString writestring epsifile (\r) writestring
+ 
+     % Define character and bit widths for the output line buffer:
+      /cwidth rm lm sub 1 add def
+diff --git a/lib/viewrgb.ps b/lib/viewrgb.ps
+new file mode 100755
+--- /dev/null
++++ b/lib/viewrgb.ps
+@@ -0,0 +1,146 @@
++%    Copyright (C) 2009 Artifex Software, Inc.  All rights reserved.
++% 
++% This software is provided AS-IS with no warranty, either express or
++% implied.
++% 
++% This software is distributed under license and may not be copied, modified
++% or distributed except as expressly authorized under the terms of that
++% license.  Refer to licensing information at http://www.artifex.com/
++% or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
++% San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
++
++% $Id$
++
++% viewrgb.ps
++% Display a raw RGB file created by  -sDEVICE=bitrgb.
++% If SCALE is defined, maps input pixels to output pixels with that scale;
++% if SCALE is undefined, scales the image to fit the page.
++% If BITS is defined, it is the number of bits per sample (1,2,8,12).
++% NB: BITS=1 (corresponding to -dGrayValues=16) is not supported.
++% if BITS is undefined, its default value is 1.
++
++/viewrgb {			% <filename> <width> viewrgb -
++  20 dict begin
++  /w exch def
++  /fname exch def
++  /bpc /BITS where { pop BITS } { 1 } ifelse def
++  /f fname (r) file def
++  mark fname status pop pop pop /flen exch def cleartomark
++  /h flen
++  w [ 0 4 8 0 0 0 0 0 24 ] bpc get
++  dup 0 eq {
++    (*** -dBITS=) print bpc =print ( is not supported. ***) = flush
++    quit
++  } if
++  mul 7 add 8 idiv idiv def
++  QUIET not { (Dimensions: ) print [w h] == flush } if
++		% Set up scaling.
++  /SCALE where {
++    pop
++	% Map pixels SCALE-for-1.  Assume orthogonal transformation.
++    SCALE 1 0 dtransform add abs div
++    SCALE 0 1 dtransform add abs div
++  } {
++	% Scale the image (uniformly) to fit the page.
++    clippath pathbbox pop pop translate
++    pathbbox 3 -1 roll sub h div
++    3 1 roll exch sub w div .min dup
++  } ifelse scale
++  bpc 1 eq {
++    [ /Indexed /DeviceRGB 15 <
++	000000
++	0000FF
++	00FF00
++	00FFFF
++	FF0000
++	FF00FF
++	FFFF00
++	FFFFFF
++	000000
++	0000FF
++	00FF00
++	00FFFF
++	FF0000
++	FF00FF
++	FFFF00
++	FFFFFF
++      >
++    ] setcolorspace
++    /BPC 4 def			% change to 4 bit indexed
++  } {
++    bpc 2 eq {
++    [ /Indexed /DeviceRGB 255 <
++	000000 000055 0000AA 0000FF
++	005500 005555 0055AA 0055FF
++	00AA00 00AA55 00AAAA 00AAFF
++	00FF00 00FF55 00FFAA 00FFFF
++        550000 550055 5500AA 5500FF
++        555500 555555 5555AA 5555FF
++        55AA00 55AA55 55AAAA 55AAFF
++        55FF00 55FF55 55FFAA 55FFFF
++        AA0000 AA0055 AA00AA AA00FF
++        AA5500 AA5555 AA55AA AA55FF
++        AAAA00 AAAA55 AAAAAA AAAAFF
++        AAFF00 AAFF55 AAFFAA AAFFFF
++        FF0000 FF0055 FF00AA FF00FF
++        FF5500 FF5555 FF55AA FF55FF
++        FFAA00 FFAA55 FFAAAA FFAAFF
++        FFFF00 FFFF55 FFFFAA FFFFFF
++
++	000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 
++	000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 
++	000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 
++	000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 
++
++	000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 
++	000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 
++	000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 
++	000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 
++
++	000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 
++	000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 
++	000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 
++	000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 
++
++	000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 
++	000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 
++	000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 
++	000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 000000 
++      >
++    ] setcolorspace
++    /BPC 8 def			% change to 4 bit indexed
++    } {
++      /DeviceRGB setcolorspace
++      /BPC bpc def
++    }
++    ifelse
++  }
++  ifelse
++  << 	/ImageType 1
++	/Width w
++	/Height h
++	/BitsPerComponent BPC
++	/ImageMatrix [1 0 0 -1 0 h]
++	/DataSource f
++	/MultipleDataSources false
++	bpc 4 lt { /Decode [ 0 [ 0 15 255 ] bpc get ] } { /Decode [ 0 1 0 1 0 1 ] } ifelse
++  >> image
++  showpage
++  f closefile
++  end
++} bind def
++
++% If the program was invoked from the command line, run it now.
++[ shellarguments {
++  counttomark 2 eq {
++    cvi viewrgb
++  } {
++    cleartomark
++    (\nUsage: gs -- viewrgb.ps filename.rgb width\n) print
++    ( e.g.: gs -- viewrgb.ps my.rgb 2550\n) print flush
++    (  -dSCALE=### sets specific scaling \(default = 1.0\)) = flush
++    (  -dBITS=# sets the BitsPerComponent \(1, 2, 8, 12] \(default = 1\)) = flush
++  } ifelse
++} {
++  pop
++} ifelse
+diff --git a/psi/dmmain.c b/psi/dmmain.c
+new file mode 100644
+--- /dev/null
++++ b/psi/dmmain.c
+@@ -0,0 +1,997 @@
++/* Copyright (C) 2001-2006 Artifex Software, Inc.
++   All Rights Reserved.
++  
++   This software is provided AS-IS with no warranty, either express or
++   implied.
++
++   This software is distributed under license and may not be copied, modified
++   or distributed except as expressly authorized under the terms of that
++   license.  Refer to licensing information at http://www.artifex.com/
++   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
++   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
++*/
++/* $Id$ */
++
++/* Ghostscript shlib example wrapper for Macintosh (Classic/Carbon) contributed
++   by Nigel Hathaway. Uses the Metrowerks CodeWarrior SIOUX command-line library.
++ */
++
++#if __ide_target("Ghostscript PPC (Debug)") || __ide_target("Ghostscript PPC (Release)")
++#define TARGET_API_MAC_CARBON 0
++#define TARGET_API_MAC_OS8 1
++#define ACCESSOR_CALLS_ARE_FUNCTIONS 1
++#endif
++
++#include <Carbon.h>
++
++#include <stdlib.h>
++#include <string.h>
++#include <stdio.h>
++#include <console.h>
++#include <SIOUX.h>
++#include <SIOUXGlobals.h>
++#include <SIOUXMenus.h>
++
++#include "gscdefs.h"
++#define GSREVISION gs_revision
++#include "ierrors.h"
++#include "iapi.h"
++
++#if DEBUG
++#include "vdtrace.h"
++#endif
++
++#include "gdevdsp.h"
++
++#define kScrollBarWidth   15
++#define MAX_ARGS 25
++
++Boolean   gRunningOnX = false;
++Boolean   gDone;
++ControlActionUPP gActionFunctionScrollUPP;
++
++const char start_string[] = "systemdict /start get exec\n";
++void *instance;
++
++const unsigned int display_format = DISPLAY_COLORS_RGB | DISPLAY_UNUSED_FIRST |
++                                    DISPLAY_DEPTH_8 | DISPLAY_BIGENDIAN |
++                                    DISPLAY_TOPFIRST;
++typedef struct IMAGE_S IMAGE;
++struct IMAGE_S {
++    void *handle;
++    void *device;
++    WindowRef  windowRef;
++    ControlRef scrollbarVertRef;
++    ControlRef scrollbarHorizRef;
++    PixMapHandle pixmapHdl;
++    UInt64 update_time;
++    int update_interval;
++    IMAGE *next;
++};
++
++IMAGE *first_image;
++
++static IMAGE *image_find(void *handle, void *device);
++
++static int GSDLLCALL gsdll_stdin(void *instance, char *buf, int len);
++static int GSDLLCALL gsdll_stdout(void *instance, const char *str, int len);
++static int GSDLLCALL gsdll_stderr(void *instance, const char *str, int len);
++static int GSDLLCALL gsdll_poll(void *handle);
++
++static int display_open(void *handle, void *device);
++static int display_preclose(void *handle, void *device);
++static int display_close(void *handle, void *device);
++static int display_presize(void *handle, void *device, int width, int height, 
++    int raster, unsigned int format);
++static int display_size(void *handle, void *device, int width, int height, 
++    int raster, unsigned int format, unsigned char *pimage);
++static int display_sync(void *handle, void *device);
++static int display_page(void *handle, void *device, int copies, int flush);
++static int display_update(void *handle, void *device, 
++    int x, int y, int w, int h);
++
++static size_t get_input(void *ptr, size_t size);
++
++static void window_create (IMAGE *img);
++static void window_invalidate (WindowRef windowRef);
++static void window_adjust_scrollbars (WindowRef windowRef);
++
++void    main                      (void);
++OSErr   quitAppEventHandler       (AppleEvent *,AppleEvent *,SInt32);
++void    doEvents                  (EventRecord *);
++void    doMouseDown               (EventRecord *);
++void    doUpdate                  (EventRecord *);
++void    doUpdateWindow            (EventRecord *);
++void    doOSEvent                 (EventRecord *);
++void    doInContent               (EventRecord *,WindowRef);
++pascal void    actionFunctionScroll      (ControlRef,ControlPartCode);
++
++/*********************************************************************/
++/* stdio functions */
++static int GSDLLCALL
++gsdll_stdin(void *instance, char *buf, int len)
++{
++    if (isatty(fileno(stdin)))
++       return get_input(buf, len);
++    else
++       return fread(buf, 1, len, stdin);
++}
++
++static int GSDLLCALL
++gsdll_stdout(void *instance, const char *str, int len)
++{
++    int n = fwrite(str, 1, len, stdout);
++    fflush(stdout);
++    return n;
++}
++
++static int GSDLLCALL
++gsdll_stderr(void *instance, const char *str, int len)
++{
++    return gsdll_stdout(instance, str, len);
++}
++
++/* Poll the caller for cooperative multitasking. */
++/* If this function is NULL, polling is not needed */
++static int GSDLLCALL gsdll_poll(void *handle)
++{
++    EventRecord eventStructure;
++
++    while (WaitNextEvent(everyEvent, &eventStructure, 0, NULL))
++        doEvents(&eventStructure);
++
++    return (gDone ? e_Fatal : 0);
++}
++/*********************************************************************/
++
++/* new dll display device */
++
++/* New device has been opened */
++/* This is the first event from this device. */
++static int display_open(void *handle, void *device)
++{
++    IMAGE *img = (IMAGE *)malloc(sizeof(IMAGE));
++    if (img == NULL)
++       return -1;
++    memset(img, 0, sizeof(IMAGE));
++
++    /* add to list */
++    if (first_image)
++       img->next = first_image;
++    first_image = img;
++
++    /* remember device and handle */
++    img->handle = handle;
++    img->device = device;
++
++    /* create window */
++    window_create(img);
++
++    gsdll_poll(handle);
++    return 0;
++}
++
++/* Device is about to be closed. */
++/* Device will not be closed until this function returns. */
++static int display_preclose(void *handle, void *device)
++{
++    /* do nothing - no thread synchonisation needed */
++    return 0;
++}
++
++/* Device has been closed. */
++/* This is the last event from this device. */
++static int display_close(void *handle, void *device)
++{
++    IMAGE *img = image_find(handle, device);
++    if (img == NULL)
++       return -1;
++
++    gsdll_poll(handle);
++
++    /* remove from list */
++    if (img == first_image)
++        first_image = img->next;
++    else
++    {
++        IMAGE *tmp;
++        for (tmp = first_image; tmp!=0; tmp=tmp->next)
++        {
++            if (img == tmp->next)
++            tmp->next = img->next;
++        }
++    }
++
++    DisposePixMap(img->pixmapHdl);   // need to go in doCloseWindow()
++    DisposeWindow(img->windowRef);
++
++    free(img);
++
++    return 0;
++}
++
++/* Device is about to be resized. */
++/* Resize will only occur if this function returns 0. */
++static int display_presize(void *handle, void *device, int width, int height, 
++    int raster, unsigned int format)
++{
++    /* Check for correct format (32-bit RGB), fatal error if not */
++    if (format != display_format)
++    {
++        printf("DisplayFormat has been set to an incompatible value.\n");
++        fflush(stdout);
++        return e_rangecheck;
++    }
++
++    return 0;
++}
++   
++/* Device has been resized. */
++/* New pointer to raster returned in pimage */
++static int display_size(void *handle, void *device, int width, int height, 
++    int raster, unsigned int format, unsigned char *pimage)
++{
++    PixMapPtr pixmap;
++    IMAGE *img = image_find(handle, device);
++    if (img == NULL)
++       return -1;
++
++    /* Check that image is within allowable bounds */
++    if (raster > 0x3fff)
++    {
++       printf("QuickDraw can't cope with an image this big.\n");
++       fflush(stdout);
++       if (img->pixmapHdl)
++       {
++           DisposePixMap(img->pixmapHdl);
++           img->pixmapHdl = NULL;
++       }
++       return e_rangecheck;
++    }
++
++    /* Create the PixMap */
++    if (!img->pixmapHdl)
++        img->pixmapHdl = NewPixMap();
++
++    pixmap = *(img->pixmapHdl);
++    pixmap->baseAddr = (char*)pimage;
++    pixmap->rowBytes = (((SInt16)raster) & 0x3fff) | 0x8000;
++    pixmap->bounds.right = width;
++    pixmap->bounds.bottom = height;
++    pixmap->packType = 0;
++    pixmap->packSize = 0;
++    pixmap->pixelType = RGBDirect;
++    pixmap->pixelSize = 32;
++    pixmap->cmpCount = 3;
++    pixmap->cmpSize = 8;
++
++    /* Update the display window */
++    window_adjust_scrollbars(img->windowRef);
++    window_invalidate(img->windowRef);
++    return gsdll_poll(handle);
++}
++   
++/* flushpage */
++static int display_sync(void *handle, void *device)
++{
++    IMAGE *img = image_find(handle, device);
++    if (img == NULL)
++       return -1;
++
++    window_invalidate(img->windowRef);
++    gsdll_poll(handle);
++
++    return 0;
++}
++
++/* showpage */
++/* If you want to pause on showpage, then don't return immediately */
++static int display_page(void *handle, void *device, int copies, int flush)
++{
++    return display_sync(handle, device);
++}
++
++/* Poll the caller for cooperative multitasking. */
++/* If this function is NULL, polling is not needed */
++static int display_update(void *handle, void *device, 
++    int x, int y, int w, int h)
++{
++    UInt64 t1;
++    UInt64 t2;
++    int delta;
++    IMAGE *img = image_find(handle, device);
++    if (img == NULL)
++       return -1;
++
++    Microseconds((UnsignedWide*)&t1);
++    delta = (t1 - img->update_time) / 1000000L;
++    if (img->update_interval < 1)
++    img->update_interval = 1;    /* seconds */
++    if (delta < 0)
++        img->update_time = t1;
++    else if (delta > img->update_interval)
++    {
++        /* redraw window */
++        window_invalidate(img->windowRef);
++
++        /* Make sure the update interval is at least 10 times
++         * what it takes to paint the window
++         */
++        Microseconds((UnsignedWide*)&t2);
++        delta = (t2 - t1) / 1000;
++        if (delta < 0)
++            delta += 60000;    /* delta = time to redraw */
++        if (delta > img->update_interval * 100)
++            img->update_interval = delta/100;
++        img->update_time = t2;
++    }
++
++    return gsdll_poll(handle);
++}
++
++display_callback display = { 
++    sizeof(display_callback),
++    DISPLAY_VERSION_MAJOR,
++    DISPLAY_VERSION_MINOR,
++    display_open,
++    display_preclose,
++    display_close,
++    display_presize,
++    display_size,
++    display_sync,
++    display_page,
++    display_update,
++    NULL,    /* memalloc */
++    NULL,    /* memfree */
++    NULL	 /* display_separation */
++};
++
++static IMAGE * image_find(void *handle, void *device)
++{
++    IMAGE *img;
++    for (img = first_image; img!=0; img=img->next) {
++    if ((img->handle == handle) && (img->device == device))
++        return img;
++    }
++    return NULL;
++}
++
++/*********************************************************************/
++
++static char *stdin_buf = NULL;
++static size_t stdin_bufpos = 0;
++static size_t stdin_bufsize = 0;
++
++/* This function is a fudge which allows the SIOUX window to be waiting for
++   input and not be modal at the same time. (Why didn't MetroWerks think of that?)
++   It is based on the SIOUX function ReadCharsFromConsole(), and contains an
++   event loop which allows other windows to be active.
++   It collects characters up to when the user presses ENTER, stores the complete
++   buffer and gives as much to the calling function as it wants until it runs
++   out, at which point it gets another line (or set of lines if pasting from the
++   clipboard) from the user.
++*/
++static size_t get_input(void *ptr, size_t size)
++{
++    EventRecord eventStructure;
++    long charswaiting, old_charswaiting = 0;
++    char *text;
++
++#if SIOUX_USE_WASTE
++    Handle textHandle;
++#endif
++
++    /* If needing more input, set edit start position */
++    if (!stdin_buf)
++#if SIOUX_USE_WASTE
++        SIOUXselstart = WEGetTextLength(SIOUXTextWindow->edit);
++#else
++        SIOUXselstart = (*SIOUXTextWindow->edit)->teLength;
++#endif
++
++    /* Wait until user presses exit (or quits) */
++    while(!gDone && !stdin_buf)
++    {
++#if SIOUX_USE_WASTE
++        charswaiting = WEGetTextLength(SIOUXTextWindow->edit) - SIOUXselstart;
++#else
++        if ((*SIOUXTextWindow->edit)->teLength > 0)
++            charswaiting = (*SIOUXTextWindow->edit)->teLength - SIOUXselstart;
++        else
++            charswaiting = ((unsigned short) (*SIOUXTextWindow->edit)->teLength) - SIOUXselstart;
++#endif
++
++        /* If something has happened, see if we need to do anything */
++        if (charswaiting != old_charswaiting)
++        {
++#if SIOUX_USE_WASTE
++            textHandle = WEGetText(SIOUXTextWindow->edit);
++            HLock(textHandle);
++            text = *textHandle + SIOUXselstart;
++#else
++            text = (*(*SIOUXTextWindow->edit)->hText) + SIOUXselstart;
++#endif
++            /* If user has pressed enter, gather up the buffer ready for returning */
++            if (text[charswaiting-1] == '\r')
++            {
++                stdin_buf = malloc(charswaiting);
++                if (!stdin_buf)
++                    return -1;
++                stdin_bufsize = charswaiting;
++                memcpy(stdin_buf, text, stdin_bufsize);
++                SIOUXselstart += charswaiting;
++                
++                text = stdin_buf;
++                while (text = memchr(text, '\r', charswaiting - (text - stdin_buf)))
++                    *text = '\n';
++            }
++#if SIOUX_USE_WASTE
++            HUnlock(textHandle);
++#endif
++            old_charswaiting = charswaiting;
++
++            if (stdin_buf)
++                break;
++        }
++
++        /* Wait for next event and process it */
++        SIOUXState = SCANFING;
++
++        if(WaitNextEvent(everyEvent, &eventStructure, SIOUXSettings.sleep ,NULL))
++            doEvents(&eventStructure);
++        else
++            SIOUXHandleOneEvent(&eventStructure);
++
++        SIOUXState = IDLE;
++    }
++
++    /* If data has been entered, return as much as has been requested */
++    if (stdin_buf && !gDone)
++    {
++        if (size >= stdin_bufsize - stdin_bufpos)
++        {
++            size = stdin_bufsize - stdin_bufpos;
++            memcpy (ptr, stdin_buf + stdin_bufpos, size);
++            free(stdin_buf);
++            stdin_buf = NULL;
++            stdin_bufpos = 0;
++            stdin_bufsize = 0;
++        }
++        else
++        {
++            memcpy (ptr, stdin_buf + stdin_bufpos, size);
++            stdin_bufpos += size;
++        }
++        return size;
++    }
++    else if (stdin_buf)
++    {
++        free(stdin_buf);
++        stdin_buf = NULL;
++        stdin_bufpos = 0;
++        stdin_bufsize = 0;
++    }
++
++    return 0;
++}
++
++/*********************************************************************/
++
++static void window_create(IMAGE *img)
++{
++    WindowRef windowRef;
++    Str255    windowTitle = "\pGhostscript Image";
++    Rect      windowRect = {20,4,580,420};//, portRect;
++    Rect      scrollbarRect = {0,0,0,0};
++
++#if TARGET_API_MAC_CARBON
++    GetAvailableWindowPositioningBounds(GetMainDevice(),&windowRect);
++#endif
++
++    /* Create a new suitablty positioned window */
++    windowRect.top = windowRect.top * 2 + 2;
++    windowRect.bottom -= 10;
++    windowRect.left += 4;
++    windowRect.right = ((windowRect.bottom - windowRect.top) * 3) / 4 + windowRect.left;
++
++    if(!(windowRef = NewCWindow(NULL, &windowRect, windowTitle, true,
++                                zoomDocProc, (WindowRef) -1, false, 0)))
++        ExitToShell();
++
++    img->windowRef = windowRef;
++
++    SetWRefCon(img->windowRef, (SInt32)img);
++
++    /* Create the window's scrollbars */
++#if TARGET_API_MAC_CARBON
++    if(gRunningOnX)
++        ChangeWindowAttributes(windowRef,kWindowLiveResizeAttribute,0);
++
++    CreateScrollBarControl(windowRef, &scrollbarRect, 0, 0, 0, 0,
++                           true, gActionFunctionScrollUPP, &(img->scrollbarVertRef));
++
++    CreateScrollBarControl(windowRef, &scrollbarRect, 0, 0, 0, 0,
++                           true, gActionFunctionScrollUPP, &(img->scrollbarHorizRef));
++#else
++    img->scrollbarVertRef = NewControl(windowRef,&scrollbarRect,"\p",false,0,0,0,scrollBarProc,0);
++    img->scrollbarHorizRef = NewControl(windowRef,&scrollbarRect,"\p",false,0,0,0,scrollBarProc,0);
++#endif
++
++    window_adjust_scrollbars(windowRef);
++}
++
++static void window_invalidate(WindowRef windowRef)
++{
++    Rect portRect;
++
++    GetWindowPortBounds(windowRef, &portRect);
++    InvalWindowRect(windowRef, &portRect);
++}
++
++static void window_adjust_scrollbars(WindowRef windowRef)
++{
++    IMAGE *img;
++    Rect   portRect;
++
++    img = (IMAGE*)GetWRefCon(windowRef);
++    GetWindowPortBounds(windowRef,&portRect);
++
++    /* Move the crollbars to the edges of the window */
++    HideControl(img->scrollbarVertRef);
++    HideControl(img->scrollbarHorizRef);
++
++    MoveControl(img->scrollbarVertRef,portRect.right - kScrollBarWidth,
++                portRect.top - 1);
++    MoveControl(img->scrollbarHorizRef,portRect.left - 1,
++                portRect.bottom - kScrollBarWidth);
++
++    SizeControl(img->scrollbarVertRef,kScrollBarWidth + 1,
++                portRect.bottom - portRect.top - kScrollBarWidth + 1);
++    SizeControl(img->scrollbarHorizRef, portRect.right - portRect.left - kScrollBarWidth + 1,
++                kScrollBarWidth + 1);
++
++    /* Adjust the scroll position showing */
++    if (img->pixmapHdl)
++    {
++        PixMap *pixmap = *(img->pixmapHdl);
++        int visibleHeight = portRect.bottom - portRect.top - kScrollBarWidth;
++        int visibleWidth = portRect.right - portRect.left - kScrollBarWidth;
++
++        if (pixmap->bounds.bottom > visibleHeight)
++        {
++            SetControl32BitMaximum(img->scrollbarVertRef,
++                                   pixmap->bounds.bottom - visibleHeight);
++            SetControlViewSize(img->scrollbarVertRef,visibleHeight);
++        }
++        else
++            SetControlMaximum(img->scrollbarVertRef, 0);
++
++        if (pixmap->bounds.right > visibleWidth)
++        {
++            SetControl32BitMaximum(img->scrollbarHorizRef,
++                                   pixmap->bounds.right - visibleWidth);
++            SetControlViewSize(img->scrollbarHorizRef, visibleWidth);
++        }
++        else
++            SetControlMaximum(img->scrollbarHorizRef, 0);
++    }
++
++    ShowControl(img->scrollbarVertRef);
++    ShowControl(img->scrollbarHorizRef);
++}
++
++/*********************************************************************/
++void main(void)
++{
++    int code;
++    int exit_code;
++    int argc;
++    char **argv;
++    char dformat[64], ddevice[32];
++    SInt32        response;
++
++    /* Initialize operating environment */
++#if TARGET_API_MAC_CARBON
++    MoreMasterPointers(224);
++#else
++    MoreMasters();
++#endif
++    InitCursor();
++    FlushEvents(everyEvent,0);
++
++    if (AEInstallEventHandler(kCoreEventClass,kAEQuitApplication,
++                              NewAEEventHandlerUPP((AEEventHandlerProcPtr) quitAppEventHandler),
++                              0L,false) != noErr)
++        ExitToShell();
++
++	gActionFunctionScrollUPP = NewControlActionUPP(&actionFunctionScroll);
++
++    Gestalt(gestaltMenuMgrAttr,&response);
++    if(response & gestaltMenuMgrAquaLayoutMask)
++                gRunningOnX = true;
++
++    /* Initialize SIOUX */
++    SIOUXSettings.initializeTB = false;
++    SIOUXSettings.standalone = false;
++    SIOUXSettings.asktosaveonclose = false;
++    SIOUXSettings.sleep = GetCaretTime();
++    SIOUXSettings.userwindowtitle = "\pGhostscript";
++
++    /* Get arguments from user */
++    argc = ccommand(&argv);
++
++    /* Show command line window */
++    if (InstallConsole(0))
++        ExitToShell();
++
++    /* Part of fudge to make SIOUX accept characters without becoming modal */
++    SelectWindow(SIOUXTextWindow->window);
++    PostEvent(keyDown, 0x4c00);  // Enter
++    ReadCharsFromConsole(dformat, 0x7FFF);
++    clrscr();
++
++    /* Add in the display format as the first command line argument */
++    if (argc >= MAX_ARGS - 1)
++    {
++       printf("Too many command line arguments\n");
++       return;
++    }
++
++    memmove(&argv[3], &argv[1], (argc-1) * sizeof(char**));
++    argc += 2;
++    argv[1] = ddevice;
++    argv[2] = dformat;
++
++	sprintf(ddevice, "-sDEVICE=display");
++    sprintf(dformat, "-dDisplayFormat=%d", display_format);
++
++    /* Run Ghostscript */
++    if (gsapi_new_instance(&instance, NULL) < 0)
++    {
++       printf("Can't create Ghostscript instance\n");
++       return;
++    }
++
++#ifdef DEBUG
++    visual_tracer_init();
++    set_visual_tracer(&visual_tracer);
++#endif
++
++    gsapi_set_stdio(instance, gsdll_stdin, gsdll_stdout, gsdll_stderr);
++    gsapi_set_poll(instance, gsdll_poll);
++    gsapi_set_display_callback(instance, &display);
++
++    code = gsapi_init_with_args(instance, argc, argv);
++    if (code == 0)
++       code = gsapi_run_string(instance, start_string, 0, &exit_code);
++    else 
++    {
++       printf("Failed to initialize. Error %d.\n", code);
++       fflush(stdout);
++    }
++    code = gsapi_exit(instance);
++    if (code != 0) 
++    {
++       printf("Failed to terminate. Error %d.\n", code);
++       fflush(stdout);
++    }
++
++    gsapi_delete_instance(instance);
++
++#ifdef DEBUG
++    visual_tracer_close();
++#endif
++
++    /* Ghostscript has finished - let user see output before quitting */
++    WriteCharsToConsole("\r[Finished - hit any key to quit]", 33);
++    fflush(stdout);
++
++    /* Process events until a key is hit or user quits from menu */
++    while(!gDone)
++    {
++        EventRecord eventStructure;
++
++        if(WaitNextEvent(everyEvent,&eventStructure,SIOUXSettings.sleep,NULL))
++        {
++            if (eventStructure.what == keyDown)
++            gDone = true;
++
++            doEvents(&eventStructure);
++        }
++        else
++            SIOUXHandleOneEvent(&eventStructure);
++    }
++}
++
++/*********************************************************************/
++
++void doEvents(EventRecord *eventStrucPtr)
++{
++    WindowRef      windowRef;
++  
++    if (eventStrucPtr->what == mouseDown &&
++        FindWindow(eventStrucPtr->where,&windowRef) == inMenuBar)
++        SelectWindow(SIOUXTextWindow->window);
++
++    SIOUXSettings.standalone = true;
++    if (SIOUXHandleOneEvent(eventStrucPtr))
++    {
++        if (SIOUXQuitting)
++            gDone = true;
++        SIOUXSettings.standalone = false;
++        return;
++    }
++    SIOUXSettings.standalone = false;
++
++    switch(eventStrucPtr->what)
++    {
++    case kHighLevelEvent:
++        AEProcessAppleEvent(eventStrucPtr);
++        break;
++
++    case mouseDown:
++        doMouseDown(eventStrucPtr);
++        break;
++
++    case keyDown:
++    case autoKey:
++        break;
++
++    case updateEvt:
++        doUpdate(eventStrucPtr);
++        break;
++
++    case activateEvt:
++        DrawGrowIcon(windowRef);
++        break;
++
++    case osEvt:
++        doOSEvent(eventStrucPtr);
++        break;
++    }
++}
++
++void doMouseDown(EventRecord *eventStrucPtr)
++{
++    WindowRef      windowRef;
++    WindowPartCode partCode, zoomPart;
++    BitMap         screenBits;
++    Rect           constraintRect, mainScreenRect;
++    Point          standardStateHeightAndWidth;
++    long           newSize;
++
++    partCode = FindWindow(eventStrucPtr->where,&windowRef);
++
++    switch(partCode)
++    {
++    case inMenuBar:
++        break;
++
++    case inContent:
++        if(windowRef != FrontWindow())
++            SelectWindow(windowRef);
++        else
++            doInContent(eventStrucPtr,windowRef);
++        break;
++
++    case inDrag:
++        DragWindow(windowRef,eventStrucPtr->where,NULL);
++        break;
++
++    case inGoAway:
++        break;
++
++    case inGrow:
++        constraintRect.top   = 75;
++        constraintRect.left = 250;
++        constraintRect.bottom = constraintRect.right = 32767;
++        newSize = GrowWindow(windowRef,eventStrucPtr->where,&constraintRect);
++        if (newSize != 0)
++            SizeWindow(windowRef,LoWord(newSize),HiWord(newSize),true);
++        window_adjust_scrollbars(windowRef);
++        window_invalidate(windowRef);
++        break;
++
++    case inZoomIn:
++    case inZoomOut:
++        mainScreenRect = GetQDGlobalsScreenBits(&screenBits)->bounds;
++        standardStateHeightAndWidth.v = mainScreenRect.bottom;
++        standardStateHeightAndWidth.h = mainScreenRect.right;
++
++        if(IsWindowInStandardState(windowRef,&standardStateHeightAndWidth,NULL))
++            zoomPart = inZoomIn;
++        else
++            zoomPart = inZoomOut;
++
++        if(TrackBox(windowRef,eventStrucPtr->where,partCode))
++        {
++            ZoomWindowIdeal(windowRef,zoomPart,&standardStateHeightAndWidth);
++            window_adjust_scrollbars(windowRef);
++        }
++        break;
++    }
++}
++
++void doUpdate(EventRecord *eventStrucPtr)
++{
++    WindowRef windowRef;
++
++    windowRef = (WindowRef) eventStrucPtr->message;
++  
++    window_adjust_scrollbars(windowRef);
++
++    BeginUpdate(windowRef);
++
++    SetPortWindowPort(windowRef);
++    doUpdateWindow(eventStrucPtr);
++
++    EndUpdate(windowRef);
++}
++
++void doUpdateWindow(EventRecord *eventStrucPtr)
++{
++    IMAGE *img;
++    WindowRef    windowRef;
++    Rect         srcRect, destRect, fillRect;
++    PixMapHandle srcPixmapHdl, destPixmapHdl;
++    RGBColor     grayColour = { 0xC000,0xC000,0xC000 };
++    SInt32  hScroll, vScroll;
++  
++    windowRef = (WindowRef) eventStrucPtr->message;
++    img = (IMAGE*)GetWRefCon(windowRef);
++    srcPixmapHdl = img->pixmapHdl;
++    destPixmapHdl = GetPortPixMap(GetWindowPort(windowRef));
++    hScroll = GetControl32BitValue(img->scrollbarHorizRef);
++    vScroll = GetControl32BitValue(img->scrollbarVertRef);
++
++    if (srcPixmapHdl)
++    {
++        PixMap *pixmap = *srcPixmapHdl;
++        PixPatHandle hdlPixPat = NewPixPat();
++        MakeRGBPat(hdlPixPat, &grayColour);
++
++        GetWindowPortBounds(windowRef,&destRect);
++        destRect.right  -= kScrollBarWidth;
++        destRect.bottom -= kScrollBarWidth;
++
++        if (destRect.right > pixmap->bounds.right)
++        {
++            fillRect.top = destRect.top;
++            fillRect.bottom = destRect.bottom;
++            fillRect.left = pixmap->bounds.right;
++            fillRect.right = destRect.right;
++            FillCRect(&fillRect, hdlPixPat);
++            destRect.right = pixmap->bounds.right;
++        }
++        if (destRect.bottom > pixmap->bounds.bottom)
++        {
++            fillRect.top = pixmap->bounds.bottom;
++            fillRect.bottom = destRect.bottom;
++            fillRect.left = destRect.left;
++            fillRect.right = destRect.right;
++            FillCRect(&fillRect, hdlPixPat);
++            destRect.bottom = pixmap->bounds.bottom;
++        }
++        DisposePixPat(hdlPixPat);
++    
++        srcRect = destRect;
++        srcRect.left += hScroll;
++        srcRect.right += hScroll;
++        srcRect.top += vScroll;
++        srcRect.bottom += vScroll;
++    
++        CopyBits((BitMap*)*srcPixmapHdl, (BitMap*)*destPixmapHdl,
++                 &srcRect, &destRect, srcCopy, NULL);
++    }
++
++    DrawGrowIcon(windowRef);
++}
++
++void doOSEvent(EventRecord *eventStrucPtr)
++{
++    switch((eventStrucPtr->message >> 24) & 0x000000FF)
++    {
++    case suspendResumeMessage:
++        if((eventStrucPtr->message & resumeFlag) == 1)
++          SetThemeCursor(kThemeArrowCursor);
++        break;
++    }
++}
++
++void doInContent(EventRecord *eventStrucPtr,WindowRef windowRef)
++{
++    ControlPartCode controlPartCode;
++    ControlRef      controlRef;
++
++    SetPortWindowPort(windowRef);
++    GlobalToLocal(&eventStrucPtr->where);
++
++    if(controlRef = FindControlUnderMouse(eventStrucPtr->where,windowRef,&controlPartCode))
++    {
++#if TARGET_API_MAC_CARBON
++        TrackControl(controlRef,eventStrucPtr->where,(ControlActionUPP) -1);
++#else
++        if (controlPartCode == kControlIndicatorPart)
++            TrackControl(controlRef,eventStrucPtr->where,NULL);
++        else
++            TrackControl(controlRef,eventStrucPtr->where,gActionFunctionScrollUPP);
++#endif
++
++        window_invalidate(windowRef);
++    }
++}
++
++pascal void actionFunctionScroll(ControlRef controlRef,ControlPartCode controlPartCode)
++{
++    SInt32 scrollDistance, controlValue, oldControlValue, controlMax;
++
++    if(controlPartCode != kControlNoPart)
++    {
++        if(controlPartCode != kControlIndicatorPart)
++        {
++            switch(controlPartCode)
++            {
++            case kControlUpButtonPart:
++            case kControlDownButtonPart:
++                scrollDistance = 10;
++                break;
++
++            case kControlPageUpPart:
++            case kControlPageDownPart:
++                scrollDistance = 100;
++                break;
++
++            default:
++                scrollDistance = 0;
++                break;
++            }
++
++            if (scrollDistance)
++            {
++                if((controlPartCode == kControlDownButtonPart) ||
++                   (controlPartCode == kControlPageDownPart))
++                    scrollDistance = -scrollDistance;
++
++                controlValue = GetControl32BitValue(controlRef);
++
++                if(((controlValue == GetControl32BitMaximum(controlRef)) && scrollDistance < 0) ||
++                   ((controlValue == GetControl32BitMinimum(controlRef)) && scrollDistance > 0))
++                    return;
++
++                oldControlValue = controlValue;
++                controlMax = GetControl32BitMaximum(controlRef);
++                controlValue = oldControlValue - scrollDistance;
++  
++                if(controlValue < 0)
++                    controlValue = 0;
++                else if(controlValue > controlMax)
++                    controlValue = controlMax;
++
++                SetControl32BitValue(controlRef,controlValue);
++            }
++        }
++    }
++}
++
++OSErr quitAppEventHandler(AppleEvent *appEvent,AppleEvent *reply,SInt32 handlerRefcon)
++{
++    OSErr    osError;
++    DescType returnedType;
++    Size     actualSize;
++
++    osError = AEGetAttributePtr(appEvent,keyMissedKeywordAttr,typeWildCard,&returnedType,NULL,0,
++                                &actualSize);
++
++    if(osError == errAEDescNotFound)
++    {
++        gDone = true;
++        osError = noErr;
++    }
++    else if(osError == noErr)
++        osError = errAEParamMissed;
++
++    return osError;
++}
++
++/*********************************************************************/
++
+diff --git a/psi/dmmain.r b/psi/dmmain.r
+new file mode 100644
+--- /dev/null
++++ b/psi/dmmain.r
+@@ -0,0 +1,2537 @@
++/* Copyright (C) 2001-2006 Artifex Software, Inc.
++   All Rights Reserved.
++ 
++   This software is provided AS-IS with no warranty, either express or
++   implied.
++
++   This software is distributed under license and may not be copied, modified
++   or distributed except as expressly authorized under the terms of that
++   license.  Refer to licensing information at http://www.artifex.com/
++   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
++   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
++*/
++/* $Id$ */
++
++/* Resource data (Rez format) for the MacOS Ghostscript shlib example wrapper
++   contributed by Nigel Hathaway. See dmmain.c for rest of this code.
++ */
++
++#include "Types.r"
++
++resource 'BNDL' (128) {
++	'MCGS',
++	0,
++	{	/* array TypeArray: 2 elements */
++		/* [1] */
++		'ICN#',
++		{	/* array IDArray: 1 elements */
++			/* [1] */
++			0, 128
++		},
++		/* [2] */
++		'FREF',
++		{	/* array IDArray: 2 elements */
++			/* [1] */
++			0, 128,
++			/* [2] */
++			1, 129
++		}
++	}
++};
++
++resource 'FREF' (128) {
++	'APPL',
++	0,
++	""
++};
++
++resource 'FREF' (129) {
++	'****',
++	1,
++	""
++};
++
++data 'MWBB' (1008) {
++	$"0001 0000"                                          /* .... */
++};
++
++data 'MPSR' (1005) {
++	$"0009 4D6F 6E61 636F 0000 0000 0000 0000"            /* .ÆMonaco........ */
++	$"0000 0000 0000 0000 0000 0000 0000 0000"            /* ................ */
++	$"0000 0003 0004 0030 0004 01CA 027B 0030"            /* .......0...Ê.{.0 */
++	$"0004 01CA 027B BA5E B2EF 0000 0000 0000"            /* ...Ê.{º^²ï...... */
++	$"0000 0000 0000 0100"                                /* ........ */
++};
++
++resource 'ICN#' (128, "Application Icon") {
++	{	/* array: 2 elements */
++		/* [1] */
++		$"0000 0000 0000 0800 0000 0A00 000B F200"
++		$"007F 4200 00FC 0700 01F0 1F80 03E0 1F80"
++		$"03E5 3FC0 03E0 1FC0 03E0 0FC0 03F0 0780"
++		$"01F8 8300 00FC 4600 003C 0800 00F4 0000"
++		$"03E0 0000 07E0 0000 07FF 6000 07FF FF00"
++		$"07FF FFC0 01FF FFE0 007F FFF0 0000 17F0"
++		$"0780 01F8 0F04 00F0 0E08 03E0 0F07 FFD0"
++		$"0780 D820 03F0 0380 007F FC00 0005 40",
++		/* [2] */
++		$"0000 1800 0000 1E00 0000 1E00 001F FF00"
++		$"00FF FF00 01FF FF00 03FF FF80 03FF FFC0"
++		$"07FF FFC0 07FF FFC0 07FF FFC0 03FF FFC0"
++		$"03FF FF80 01FF FF00 007F FE00 03FF F000"
++		$"07FF F800 07FF FE00 0FFF FF80 0FFF FFE0"
++		$"07FF FFF0 03FF FFF8 01FF FFF8 027F FFFC"
++		$"1FFF FFFC 1FFF FFFC 1FFF FFF8 1FFF FFF8"
++		$"1FFF FFF0 07FF FFC0 01FF FF00 007F FC"
++	}
++};
++
++resource 'ics#' (128, "Application Icon") {
++	{	/* array: 2 elements */
++		/* [1] */
++		$"0000 00A0 0F10 1C78 1878 1C18 0E20 0600"
++		$"1800 3FD0 1FF8 057C 300C 3358 18A8 0340",
++		/* [2] */
++		$"0070 07F0 1FF0 1FF8 3FF8 3FF8 1FF8 1FF0"
++		$"3FF0 3FFC 3FFE 1FFE 7FFE 7FFE 7FFC 1FF0"
++	}
++};
++
++resource 'icl8' (128, "Application Icon") {
++	$"0000 0000 0000 0000 0000 0000 0000 0000"
++	$"0000 0000 F600 0000 0000 0000 0000 0000"
++	$"0000 0000 0000 0000 0000 0000 0000 0000"
++	$"0000 0000 5656 0000 0000 0000 0000 0000"
++	$"0000 0000 0000 0000 0000 0000 0000 0000"
++	$"0000 00F6 FCF8 F900 0000 0000 0000 0000"
++	$"0000 0000 0000 0000 0000 00F6 56F9 FCAC"
++	$"FCFC ACFE F600 FFF6 0000 0000 0000 0000"
++	$"0000 0000 0000 0000 F5FA FDFF FFFF FFFF"
++	$"FD81 F800 00F7 FFF7 0000 0000 0000 0000"
++	$"0000 0000 0000 00F6 E0FF FFFF FFFD F92B"
++	$"0000 0000 F6AC FFFA 0000 0000 0000 0000"
++	$"0000 0000 0000 2BFF EAFF FFFE F700 0000"
++	$"0000 0056 FFFF FFFF 8100 0000 0000 0000"
++	$"0000 0000 0000 FCFF FFFF FF56 0000 00F5"
++	$"F500 FAFF FFFF FFFF FFF8 0000 0000 0000"
++	$"0000 0000 00F6 FFFF FFFF FE00 0079 0055"
++	$"F600 FBFF FFFF FFFF FFFD 0000 0000 0000"
++	$"0000 0000 002B FFFF FFFF FC00 007A F6F5"
++	$"4F00 00AC FFFF FFFF FFFF 0000 0000 0000"
++	$"0000 0000 00F6 FFFF FFFF FFF5 0000 F500"
++	$"0000 00F5 ACFF FFFF FFFC 0000 0000 0000"
++	$"0000 0000 0000 FCFF FFFF FF81 0000 0024"
++	$"F600 0000 F5FD FFFF FF2B 0000 0000 0000"
++	$"0000 0000 0000 F5FF FFFF FFFF 8100 0000"
++	$"7A7A 0000 00FA FFFF F800 0000 0000 0000"
++	$"0000 0000 0000 00F6 FDFF FFFF FFFB 0000"
++	$"F579 0000 00FB F4F8 0000 0000 0000 0000"
++	$"0000 0000 0000 0000 0056 FFFF FFFF F800"
++	$"0000 00F6 8181 0000 0000 0000 0000 0000"
++	$"0000 0000 0000 00F8 81FE FFFF FDFA F500"
++	$"0000 2BF7 0000 0000 0000 0000 0000 0000"
++	$"0000 0000 00F5 FCFF FFFF FBF6 0000 0000"
++	$"0000 0000 0000 0000 0000 0000 0000 0000"
++	$"0000 0000 00AC FFFF FFFF FC2B 0000 0000"
++	$"0000 0000 0000 0000 0000 0000 0000 0000"
++	$"0000 0000 2BFF FFFF FFFF FFFF E0FC FC81"
++	$"FAF9 FAF7 2B00 0000 0000 0000 0000 0000"
++	$"0000 0000 F6FF FFFF FFFF FFFF FFFF FFFF"
++	$"FFFF FFFF FFFF ACF9 F600 0000 0000 0000"
++	$"0000 0000 00FC FFFF FFFF FFFF FFFF FFFF"
++	$"FFFF FFFF FFFF FFFF FF81 F600 0000 0000"
++	$"0000 0000 0000 FAFF FFFF FFFF FFFF FFFF"
++	$"FFFF FFFF FFFF FFFF FFFF FE2B 0000 0000"
++	$"0000 0000 0000 0000 F8FB FCFF FFFF FFFF"
++	$"FFFF FFFF FFFF FFFF FFFF FFFD 0000 0000"
++	$"0000 0000 0000 0000 0000 0000 00F5 F7F7"
++	$"2BF7 F8FA FAFD FFFF FFFF FFFF F900 0000"
++	$"0000 0000 F7AC FFFF FCF6 0000 0000 0000"
++	$"0000 0000 0000 F5FE FFFF FFFF F900 0000"
++	$"0000 00F6 FFFF FFFB 0000 0000 2B81 F700"
++	$"0000 0000 0000 00F9 FFFF FFFF 0000 0000"
++	$"0000 002B FFFF FF2B 0000 0000 FAFB 0000"
++	$"0000 0000 00F5 F8FF FFFF FEF6 F500 0000"
++	$"0000 00F5 FEFF FFFC 0000 0000 F5FC FDFC"
++	$"ACFC ACFC FDFF FFFF FF81 F556 F500 0000"
++	$"0000 0000 F8FF FFFF FBF5 0000 0000 F6FA"
++	$"81AC FCFC FCFA 562B F5F8 FCF5 0000 0000"
++	$"0000 0000 002B FCFF FFFE FCF9 F82B 0000"
++	$"0000 0000 2BF7 FAFC FD56 0000 0000 0000"
++	$"0000 0000 0000 00F7 FAFE FFFF FFFF FFFF"
++	$"FFFF FFFF FFAC 812B 0000 0000 0000 0000"
++	$"0000 0000 0000 0000 0000 F52B F9F9 FAF9"
++	$"FAF8 F72B F6"
++};
++
++resource 'icl4' (128, "Application Icon") {
++	$"0000 0000 0000 0000 0000 C000 0000 0000"
++	$"0000 0000 0000 0000 0000 CD00 0000 0000"
++	$"0000 0000 0000 0000 000C ECD0 0000 0000"
++	$"0000 0000 000C DDEE EEEE C0FC 0000 0000"
++	$"0000 0000 0DFF FFFF AEC0 0CFC 0000 0000"
++	$"0000 000C FFFF FEDC 0000 CEFD 0000 0000"
++	$"0000 00CA FFFA C000 000D AFFF D000 0000"
++	$"0000 00EF FFFD 000C 00DF FFFF FD00 0000"
++	$"0000 0CFF FFF0 0D0C C0EF FFFF FE00 0000"
++	$"0000 0CFF FFE0 07C0 C00E FFFF FF00 0000"
++	$"0000 00FF FFF0 0000 0000 EFFF FE00 0000"
++	$"0000 00EF FFFE 0000 C000 CAFF FC00 0000"
++	$"0000 000F FFFF D000 7D00 0DFF C000 0000"
++	$"0000 000C EFFF FE00 0D00 0EFD 0000 0000"
++	$"0000 0000 0DFF FFD0 000C DD00 0000 0000"
++	$"0000 000C EEFF AD00 00CC 0000 0000 0000"
++	$"0000 00EF FFE0 0000 0000 0000 0000 0000"
++	$"0000 0EFF FFEC 0000 0000 0000 0000 0000"
++	$"0000 CFFF FFFF FEED DDDC C000 0000 0000"
++	$"0000 CFFF FFFF FFFF FFFF FFED C000 0000"
++	$"0000 0EFF FFFF FFFF FFFF FFFF FDC0 0000"
++	$"0000 00DF FFFF FFFF FFFF FFFF FFAC 0000"
++	$"0000 0000 CEEF FFFF FFFF FFFF FFFE 0000"
++	$"0000 0000 0000 00CC CCDD DAFF FFFF D000"
++	$"0000 CEFF EC00 0000 0000 000F FFFF D000"
++	$"000C FFFE 0000 CEC0 0000 000D FFFF 0000"
++	$"000C FFFC 0000 DD00 0000 00DF FFF0 C000"
++	$"0000 FFFE 0000 0EFE EEEE FFFF FD0D 0000"
++	$"0000 CFFF E000 00CD DEEE EDDC 0DE0 0000"
++	$"0000 0CEF FFED CC00 0000 CCDD FC00 0000"
++	$"0000 000C DAFF FFFF FFFF FEEC 0000 0000"
++	$"0000 0000 000C DDDD DDCC"
++};
++
++resource 'ics8' (128, "Application Icon") {
++	$"0000 0000 0000 0000 0000 2B00 0000 0000"
++	$"0000 0000 0000 2B56 F8F9 F856 0000 0000"
++	$"0000 0000 FBFF FFFB 56F5 F7FC 0000 0000"
++	$"0000 00FC FFFD F500 00F9 FFFF F900 0000"
++	$"0000 F5FF FF56 2B2A F6FB FFFF FF00 0000"
++	$"0000 00FE FFFB 00F5 0000 FBFF FC00 0000"
++	$"0000 00F8 FFFF FA00 7900 F7FD F500 0000"
++	$"0000 00F5 F9FF FDF6 00F6 F800 0000 0000"
++	$"0000 2BEA FF56 0000 0000 0000 0000 0000"
++	$"0000 81FF FFFF FEFD FCFC FAF8 0000 0000"
++	$"0000 F6FE FFFF FFFF FFFF FFFF FEF7 0000"
++	$"0000 0000 2B56 FA81 81FC FDFF FFFF F600"
++	$"0000 ACFE 2B00 2BF5 0000 00F8 FFFF F500"
++	$"00F5 FFFC 0000 FA56 56F8 F9FD FE56 F500"
++	$"0000 56E0 FBF7 F6F6 F856 56F9 56F6 0000"
++	$"0000 0000 F881 FCAC FC81 FA2B"
++};
++
++resource 'ics4' (128, "Application Icon") {
++	$"0000 0000 00C0 0000 0000 00CD CDCD 0000"
++	$"0000 EFFD D0CE 0000 000E FA00 0DFF D000"
++	$"000F FDCC 0EFF F000 000F FE00 00EF E000"
++	$"000C FFD0 D0CE 0000 0000 DFF0 0CC0 0000"
++	$"00CF FD00 0000 0000 00DF FFFA EEDD 0000"
++	$"00CA FFFF FFFF FC00 0000 CDDE DEEF FFC0"
++	$"00EF C0C0 000C FF00 00FE 00DD CDDF AD00"
++	$"00DF DCC0 DCDD D000 0000 DDEE EDDC"
++};
++
++resource 'icm8' (128, "Application Icon") {
++	$"0000 0000 0000 0000 0000 F800 0000 0000"
++	$"0000 0000 2BFA FBAC 8156 F681 0000 0000"
++	$"0000 00FA FFFD F7F5 0056 FDFF F800 0000"
++	$"0000 F5FF FF56 2B2A F556 FFFF FF00 0000"
++	$"0000 00FB FFFE F600 4F00 56FF F800 0000"
++	$"0000 00F5 81EA FEF5 00F6 F8F6 0000 0000"
++	$"0000 F8FF FFFA 2BF6 F600 0000 0000 0000"
++	$"0000 56FF FFFF FFFF FFFF E0FC F9F5 0000"
++	$"0000 00F6 F981 FBFC FCAC FDFF FFFD F500"
++	$"0000 FDFD F600 F700 0000 0056 FFFE F500"
++	$"0000 ACFE 2B00 F7F9 8181 FBFB 81F7 0000"
++	$"0000 00F7 FAFB FBFA FAF9 56F8 F6"
++};
++
++resource 'icm4' (128, "Application Icon") {
++	$"0000 0000 00C0 0000 0000 CDEE ECCE 0000"
++	$"000D FAC0 0DEF C000 000F FD0C 0DFF F000"
++	$"000E FFC0 C0DF C000 0000 DFEC 00CC 0000"
++	$"00CF FDC0 C000 0000 00DF FFFF FFFE D000"
++	$"000C DDEE EEFF FF00 00AE C0C0 000D FEC0"
++	$"00FE C0CD DEDE DC00 000C DDED DDDC C0"
++};
++
++resource 'icm#' (128, "Application Icon") {
++	{	/* array: 2 elements */
++		/* [1] */
++		$"0000 0350 1C30 1C78 1C10 0620 1900 3FF8"
++		$"0B7C 300C 31B0 0720",
++		/* [2] */
++		$"0070 0FF0 1FF8 3FF8 3FF8 1FF0 3FF8 3FFC"
++		$"1FFE 7FFE 7FFE 3FF8"
++	}
++};
++
++resource 'icns' (128, "Application Icon") {
++	{	/* array elementArray: 20 elements */
++		/* [1] */
++		'ICN#',
++		$"0000 0000 0000 0800 0000 0A00 000B F200"
++		$"007F 4200 00FC 0700 01F0 1F80 03E0 1F80"
++		$"03E5 3FC0 03E0 1FC0 03E0 0FC0 03F0 0780"
++		$"01F8 8300 00FC 4600 003C 0800 00F4 0000"
++		$"03E0 0000 07E0 0000 07FF 6000 07FF FF00"
++		$"07FF FFC0 01FF FFE0 007F FFF0 0000 17F0"
++		$"0780 01F8 0F04 00F0 0E08 03E0 0F07 FFD0"
++		$"0780 D820 03F0 0380 007F FC00 0005 4000"
++		$"0000 1800 0000 1E00 0000 1E00 001F FF00"
++		$"00FF FF00 01FF FF00 03FF FF80 03FF FFC0"
++		$"07FF FFC0 07FF FFC0 07FF FFC0 03FF FFC0"
++		$"03FF FF80 01FF FF00 007F FE00 03FF F000"
++		$"07FF F800 07FF FE00 0FFF FF80 0FFF FFE0"
++		$"07FF FFF0 03FF FFF8 01FF FFF8 027F FFFC"
++		$"1FFF FFFC 1FFF FFFC 1FFF FFF8 1FFF FFF8"
++		$"1FFF FFF0 07FF FFC0 01FF FF00 007F FC00",
++		/* [2] */
++		'icl4',
++		$"0000 0000 0000 0000 0000 C000 0000 0000"
++		$"0000 0000 0000 0000 0000 CD00 0000 0000"
++		$"0000 0000 0000 0000 000C ECD0 0000 0000"
++		$"0000 0000 000C DDEE EEEE C0FC 0000 0000"
++		$"0000 0000 0DFF FFFF AEC0 0CFC 0000 0000"
++		$"0000 000C FFFF FEDC 0000 CEFD 0000 0000"
++		$"0000 00CA FFFA C000 000D AFFF D000 0000"
++		$"0000 00EF FFFD 000C 00DF FFFF FD00 0000"
++		$"0000 0CFF FFF0 0D0C C0EF FFFF FE00 0000"
++		$"0000 0CFF FFE0 07C0 C00E FFFF FF00 0000"
++		$"0000 00FF FFF0 0000 0000 EFFF FE00 0000"
++		$"0000 00EF FFFE 0000 C000 CAFF FC00 0000"
++		$"0000 000F FFFF D000 7D00 0DFF C000 0000"
++		$"0000 000C EFFF FE00 0D00 0EFD 0000 0000"
++		$"0000 0000 0DFF FFD0 000C DD00 0000 0000"
++		$"0000 000C EEFF AD00 00CC 0000 0000 0000"
++		$"0000 00EF FFE0 0000 0000 0000 0000 0000"
++		$"0000 0EFF FFEC 0000 0000 0000 0000 0000"
++		$"0000 CFFF FFFF FEED DDDC C000 0000 0000"
++		$"0000 CFFF FFFF FFFF FFFF FFED C000 0000"
++		$"0000 0EFF FFFF FFFF FFFF FFFF FDC0 0000"
++		$"0000 00DF FFFF FFFF FFFF FFFF FFAC 0000"
++		$"0000 0000 CEEF FFFF FFFF FFFF FFFE 0000"
++		$"0000 0000 0000 00CC CCDD DAFF FFFF D000"
++		$"0000 CEFF EC00 0000 0000 000F FFFF D000"
++		$"000C FFFE 0000 CEC0 0000 000D FFFF 0000"
++		$"000C FFFC 0000 DD00 0000 00DF FFF0 C000"
++		$"0000 FFFE 0000 0EFE EEEE FFFF FD0D 0000"
++		$"0000 CFFF E000 00CD DEEE EDDC 0DE0 0000"
++		$"0000 0CEF FFED CC00 0000 CCDD FC00 0000"
++		$"0000 000C DAFF FFFF FFFF FEEC 0000 0000"
++		$"0000 0000 000C DDDD DDCC 0000 0000 0000",
++		/* [3] */
++		'icl8',
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 F600 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 5656 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 00F6 FCF8 F900 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 00F6 56F9 FCAC"
++		$"FCFC ACFE F600 FFF6 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 F5FA FDFF FFFF FFFF"
++		$"FD81 F800 00F7 FFF7 0000 0000 0000 0000"
++		$"0000 0000 0000 00F6 E0FF FFFF FFFD F92B"
++		$"0000 0000 F6AC FFFA 0000 0000 0000 0000"
++		$"0000 0000 0000 2BFF EAFF FFFE F700 0000"
++		$"0000 0056 FFFF FFFF 8100 0000 0000 0000"
++		$"0000 0000 0000 FCFF FFFF FF56 0000 00F5"
++		$"F500 FAFF FFFF FFFF FFF8 0000 0000 0000"
++		$"0000 0000 00F6 FFFF FFFF FE00 0079 0055"
++		$"F600 FBFF FFFF FFFF FFFD 0000 0000 0000"
++		$"0000 0000 002B FFFF FFFF FC00 007A F6F5"
++		$"4F00 00AC FFFF FFFF FFFF 0000 0000 0000"
++		$"0000 0000 00F6 FFFF FFFF FFF5 0000 F500"
++		$"0000 00F5 ACFF FFFF FFFC 0000 0000 0000"
++		$"0000 0000 0000 FCFF FFFF FF81 0000 0024"
++		$"F600 0000 F5FD FFFF FF2B 0000 0000 0000"
++		$"0000 0000 0000 F5FF FFFF FFFF 8100 0000"
++		$"7A7A 0000 00FA FFFF F800 0000 0000 0000"
++		$"0000 0000 0000 00F6 FDFF FFFF FFFB 0000"
++		$"F579 0000 00FB F4F8 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0056 FFFF FFFF F800"
++		$"0000 00F6 8181 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00F8 81FE FFFF FDFA F500"
++		$"0000 2BF7 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 00F5 FCFF FFFF FBF6 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 00AC FFFF FFFF FC2B 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 2BFF FFFF FFFF FFFF E0FC FC81"
++		$"FAF9 FAF7 2B00 0000 0000 0000 0000 0000"
++		$"0000 0000 F6FF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF ACF9 F600 0000 0000 0000"
++		$"0000 0000 00FC FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FF81 F600 0000 0000"
++		$"0000 0000 0000 FAFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FE2B 0000 0000"
++		$"0000 0000 0000 0000 F8FB FCFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFD 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 00F5 F7F7"
++		$"2BF7 F8FA FAFD FFFF FFFF FFFF F900 0000"
++		$"0000 0000 F7AC FFFF FCF6 0000 0000 0000"
++		$"0000 0000 0000 F5FE FFFF FFFF F900 0000"
++		$"0000 00F6 FFFF FFFB 0000 0000 2B81 F700"
++		$"0000 0000 0000 00F9 FFFF FFFF 0000 0000"
++		$"0000 002B FFFF FF2B 0000 0000 FAFB 0000"
++		$"0000 0000 00F5 F8FF FFFF FEF6 F500 0000"
++		$"0000 00F5 FEFF FFFC 0000 0000 F5FC FDFC"
++		$"ACFC ACFC FDFF FFFF FF81 F556 F500 0000"
++		$"0000 0000 F8FF FFFF FBF5 0000 0000 F6FA"
++		$"81AC FCFC FCFA 562B F5F8 FCF5 0000 0000"
++		$"0000 0000 002B FCFF FFFE FCF9 F82B 0000"
++		$"0000 0000 2BF7 FAFC FD56 0000 0000 0000"
++		$"0000 0000 0000 00F7 FAFE FFFF FFFF FFFF"
++		$"FFFF FFFF FFAC 812B 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 F52B F9F9 FAF9"
++		$"FAF8 F72B F600 0000 0000 0000 0000 0000",
++		/* [4] */
++		'il32',
++		$"91FF 00DF 9CFF 01A0 909A FF03 D350 AF80"
++		$"91FF 02CF A080 8140 0538 24D5 FF00 DF8D"
++		$"FF02 EF80 2081 0008 0420 60A2 FFFF BF00"
++		$"BF8C FF01 CF10 8100 022C 86BF 81FF 03DF"
++		$"3000 728B FF01 CF10 8000 0110 B083 FF01"
++		$"9410 8000 0066 8AFF 0040 8100 00A2 80FF"
++		$"03E5 E3FF 7C83 0000 A088 FF00 DF81 0008"
++		$"10FF FF82 FF91 C7FF 6083 0000 3088 FF00"
++		$"BF81 0009 40FF FF66 E3D5 BAFF F330 8300"
++		$"88FF 00DF 8200 03EF FFF1 E381 FF01 EF30"
++		$"8100 0044 89FF 004C 8100 006C 80FF 01F1"
++		$"C780 FF05 EF20 0000 04C5 89FF 01DF 1081"
++		$"0000 6C80 FF01 7458 80FF 0380 0000 A08B"
++		$"FF01 D120 8100 0460 FFFF E382 80FF 0254"
++		$"10A2 8EFF 0192 0280 0000 A081 FF03 DB64"
++		$"60EF 8DFF 07AF 6412 0204 2080 EF80 FF01"
++		$"CFBB 8EFF 01EF 4480 0001 50CF 96FF 0040"
++		$"8100 0150 CF95 FF00 CF84 0003 1040 4268"
++		$"8080 01BF D18C FF01 CF02 8D00 0238 92DF"
++		$"89FF 0044 8F00 0204 62DF 88FF 0070 9000"
++		$"0110 CF89 FF02 A060 408D 0001 22EF 8DFF"
++		$"00DF 81BF 04A0 8070 2002 8200 0090 84FF"
++		$"05B4 3600 0046 DB89 FF01 DF20 8100 0090"
++		$"83FF 00DF 8000 0058 81FF 02CF 68BF 85FF"
++		$"0080 8000 0110 EF83 FF00 BF80 0000 BF81"
++		$"FF01 705A 84FF 07EF A410 0000 10CF EF83"
++		$"FF04 EF10 0000 5281 FF02 EF42 2082 4000"
++		$"2681 0003 68E7 96EF 84FF 05A2 0200 0052"
++		$"EF81 FF02 D380 6080 4007 4480 90BF EFA4"
++		$"54EF 86FF 08C3 4000 0010 5080 AFCF 83FF"
++		$"05CF AF80 4C24 A28A FF02 BF70 2086 0004"
++		$"0400 3260 C38F FF02 EFBF 9081 8003 A0BF"
++		$"C7DF 88FF 91FF 00DE 9BFF 02FE A090 9AFF"
++		$"03D3 50AF 8091 FF02 CFA0 8081 4005 3824"
++		$"D4FF 00DF 8DFF 02EF 8020 8100 0804 2060"
++		$"A2FF FFBF 00BF 8CFF 01CF 1081 0002 2C85"
++		$"BF81 FF03 DF30 0072 8BFF 01CF 1080 0001"
++		$"10B0 83FF 0194 1080 0000 668A FF00 4081"
++		$"0000 A280 FF03 ECEB FF7C 8300 00A0 88FF"
++		$"00DF 8100 0810 FFFF A6FF B1D7 FF60 8300"
++		$"002F 88FF 00BF 8100 0940 FFFF 92EB E1CE"
++		$"FFF2 3083 0088 FF00 DE82 0003 EFFF F5EB"
++		$"81FF 01EF 3081 0000 4489 FF00 4C81 0000"
++		$"6B80 FF01 F5D7 80FF 05EF 2000 0004 C589"
++		$"FF01 DF10 8100 006B 80FF 019C 8780 FF03"
++		$"8000 00A0 8BFF 01D1 2081 0004 60FF FFEB"
++		$"A680 FF02 5410 A28E FF01 9202 8000 00A0"
++		$"81FF 03DB 6360 EF8D FF07 AF64 1202 0420"
++		$"80EF 80FF 01CF BB8E FF01 EF44 8000 0150"
++		$"CF96 FF00 3F81 0001 50CF 95FF 00CF 8400"
++		$"0310 4042 6880 8001 BFD1 8CFF 01CF 028D"
++		$"0002 3892 DF89 FF00 448F 0002 0462 DF88"
++		$"FF00 7090 0001 10CF 89FF 02A0 6040 8D00"
++		$"0122 EF8D FF00 DF81 BF04 9F80 7020 0282"
++		$"0000 9084 FF05 B336 0000 46DB 89FF 01DF"
++		$"2081 0000 9083 FF00 DF80 0000 5881 FF04"
++		$"CF68 BFFE FE83 FF00 8080 0001 10EF 83FF"
++		$"00BF 8000 00BF 81FF 0170 5A84 FF07 EFA4"
++		$"1000 0010 CFEE 83FF 04EF 1000 0052 81FF"
++		$"08EF 4220 4040 3F3F 4026 8100 0368 E795"
++		$"EF84 FF05 A102 0000 52EF 81FF 0DD3 8060"
++		$"403F 3F43 8090 BFEF A354 EF86 FF08 C340"
++		$"0000 1050 80AF CF82 FF06 FECF AF7F 4C24"
++		$"A28A FF02 BF70 2086 0004 0400 3260 C38F"
++		$"FF02 EFBF 9081 8003 A0BF C7DF 88FF 90FF"
++		$"01FE DC9B FF03 FCA0 90FE 99FF 03D3 50AF"
++		$"8091 FF02 CFA0 7F81 4005 3C24 D8FF 00DF"
++		$"8DFF 02ED 8020 8100 0804 1E60 A4FF FFBF"
++		$"00BF 8CFF 01CF 0F81 0003 2C80 BEFD 80FF"
++		$"03DF 3000 748B FF01 CF10 8000 0110 B082"
++		$"FF02 FE94 1080 0000 6C8A FF00 4081 0000"
++		$"A480 FF03 F0EF FF7C 8300 00A0 88FF 00DE"
++		$"8100 0810 FFFF B8FF C2DF FF5F 8300 002E"
++		$"88FF 00BF 8100 0940 FFFF A7ED E7D8 FFF0"
++		$"2F83 0088 FF00 DC82 0003 EFFF F6EE 81FF"
++		$"01EE 3081 0000 4489 FF00 4C81 000E 6AFD"
++		$"FFFF F6DE FDFF FFEF 2000 0008 C589 FF01"
++		$"DE10 8100 056A FFFF FEAF 9E80 FF03 8000"
++		$"00A0 8BFF 01D2 2081 0004 60FF FFEF B880"
++		$"FF02 5410 A48E FF01 9404 8000 00A0 81FF"
++		$"03DB 645F EF8C FF08 FDAF 6414 0404 1F80"
++		$"EE80 FF01 CEBB 8EFF 01EF 4680 0002 50CE"
++		$"FE95 FF00 3E81 0001 4ECE 95FF 00CD 8400"
++		$"0310 4044 6880 8001 BFD2 8CFF 01CF 048D"
++		$"0002 3894 DF89 FF00 478F 0002 0464 DF88"
++		$"FF00 6F90 0001 10CF 88FF 03FE A060 408D"
++		$"0001 23ED 86FF 00FE 83FF 00DF 81BF 049C"
++		$"8070 2004 8200 0090 83FF 07FE B23C 0000"
++		$"48DA FD88 FF01 DF20 8100 0090 83FF 00DF"
++		$"8000 0057 81FF 04CF 70BF FCFC 82FF 01FE"
++		$"8080 0001 10ED 83FF 00BF 8000 00BF 81FF"
++		$"0270 58FD 83FF 07EF A410 0000 10CF EC83"
++		$"FF04 EF10 0000 5481 FF08 ED44 2040 403D"
++		$"3D40 2881 0003 68E7 9AEF 83FF 06FE A304"
++		$"0000 53EF 81FF 0DD2 8060 3E3C 3C45 8090"
++		$"BEEE A357 EF86 FF14 C240 0000 1050 80AF"
++		$"CFFF FDFF FFFE FCCF AF7A 4C24 A48A FF02"
++		$"BE70 1E86 0004 0800 3460 C78E FF03 FDEF"
++		$"BF90 8180 04A0 BFCA DFFD 87FF",
++		/* [5] */
++		'l8mk',
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0005 FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0005 FFFF 0500 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 00FF FFFF FF00 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 00FF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
++		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
++		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FF00 0000 0000 0000"
++		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
++		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
++		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
++		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
++		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
++		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FF00 0000 0000 0000"
++		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
++		$"0000 0000 0000 05FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
++		$"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FF00 0000 0000 0000"
++		$"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000"
++		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
++		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 0000 0000 0005 FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 0000 0000 0500 00FF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000"
++		$"0000 0005 FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000"
++		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000"
++		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 0005 FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
++		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
++		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0005 FFFF FFFF FFFF"
++		$"FFFF FFFF FF05 0000 0000 0000 0000 0000",
++		/* [6] */
++		'ich#',
++		$"0000 0000 0000 0000 0001 0000 0000 0002"
++		$"8000 0000 0002 4000 0000 000C 4000 0000"
++		$"1FFC 6000 0001 FFE0 6000 0007 FF00 E000"
++		$"000F F801 F000 003F E003 F800 003F 800F"
++		$"FC00 007F 800F FC00 007F 091F FE00 007F"
++		$"010F FE00 00FF 0887 FE00 007F 8003 FE00"
++		$"007F 8001 FC00 003F C000 FC00 003F E0C0"
++		$"F000 001F F020 7000 000F F840 C000 0001"
++		$"F801 8000 0003 FC0E 0000 000F F000 0000"
++		$"007F 0000 0000 007E 0000 0000 00FF 8000"
++		$"0000 01FF F690 0000 01FF FFFF 0000 01FF"
++		$"FFFF F000 00FF FFFF FC00 007F FFFF FF00"
++		$"003F FFFF FF80 0007 FFFF FFC0 0000 5FFF"
++		$"FFC0 0000 0001 FFE0 01FC 0000 1FE0 03F0"
++		$"0000 1FC0 03E0 1800 1FC0 03E0 3000 1F80"
++		$"07E0 1801 FF00 03F0 0FFF FC40 01F8 02FF"
++		$"4100 00FC 0000 0E00 007F C000 F800 000F"
++		$"FFFF C000 0001 FFFE 0000 0000 0480 0000"
++		$"0000 0006 0000 0000 0007 4000 0000 0007"
++		$"8000 0000 0007 C000 0000 100F E000 0000"
++		$"7FFF E000 0003 FFFF E000 000F FFFF E000"
++		$"001F FFFF F000 003F FFFF F800 007F FFFF"
++		$"FC00 007F FFFF FE00 00FF FFFF FE00 00FF"
++		$"FFFF FE00 00FF FFFF FE00 00FF FFFF FE00"
++		$"00FF FFFF FE00 007F FFFF FC00 007F FFFF"
++		$"F800 001F FFFF F000 001F FFFF F000 0007"
++		$"FFFF C000 0003 FFFE 0000 007F FFFC 0000"
++		$"007F FFFE 0000 00FF FFFF 8000 01FF FFFF"
++		$"C000 03FF FFFF F800 01FF FFFF FC00 01FF"
++		$"FFFF FF00 01FF FFFF FF80 00FF FFFF FFC0"
++		$"007F FFFF FFE0 001F FFFF FFF0 0000 FFFF"
++		$"FFF0 0043 FFFF FFF0 03FF FFFF FFF0 07FF"
++		$"FFFF FFF0 07FF FFFF FFF0 07FF FFFF FFE0"
++		$"07FF FFFF FFE0 03FF FFFF FFC0 07FF FFFF"
++		$"FF80 01FF FFFF FF00 01FF FFFF FE00 001F"
++		$"FFFF F000 0007 FFFF 8000 0000 3FE4 0000",
++		/* [7] */
++		'ich4',
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00CE 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 00DC"
++		$"D000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00F0 DD00 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 DAE0"
++		$"CFC0 0000 0000 0000 0000 0000 0000 0000"
++		$"0CDE EFFF FFFF FE00 0FA0 0000 0000 0000"
++		$"0000 0000 0000 00DE FFFF FFFF FFED C000"
++		$"CFF0 0000 0000 0000 0000 0000 0000 CFFF"
++		$"FFFF FFFF C000 0000 EFF0 0000 0000 0000"
++		$"0000 0000 000C FFFF FFFF ECC0 0000 000D"
++		$"FFFD 0000 0000 0000 0000 0000 00DF FFFF"
++		$"FFD0 0000 0000 0CFF FFFF E000 0000 0000"
++		$"0000 0000 0CFF FFFF FD00 0000 0000 EFFF"
++		$"FFFF FE00 0000 0000 0000 0000 0AFF FFFF"
++		$"F000 0000 C00D FFFF FFFF FFC0 0000 0000"
++		$"0000 0000 CFFF FFFF D000 D00D C00D FFFF"
++		$"FFFF FFE0 0000 0000 0000 0000 CFFF FFFF"
++		$"0000 9007 C00C FFFF FFFF FFF0 0000 0000"
++		$"0000 0000 CFFF FFFF 0000 7C00 C000 CAFF"
++		$"FFFF FFF0 0000 0000 0000 0000 CFFF FFFF"
++		$"D000 0C00 0000 00FF FFFF FFE0 0000 0000"
++		$"0000 0000 0FFF FFFF F000 0000 0000 000F"
++		$"FFFF FFC0 0000 0000 0000 0000 0DFF FFFF"
++		$"FD00 0000 CC00 000C FFFF FE00 0000 0000"
++		$"0000 0000 00AF FFFF FFD0 0000 7DD0 0000"
++		$"EFFF E000 0000 0000 0000 0000 000E FFFF"
++		$"FFFE 0000 0690 0000 DFFE 0000 0000 0000"
++		$"0000 0000 000C EFFF FFFF E000 0CC0 000C"
++		$"FFDC 0000 0000 0000 0000 0000 0000 0CDF"
++		$"FFFF FD00 0000 00DF E000 0000 0000 0000"
++		$"0000 0000 0000 00EF FFFF FD00 0000 DED0"
++		$"0000 0000 0000 0000 0000 0000 00CD EFFF"
++		$"FFAE C000 000C C000 0000 0000 0000 0000"
++		$"0000 0000 0DFF FFFE DC00 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 DFFF FFFD"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 000C FFFF FFFE DC00 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 000E FFFF FFFF"
++		$"FFFE EDED CCDC C000 0000 0000 0000 0000"
++		$"0000 000F FFFF FFFF FFFF FFFF FFFF FFFD"
++		$"DC00 0000 0000 0000 0000 000E FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFED C000 0000 0000"
++		$"0000 000C FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FED0 0000 0000 0000 0000 CFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFA 0000 0000"
++		$"0000 0000 0CAF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF EC00 0000 0000 0000 0000 DEAF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FE00 0000"
++		$"0000 0000 0000 0000 CDDD EFFF FFFF FFFF"
++		$"FFFF FFFF FFC0 0000 0000 0000 0000 0000"
++		$"0000 0000 000C CCDD FFFF FFFF FFE0 0000"
++		$"0000 00CD EFFF FDC0 0000 0000 0000 0000"
++		$"00DF FFFF FFE0 0000 0000 00EF FFFF C000"
++		$"0000 0000 0000 0000 000A FFFF FFC0 0000"
++		$"0000 0CFF FFFC 0000 000F ECC0 0000 0000"
++		$"000E FFFF FF00 0000 0000 0CFF FFF0 0000"
++		$"00DF D000 0000 0000 0CDF FFFF A000 0000"
++		$"0000 0DFF FFFC 0000 00CF AC00 0000 00CD"
++		$"EAFF FFFE 0CC0 0000 0000 00AF FFFE 0000"
++		$"0000 EFFF FFFF FFFF FFFF FED0 CD00 0000"
++		$"0000 00CF FFFF E000 0000 0CDE EFFF FFFE"
++		$"EDDC 00CE D000 0000 0000 000C FFFF FFC0"
++		$"0000 0000 0000 0000 000C DFFC 0000 0000"
++		$"0000 0000 0DFF FFFF EEDC C000 0000 00CC"
++		$"DEEA FD00 0000 0000 0000 0000 000C EFFF"
++		$"FFFF FFFF FFFF FFFF FFDC 0000 0000 0000"
++		$"0000 0000 0000 00CD FFFF FFFF FFFF FEFD"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"00CC CCDC CD00 0000 0000 0000 0000 0000",
++		/* [8] */
++		'ich8',
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 F6AC"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 81F6"
++		$"FA00 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 00F5 FF00"
++		$"5681 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 FAAC 8100"
++		$"2BFF 2B00 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"00F8 F9FB FBFF FFFF FFFF FFFE FFAC F500"
++		$"00FF FD00 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 F9AC"
++		$"FFFF FFFF FFFF FFFF FFFF ACFA F600 0000"
++		$"2BFF FF00 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 F8FF FFFF"
++		$"FFFF FFFF FFFF FFFF F800 0000 0000 0000"
++		$"FBFF FF00 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 00F8 FFFF FFFF"
++		$"FFFF FFFF FBF7 F600 0000 0000 0000 F5FA"
++		$"FFFF FFFA 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 F9FF FFFF FFFF"
++		$"FFFF FA00 0000 0000 0000 0000 00F8 FEFF"
++		$"FFFF FFFF 8100 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 00F8 FFFF FFFF FFFF"
++		$"FFF9 0000 0000 0000 0000 0000 FCFF FFFF"
++		$"FFFF FFFF FFFC 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 00AC FFFF FFFF FFFF"
++		$"FFF6 0000 0000 00F6 F600 00F9 FFFF FFFF"
++		$"FFFF FFFF FFFF 2B00 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 F5FF FFFF FFFF FFFF"
++		$"F900 0000 7A00 007A 4F00 00FA FFFF FFFF"
++		$"FFFF FFFF FFFF FB00 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 F8FF FFFF FFFF FFFF"
++		$"0000 0000 C800 0079 2B00 00F6 FEFF FFFF"
++		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 F8FF FFFF FFFF FFFF"
++		$"0000 0000 A5F6 00F5 5500 0000 F6FE FFFF"
++		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 2BFF FFFF FFFF FFFF"
++		$"FA00 0000 F52A 0000 0000 0000 00F5 FEFF"
++		$"FFFF FFFF FFFF FC00 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
++		$"FF00 0000 0000 0000 0000 0000 0000 F6FF"
++		$"FFFF FFFF FFFF F800 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 00F9 FFFF FFFF FFFF"
++		$"FF81 0000 0000 00F5 4FF5 0000 0000 00F6"
++		$"FFFF FFFF FFFC 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 FDFF FFFF FFFF"
++		$"FFFF 8100 0000 0000 55C9 5500 0000 0000"
++		$"FBFF FFFF FB00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 00AC FFFF FFFF"
++		$"FFFF FFAC 0000 0000 25A4 C900 0000 0000"
++		$"FBFF FFFD 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 00F5 ACFF FFFF"
++		$"FFFF FFFF FB00 0000 0055 2B00 0000 00F6"
++		$"FEFF 81F5 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 00F6 FAFF"
++		$"FFFF FFFF FFF9 0000 0000 0000 0000 F9FF"
++		$"ACF5 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 FBFE"
++		$"FFFF FFFF FFF9 0000 0000 0000 FAFC F900"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 2B56 ACFF FFFF"
++		$"FFFF FEFB 2B00 0000 0000 00F6 F800 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 00FA FFFF FFFF FFFD"
++		$"F92B 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 FAFF FFFF FFFF FFF8"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00F6 FFFF FFFF FFFF FFFE"
++		$"F92B 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00FD FFFF FFFF FFFF FFFF"
++		$"FFFF FFFB FBFB FB56 F8F8 F8F8 F600 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFF9"
++		$"FAF6 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00AC FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF AC81 2B00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00F6 FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFAC 5600 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 F8FF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFD 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 00F8 FDFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FDF5 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 56FB FEFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFAC 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"2BFA F9FA FDFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF F800 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 00F5 F8F8 F8FB"
++		$"FDFF FFFF FFFF FFFF FFFF FB00 0000 0000"
++		$"0000 0000 0000 F5FA FCFF FFFF FFFA F500"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"00F5 FAFF FFFF FFFF FFFF FB00 0000 0000"
++		$"0000 0000 0000 ACFF FFFF FFFF F600 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 00FD FFFF FFFF FFFF F800 0000 0000"
++		$"0000 0000 002B FFFF FFFF FF56 0000 0000"
++		$"0000 F5FD FCF8 F600 0000 0000 0000 0000"
++		$"0000 00FB FFFF FFFF FFFE 0000 0000 0000"
++		$"0000 0000 00F8 FFFF FFFF FF00 0000 0000"
++		$"0000 F9FF 5600 0000 0000 0000 0000 0000"
++		$"00F6 F9FF FFFF FFFF FDF5 0000 0000 0000"
++		$"0000 0000 00F8 FFFF FFFF FFF6 0000 0000"
++		$"0000 F6FF FFF8 0000 0000 0000 0000 F6F9"
++		$"FBFF FFFF FFFF FFFC 00F6 F800 0000 0000"
++		$"0000 0000 0000 FEFF FFFF FFFB 0000 0000"
++		$"0000 00F6 FCFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFD 5600 F6FA 0000 0000 0000"
++		$"0000 0000 0000 F7FF FFFF FFFF FBF6 0000"
++		$"0000 0000 002B FAFB ACFF FFFF FFFF FFAC"
++		$"FBFB F8F8 0000 F6AC FA00 0000 0000 0000"
++		$"0000 0000 0000 002B FFFF FFFF FFFF F800"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 00F6 F9FF FFF8 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 F581 FFFF FFFF FFFF"
++		$"FBFB F9F8 2B00 0000 0000 0000 0000 2BF8"
++		$"F9FB FBFF FDF9 F500 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 00F9 FBFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFE 812B 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 F8FA"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFD FDF9"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 2BF8 F8F8 F8F8 F8F8 F500 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000",
++		/* [9] */
++		'ih32',
++		$"CBFF 01D5 40AB FF02 71D5 71A9 FF04 E300"
++		$"FF8E 71A7 FF06 8035 60FF D500 C09B FF03"
++		$"AA8E 5555 8300 070E 0B39 E6FF FF00 2B98"
++		$"FF01 8E39 8700 0239 75D5 80FF 02C6 0000"
++		$"96FF 00AA 8700 010B AA84 FF02 5500 0095"
++		$"FF00 AA85 0002 4EB5 D584 FF01 E380 8000"
++		$"0075 93FF 0080 8400 0071 87FF 01AA 1C82"
++		$"0000 6091 FF00 AA84 0000 8087 FF00 5085"
++		$"0000 4090 FF00 3983 0001 06E3 82FF 04D0"
++		$"CDFF FF87 8700 00C6 8EFF 00E3 8400 0080"
++		$"80FF 076A FFFF 6DB5 FFFF 7187 0000 558E"
++		$"FF00 AA84 0081 FF08 20FF FF6A B5FF FFD5"
++		$"1087 008E FF00 AA84 0081 FF04 39CD FFE6"
++		$"9C80 FF01 D51C 8600 8EFF 00C6 8400 0080"
++		$"80FF 01E6 CE84 FF01 E31C 8400 0040 8FFF"
++		$"000B 8400 8AFF 00D5 8400 00AA 8FFF 007F"
++		$"8400 006A 82FF 02E6 B5DA 82FF 00D5 8200"
++		$"0045 91FF 002B 8400 006A 82FF 0283 2083"
++		$"82FF 0055 8000 0055 93FF 002B 8400 0040"
++		$"81FF 02DA 2020 82FF 0355 0000 2B94 FF01"
++		$"E639 8400 0055 81FF 0190 B581 FF04 D523"
++		$"005B E396 FF01 D571 8300 008E 85FF 0391"
++		$"0639 E399 FF01 600B 8200 0080 83FF 0280"
++		$"4080 98FF 02D5 8E40 8100 0307 1C55 C683"
++		$"FF01 E3AA 99FF 0079 8200 021C 80C6 A3FF"
++		$"0080 8300 00AA A4FF 00D5 8400 021C 80C6"
++		$"A2FF 002B 8800 8055 015B 9C81 AA00 D597"
++		$"FF94 0003 0580 80D5 92FF 0030 9600 0307"
++		$"3575 C68F FF01 DA04 9900 0135 918E FF00"
++		$"AA9B 0000 2B8E FF01 AA2B 9A00 012B E38F"
++		$"FF02 8E55 1C97 0000 3C93 FF00 C080 8000"
++		$"2B92 0000 AA9D FF00 E380 AA02 551C 0485"
++		$"0000 5588 FF02 E380 4380 0002 0B6B EA8F"
++		$"FF01 E380 8400 0055 88FF 0035 8200 00D5"
++		$"93FF 002B 8300 00AA 87FF 00C6 8200 009C"
++		$"83FF 04E3 2B47 AAD5 89FF 0055 8200 001C"
++		$"88FF 00AA 8200 84FF 028E 0098 89FF 01E3"
++		$"8082 0001 2BE3 88FF 00AA 8200 00DA 83FF"
++		$"03D5 000B AA85 FF03 DF88 550B 8200 0340"
++		$"FFD5 AA88 FF00 1C81 0000 5584 FF01 D53C"
++		$"8D00 042B 9CFF DA78 89FF 00AE 8200 0155"
++		$"DA84 FF03 CD80 5539 8300 0935 5555 AAAA"
++		$"FFFF CD40 808B FF01 C80B 8200 00AA 91FF"
++		$"04DF 8000 05AA 8DFF 01E3 7183 0004 5555"
++		$"8EAA C686 FF08 C6AA 8E55 550E 2380 E391"
++		$"FF01 8E55 9000 0304 1C60 C697 FF01 AA80"
++		$"8A00 0220 2B80 9FFF 00C6 84AA 00E3 92FF"
++		$"CAFF 04FE D340 FFFE A9FF 0271 D571 A9FF"
++		$"04E3 00FF 8E71 9EFF 00FE 85FF 0680 355F"
++		$"FFD5 00C0 9BFF 03AA 8E55 5583 0007 0E0B"
++		$"39E5 FFFF 002B 98FF 018E 3987 0002 3975"
++		$"D580 FF02 C600 0096 FF00 A887 0002 0BA9"
++		$"FD83 FF02 5500 0095 FF00 AA85 0002 4EB3"
++		$"D484 FF01 E380 8000 0075 93FF 0080 8400"
++		$"0071 87FF 01AA 1C82 0000 6091 FF00 AA84"
++		$"0000 8087 FF00 4F85 0000 4090 FF00 3983"
++		$"0001 06E3 82FF 04DC DCFF FF87 8700 00C6"
++		$"8EFF 00E2 8400 0080 80FF 0795 FFFF 97CA"
++		$"FFFF 7187 0000 548E FF00 AA84 0081 FF08"
++		$"60FE FF95 CAFF FFD3 1087 008E FF00 AA84"
++		$"0081 FF09 72DC FFED B8FF FFFE D41C 8600"
++		$"8EFF 00C6 8400 0080 80FF 01ED DB84 FF01"
++		$"E31C 8400 0040 8EFF 01FE 0B84 008A FF00"
++		$"D584 0000 A98F FF00 7F84 0001 69FE 81FF"
++		$"03ED C9E5 FE81 FF00 D582 0000 4591 FF00"
++		$"2B84 0000 6982 FF02 A660 A682 FF00 5580"
++		$"0000 5593 FF00 2B84 0000 4081 FF02 E560"
++		$"6082 FF03 5500 002B 94FF 01E6 3984 0000"
++		$"5581 FF01 B0CA 81FF 04D5 2300 5BE3 96FF"
++		$"01D5 7183 0000 8E85 FF03 8F06 38E3 99FF"
++		$"0160 0B82 0000 8083 FF02 8040 8097 FF03"
++		$"FED4 8E40 8100 0307 1C55 C683 FF01 E2AA"
++		$"99FF 0077 8200 021C 7FC6 A3FF 0080 8300"
++		$"00AA A4FF 00D3 8400 021C 7FC6 A2FF 002A"
++		$"8800 8055 015B 9C81 AA02 D5FF FE95 FF94"
++		$"0003 0580 80D5 92FF 0030 9600 0307 3575"
++		$"C68F FF01 D904 9900 0135 918E FF00 AA9B"
++		$"0000 2B8E FF01 AA2B 9A00 012B E38F FF02"
++		$"8E55 1C97 0000 3C93 FF00 C080 8000 2B92"
++		$"0000 A99D FF00 E180 AA02 551C 0485 0000"
++		$"5588 FF02 E280 4380 0003 0B6B E9FE 8EFF"
++		$"01E3 8084 0000 5587 FF01 FE35 8200 00D5"
++		$"87FF 01FE FE87 FF00 2B83 0000 AA87 FF00"
++		$"C682 0000 9C83 FF06 E32B 47AA D5FE FE87"
++		$"FF00 5582 0001 1CFE 87FF 00AA 8200 84FF"
++		$"028E 0098 89FF 01E3 8082 0002 2BE3 FE87"
++		$"FF00 AA82 0000 DA83 FF03 D500 0BAA 81FF"
++		$"07FD FDFF FFDF 8855 0B82 0003 40FF D5AA"
++		$"88FF 001C 8100 0055 83FF 02FE D53C 8D00"
++		$"042B 9CFF D978 89FF 00AD 8200 0155 D984"
++		$"FF03 CD7F 5539 8300 0935 5555 AAAA FFFF"
++		$"CD40 808B FF01 C70B 8200 00AA 88FF 00FE"
++		$"81FD 08FF FFFE FEDF 8000 05AA 8DFF 01E3"
++		$"7183 0007 5555 8EAA C6FF FFFE 81FF 0AFE"
++		$"FEC6 AA8E 5455 0E23 80E3 91FF 018D 5590"
++		$"0003 041C 60C6 96FF 02FD A980 8A00 0320"
++		$"2B7F FE9E FF00 C684 AA03 E3FF FFFE 8FFF"
++		$"9AFF 01FD FDAB FF04 FAD0 40FF FDA8 FF03"
++		$"FD71 D571 A9FF 04E3 00FF 8E71 9EFF 00FC"
++		$"85FF 0680 3568 FFD5 00C0 9BFF 03AA 8E55"
++		$"5583 0007 150B 39E5 FFFF 002B 98FF 018E"
++		$"3987 0002 3978 D580 FF02 C600 0096 FF00"
++		$"A387 0002 0BA5 F883 FF02 5500 0095 FF00"
++		$"AA85 0003 4EAA D2FD 83FF 01E3 8080 0000"
++		$"7893 FF00 8084 0000 7187 FF01 AA1C 8200"
++		$"006A 91FF 00AA 8400 0080 87FF 004C 8500"
++		$"0040 90FF 0039 8300 010B E382 FF04 E4E3"
++		$"FFFF 8787 0000 C68E FF00 DF84 0000 8080"
++		$"FF07 AAFF FFAE D5FF FF70 8700 0052 8EFF"
++		$"00AA 8400 81FF 0880 FAFF AAD5 FFFF D010"
++		$"8700 8EFF 00AA 8400 80FF 0AFD 8EE3 FFEF"
++		$"C6FF FFFC D21C 8600 8EFF 00C3 8400 0080"
++		$"80FF 01EF E183 FF02 FDE3 1C84 0000 408E"
++		$"FF01 FA0B 8400 8AFF 00D5 8400 00A8 8FFF"
++		$"007F 8400 0167 FC81 FF03 EFD2 EAFC 81FF"
++		$"00D5 8200 0053 90FF 01FD 2B84 0000 6781"
++		$"FF03 FDB7 80B5 82FF 0055 8000 0055 93FF"
++		$"002B 8400 0040 81FF 02EA 8080 82FF 0355"
++		$"0000 2B94 FF01 E839 8400 0055 81FF 01C0"
++		$"D581 FF04 D523 0060 E396 FF01 D571 8300"
++		$"008E 85FF 038E 0B37 E399 FF01 6B15 8200"
++		$"0080 83FF 0280 4080 97FF 03FC D28E 4081"
++		$"0004 071C 53C6 FD82 FF02 E1AA FD98 FF00"
++		$"7C82 0004 1C7D C6FF FDA1 FF00 8083 0000"
++		$"AAA4 FF00 D084 0002 1B7D C5A1 FF01 FD28"
++		$"8800 8055 0160 9C81 AA02 D5FF FC95 FF94"
++		$"0003 0B80 80D5 92FF 0035 9600 0307 3578"
++		$"C68F FF01 DD07 9900 0135 958E FF00 AA9B"
++		$"0000 2B8E FF01 A82B 9A00 012B E38E FF03"
++		$"FD8E 551C 9700 013E FD92 FF00 C080 8000"
++		$"2B92 0000 A88B FF00 FD8E FF00 DC80 AA02"
++		$"551C 0785 0000 5588 FF02 E180 4E80 0003"
++		$"0E6B E6FC 8EFF 01E3 8084 0000 5587 FF01"
++		$"FD33 8200 00D5 87FF 01FD FD87 FF00 2B83"
++		$"0000 AA87 FF00 C682 0000 9A83 FF06 E32B"
++		$"55AA D5FC FC85 FF02 FDFF 5582 0001 1CFC"
++		$"87FF 00AA 8200 84FF 038E 0095 FD88 FF01"
++		$"E380 8200 022B E3FA 87FF 00AA 8200 00DF"
++		$"83FF 03D5 000B A881 FF07 F8F8 FFFF DF90"
++		$"550B 8200 0340 FFD5 AA88 FF00 1C81 0000"
++		$"5583 FF02 FCD5 408D 0004 2B9C FFDD 7E88"
++		$"FF01 FDAF 8200 0155 DD84 FF03 CD7D 5539"
++		$"8300 0940 5555 A8AA FDFD CD47 808B FF01"
++		$"CC0B 8200 00AA 88FF 00FA 81F8 08FF FFFA"
++		$"FCDF 8000 0BA8 8CFF 02FD E371 8300 0755"
++		$"558E AAC6 FFFF FC81 FF0A FAFC C6AA 8E52"
++		$"530E 2380 E391 FF01 8C55 9000 0307 1C6B"
++		$"C696 FF02 F8A5 808A 0003 352B 7CFD 9EFF"
++		$"00C6 84AA 03E3 FFFF FC8F FF",
++		/* [10] */
++		'h8mk',
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0005 0500"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0005 FFFF"
++		$"0005 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0005 FFFF"
++		$"FF00 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 00FF FFFF"
++		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0005 0000 0000 0000 0000 FFFF FFFF"
++		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"00FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 00FF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 05FF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0005 FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 00FF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 00DB FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 00FF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0005 FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FF05 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FF00 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 05FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
++		$"0000 0000 0000 00DB FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FF00 0000 0000 0000"
++		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
++		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000"
++		$"0000 0000 0000 0000 0000 0005 FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
++		$"0000 0000 0000 0000 0005 0000 0000 FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
++		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
++		$"0000 0000 0005 FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
++		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
++		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000"
++		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000"
++		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
++		$"0000 0000 0005 FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FF00 0000 0000 0000"
++		$"0000 0000 0000 00DB FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
++		$"0000 0000 0000 0005 FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 00FF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0005 FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"0500 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 FFFF FFFF FFFF FFFF FF00 0005 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000",
++		/* [11] */
++		'ics#',
++		$"0000 00A0 0F10 1C78 1878 1C18 0E20 0600"
++		$"1800 3FD0 1FF8 057C 300C 3358 18A8 0340"
++		$"0070 07F0 1FF0 1FF8 3FF8 3FF8 1FF8 1FF0"
++		$"3FF0 3FFC 3FFE 1FFE 7FFE 7FFE 7FFC 1FF0",
++		/* [12] */
++		'ics4',
++		$"0000 0000 00C0 0000 0000 00CD CDCD 0000"
++		$"0000 EFFD D0CE 0000 000E FA00 0DFF D000"
++		$"000F FDCC 0EFF F000 000F FE00 00EF E000"
++		$"000C FFD0 D0CE 0000 0000 DFF0 0CC0 0000"
++		$"00CF FD00 0000 0000 00DF FFFA EEDD 0000"
++		$"00CA FFFF FFFF FC00 0000 CDDE DEEF FFC0"
++		$"00EF C0C0 000C FF00 00FE 00DD CDDF AD00"
++		$"00DF DCC0 DCDD D000 0000 DDEE EDDC 0000",
++		/* [13] */
++		'ics8',
++		$"0000 0000 0000 0000 0000 2B00 0000 0000"
++		$"0000 0000 0000 2B56 F8F9 F856 0000 0000"
++		$"0000 0000 FBFF FFFB 56F5 F7FC 0000 0000"
++		$"0000 00FC FFFD F500 00F9 FFFF F900 0000"
++		$"0000 F5FF FF56 2B2A F6FB FFFF FF00 0000"
++		$"0000 00FE FFFB 00F5 0000 FBFF FC00 0000"
++		$"0000 00F8 FFFF FA00 7900 F7FD F500 0000"
++		$"0000 00F5 F9FF FDF6 00F6 F800 0000 0000"
++		$"0000 2BEA FF56 0000 0000 0000 0000 0000"
++		$"0000 81FF FFFF FEFD FCFC FAF8 0000 0000"
++		$"0000 F6FE FFFF FFFF FFFF FFFF FEF7 0000"
++		$"0000 0000 2B56 FA81 81FC FDFF FFFF F600"
++		$"0000 ACFE 2B00 2BF5 0000 00F8 FFFF F500"
++		$"00F5 FFFC 0000 FA56 56F8 F9FD FE56 F500"
++		$"0000 56E0 FBF7 F6F6 F856 56F9 56F6 0000"
++		$"0000 0000 F881 FCAC FC81 FA2B 0000 0000",
++		/* [14] */
++		'is32',
++		$"87FF 00C3 87FF 06F3 C79F 9F8C B598 84FF"
++		$"08F3 6008 0B53 9FE8 B34C 84FF 0948 002C"
++		$"EBF8 F884 0400 8182 FF0A E700 0093 B9D2"
++		$"E061 0000 0C82 FF0A F713 0057 FCF5 F1FB"
++		$"5000 4383 FF09 B008 0073 FF8C FFB4 2DE7"
++		$"83FF 08EB 8202 28E3 FFD9 B0FB 83FF 03CB"
++		$"1100 9089 FF00 6880 0006 142B 4050 75B2"
++		$"F782 FF01 D01C 8500 011A AF83 FF13 BF90"
++		$"7860 6048 2401 0009 DFFF FFF7 3B16 C8FF"
++		$"CDEF 80FF 139F 0004 DFFF FFEB 0444 FFFF"
++		$"7F97 9F9F 852D 1A97 F780 FF0B 9A10 54B3"
++		$"DFD4 A79F 9187 96D0 82FF 08EF A36C 4440"
++		$"4863 84C8 81FF 87FF 00C3 87FF 06F3 C79F"
++		$"9F8C B598 84FF 08F3 6008 0B52 9FE8 B34C"
++		$"84FF 0948 002C EBFA FA84 0400 8182 FF0A"
++		$"E700 0093 CDDF E960 0000 0C82 FF0A F713"
++		$"0057 FCF8 F5FB 5000 4383 FF09 B008 0072"
++		$"FFAD FFB4 2DE7 83FF 08EB 8202 28E3 FFD9"
++		$"B0FB 83FF 03CB 1100 8F89 FF00 6880 0006"
++		$"142B 4050 74B2 F782 FF01 D01C 8500 011A"
++		$"AF83 FF13 BF90 7860 6048 2401 0008 DFFF"
++		$"FFF7 3A16 C8FF CDEF 80FF 139F 0004 DFFF"
++		$"FFEB 0444 FFFF 7F97 9F9F 852D 1A97 F780"
++		$"FF0B 9910 54B3 DFD4 A79F 9086 96D0 82FF"
++		$"08EF A36C 4440 4863 84C8 81FF 86FF 01FE"
++		$"C287 FF06 F3C7 9F9F 8DB6 9884 FF08 F35F"
++		$"080B 519F E8B3 4D84 FF09 4800 2DEB FBFB"
++		$"8304 0083 82FF 0AE7 0000 93D7 E5ED 5F00"
++		$"000C 82FF 0AF6 1300 56FC F9F6 FB50 0044"
++		$"83FF 09B0 0800 72FF BDFF B42D E783 FF08"
++		$"EA83 0328 E3FF D9B0 FB83 FF03 CB12 008F"
++		$"89FF 0068 8000 0614 2B40 5075 B2F7 82FF"
++		$"01D1 1C85 0001 1AAF 83FF 2ABF 9078 6060"
++		$"4724 0100 09DF FFFF F73C 16C8 FFCF EEFE"
++		$"FFFF 9F00 04DF FFFF EB04 45FF FF7E 979F"
++		$"9F86 2D1A 98F6 80FF 0B9A 1055 B3DF D3A7"
++		$"9D91 8596 D182 FF08 EFA3 6C44 4048 6584"
++		$"C981 FF",
++		/* [15] */
++		's8mk',
++		$"0000 0000 0000 0000 0005 FF05 0000 0000"
++		$"0000 0000 00FF FFFF FFFF FFFF 0000 0000"
++		$"0000 00FF FFFF FFFF FFFF FFFF 0000 0000"
++		$"0000 00FF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 FFFF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 FFFF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 00FF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 00FF FFFF FFFF FFFF FFFF 0000 0000"
++		$"0000 FFFF FFFF FFFF FFFF FFFF 0000 0000"
++		$"0000 FFFF FFFF FFFF FFFF FFFF FFFF 0000"
++		$"0000 FFFF FFFF FFFF FFFF FFFF FFFF FF00"
++		$"0000 0005 FFFF FFFF FFFF FFFF FFFF FF00"
++		$"00FF FFFF FFFF FFFF FFFF FFFF FFFF FF00"
++		$"00FF FFFF FFFF FFFF FFFF FFFF FFFF FF00"
++		$"0005 FFFF FFFF FFFF FFFF FFFF FFFF 0000"
++		$"0000 00FF FFFF FFFF FFFF FFFF 0000 0000",
++		/* [16] */
++		'icm#',
++		$"0000 0350 1C30 1C78 1C10 0620 1900 3FF8"
++		$"0B7C 300C 31B0 0720 0070 0FF0 1FF8 3FF8"
++		$"3FF8 1FF0 3FF8 3FFC 1FFE 7FFE 7FFE 3FF8",
++		/* [17] */
++		'icm4',
++		$"0000 0000 00C0 0000 0000 CDEE ECCE 0000"
++		$"000D FAC0 0DEF C000 000F FD0C 0DFF F000"
++		$"000E FFC0 C0DF C000 0000 DFEC 00CC 0000"
++		$"00CF FDC0 C000 0000 00DF FFFF FFFE D000"
++		$"000C DDEE EEFF FF00 00AE C0C0 000D FEC0"
++		$"00FE C0CD DEDE DC00 000C DDED DDDC C000",
++		/* [18] */
++		'icm8',
++		$"0000 0000 0000 0000 0000 F800 0000 0000"
++		$"0000 0000 2BFA FBAC 8156 F681 0000 0000"
++		$"0000 00FA FFFD F7F5 0056 FDFF F800 0000"
++		$"0000 F5FF FF56 2B2A F556 FFFF FF00 0000"
++		$"0000 00FB FFFE F600 4F00 56FF F800 0000"
++		$"0000 00F5 81EA FEF5 00F6 F8F6 0000 0000"
++		$"0000 F8FF FFFA 2BF6 F600 0000 0000 0000"
++		$"0000 56FF FFFF FFFF FFFF E0FC F9F5 0000"
++		$"0000 00F6 F981 FBFC FCAC FDFF FFFD F500"
++		$"0000 FDFD F600 F700 0000 0056 FFFE F500"
++		$"0000 ACFE 2B00 F7F9 8181 FBFB 81F7 0000"
++		$"0000 00F7 FAFB FBFA FAF9 56F8 F600 0000",
++		/* [19] */
++		'it32',
++		$"0000 0000 FFFF FFFF FFFF C9FF 0100 00FC"
++		$"FF01 0000 F8FF 0000 80FF 0100 00F7 FF01"
++		$"0000 80FF 0100 00F6 FF01 0000 81FF 0100"
++		$"00F5 FF80 0080 FF80 00F4 FF80 0081 FF80"
++		$"00F2 FF81 0081 FF80 00F1 FF00 4080 0082"
++		$"FF81 00ED FF82 0001 2020 83FF 8100 D9FF"
++		$"8D00 0240 2020 8200 0020 84FF 8100 D3FF"
++		$"9B00 85FF 8200 CDFF 9C00 0140 0087 FF82"
++		$"00CA FF9F 0089 FF82 00C7 FF9E 0001 2000"
++		$"8AFF 8300 C5FF 9E00 8EFF 8300 C3FF 9800"
++		$"0040 8000 91FF 8400 C1FF 9C00 93FF 8400"
++		$"C0FF 9700 0160 0096 FF85 00BF FF93 0002"
++		$"4040 0099 FF88 00BC FF94 0000 4099 FF89"
++		$"0001 2000 BAFF 9300 9BFF 8C00 0020 B8FF"
++		$"9300 9AFF 9000 B6FF 9200 9BFF 9000 0120"
++		$"20B4 FF92 009A FF00 4094 00B3 FF91 009A"
++		$"FF97 00B1 FF92 0099 FF00 4097 00B1 FF91"
++		$"0090 FF00 2085 FF01 4040 9800 AFFF 9100"
++		$"0020 8EFF 023A 2020 85FF 9A00 AFFF 9100"
++		$"88FF 0020 83FF 8020 85FF 9B00 AEFF 9100"
++		$"87FF 0120 2083 FF80 2085 FF9B 00AD FF92"
++		$"0086 FF80 2083 FF02 203A 2086 FF9A 00AD"
++		$"FF91 0087 FF80 2083 FF80 2086 FF9B 00AC"
++		$"FF91 0087 FF80 2083 FF80 2087 FF00 4099"
++		$"00AC FF91 0087 FF80 2084 FF80 2087 FF99"
++		$"00AC FF91 0087 FF81 2084 FF01 2020 88FF"
++		$"9800 ACFF 9100 88FF 8020 92FF 9700 ACFF"
++		$"9200 88FF 8020 92FF 9600 ACFF 9200 A1FF"
++		$"9200 0140 00AE FF91 00A2 FF93 00AE FF92"
++		$"00A2 FF91 00AF FF00 4091 00A3 FF90 00B0"
++		$"FF92 00A3 FF8D 0000 60B1 FF01 4040 9000"
++		$"0040 A3FF 8B00 0120 00B2 FF91 0001 4040"
++		$"8CFF 8220 8EFF 8B00 0020 B4FF 9300 8DFF"
++		$"8220 8DFF 8A00 B5FF 9300 0040 8CFF 8320"
++		$"8CFF 8900 B7FF 9200 0140 408C FF82 208C"
++		$"FF88 00B9 FF94 008B FF83 208B FF87 00BB"
++		$"FF94 008B FF82 208B FF86 00BD FF00 2093"
++		$"008A FF81 208C FF85 00BF FF94 008A FF01"
++		$"2020 8CFF 0040 8300 0020 C2FF 9300 99FF"
++		$"8400 C6FF 9200 97FF 8300 CAFF 9000 96FF"
++		$"8300 CDFF 8F00 93FF 0500 2000 2000 00CE"
++		$"FF01 2020 8E00 90FF 8040 8000 CFFF 0300"
++		$"0020 208D 008F FF01 0000 8040 CFFF 0040"
++		$"9100 90FF 8000 CFFF 9300 E4FF 8E00 0040"
++		$"8100 E6FF 9100 E7FF 0120 208E 00E9 FF8F"
++		$"00EA FF8F 00EA FF90 00E9 FF92 00E8 FF94"
++		$"00E5 FF98 00E2 FF9C 00DD FFA8 00D2 FFA5"
++		$"0004 2000 0040 4089 00C4 FFBC 0000 20BD"
++		$"FFC3 00B7 FFC4 0001 4040 B4FF C800 0020"
++		$"B2FF 0020 CA00 AFFF 0020 CB00 0040 AEFF"
++		$"CD00 0020 ACFF 0020 CF00 ABFF D100 ABFF"
++		$"D000 ABFF D000 ABFF D000 ACFF CF00 AFFF"
++		$"CB00 0020 B0FF CA00 B4FF C700 B9FF C200"
++		$"C2FF B800 D6FF A500 DEFF 9C00 E1FF 0200"
++		$"0020 9600 A2FF 0020 8900 0140 40B1 FF95"
++		$"009F FF03 0000 2020 8900 0040 B4FF 9300"
++		$"9DFF 8D00 0060 B7FF 9200 9CFF 0040 8C00"
++		$"B9FF 9100 9CFF 8D00 BBFF 9000 9CFF 8C00"
++		$"92FF 0200 2020 8200 9FFF 8F00 9CFF 8B00"
++		$"0020 92FF 0400 0020 2000 A3FF 8F00 9CFF"
++		$"8B00 0060 91FF 8100 A5FF 8E00 9DFF 8B00"
++		$"92FF 8100 A4FF 8E00 9EFF 8B00 91FF 8100"
++		$"0060 A3FF 8E00 9FFF 8B00 92FF 8200 A0FF"
++		$"8F00 A0FF 8B00 92FF 8200 0040 9CFF 0100"
++		$"408F 0082 FF00 009B FF8B 0000 2092 FF84"
++		$"0095 FF01 4020 9100 0140 4082 FF01 0000"
++		$"9CFF 8B00 93FF AE00 0240 4000 83FF 0100"
++		$"009D FF8C 0093 FF01 0020 AC00 84FF 0120"
++		$"009F FF8C 0094 FFAA 0085 FF01 2020 A0FF"
++		$"0020 8C00 95FF 0100 40A2 0087 FF80 00A2"
++		$"FF8D 0097 FF94 0000 2084 008A FF03 0000"
++		$"2000 A4FF 8D00 0020 9BFF 8E00 0020 8FFF"
++		$"0400 4000 0020 A6FF 0020 8D00 BBFF 8400"
++		$"A8FF 0040 8E00 B5FF 0040 8300 0120 00AC"
++		$"FF91 00AF FF02 0040 4083 00B0 FF95 00A3"
++		$"FF8A 00B4 FF99 0097 FF8C 0001 4000 B8FF"
++		$"BC00 0220 0000 BDFF BA00 0020 C3FF B000"
++		$"0020 8000 C9FF A400 0120 2083 00D3 FF9F"
++		$"0004 2020 4000 00DC FF92 00FF FFFF FFB3"
++		$"FFFF FFCA FF00 FBFD FF00 FBFC FF03 FBFB"
++		$"0000 F6FF 01FB FB81 FF01 0000 80FF 00FB"
++		$"F4FF 0000 80FF 0100 00F7 FF01 0000 80FF"
++		$"0100 00F5 FF02 FB00 0081 FF01 0000 F5FF"
++		$"8000 80FF 8000 F4FF 8000 81FF 8000 F2FF"
++		$"8100 81FF 8000 F1FF 0040 8000 82FF 8100"
++		$"D6FF 00FB 93FF 8200 0220 20FB 82FF 8100"
++		$"D9FF 8D00 0240 2020 8200 0220 FFFB 82FF"
++		$"8100 D3FF 9B00 01FB FB83 FF82 00CD FF9C"
++		$"0001 4000 87FF 8200 CAFF 9F00 89FF 8200"
++		$"C7FF 9E00 0120 008A FF83 00C5 FF9E 008E"
++		$"FF83 00C0 FF02 FBFB FF98 0000 4080 0001"
++		$"FBFB 8FFF 8400 C0FF 00FB 9C00 03FF FFFB"
++		$"FB8F FF84 00C0 FF97 0003 6000 FBFB 94FF"
++		$"8500 BFFF 9300 0440 4000 FBFB 97FF 8800"
++		$"BCFF 9400 0440 FFFF FBFB 95FF 8900 0120"
++		$"00BA FF93 009B FF8C 0000 20B8 FF93 009A"
++		$"FF90 00B6 FF92 009B FF90 0001 2020 B4FF"
++		$"9200 99FF 01FB 4094 00B3 FF91 009A FF97"
++		$"00B1 FF92 008D FF00 FB88 FF00 4097 00B1"
++		$"FF91 008E FF02 FBFF 6085 FF01 4040 9800"
++		$"AFFF 9100 0020 8EFF 026E 6060 85FF 9A00"
++		$"ADFF 01FB FF91 0088 FF00 6083 FF80 6085"
++		$"FF9B 0000 FBAB FF01 FBFF 9100 87FF 0160"
++		$"6083 FF80 6085 FF9B 0000 FBAC FF92 0086"
++		$"FF80 6083 FF02 606E 6084 FF01 FBFF 9A00"
++		$"ADFF 9100 87FF 8060 83FF 8060 86FF 9B00"
++		$"ACFF 9100 87FF 8060 01FB FB81 FF80 6085"
++		$"FF02 FBFB 4099 00AC FF91 0087 FF80 6084"
++		$"FF80 6084 FF02 FBFB FF99 00AC FF91 0086"
++		$"FF00 FB81 6082 FF03 FBFF 6060 88FF 9800"
++		$"ACFF 9100 88FF 8060 90FF 01FB FF97 00AC"
++		$"FF92 0088 FF80 608F FF02 FBFF FF96 00AC"
++		$"FF92 0088 FF03 FBFF FFFB 92FF 9200 0140"
++		$"00AC FF01 FBFB 9100 A2FF 9300 ACFF 01FB"
++		$"FB92 00A2 FF91 00AF FF00 4091 00A3 FF90"
++		$"0000 FBAF FF92 0001 FBFB 8CFF 80FB 8FFF"
++		$"8D00 0060 B1FF 0140 4090 0002 40FF FB91"
++		$"FF00 FB8C FF8B 0001 2000 B2FF 9100 0240"
++		$"40FB 8BFF 8260 01FF FB8C FF8B 0001 20FB"
++		$"B1FF 01FB FF93 0001 FBFB 89FF 01FB FF82"
++		$"6001 FBFB 8BFF 8A00 B5FF 9300 0040 8CFF"
++		$"8360 8CFF 8900 B7FF 9200 0140 408B FF00"
++		$"FB82 608C FF88 00B9 FF94 008B FF83 608B"
++		$"FF87 00BB FF94 008B FF82 608B FF86 00BD"
++		$"FF00 2093 008A FF81 608C FF85 00BE FF00"
++		$"FB94 008A FF01 6060 8CFF 0040 8300 0020"
++		$"C2FF 9300 99FF 8400 C6FF 9200 94FF 02FB"
++		$"FBFF 8300 CAFF 9000 94FF 01FB FB83 00CD"
++		$"FF8F 0093 FF06 0020 0020 0000 FBCD FF01"
++		$"2020 8E00 90FF 8040 8000 CFFF 0300 0020"
++		$"208D 008F FF01 0000 8040 CFFF 0040 9100"
++		$"80FF 00FB 8AFF 01FB FF80 0001 FFFB CAFF"
++		$"02FB FFFF 9300 E1FF 02FB FBFF 8E00 0040"
++		$"8100 01FF FBE2 FF01 FBFB 9100 81FF 00FB"
++		$"E2FF 0120 208E 0000 FBE8 FF8F 00EA FF8F"
++		$"00EA FF90 00E8 FF00 FB92 0001 FBFB E5FF"
++		$"00FB 9400 E5FF 9800 00FB DFFF 01FB FB9C"
++		$"00DD FFA8 008F FF01 FBFB BEFF A500 0420"
++		$"0000 4040 8900 C4FF BC00 0020 BDFF C300"
++		$"B7FF C400 0140 40B4 FFC8 0000 20B2 FF00"
++		$"20CA 00AF FF00 20CB 0000 40AE FFCD 0000"
++		$"20AB FF01 FB20 CF00 ABFF D100 ABFF D000"
++		$"ABFF D000 ABFF D000 A8FF 00FB 80FF CF00"
++		$"AFFF CB00 0220 FBFB AEFF CA00 ABFF 00FB"
++		$"85FF C700 B9FF C200 00FB C1FF B800 D4FF"
++		$"01FB FBA5 00D3 FF01 FBFB 86FF 9C00 A3FF"
++		$"00FB BAFF 0200 0020 9600 A2FF 0020 8900"
++		$"0440 40FF FBFB AEFF 9500 9FFF 0300 0020"
++		$"2089 0004 40FF FFFB FBB0 FF93 009C FF00"
++		$"FB8D 0000 60B7 FF92 009A FF02 FBFB 408C"
++		$"00B9 FF91 009C FF8D 009C FF01 FBFB 9AFF"
++		$"9000 9CFF 8C00 92FF 0200 2020 8200 80FF"
++		$"01FB FB9A FF8F 009C FF8B 0002 20FF FB90"
++		$"FF04 0000 2020 0084 FF01 FBFB 9AFF 8F00"
++		$"00FB 9BFF 8B00 0060 91FF 8100 A1FF 00FB"
++		$"80FF 8E00 80FF 00FB 99FF 8B00 92FF 8100"
++		$"A4FF 8E00 81FF 00FB 99FF 8B00 91FF 8100"
++		$"0060 A3FF 8E00 81FF 01FB FB99 FF8B 0092"
++		$"FF82 0080 FF00 FB9C FF8F 00A0 FF8B 0092"
++		$"FF82 0003 40FF FFFB 99FF 0100 408F 0082"
++		$"FF00 009B FF8B 0000 2092 FF84 0088 FF83"
++		$"FB84 FF01 4020 9100 0140 4082 FF01 0000"
++		$"9CFF 8B00 90FF 02FB FBFF AE00 0240 4000"
++		$"81FF 03FB FB00 009D FF8C 0093 FF01 0020"
++		$"AC00 84FF 0120 009F FF8C 0094 FFAA 0085"
++		$"FF01 2020 9EFF 02FB FB20 8C00 02FF FFFB"
++		$"92FF 0100 40A2 0002 FFFF FB84 FF80 00A2"
++		$"FF8D 0096 FF00 FB94 0000 2084 0001 FFFB"
++		$"84FF 00FB 80FF 0300 0020 00A4 FF8D 0000"
++		$"209B FF8E 0000 208F FF04 0040 0000 20A6"
++		$"FF00 208D 009E FF8A FB8D FF84 0000 FBA6"
++		$"FF01 FB40 8E00 AFFF 80FB 80FF 0040 8300"
++		$"0120 00A9 FF02 FBFF FF91 00AB FF80 FB03"
++		$"FF00 4040 8300 B0FF 9500 89FF 01FB FB89"
++		$"FF81 FB85 FF8A 00B4 FF99 0097 FF8C 0001"
++		$"4000 B8FF BC00 0220 0000 BDFF BA00 0020"
++		$"BFFF 00FB 80FF B000 0020 8000 C7FF 01FB"
++		$"FBA4 0001 2020 8300 CCFF 01FB FB82 FF9F"
++		$"0008 2020 4000 00FF FFFB FBD8 FF92 0084"
++		$"FF01 FBFB FFFF FFFF AAFF FFFF CAFF 00F0"
++		$"FDFF 00F0 FCFF 03F0 F000 00F6 FF01 F0F0"
++		$"81FF 0100 0080 FF00 F0F4 FF00 0080 FF01"
++		$"0000 F7FF 0100 0080 FF01 0000 F5FF 02F0"
++		$"0000 81FF 0100 00F5 FF80 0080 FF80 00F4"
++		$"FF80 0081 FF80 00F2 FF81 0081 FF80 00F1"
++		$"FF00 4080 0082 FF81 00D6 FF00 F093 FF82"
++		$"0002 4040 F082 FF81 00D9 FF8D 0080 4082"
++		$"0002 40FF F082 FF81 00D3 FF9B 0001 F0F0"
++		$"83FF 8200 CDFF 9C00 0140 0087 FF82 00CA"
++		$"FF9F 0089 FF82 00C7 FF9E 0001 4000 8AFF"
++		$"8300 C5FF 9E00 8EFF 8300 C0FF 02F0 F0FF"
++		$"9800 0040 8000 01F0 F08F FF84 00C0 FF00"
++		$"F09C 0003 FFFF F0F0 8FFF 8400 C0FF 9700"
++		$"0340 00F0 F094 FF85 00BF FF93 0004 4040"
++		$"00F0 F097 FF88 00BC FF94 0004 40FF FFF0"
++		$"F095 FF89 0001 4000 BAFF 9300 9BFF 8C00"
++		$"0040 B8FF 9300 9AFF 9000 B6FF 9200 9BFF"
++		$"9000 0140 40B4 FF92 0099 FF01 F040 9400"
++		$"B3FF 9100 9AFF 9700 B1FF 9200 8DFF 00F0"
++		$"88FF 0040 9700 B1FF 9100 8EFF 02F0 FF80"
++		$"85FF 0140 4098 00AF FF91 0000 408E FF02"
++		$"A580 8085 FF9A 00AD FF01 F0FF 9100 88FF"
++		$"0080 83FF 8080 85FF 9B00 00F0 ABFF 01F0"
++		$"FF91 0087 FF01 8080 83FF 8080 85FF 9B00"
++		$"00F0 ACFF 9200 86FF 8080 83FF 0280 A580"
++		$"84FF 01F0 FF9A 00AD FF91 0087 FF80 8083"
++		$"FF80 8086 FF9B 00AC FF91 0087 FF80 8001"
++		$"F0F0 81FF 8080 85FF 02F0 F040 9900 ACFF"
++		$"9100 87FF 8080 84FF 8080 84FF 02F0 F0FF"
++		$"9900 ACFF 9100 86FF 00F0 8180 82FF 03F0"
++		$"FF80 8088 FF98 00AC FF91 0088 FF80 8090"
++		$"FF01 F0FF 9700 ACFF 9200 88FF 8080 8FFF"
++		$"02F0 FFFF 9600 ACFF 9200 88FF 03F0 FFFF"
++		$"F092 FF92 0001 4000 ACFF 01F0 F091 00A2"
++		$"FF93 00AC FF01 F0F0 9200 A2FF 9100 AFFF"
++		$"0040 9100 A3FF 9000 00F0 AFFF 9200 01F0"
++		$"F08C FF80 F08F FF8D 0000 80B1 FF01 4040"
++		$"9000 0240 FFF0 91FF 00F0 8CFF 8B00 0140"
++		$"00B2 FF91 0002 4040 F08B FF82 8001 FFF0"
++		$"8CFF 8B00 0140 F0B1 FF01 F0FF 9300 01F0"
++		$"F089 FF01 F0FF 8280 01F0 F08B FF8A 00B5"
++		$"FF93 0000 408C FF83 808C FF89 00B7 FF92"
++		$"0001 4040 8BFF 00F0 8280 8CFF 8800 B9FF"
++		$"9400 8BFF 8380 8BFF 8700 BBFF 9400 8BFF"
++		$"8280 8BFF 8600 BDFF 0040 9300 8AFF 8180"
++		$"8CFF 8500 BEFF 00F0 9400 8AFF 0180 808C"
++		$"FF00 4083 0000 40C2 FF93 0099 FF84 00C6"
++		$"FF92 0094 FF02 F0F0 FF83 00CA FF90 0094"
++		$"FF01 F0F0 8300 CDFF 8F00 93FF 0600 4000"
++		$"4000 00F0 CDFF 0140 408E 0090 FF80 4080"
++		$"00CF FF03 0000 4040 8D00 8FFF 0100 0080"
++		$"40CF FF00 4091 0080 FF00 F08A FF01 F0FF"
++		$"8000 01FF F0CA FF02 F0FF FF93 00E1 FF02"
++		$"F0F0 FF8E 0000 4081 0001 FFF0 E2FF 01F0"
++		$"F091 0081 FF00 F0E2 FF01 4040 8E00 00F0"
++		$"E8FF 8F00 EAFF 8F00 EAFF 9000 E8FF 00F0"
++		$"9200 01F0 F0E5 FF00 F094 00E5 FF98 0000"
++		$"F0DF FF01 F0F0 9C00 DDFF A800 8FFF 01F0"
++		$"F0BE FFA5 0004 4000 0040 4089 00C4 FFBC"
++		$"0000 40BD FFC3 00B7 FFC4 0001 4040 B4FF"
++		$"C800 0040 B2FF 0040 CA00 AFFF 0040 CB00"
++		$"0040 AEFF CD00 0040 ABFF 01F0 40CF 00AB"
++		$"FFD1 00AB FFD0 00AB FFD0 00AB FFD0 00A8"
++		$"FF00 F080 FFCF 00AF FFCB 0002 40F0 F0AE"
++		$"FFCA 00AB FF00 F085 FFC7 00B9 FFC2 0000"
++		$"F0C1 FFB8 00D4 FF01 F0F0 A500 D3FF 01F0"
++		$"F086 FF9C 00A3 FF00 F0BA FF02 0000 4096"
++		$"00A2 FF00 4089 0004 4040 FFF0 F0AE FF95"
++		$"009F FF03 0000 4040 8900 0440 FFFF F0F0"
++		$"B0FF 9300 9CFF 00F0 8D00 0080 B7FF 9200"
++		$"9AFF 02F0 F040 8C00 B9FF 9100 9CFF 8D00"
++		$"9CFF 01F0 F09A FF90 009C FF8C 0092 FF02"
++		$"0040 4082 0080 FF01 F0F0 9AFF 8F00 9CFF"
++		$"8B00 0240 FFF0 90FF 0400 0040 4000 84FF"
++		$"01F0 F09A FF8F 0000 F09B FF8B 0000 4091"
++		$"FF81 00A1 FF00 F080 FF8E 0080 FF00 F099"
++		$"FF8B 0092 FF81 00A4 FF8E 0081 FF00 F099"
++		$"FF8B 0091 FF81 0000 40A3 FF8E 0081 FF01"
++		$"F0F0 99FF 8B00 92FF 8200 80FF 00F0 9CFF"
++		$"8F00 A0FF 8B00 92FF 8200 0340 FFFF F099"
++		$"FF01 0040 8F00 82FF 0000 9BFF 8B00 0040"
++		$"92FF 8400 88FF 83F0 84FF 0140 4091 0001"
++		$"4040 82FF 0100 009C FF8B 0090 FF02 F0F0"
++		$"FFAE 0002 4040 0081 FF03 F0F0 0000 9DFF"
++		$"8C00 93FF 0100 40AC 0084 FF01 4000 9FFF"
++		$"8C00 94FF AA00 85FF 0140 409E FF02 F0F0"
++		$"408C 0002 FFFF F092 FF01 0040 A200 02FF"
++		$"FFF0 84FF 8000 A2FF 8D00 96FF 00F0 9400"
++		$"0040 8400 01FF F084 FF00 F080 FF03 0000"
++		$"4000 A4FF 8D00 0040 9BFF 8E00 0040 8FFF"
++		$"0400 4000 0040 A6FF 0040 8D00 9EFF 8AF0"
++		$"8DFF 8400 00F0 A6FF 01F0 408E 00AF FF80"
++		$"F080 FF00 4083 0001 4000 A9FF 02F0 FFFF"
++		$"9100 ABFF 80F0 03FF 0040 4083 00B0 FF95"
++		$"0089 FF01 F0F0 89FF 81F0 85FF 8A00 B4FF"
++		$"9900 97FF 8C00 0140 00B8 FFBC 0002 4000"
++		$"00BD FFBA 0000 40BF FF00 F080 FFB0 0000"
++		$"4080 00C7 FF01 F0F0 A400 0140 4083 00CC"
++		$"FF01 F0F0 82FF 9F00 8040 0500 00FF FFF0"
++		$"F0D8 FF92 0084 FF01 F0F0 FFFF FFFF AAFF",
++		/* [20] */
++		't8mk',
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0005"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0500 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0505 FFFF 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0005 0500"
++		$"00FF FFFF FF00 0000 0500 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0005"
++		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"FFFF FFFF FFFF FFFF FF00 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 00FF"
++		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 BFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0500 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 00FF FFFF FFFF"
++		$"DBFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF BFDB DBFF FFFF FFFF"
++		$"DBFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 00FF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF BFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0505 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF BFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"05FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 00FF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF DBFF"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 00FF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"DB00 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 00FF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFDB DB00 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0500 FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FF05 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0500 FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FF05 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFBF FF00 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0505 FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0505 FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 BFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF 0500 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF 9B00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 00BF BFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFDB FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFDB 0500 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0005 00FF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 00FF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFBF BFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FF00 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 00FF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 00DB"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0005"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFBF FFFF FFFF FFFF DB00 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FF00 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFDB FFDB FFFF 0500 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00DB DBFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF BFBF"
++		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 00FF FFDB DBFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFBF BFBF"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 BFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0500"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0500 00FF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0005 0500 FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0005 05FF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 00DB DBFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 05FF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 05FF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FF00 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0505 FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FF00 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFBF FFFF FFFF"
++		$"FFFF FFFF FFFF FF00 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 DBFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 DBFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FF00 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 05DB FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FF00"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FF00 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0500 0000 FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0005 0000"
++		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 00FF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 00FF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0500 0000 0000 0000"
++		$"0000 0000 0000 FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 00DB FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF BFBF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 FFFF DBDB FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF BFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0005 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0005"
++		$"05BF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 00FF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 00FF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 00FF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 00FF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FF00 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 00FF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 00FF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 00FF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FF00 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFBF BFFF FFFF FFFF FFFF FFFF"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFDB FF00"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"00FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFDB 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0005"
++		$"05DB FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FF00 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF DBFF 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFBF FFFF DB00 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 DBFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF 0500 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 05BF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFBF"
++		$"FFFF FFFF FFFF DBFF 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0500 00FF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFBF"
++		$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 00FF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 00FF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"BFFF 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 00FF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF DBFF FF00"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 00FF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF DB00 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0005"
++		$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF DBFF FFFF 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0505 FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFDB DBFF"
++		$"FFFF FFFF FF00 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0505 0000 0000 00FF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF FFFF FFFF FFFF FFDB DBBF"
++		$"FFFF 0000 0505 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"00FF FFFF FFFF FFFF FFFF FFFF FFFF FFFF"
++		$"FFFF FFFF FFFF 0000 0000 0000 0005 0500"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++		$"0000 0000 0000 0000 0000 0000 0000 0000"
++	}
++};
+diff --git a/psi/dwimg.c b/psi/dwimg.c
+--- a/psi/dwimg.c
++++ b/psi/dwimg.c
+@@ -1437,25 +1437,33 @@ WndImg2Proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
+ 	    if (img->hwndtext)
+ 		SendMessage(img->hwndtext, message, wParam, lParam);
+ 	    else {
+-		char szFile[256];
++		char *szFile;
+ 		int i, cFiles;
++		unsigned int Len, error;
+ 		const char *p;
+ 		const char *szDragPre = "\r(";
+ 		const char *szDragPost = ") run\r";
+ 		HDROP hdrop = (HDROP)wParam;
+ 		cFiles = DragQueryFile(hdrop, (UINT)(-1), (LPSTR)NULL, 0);
+ 		for (i=0; i<cFiles; i++) {
+-		    DragQueryFile(hdrop, i, szFile, 80);
+-		    for (p=szDragPre; *p; p++)
+-			    SendMessage(hwnd,WM_CHAR,*p,1L);
+-		    for (p=szFile; *p; p++) {
+-			if (*p == '\\')
+-			    SendMessage(hwnd,WM_CHAR,'/',1L);
+-			else
+-			    SendMessage(hwnd,WM_CHAR,*p,1L);
++		    Len = DragQueryFile(hdrop, i, NULL, 0);
++		    szFile = malloc(Len+1);
++		    if (szFile != 0) {
++			error = DragQueryFile(hdrop, i, szFile, Len+1);
++			if (error != 0) {
++			    for (p=szDragPre; *p; p++)
++				SendMessage(hwnd,WM_CHAR,*p,1L);
++			    for (p=szFile; *p; p++) {
++				if (*p == '\\')
++				    SendMessage(hwnd,WM_CHAR,'/',1L);
++				else
++				    SendMessage(hwnd,WM_CHAR,*p,1L);
++			    }
++			    for (p=szDragPost; *p; p++)
++				SendMessage(hwnd,WM_CHAR,*p,1L);
++			}
++			free(szFile);
+ 		    }
+-		    for (p=szDragPost; *p; p++)
+-			    SendMessage(hwnd,WM_CHAR,*p,1L);
+ 		}
+ 		DragFinish(hdrop);
+ 	    }
+diff --git a/psi/dwtext.c b/psi/dwtext.c
+--- a/psi/dwtext.c
++++ b/psi/dwtext.c
+@@ -652,25 +652,33 @@ int ch;
+ void
+ text_drag_drop(TW *tw, HDROP hdrop)
+ {
+-    char szFile[256];
++    char *szFile;
+     int i, cFiles;
++    unsigned int Len, error;
+     const char *p;
+     if ( (tw->DragPre==NULL) || (tw->DragPost==NULL) )
+ 	    return;
+ 
+     cFiles = DragQueryFile(hdrop, (UINT)(-1), (LPSTR)NULL, 0);
+     for (i=0; i<cFiles; i++) {
+-	DragQueryFile(hdrop, i, szFile, 80);
+-	for (p=tw->DragPre; *p; p++)
+-		SendMessage(tw->hwnd,WM_CHAR,*p,1L);
+-	for (p=szFile; *p; p++) {
+-	    if (*p == '\\')
+-		SendMessage(tw->hwnd,WM_CHAR,'/',1L);
+-	    else 
+-		SendMessage(tw->hwnd,WM_CHAR,*p,1L);
++	Len = DragQueryFile(hdrop, i, NULL, 0);
++	szFile = (char *)malloc(Len+1);
++	if (szFile != 0) {
++	    error = DragQueryFile(hdrop, i, szFile, Len+1);
++	    if (error != 0) {
++		for (p=tw->DragPre; *p; p++)
++		    SendMessage(tw->hwnd,WM_CHAR,*p,1L);
++		for (p=szFile; *p; p++) {
++		    if (*p == '\\')
++			SendMessage(tw->hwnd,WM_CHAR,'/',1L);
++		    else 
++			SendMessage(tw->hwnd,WM_CHAR,*p,1L);
++		}
++		for (p=tw->DragPost; *p; p++)
++		    SendMessage(tw->hwnd,WM_CHAR,*p,1L);
++	    }
++	    free(szFile);
+ 	}
+-	for (p=tw->DragPost; *p; p++)
+-		SendMessage(tw->hwnd,WM_CHAR,*p,1L);
+     }
+     DragFinish(hdrop);
+ }
+diff --git a/psi/fapi_ft.c b/psi/fapi_ft.c
+--- a/psi/fapi_ft.c
++++ b/psi/fapi_ft.c
+@@ -26,826 +26,868 @@ Started by Graham Asher, 6th June 2002.
+ #include "write_t2.h"
+ #include "math_.h"
+ #include "gserror.h"
++#include "gxfixed.h"
+ 
+ /* FreeType headers */
+-#include "freetype/freetype.h"
+-#include "freetype/ftincrem.h"
+-#include "freetype/ftglyph.h"
+-#include "freetype/ftoutln.h"
+-#include "freetype/fttrigon.h"
++#include <ft2build.h>
++#include FT_FREETYPE_H
++#include FT_INCREMENTAL_H
++#include FT_GLYPH_H
+ 
+ /* Note: structure definitions here start with FF_, which stands for 'FAPI FreeType". */
+ 
+-typedef struct FF_server_
+-    {
+-    FAPI_server m_fapi_server;
+-    FT_Library m_freetype_library;
+-    FT_OutlineGlyph m_outline_glyph;
+-    FT_BitmapGlyph m_bitmap_glyph;
+-    } FF_server;
++typedef struct FF_server_s
++{
++    FAPI_server fapi_server;
++    FT_Library freetype_library;
++    FT_OutlineGlyph outline_glyph;
++    FT_BitmapGlyph bitmap_glyph;
++} FF_server;
+ 
+-typedef struct FF_face_
+-    {
+-    FT_Face m_ft_face;			                /* The FreeType typeface object. */
+-    FT_Incremental_InterfaceRec* m_ft_inc_int;  /* If non-null, the incremental interface object passed to FreeType. */
+-	unsigned char* m_font_data;					/* Non-null if font data is owned by this object. */
+-    } FF_face;
++typedef struct FF_face_s
++{
++    FT_Face ft_face;
+ 
+-/*
+-This structure has to have the tag FT_IncrementalRec to be compatible with
+-the functions defined in FT_Incremental_FuncsRec.
+-*/
++    /* If non-null, the incremental interface object passed to FreeType. */
++    FT_Incremental_InterfaceRec *ft_inc_int;
++
++    /* Non-null if font data is owned by this object. */
++    unsigned char *font_data;
++} FF_face;
++
++/* Here we define the struct FT_Incremental that is used as an opaque type
++ * inside FreeType. This structure has to have the tag FT_IncrementalRec_
++ * to be compatible with the functions defined in FT_Incremental_FuncsRec. 
++ */
+ typedef struct FT_IncrementalRec_
+-    {
+-    FAPI_font* m_fapi_font;						/* The font. */
+-    unsigned char* m_glyph_data;				/* A one-shot buffer for glyph data. */
+-												/* If it is already in use glyph data is allocated on the heap. */
+-	size_t m_glyph_data_length;					/* Length in bytes of m_glyph_data. */
+-	bool m_glyph_data_in_use;					/* True if m_glyph_data is already in use. */
+-	FT_Incremental_MetricsRec m_glyph_metrics;	/* Incremental glyph metrics supplied by GhostScript. */
+-	unsigned long m_glyph_metrics_index;		/* m_glyph_metrics contains data for this glyph index unless it is 0xFFFFFFFF. */
+-	FAPI_metrics_type m_metrics_type;			/* The metrics type determines whether metrics are replaced, added, etc. */
+-    } FT_IncrementalRec;
++{
++    FAPI_font *fapi_font;		/* The font. */
++
++    /* If it is already in use glyph data is allocated on the heap. */
++    unsigned char *glyph_data;		/* A one-shot buffer for glyph data. */
++    size_t glyph_data_length;		/* Length in bytes of glyph_data. */
++    bool glyph_data_in_use;		/* True if glyph_data is already in use. */
++
++    FT_Incremental_MetricsRec glyph_metrics; /* Incremental glyph metrics supplied by Ghostscript. */
++    unsigned long glyph_metrics_index;	/* contains data for this glyph index unless it is 0xFFFFFFFF. */
++    FAPI_metrics_type metrics_type;	/* determines whether metrics are replaced, added, etc. */
++} FT_IncrementalRec;
+ 
+-static FF_face* new_face(FT_Face a_ft_face,FT_Incremental_InterfaceRec* a_ft_inc_int,
+-						 unsigned char* a_font_data)
++static FF_face *
++new_face(FT_Face a_ft_face, FT_Incremental_InterfaceRec *a_ft_inc_int, unsigned char *a_font_data)
++{
++    FF_face *face = (FF_face *)malloc(sizeof(FF_face));
++    if (face)
+     {
+-	FF_face* face = (FF_face *)malloc(sizeof(FF_face));
+-	if (face)
+-        {
+-	    face->m_ft_face = a_ft_face;
+-        face->m_ft_inc_int = a_ft_inc_int;
+-		face->m_font_data = a_font_data;
+-        }
++	face->ft_face = a_ft_face;
++	face->ft_inc_int = a_ft_inc_int;
++	face->font_data = a_font_data;
++    }
+     return face;
+-    }
++}
+ 
+-static void delete_face(FF_face* a_face)
+-    {
++static void
++delete_face(FF_face *a_face)
++{
+     if (a_face)
+-        {
+-	    FT_Done_Face(a_face->m_ft_face);
+-        free(a_face->m_ft_inc_int);
+-		free(a_face->m_font_data);
+-        free(a_face);
+-        }
++    {
++	FT_Done_Face(a_face->ft_face);
++	free(a_face->ft_inc_int);
++	free(a_face->font_data);
++	free(a_face);
+     }
++}
+ 
+-static FT_IncrementalRec* new_inc_int_info(FAPI_font* a_fapi_font)
+-	{
+-	FT_IncrementalRec* info = (FT_IncrementalRec*)malloc(sizeof(FT_IncrementalRec));
+-	if (info)
+-		{
+-		info->m_fapi_font = a_fapi_font;
+-		info->m_glyph_data = NULL;
+-		info->m_glyph_data_length = 0;
+-		info->m_glyph_data_in_use = false;
+-		info->m_glyph_metrics_index = 0xFFFFFFFF;
+-		info->m_metrics_type = FAPI_METRICS_NOTDEF;
+-		}
+-	return info;
+-	}
++static FT_IncrementalRec *
++new_inc_int_info(FAPI_font *a_fapi_font)
++{
++    FT_IncrementalRec *info = (FT_IncrementalRec*)malloc(sizeof(FT_IncrementalRec));
++    if (info)
++    {
++	info->fapi_font = a_fapi_font;
++	info->glyph_data = NULL;
++	info->glyph_data_length = 0;
++	info->glyph_data_in_use = false;
++	info->glyph_metrics_index = 0xFFFFFFFF;
++	info->metrics_type = FAPI_METRICS_NOTDEF;
++    }
++    return info;
++}
+ 
+-static void delete_inc_int_info(FT_IncrementalRec* a_inc_int_info)
+-	{
+-	if (a_inc_int_info)
+-		{
+-		free(a_inc_int_info->m_glyph_data);
+-		free(a_inc_int_info);
+-		}
+-	}
++static void
++delete_inc_int_info(FT_IncrementalRec *a_inc_int_info)
++{
++    if (a_inc_int_info)
++    {
++	free(a_inc_int_info->glyph_data);
++	free(a_inc_int_info);
++    }
++}
+ 
+-static FT_Error get_fapi_glyph_data(FT_Incremental a_info,FT_UInt a_index,FT_Data* a_data)
+-	{
+-    FAPI_font* ff = a_info->m_fapi_font;
+-	ushort length = 0;
++static FT_Error
++get_fapi_glyph_data(FT_Incremental a_info, FT_UInt a_index, FT_Data *a_data)
++{
++    FAPI_font *ff = a_info->fapi_font;
++    ushort length = 0;
+ 
+-	/* Tell the FAPI interface that we need to decrypt the glyph data. */
+-	ff->need_decrypt = true;
++    /* Tell the FAPI interface that we need to decrypt the glyph data. */
++    ff->need_decrypt = true;
+ 
+-	/* If m_glyph_data is already in use (as will happen for composite glyphs) create a new buffer on the heap. */
+-	if (a_info->m_glyph_data_in_use)
+-		{
+-		unsigned char* buffer = NULL;
+-		length = ff->get_glyph(ff,a_index,NULL,0);
+-		buffer = malloc(length);
+-		if (!buffer)
+-			return FT_Err_Out_Of_Memory;
+-		ff->get_glyph(ff,a_index,buffer,length);
+-		a_data->pointer = buffer;
+-		}
+-	else
+-		{
+-		/*
+-		Save ff->char_data, which is set to null by FAPI_FF_get_glyph as part of a hack to
+-		make the deprecated Type 2 endchar ('seac') work, so that it can be restored
+-		if we need to try again with a longer buffer.
+-		*/
+-		const void* saved_char_data = ff->char_data;
++    /* If glyph_data is already in use (as will happen for composite glyphs)
++     * create a new buffer on the heap.
++     */
++    if (a_info->glyph_data_in_use)
++    {
++	unsigned char *buffer = NULL;
++	length = ff->get_glyph(ff, a_index, NULL, 0);
++	buffer = malloc(length);
++	if (!buffer)
++	    return FT_Err_Out_Of_Memory;
++	ff->get_glyph(ff, a_index, buffer, length);
++	a_data->pointer = buffer;
++    }
++    else
++    {
++	/* Save ff->char_data, which is set to null by FAPI_FF_get_glyph as part of a hack to
++	 * make the deprecated Type 2 endchar ('seac') work, so that it can be restored
++	 * if we need to try again with a longer buffer.
++	 */
++	const void *saved_char_data = ff->char_data;
+ 
+-		/* Get as much of the glyph data as possible into the buffer */
+-		length = ff->get_glyph(ff,a_index,a_info->m_glyph_data,(ushort)a_info->m_glyph_data_length);
++	/* Get as much of the glyph data as possible into the buffer */
++	length = ff->get_glyph(ff, a_index, a_info->glyph_data, (ushort)a_info->glyph_data_length);
+ 
+-		/* If the buffer was too small enlarge it and try again. */
+-		if (length > a_info->m_glyph_data_length)
+-			{
+-			a_info->m_glyph_data = realloc(a_info->m_glyph_data,length);
+-			if (!a_info->m_glyph_data)
+-				{
+-				a_info->m_glyph_data_length = 0;
+-				return FT_Err_Out_Of_Memory;
+-				}
+-			a_info->m_glyph_data_length = length;
+-			ff->char_data = saved_char_data;
+-			ff->get_glyph(ff,a_index,a_info->m_glyph_data,length);
+-			}
++	/* If the buffer was too small enlarge it and try again. */
++	if (length > a_info->glyph_data_length)
++	{
++	    a_info->glyph_data = realloc(a_info->glyph_data, length);
++	    if (!a_info->glyph_data)
++	    {
++		a_info->glyph_data_length = 0;
++		return FT_Err_Out_Of_Memory;
++	    }
++	    a_info->glyph_data_length = length;
++	    ff->char_data = saved_char_data;
++	    ff->get_glyph(ff, a_index, a_info->glyph_data, length);
++	}
+ 
+-		/* Set the returned pointer and length. */
+-		a_data->pointer = a_info->m_glyph_data;
++	/* Set the returned pointer and length. */
++	a_data->pointer = a_info->glyph_data;
+ 
+-		a_info->m_glyph_data_in_use = true;
+-		}
++	a_info->glyph_data_in_use = true;
++    }
+ 
+-	a_data->length = length;
+-	return 0;
+-	}
++    a_data->length = length;
++    return 0;
++}
+ 
+-static void free_fapi_glyph_data(FT_Incremental a_info,FT_Data* a_data)
+-	{
+-	if (a_data->pointer == (const FT_Byte*)a_info->m_glyph_data)
+-		a_info->m_glyph_data_in_use = false;
+-	else
+-		free((FT_Byte*)a_data->pointer);
+-	}
++static void
++free_fapi_glyph_data(FT_Incremental a_info, FT_Data *a_data)
++{
++    if (a_data->pointer == (const FT_Byte*)a_info->glyph_data)
++	a_info->glyph_data_in_use = false;
++    else
++	free((FT_Byte*)a_data->pointer);
++}
+ 
+-static FT_Error get_fapi_glyph_metrics(FT_Incremental a_info,FT_UInt a_glyph_index,
+-									   FT_Bool bVertical, FT_Incremental_MetricsRec* a_metrics)
++static FT_Error
++get_fapi_glyph_metrics(FT_Incremental a_info, FT_UInt a_glyph_index,
++	FT_Bool bVertical, FT_Incremental_MetricsRec *a_metrics)
++{
++    /* fixme : bVertical is not implemented. */
++    if (a_info->glyph_metrics_index == a_glyph_index)
++    {
++	switch (a_info->metrics_type)
+ 	{
+-	    /* fixme : bVertical is not implemented. */
+-	if (a_info->m_glyph_metrics_index == a_glyph_index)
+-		{
+-		switch (a_info->m_metrics_type)
+-			{
+-			case FAPI_METRICS_ADD:
+-				a_metrics->advance += a_info->m_glyph_metrics.advance;
+-				break;
+-			case FAPI_METRICS_REPLACE_WIDTH:
+-				a_metrics->advance = a_info->m_glyph_metrics.advance;
+-				break;
+-			case FAPI_METRICS_REPLACE:
+-				*a_metrics = a_info->m_glyph_metrics;
+-				break;
+-			default:
+-				/* This can't happen. */
+-				return FT_Err_Invalid_Argument;
+-			}
+-		}
+-	return 0;
++	    case FAPI_METRICS_ADD:
++		a_metrics->advance += a_info->glyph_metrics.advance;
++		break;
++	    case FAPI_METRICS_REPLACE_WIDTH:
++		a_metrics->advance = a_info->glyph_metrics.advance;
++		break;
++	    case FAPI_METRICS_REPLACE:
++		*a_metrics = a_info->glyph_metrics;
++		break;
++	    default:
++		/* This can't happen. */
++		return FT_Err_Invalid_Argument;
+ 	}
++    }
++    return 0;
++}
+ 
+-static const FT_Incremental_FuncsRec TheFAPIIncrementalInterfaceFuncs =
+-    {
++static const
++FT_Incremental_FuncsRec TheFAPIIncrementalInterfaceFuncs =
++{
+     get_fapi_glyph_data,
+-	free_fapi_glyph_data,
++    free_fapi_glyph_data,
+     get_fapi_glyph_metrics
+-    };
++};
+ 
+-static FT_Incremental_InterfaceRec* new_inc_int(FAPI_font* a_fapi_font)
+-	{
+-	FT_Incremental_InterfaceRec* i = (FT_Incremental_InterfaceRec*)malloc(sizeof(FT_Incremental_InterfaceRec));
+-	if (i)
+-		{
+-		i->object = (FT_Incremental)new_inc_int_info(a_fapi_font);
+-		i->funcs = &TheFAPIIncrementalInterfaceFuncs;
+-		}
+-	if (!i->object)
+-		{
+-		free(i);
+-		i = NULL;
+-		}
+-	return i;
+-	}
+-
+-static void delete_inc_int(FT_Incremental_InterfaceRec* a_inc_int)
+-	{
+-	if (a_inc_int)
+-		{
+-		delete_inc_int_info(a_inc_int->object);
+-		free(a_inc_int);
+-		}
+-	}
++static FT_Incremental_InterfaceRec *
++new_inc_int(FAPI_font *a_fapi_font)
++{
++    FT_Incremental_InterfaceRec *i =
++	(FT_Incremental_InterfaceRec*) malloc(sizeof(FT_Incremental_InterfaceRec)); /* malloc!? /Tor */
++    if (i)
++    {
++	i->object = (FT_Incremental)new_inc_int_info(a_fapi_font);
++	i->funcs = &TheFAPIIncrementalInterfaceFuncs;
++    }
++    if (!i->object)
++    {
++	free(i);
++	i = NULL;
++    }
++    return i;
++}
+ 
+-/*
+-Convert FreeType error codes to GhostScript ones.
+-Very rudimentary because most don't correspond.
+-*/
+-static int ft_to_gs_error(FT_Error a_error)
++static void
++delete_inc_int(FT_Incremental_InterfaceRec *a_inc_int)
++{
++    if (a_inc_int)
+     {
++	delete_inc_int_info(a_inc_int->object);
++	free(a_inc_int);
++    }
++}
++
++/* Convert FreeType error codes to GhostScript ones.
++ * Very rudimentary because most don't correspond.
++ */
++static int
++ft_to_gs_error(FT_Error a_error)
++{
+     if (a_error)
+-        {
+-        if (a_error == FT_Err_Out_Of_Memory)
+-            return e_VMerror;
+-        else
+-            return e_unknownerror;
+-        }
+-    return 0;
++    {
++	if (a_error == FT_Err_Out_Of_Memory)
++	    return e_VMerror;
++	else
++	    return e_unknownerror;
+     }
++    return 0;
++}
+ 
+-/*
+-Load a glyph and optionally rasterize it. Return its metrics in a_metrics.
+-If a_bitmap is true convert the glyph to a bitmap.
+-*/
+-static FAPI_retcode load_glyph(FAPI_font* a_fapi_font,const FAPI_char_ref *a_char_ref,
+-							   FAPI_metrics* a_metrics,FT_Glyph* a_glyph,bool a_bitmap)	 
+-	{
++/* Load a glyph and optionally rasterize it. Return its metrics in a_metrics.
++ * If a_bitmap is true convert the glyph to a bitmap.
++ */
++static FAPI_retcode
++load_glyph(FAPI_font *a_fapi_font, const FAPI_char_ref *a_char_ref,
++	FAPI_metrics *a_metrics, FT_Glyph *a_glyph, bool a_bitmap)
++{
+     FT_Error ft_error = 0;
+-	FF_face* face = (FF_face*)a_fapi_font->server_font_data;
+-	FT_Face ft_face = face->m_ft_face;
++    FF_face *face = (FF_face*)a_fapi_font->server_font_data;
++    FT_Face ft_face = face->ft_face;
+     int index = a_char_ref->char_code;
+ 
+-	/*
+-	Save a_fapi_font->char_data, which is set to null by FAPI_FF_get_glyph as part of a hack to
+-	make the deprecated Type 2 endchar ('seac') work, so that it can be restored
+-	after the first call to FT_Load_Glyph.
+-	*/
+-	const void* saved_char_data = a_fapi_font->char_data;
++    /* Save a_fapi_font->char_data, which is set to null by FAPI_FF_get_glyph as part of a hack to
++     * make the deprecated Type 2 endchar ('seac') work, so that it can be restored
++     * after the first call to FT_Load_Glyph.
++     */
++    const void *saved_char_data = a_fapi_font->char_data;
+ 
+     if (!a_char_ref->is_glyph_index)
+-		{
+-		if (ft_face->num_charmaps)
+-			index = FT_Get_Char_Index(ft_face,index);
+-		else
+-			/*
+-			If there are no character maps and no glyph index, loading the glyph will still work
+-			properly if both glyph data and metrics are supplied by the incremental interface.
+-			In that case we use a dummy glyph index which will be passed
+-			back to FAPI_FF_get_glyph by get_fapi_glyph_data.
++    {
++	if (ft_face->num_charmaps)
++	    index = FT_Get_Char_Index(ft_face, index);
++	else
++	{
++	    /* If there are no character maps and no glyph index, loading the glyph will still work
++	     * properly if both glyph data and metrics are supplied by the incremental interface.
++	     * In that case we use a dummy glyph index which will be passed
++	     * back to FAPI_FF_get_glyph by get_fapi_glyph_data.
++	     *
++	     * Type 1 fonts don't use the code and can appear to FreeType to have only one glyph,
++	     * so we have to set the index to 0.
++	     *
++	     * For other font types, FAPI_FF_get_glyph requires the character code
++	     * when getting data.
++	     */
++	    if (a_fapi_font->is_type1)
++		index = 0;
++	    else
++		index = a_char_ref->char_code;
++	}
++    }
+ 
+-			*/
+-			{
+-			/*
+-			Type 1 fonts don't use the code and can appear to FreeType to have only one glyph,
+-			so we have to set the index to 0.
+-			*/
+-			if (a_fapi_font->is_type1)
+-				index = 0;
+-			/*
+-			For other font types, FAPI_FF_get_glyph requires the character code when getting
+-			data.
+-			*/
+-			else
+-				index = a_char_ref->char_code;
+-			}
+-		}
++    /* Refresh the pointer to the FAPI_font held by the incremental interface. */
++    if (face->ft_inc_int)
++	face->ft_inc_int->object->fapi_font = a_fapi_font;
+ 
+-	/* Refresh the pointer to the FAPI_font held by the incremental interface. */
+-	if (face->m_ft_inc_int)
+-		face->m_ft_inc_int->object->m_fapi_font = a_fapi_font;
++    /* Store the overriding metrics if they have been supplied. */
++    if (face->ft_inc_int && a_char_ref->metrics_type != FAPI_METRICS_NOTDEF)
++    {
++	FT_Incremental_MetricsRec *m = &face->ft_inc_int->object->glyph_metrics;
++	m->bearing_x = a_char_ref->sb_x >> 16;
++	m->bearing_y = a_char_ref->sb_y >> 16;
++	m->advance = a_char_ref->aw_x >> 16;
++	face->ft_inc_int->object->glyph_metrics_index = index;
++	face->ft_inc_int->object->metrics_type = a_char_ref->metrics_type;
++    }
+ 
+-	/* Store the overriding metrics if they have been supplied. */
+-	if (face->m_ft_inc_int && a_char_ref->metrics_type != FAPI_METRICS_NOTDEF)
+-		{
+-		FT_Incremental_MetricsRec* m = &face->m_ft_inc_int->object->m_glyph_metrics;
+-		m->bearing_x = a_char_ref->sb_x >> 16;
+-		m->bearing_y = a_char_ref->sb_y >> 16;
+-		m->advance = a_char_ref->aw_x >> 16;
+-		face->m_ft_inc_int->object->m_glyph_metrics_index = index;
+-		face->m_ft_inc_int->object->m_metrics_type = a_char_ref->metrics_type;
+-		}
+-
+-    ft_error = FT_Load_Glyph(ft_face,index,FT_LOAD_MONOCHROME | FT_LOAD_NO_SCALE);
++    ft_error = FT_Load_Glyph(ft_face, index, FT_LOAD_MONOCHROME | FT_LOAD_NO_SCALE);
+     if (!ft_error && a_metrics)
+-	    {
+-	    a_metrics->bbox_x0 = ft_face->glyph->metrics.horiBearingX;
+-	    a_metrics->bbox_y0 = ft_face->glyph->metrics.horiBearingY - ft_face->glyph->metrics.height;
+-	    a_metrics->bbox_x1 = a_metrics->bbox_x0 + ft_face->glyph->metrics.width;
+-	    a_metrics->bbox_y1 = a_metrics->bbox_y0 + ft_face->glyph->metrics.height;
+-	    a_metrics->escapement = ft_face->glyph->metrics.horiAdvance;
+-	    a_metrics->em_x = ft_face->units_per_EM;
+-	    a_metrics->em_y = ft_face->units_per_EM;
+-	    }
++    {
++	a_metrics->bbox_x0 = ft_face->glyph->metrics.horiBearingX;
++	a_metrics->bbox_y0 = ft_face->glyph->metrics.horiBearingY - ft_face->glyph->metrics.height;
++	a_metrics->bbox_x1 = a_metrics->bbox_x0 + ft_face->glyph->metrics.width;
++	a_metrics->bbox_y1 = a_metrics->bbox_y0 + ft_face->glyph->metrics.height;
++	a_metrics->escapement = ft_face->glyph->metrics.horiAdvance;
++	a_metrics->em_x = ft_face->units_per_EM;
++	a_metrics->em_y = ft_face->units_per_EM;
++    }
+ 
+     /* We have to load the glyph again, scale it correctly, and render it if we need a bitmap. */
+     if (!ft_error)
+-		{
+-		a_fapi_font->char_data = saved_char_data;
+-	    ft_error = FT_Load_Glyph(ft_face,index,a_bitmap ? FT_LOAD_MONOCHROME | FT_LOAD_RENDER: FT_LOAD_MONOCHROME);
+-		}
++    {
++	a_fapi_font->char_data = saved_char_data;
++	ft_error = FT_Load_Glyph(ft_face, index, a_bitmap ? FT_LOAD_MONOCHROME | FT_LOAD_RENDER: FT_LOAD_MONOCHROME);
++    }
+     if (!ft_error && a_glyph)
+-	    ft_error = FT_Get_Glyph(ft_face->glyph,a_glyph);
++	ft_error = FT_Get_Glyph(ft_face->glyph, a_glyph);
+     return ft_to_gs_error(ft_error);
+-	} 
+-
+-/**
+-Ensure that the rasterizer is open.
+-
+-In the case of FreeType this means creating the FreeType library object.
+-*/
+-static FAPI_retcode ensure_open(FAPI_server* a_server, const byte *server_param, int server_param_size)
+-	{
+-	FF_server* s = (FF_server*)a_server;
+-	if (!s->m_freetype_library)
+-		{
+-		FT_Error ft_error = FT_Init_FreeType(&s->m_freetype_library);
+-		if (ft_error)
+-			return ft_to_gs_error(ft_error);
+-		}
++} 
++
++/*
++ * Ensure that the rasterizer is open.
++ *
++ * In the case of FreeType this means creating the FreeType library object.
++ */
++static FAPI_retcode
++ensure_open(FAPI_server *a_server, const byte *server_param, int server_param_size)
++{
++    FF_server *s = (FF_server*)a_server;
++    if (!s->freetype_library)
++    {
++	FT_Error ft_error = FT_Init_FreeType(&s->freetype_library);
++	if (ft_error)
++	    return ft_to_gs_error(ft_error);
++    }
++    return 0;
++}
++
++static void
++transform_concat(FT_Matrix *a_A, const FT_Matrix *a_B)
++{
++    FT_Matrix result = *a_B;
++    FT_Matrix_Multiply(a_A, &result);
++    *a_A = result;
++}
++
++/* Create a transform representing an angle defined as a vector. */
++static void
++make_rotation(FT_Matrix *a_transform, const FT_Vector *a_vector)
++{
++    FT_Fixed length, cos, sin;
++    if (a_vector->x >= 0 && a_vector->y == 0)
++    {
++	a_transform->xx = a_transform->yy = 65536;
++	a_transform->xy = a_transform->yx = 0;
++	return;
++    }
++
++    length = FT_Vector_Length((FT_Vector*)a_vector);
++    cos = FT_DivFix(a_vector->x, length);
++    sin = FT_DivFix(a_vector->y, length);
++    a_transform->xx = a_transform->yy = cos;
++    a_transform->xy = -sin;
++    a_transform->yx = sin;
++}
++
++/* Divide a transformation into a scaling part and a rotation-and-shear part.
++ * The scaling part is used for setting the pixel size for hinting.
++ */
++static void
++transform_decompose(FT_Matrix *a_transform, FT_Fixed *a_x_scale, FT_Fixed *a_y_scale)
++{
++    float a = a_transform->xx / 65536.0;
++    float b = a_transform->xy / 65536.0;
++    float c = a_transform->yx / 65536.0;
++    float d = a_transform->yy / 65536.0;
++
++    float scale = sqrt(fabs(a * d - b * c));
++
++    a_transform->xx = a / scale * 65536.0;
++    a_transform->xy = b / scale * 65536.0;
++    a_transform->yx = c / scale * 65536.0;
++    a_transform->yy = d / scale * 65536.0;
++
++    *a_x_scale = scale * 65536.0;
++    *a_y_scale = scale * 65536.0;
++}
++
++/*
++ * Open a font and set its size.
++ */
++static FAPI_retcode
++get_scaled_font(FAPI_server *a_server, FAPI_font *a_font,
++	const FAPI_font_scale *a_font_scale,
++	const char *a_map,
++	FAPI_descendant_code a_descendant_code)
++{
++    FF_server *s = (FF_server*)a_server;
++    FF_face *face = (FF_face*)a_font->server_font_data;
++    FT_Error ft_error = 0;
++
++    /* dpf("get_scaled_font enter: is_type1=%d is_cid=%d font_file_path='%s' a_descendant_code=%d\n",
++       a_font->is_type1, a_font->is_cid, a_font->font_file_path ? a_font->font_file_path : "", a_descendant_code); */
++
++    /* If this font is the top level font of an embedded CID type 0 font (font type 9)
++     * do nothing. See the comment in FAPI_prepare_font. The descendant fonts are
++     * passed in individually.
++     */
++    if (a_font->is_cid && a_font->is_type1 && a_font->font_file_path == NULL &&
++	    (a_descendant_code == FAPI_TOPLEVEL_BEGIN ||
++	     a_descendant_code == FAPI_TOPLEVEL_COMPLETE))
++    {
++	/* dpf("get_scaled_font return 0\n"); */
+ 	return 0;
+-	}
++    }
+ 
+-static void transform_concat(FT_Matrix* a_A,const FT_Matrix* a_B)
+-	{
+-	FT_Matrix result = *a_B;
+-	FT_Matrix_Multiply(a_A,&result);
+-	*a_A = result;
+-	}
++    /* Create the face if it doesn't already exist. */
++    if (!face)
++    {
++	FT_Face ft_face = NULL;
++	FT_Parameter ft_param;
++	FT_Incremental_InterfaceRec *ft_inc_int = NULL;
++	unsigned char *own_font_data = NULL;
+ 
+-/** Create a transform representing an angle defined as a vector. */
+-static void make_rotation(FT_Matrix* a_transform,const FT_Vector* a_vector)
+-	{
+-	FT_Fixed length, cos, sin;
+-	if (a_vector->x >= 0 && a_vector->y == 0)
+-		{
+-		a_transform->xx = a_transform->yy = 65536;
+-		a_transform->xy = a_transform->yx = 0;
+-		return;
+-		}
++	/* dpf("get_scaled_font creating face\n"); */
+ 
+-	length = FT_Vector_Length((FT_Vector*)a_vector);
+-	cos = FT_DivFix(a_vector->x,length);
+-	sin = FT_DivFix(a_vector->y,length);
+-	a_transform->xx = a_transform->yy = cos;
+-	a_transform->xy = -sin;
+-	a_transform->yx = sin;
++	/* Load a typeface from a file. */
++	if (a_font->font_file_path)
++	{
++	    ft_error = FT_New_Face(s->freetype_library, a_font->font_file_path, a_font->subfont, &ft_face);
++	    if (!ft_error && ft_face)
++		ft_error = FT_Select_Charmap(ft_face, ft_encoding_unicode);
+ 	}
+ 
+-/**
+-Divide a transformation into a scaling part and a rotation-and-shear part.
+-The scaling part is used for setting the pixel size for hinting.
+-*/
+-static void transform_decompose(FT_Matrix* a_transform,
+-								FT_Fixed* a_x_scale,FT_Fixed* a_y_scale)
++	/* Load a typeface from a representation in GhostScript's memory. */
++	else
+ 	{
+-	FT_Matrix rotation;
+-	bool have_rotation = false;
+-	FT_Vector v;
+-
+-	/*
+-	Set v to the result of applying the matrix to the (1,0) vector
+-	and reverse the direction of rotation by negating the y coordinate.
+-	*/
+-	v.x = a_transform->xx;
+-	v.y = -a_transform->yx;
+-	if (v.y || v.x < 0)
+-		{
+-		have_rotation = true;
++	    FT_Open_Args open_args;
++	    open_args.flags = FT_OPEN_MEMORY;
+ 
+-		/* Get the inverse of the rotation. */
+-		make_rotation(&rotation,&v);
++	    if (a_font->is_type1)
++	    {
++		long length;
++		int type = a_font->get_word(a_font, FAPI_FONT_FEATURE_FontType, 0);
+ 
+-		/* Remove the rotation. */
+-		transform_concat(a_transform,&rotation);
+-		}
++		/* Tell the FAPI interface that we need to decrypt the /Subrs data. */
++		a_font->need_decrypt = true;
+ 
+-	/* Separate the scales from the transform. */
+-	*a_x_scale = a_transform->xx;
+-	if (*a_x_scale < 0)
+-		{
+-		*a_x_scale = -*a_x_scale;
+-		a_transform->xx = -65536;
+-		}
+-	else
+-		a_transform->xx = 65536;
+-	*a_y_scale = a_transform->yy;
+-	if (*a_y_scale < 0)
+-		{
+-		*a_y_scale = -*a_y_scale;
+-		a_transform->yy = -65536;
+-		}
+-	else
+-		a_transform->yy = 65536;
+-	a_transform->yx = FT_DivFix(a_transform->yx,*a_x_scale);
+-	a_transform->xy = FT_DivFix(a_transform->xy,*a_y_scale);
+-
+-	if (have_rotation)
+-		{
+-		/* Add back the rotation. */
+-		rotation.xy = -rotation.xy;
+-		rotation.yx = -rotation.yx;
+-		transform_concat(a_transform,&rotation);
+-		}
+-	}
+-
+-/**
+-Open a font and set its size.
+-*/
+-static FAPI_retcode get_scaled_font(FAPI_server* a_server,FAPI_font* a_font,
+-									const FAPI_font_scale* a_font_scale,
+-									const char* a_map,
+-									FAPI_descendant_code a_descendant_code)
+-	{
+-	FF_server* s = (FF_server*)a_server;
+-	FF_face* face = (FF_face*)a_font->server_font_data;
+-	FT_Error ft_error = 0;
+-
+-	/* dpf("get_scaled_font enter: is_type1=%d is_cid=%d font_file_path='%s' a_descendant_code=%d\n",
+-		a_font->is_type1,a_font->is_cid,a_font->font_file_path ? a_font->font_file_path : "",a_descendant_code); */
+-
+-	/*
+-	If this font is the top level font of an embedded CID type 0 font (font type 9)
+-	do nothing. See the comment in FAPI_prepare_font. The descendant fonts are
+-	passed in individually.
+-	*/
+-	if (a_font->is_cid && a_font->is_type1 && a_font->font_file_path == NULL &&
+-		(a_descendant_code == FAPI_TOPLEVEL_BEGIN ||
+-		 a_descendant_code == FAPI_TOPLEVEL_COMPLETE))
+-		{
+-		/* dpf("get_scaled_font return 0\n"); */
+-		return 0;
+-		}
+-
+-	/* Create the face if it doesn't already exist. */
+-	if (!face)
+-		{
+-		FT_Face ft_face = NULL;
+-		FT_Parameter ft_param;
+-        FT_Incremental_InterfaceRec* ft_inc_int = NULL;
+-		unsigned char* own_font_data = NULL;
+-
+-		/* dpf("get_scaled_font creating face\n"); */
+-
+-		/* Load a typeface from a file. */
+-		if (a_font->font_file_path)
+-			{
+-			ft_error = FT_New_Face(s->m_freetype_library,a_font->font_file_path,a_font->subfont,&ft_face);
+-			if (!ft_error && ft_face)
+-				ft_error = FT_Select_Charmap(ft_face,ft_encoding_unicode);
+-			}
+-		
+-		/* Load a typeface from a representation in GhostScript's memory. */
++		/*
++		   Serialise a type 1 font in PostScript source form, or
++		   a Type 2 font in binary form, so that FreeType can read it.
++		 */
++		if (type == 1)
++		    length = FF_serialize_type1_font(a_font, NULL, 0);
+ 		else
+-			{
+-			FT_Open_Args open_args;
+-			open_args.flags = FT_OPEN_MEMORY;
+-
+-			if (a_font->is_type1)
+-				{
+-				long length;
+-				int type = a_font->get_word(a_font,FAPI_FONT_FEATURE_FontType,0);
+-
+-				/* Tell the FAPI interface that we need to decrypt the /Subrs data. */
+-				a_font->need_decrypt = true;
+-
+-				/*
+-				Serialise a type 1 font in PostScript source form, or
+-				a Type 2 font in binary form, so that FreeType can read it.
+-				*/
+-				if (type == 1)
+-					length = FF_serialize_type1_font(a_font,NULL,0);
+-				else
+-					length = FF_serialize_type2_font(a_font,NULL,0);
+-				open_args.memory_base = own_font_data = malloc(length);
+-				if (!open_args.memory_base)
+-					return e_VMerror;
+-				if (type == 1)
+-					open_args.memory_size = FF_serialize_type1_font(a_font,own_font_data,length);
+-				else
+-					open_args.memory_size = FF_serialize_type2_font(a_font,own_font_data,length);
+-				if (open_args.memory_size != length)
+-				    return_error(e_unregistered); /* Must not happen. */
+-				ft_inc_int = new_inc_int(a_font);
+-				if (!ft_inc_int)
+-					{
+-					free(own_font_data);
+-					return e_VMerror;
+-					}
+-				}
+-
+-			/* It must be type 42 (see code in FAPI_FF_get_glyph in zfapi.c). */
+-			else 
+-				{
+-				/* Get the length of the TrueType data. */
+-				open_args.memory_size = a_font->get_long(a_font,FAPI_FONT_FEATURE_TT_size,0);
+-				if (open_args.memory_size == 0)
+-					return e_invalidfont;
+-
+-				/* Load the TrueType data into a single buffer. */
+-				open_args.memory_base = own_font_data = malloc(open_args.memory_size);
+-				if (!own_font_data)
+-					return e_VMerror;
+-				if (a_font->serialize_tt_font(a_font,own_font_data,open_args.memory_size))
+-					return e_invalidfont;
+-
+-				/* We always load incrementally. */
+-				ft_inc_int = new_inc_int(a_font);
+-                if (!ft_inc_int)
+-					{
+-					free(own_font_data);
+-				    return e_VMerror;
+-					}
+-				}
+-
+-			if (ft_inc_int)
+-				{
+-				open_args.flags = (FT_UInt)(open_args.flags | FT_OPEN_PARAMS);
+-				ft_param.tag = FT_PARAM_TAG_INCREMENTAL;
+-				ft_param.data = ft_inc_int;
+-				open_args.num_params = 1;
+-				open_args.params = &ft_param;
+-				}
+-			ft_error = FT_Open_Face(s->m_freetype_library,&open_args,a_font->subfont,&ft_face);
+-			}
+-
+-		if (ft_face)
+-			{
+-			face = new_face(ft_face,ft_inc_int,own_font_data);
+-			if (!face)
+-                {
+-				free(own_font_data);
+-				FT_Done_Face(ft_face);
+-				delete_inc_int(ft_inc_int);
+-				return e_VMerror;
+-                }
+-			a_font->server_font_data = face;
+-			}
++		    length = FF_serialize_type2_font(a_font, NULL, 0);
++		open_args.memory_base = own_font_data = malloc(length);
++		if (!open_args.memory_base)
++		    return e_VMerror;
++		if (type == 1)
++		    open_args.memory_size = FF_serialize_type1_font(a_font, own_font_data, length);
+ 		else
+-			a_font->server_font_data = NULL;	
++		    open_args.memory_size = FF_serialize_type2_font(a_font, own_font_data, length);
++		if (open_args.memory_size != length)
++		    return_error(e_unregistered); /* Must not happen. */
++		ft_inc_int = new_inc_int(a_font);
++		if (!ft_inc_int)
++		{
++		    free(own_font_data);
++		    return e_VMerror;
+ 		}
+-
+-	/*
+-	Set the point size and transformation.
+-	The matrix is scaled by the shift specified in the server, 16,
+-	so we divide by 65536 when converting to a gs_matrix.
+-	*/
+-	if (face)
++	    }
++
++	    /* It must be type 42 (see code in FAPI_FF_get_glyph in zfapi.c). */
++	    else 
++	    {
++		/* Get the length of the TrueType data. */
++		open_args.memory_size = a_font->get_long(a_font, FAPI_FONT_FEATURE_TT_size, 0);
++		if (open_args.memory_size == 0)
++		    return e_invalidfont;
++
++		/* Load the TrueType data into a single buffer. */
++		open_args.memory_base = own_font_data = malloc(open_args.memory_size);
++		if (!own_font_data)
++		    return e_VMerror;
++		if (a_font->serialize_tt_font(a_font, own_font_data, open_args.memory_size))
++		    return e_invalidfont;
++
++		/* We always load incrementally. */
++		ft_inc_int = new_inc_int(a_font);
++		if (!ft_inc_int)
+ 		{
+-		static const FT_Matrix ft_reflection = { 65536, 0, 0, -65536 };
+-		FT_Matrix ft_transform;
+-		FT_F26Dot6 width, height;
+-
+-		/*
+-		Convert the GS transform into an FT transform.
+-		Ignore the translation elements because they contain very large values
+-		derived from the current transformation matrix and so are of no use.
+-		*/
+-		ft_transform.xx = a_font_scale->matrix[0];
+-		ft_transform.xy = a_font_scale->matrix[1];
+-		ft_transform.yx = -a_font_scale->matrix[2];
+-		ft_transform.yy = -a_font_scale->matrix[3];
+-
+-		/*
+-		Split the transform into scale factors and a rotation-and-shear
+-		transform.
+-		*/
+-		transform_decompose(&ft_transform,&width,&height);
+-
+-		/* Convert width and height to 64ths of pixels and set the FreeType sizes. */
+-		width >>= 10;
+-		height >>= 10;
+-		ft_error = FT_Set_Char_Size(face->m_ft_face,width,height,
+-									a_font_scale->HWResolution[0] >> 16,
+-									a_font_scale->HWResolution[1] >> 16);
+-		if (ft_error)
+-			{
+-			delete_face(face);
+-			a_font->server_font_data = NULL;
+-			return ft_to_gs_error(ft_error);
+-			}
+-
+-		/*
+-		Concatenate the transform to a reflection around (y=0) so that it
+-		produces a glyph that is upside down in FreeType terms, with its
+-		first row at the bottom. That is what GhostScript needs.
+-		*/
+-		FT_Matrix_Multiply(&ft_reflection,&ft_transform);
+-		
+-		FT_Set_Transform(face->m_ft_face,&ft_transform,NULL);
++		    free(own_font_data);
++		    return e_VMerror;
+ 		}
+-
+-	/* dpf("get_scaled_font return %d\n",a_font->server_font_data ? 0 : -1); */
+-	return a_font->server_font_data ? 0 : -1;
+-	}
+-
+-/**
+-Return the name of a resource which maps names to character codes. Do this by setting a_decoding_id
+-to point to a null-terminated string. The resource is in the 'decoding' directory in the directory named by
+-/GenericResourceDir in \lib\gs_res.ps.
+-*/
+-static FAPI_retcode get_decodingID(FAPI_server* a_server,FAPI_font* a_font,const char** a_decoding_id)
+-	{
+-	*a_decoding_id = "Unicode";
+-	return 0;
++	    }
++
++	    if (ft_inc_int)
++	    {
++		open_args.flags = (FT_UInt)(open_args.flags | FT_OPEN_PARAMS);
++		ft_param.tag = FT_PARAM_TAG_INCREMENTAL;
++		ft_param.data = ft_inc_int;
++		open_args.num_params = 1;
++		open_args.params = &ft_param;
++	    }
++	    ft_error = FT_Open_Face(s->freetype_library, &open_args, a_font->subfont, &ft_face);
+ 	}
+ 
+-/**
+-Get the font bounding box in font units.
+-*/
+-static FAPI_retcode get_font_bbox(FAPI_server* a_server,FAPI_font* a_font,int a_box[4])
++	if (ft_face)
+ 	{
+-	FF_face* face = (FF_face*)a_font->server_font_data;
+-	a_box[0] = face->m_ft_face->bbox.xMin;
+-	a_box[1] = face->m_ft_face->bbox.yMin;
+-	a_box[2] = face->m_ft_face->bbox.xMax;
+-	a_box[3] = face->m_ft_face->bbox.yMax;
+-	return 0;
+-	}
+-
+-/**
+-Return a boolean value in a_proportional stating whether the font is proportional
+-or fixed-width.
+-*/
+-static FAPI_retcode get_font_proportional_feature(FAPI_server* a_server,FAPI_font* a_font,bool* a_proportional)
+-	{
+-	*a_proportional = true;
+-	return 0;
++	    face = new_face(ft_face, ft_inc_int, own_font_data);
++	    if (!face)
++	    {
++		free(own_font_data);
++		FT_Done_Face(ft_face);
++		delete_inc_int(ft_inc_int);
++		return e_VMerror;
++	    }
++	    a_font->server_font_data = face;
+ 	}
+-
+-/**
+-Convert the character name in a_char_ref.char_name to a character code or glyph index and put it in a_char_ref.char_code,
+-setting a_char_ref.is_glyph_index as appropriate. If this is possible set a_result to true, otherwise set it to false.
+-The return value is a standard error return code.
+-*/
+-static FAPI_retcode can_retrieve_char_by_name(FAPI_server* a_server,FAPI_font* a_font,FAPI_char_ref* a_char_ref,
+-											  bool* a_result)
+-	{
+-	FF_face* face = (FF_face*)a_font->server_font_data;
+-	char name[128];
+-	if (FT_HAS_GLYPH_NAMES(face->m_ft_face) && a_char_ref->char_name_length < sizeof(name))
+-		{
+-		memcpy(name,a_char_ref->char_name,a_char_ref->char_name_length);
+-		name[a_char_ref->char_name_length] = 0;
+-		a_char_ref->char_code = FT_Get_Name_Index(face->m_ft_face,name);
+-		*a_result = a_char_ref->char_code != 0;
+-		if (*a_result)
+-			a_char_ref->is_glyph_index = true;
+-		}
+ 	else
+-		*a_result = false;
+-	return 0;
++	    a_font->server_font_data = NULL;	
++    }
++
++    /* Set the point size and transformation.
++     * The matrix is scaled by the shift specified in the server, 16,
++     * so we divide by 65536 when converting to a gs_matrix.
++     */
++    if (face)
++    {
++	static const FT_Matrix ft_reflection = { 65536, 0, 0, -65536 };
++	FT_Matrix ft_transform;
++	FT_F26Dot6 width, height;
++
++	/* Convert the GS transform into an FT transform.
++	 * Ignore the translation elements because they contain very large values
++	 * derived from the current transformation matrix and so are of no use.
++	 */
++	ft_transform.xx = a_font_scale->matrix[0];
++	ft_transform.xy = a_font_scale->matrix[2];
++	ft_transform.yx = a_font_scale->matrix[1];
++	ft_transform.yy = a_font_scale->matrix[3];
++
++	/* Split the transform into scale factors and a rotation-and-shear
++	 * transform.
++	 */
++	transform_decompose(&ft_transform, &width, &height);
++
++	/* Convert width and height to 64ths of pixels and set the FreeType sizes. */
++	width >>= 10;
++	height >>= 10;
++	ft_error = FT_Set_Char_Size(face->ft_face, width, height,
++		a_font_scale->HWResolution[0] >> 16,
++		a_font_scale->HWResolution[1] >> 16);
++	if (ft_error)
++	{
++	    delete_face(face);
++	    a_font->server_font_data = NULL;
++	    return ft_to_gs_error(ft_error);
+ 	}
+ 
+-/**
+-Return non-zero if the metrics can be replaced.
+-*/
+-static FAPI_retcode can_replace_metrics(FAPI_server *a_server,FAPI_font *a_font,FAPI_char_ref *a_char_ref,int *a_result)
+-	{
+-	/* Replace metrics only if the metrics are supplied in font units. */
++	/* Concatenate the transform to a reflection around (y=0) so that it
++	 * produces a glyph that is upside down in FreeType terms, with its
++	 * first row at the bottom. That is what GhostScript needs.
++	 */
++
++	FT_Set_Transform(face->ft_face, &ft_transform, NULL);
++    }
++
++    /* dpf("get_scaled_font return %d\n", a_font->server_font_data ? 0 : -1); */
++    return a_font->server_font_data ? 0 : -1;
++}
++
++/*
++ * Return the name of a resource which maps names to character codes. Do this
++ * by setting a_decoding_id to point to a null-terminated string. The resource
++ * is in the 'decoding' directory in the directory named by /GenericResourceDir
++ * in lib/gs_res.ps.
++ */
++static FAPI_retcode
++get_decodingID(FAPI_server *a_server, FAPI_font *a_font, const char** a_decoding_id)
++{
++    *a_decoding_id = "Unicode";
++    return 0;
++}
++
++/*
++ * Get the font bounding box in font units.
++ */
++static FAPI_retcode
++get_font_bbox(FAPI_server *a_server, FAPI_font *a_font, int a_box[4])
++{
++    FF_face *face = (FF_face*)a_font->server_font_data;
++    a_box[0] = face->ft_face->bbox.xMin;
++    a_box[1] = face->ft_face->bbox.yMin;
++    a_box[2] = face->ft_face->bbox.xMax;
++    a_box[3] = face->ft_face->bbox.yMax;
++    return 0;
++}
++
++/*
++ * Return a boolean value in a_proportional stating whether the font is proportional
++ * or fixed-width.
++ */
++static FAPI_retcode
++get_font_proportional_feature(FAPI_server *a_server, FAPI_font *a_font, bool *a_proportional)
++{
++    *a_proportional = true;
++    return 0;
++}
++
++/* Convert the character name in a_char_ref.char_name to a character code or
++ * glyph index and put it in a_char_ref.char_code, setting
++ * a_char_ref.is_glyph_index as appropriate. If this is possible set a_result
++ * to true, otherwise set it to false.  The return value is a standard error
++ * return code.
++ */
++static FAPI_retcode
++can_retrieve_char_by_name(FAPI_server *a_server, FAPI_font *a_font, FAPI_char_ref *a_char_ref, bool *a_result)
++{
++    FF_face *face = (FF_face*)a_font->server_font_data;
++    char name[128];
++    if (FT_HAS_GLYPH_NAMES(face->ft_face) && a_char_ref->char_name_length < sizeof(name))
++    {
++	memcpy(name, a_char_ref->char_name, a_char_ref->char_name_length);
++	name[a_char_ref->char_name_length] = 0;
++	a_char_ref->char_code = FT_Get_Name_Index(face->ft_face, name);
++	*a_result = a_char_ref->char_code != 0;
++	if (*a_result)
++	    a_char_ref->is_glyph_index = true;
++    }
++    else
++	*a_result = false;
++    return 0;
++}
++
++/*
++ * Return non-zero if the metrics can be replaced.
++ */
++static FAPI_retcode
++can_replace_metrics(FAPI_server *a_server, FAPI_font *a_font, FAPI_char_ref *a_char_ref, int *a_result)
++{
++    /* Replace metrics only if the metrics are supplied in font units. */
+     *a_result = a_char_ref->metrics_scale == 0;
+     return 0;
+-	}
+-
+-/**
+-Retrieve the metrics of a_char_ref and put them in a_metrics.
+-*/
+-static FAPI_retcode get_char_width(FAPI_server *a_server,FAPI_font *a_font,FAPI_char_ref *a_char_ref,
+-									FAPI_metrics *a_metrics)
+-	{
+-	return load_glyph(a_font,a_char_ref,a_metrics,NULL,false);
+-	}
+-
+-/**
+-Rasterize the character a_char and return its metrics. Do not return the bitmap but store this. It can be retrieved by
+-a subsequent call to get_char_raster.
+-*/
+-static FAPI_retcode get_char_raster_metrics(FAPI_server* a_server,FAPI_font* a_font,FAPI_char_ref* a_char_ref,
+-											 FAPI_metrics* a_metrics)
+-	{
+-	FF_server* s = (FF_server*)a_server;
+-	FAPI_retcode error = load_glyph(a_font,a_char_ref,a_metrics,(FT_Glyph*)&s->m_bitmap_glyph,true);
+-	return error;
+-	}
+-
+-/**
+-Return the bitmap created by the last call to get_char_raster_metrics.
+-*/
+-static FAPI_retcode get_char_raster(FAPI_server *a_server,FAPI_raster *a_raster)
+-	{
+-	FF_server* s = (FF_server*)a_server;
+-	if (!s->m_bitmap_glyph)
+-		return_error(e_unregistered); /* Must not happen. */
+-	a_raster->p = s->m_bitmap_glyph->bitmap.buffer;
+-	a_raster->width = s->m_bitmap_glyph->bitmap.width;
+-	a_raster->height = s->m_bitmap_glyph->bitmap.rows;
+-	a_raster->line_step = s->m_bitmap_glyph->bitmap.pitch;
+-	a_raster->orig_x = s->m_bitmap_glyph->left * 16;
+-	a_raster->orig_y = s->m_bitmap_glyph->top * 16;
+-	return 0;
+-	}
+-
+-/**
+-Create an outline for the character a_char and return its metrics. Do not return the outline but store this.
+-It can be retrieved by a subsequent call to get_char_outline.
+-*/
+-static FAPI_retcode get_char_outline_metrics(FAPI_server *a_server,FAPI_font *a_font,FAPI_char_ref *a_char_ref,
+-											  FAPI_metrics *a_metrics)
+-	{
+-	FF_server* s = (FF_server*)a_server;
+-	return load_glyph(a_font,a_char_ref,a_metrics,(FT_Glyph*)&s->m_outline_glyph,false);
+-	}
+-
+-typedef struct FF_path_info_
+-	{
+-	FAPI_path* m_path;
+-	FracInt m_x;
+-	FracInt m_y;
+-	} FF_path_info;
+-
+-static int move_to(FT_Vector* aTo,void* aObject)
+-	{
+-	FF_path_info* p = (FF_path_info*)aObject;
+-	p->m_x = aTo->x;
+-	p->m_y = aTo->y;
+-	return p->m_path->moveto(p->m_path,aTo->x,aTo->y) ? -1 : 0;
+-	}
+-
+-static int line_to(FT_Vector* aTo,void* aObject)
+-	{
+-	FF_path_info* p = (FF_path_info*)aObject;
+-	p->m_x = aTo->x;
+-	p->m_y = aTo->y;
+-	return p->m_path->lineto(p->m_path,aTo->x,aTo->y) ? -1 : 0;
+-	}
+-
+-static int conic_to(FT_Vector* aControl,FT_Vector* aTo,void* aObject)
+-	{
+-	FF_path_info* p = (FF_path_info*)aObject;
+-	p->m_x = aTo->x;
+-	p->m_y = aTo->y;
+-	/*
+-	Convert a quadratic spline to a cubic. Do this by changing the three points
+-	A, B and C to A, 1/3(B,A), 1/3(B,C), C - that is, the two cubic control points are
+-	a third of the way from the single quadratic control point to the end points. This
+-	gives the same curve as the original quadratic.
+-	*/
+-	return p->m_path->curveto(p->m_path,(p->m_x + aControl->x * 2) / 3,
+-						      (p->m_y + aControl->y * 2) / 3,
+-						      (aTo->x + aControl->x * 2) / 3,
+-						      (aTo->y + aControl->y * 2) / 3,
+-						      aTo->x,aTo->y) ? -1 : 0;
+-	}
+-
+-static int cubic_to(FT_Vector* aControl1,FT_Vector* aControl2,FT_Vector* aTo,void* aObject)
+-	{
+-	FF_path_info* p = (FF_path_info*)aObject;
+-	p->m_x = aTo->x;
+-	p->m_y = aTo->y;
+-	return p->m_path->curveto(p->m_path,aControl1->x,aControl1->y,aControl2->x,aControl2->y,aTo->x,aTo->y) ? -1 : 0;
+-	}
++}
++
++/*
++ * Retrieve the metrics of a_char_ref and put them in a_metrics.
++ */
++static FAPI_retcode
++get_char_width(FAPI_server *a_server, FAPI_font *a_font, FAPI_char_ref *a_char_ref, FAPI_metrics *a_metrics)
++{
++    return load_glyph(a_font, a_char_ref, a_metrics, NULL, false);
++}
++
++/*
++ * Rasterize the character a_char and return its metrics. Do not return the
++ * bitmap but store this. It can be retrieved by a subsequent call to
++ * get_char_raster.
++ */
++static FAPI_retcode
++get_char_raster_metrics(FAPI_server *a_server, FAPI_font *a_font,
++	FAPI_char_ref *a_char_ref, FAPI_metrics *a_metrics)
++{
++    FF_server *s = (FF_server*)a_server;
++    FAPI_retcode error = load_glyph(a_font, a_char_ref, a_metrics, (FT_Glyph*)&s->bitmap_glyph, true);
++    return error;
++}
++
++/*
++ * Return the bitmap created by the last call to get_char_raster_metrics.
++ */
++static FAPI_retcode
++get_char_raster(FAPI_server *a_server, FAPI_raster *a_raster)
++{
++    FF_server *s = (FF_server*)a_server;
++    if (!s->bitmap_glyph)
++	return_error(e_unregistered); /* Must not happen. */
++    a_raster->p = s->bitmap_glyph->bitmap.buffer;
++    a_raster->width = s->bitmap_glyph->bitmap.width;
++    a_raster->height = s->bitmap_glyph->bitmap.rows;
++    a_raster->line_step = s->bitmap_glyph->bitmap.pitch;
++    a_raster->orig_x = s->bitmap_glyph->left * 16;
++    a_raster->orig_y = s->bitmap_glyph->top * 16;
++    a_raster->left_indent = a_raster->top_indent = a_raster->black_height = a_raster->black_width = 0;
++    return 0;
++}
++
++/*
++ * Create an outline for the character a_char and return its metrics. Do not
++ * return the outline but store this.
++ * It can be retrieved by a subsequent call to get_char_outline.
++ */
++static FAPI_retcode
++get_char_outline_metrics(FAPI_server *a_server, FAPI_font *a_font,
++	FAPI_char_ref *a_char_ref, FAPI_metrics *a_metrics)
++{
++    FF_server *s = (FF_server*)a_server;
++    return load_glyph(a_font, a_char_ref, a_metrics, (FT_Glyph*)&s->outline_glyph, false);
++}
++
++typedef struct FF_path_info_s
++{
++    FAPI_path *path;
++    FracInt x;
++    FracInt y;
++} FF_path_info;
++
++static int move_to(FT_Vector *aTo, void *aObject)
++{
++    FF_path_info *p = (FF_path_info*)aObject;
++
++    /* FAPI expects that co-ordinates will be as implied by frac_shift
++     * in our case 16.16 fixed precision. True for 'low level' FT 
++     * routines (apparently), it isn't true for these routines where
++     * FT returns a 26.6 format. Rescale to 16.16 so that FAPI will
++     * be able to convert to GS co-ordinates properly.
++     */
++    p->x = aTo->x << 10;
++    p->y = aTo->y << 10;
++
++    return p->path->moveto(p->path, p->x, p->y) ? -1 : 0;
++}
++
++static int line_to(FT_Vector *aTo, void *aObject)
++{
++    FF_path_info *p = (FF_path_info*)aObject;
++
++    /* See move_to() above */
++    p->x = aTo->x << 10;
++    p->y = aTo->y << 10;
++
++    return p->path->lineto(p->path, p->x, p->y) ? -1 : 0;
++}
++
++static int conic_to(FT_Vector *aControl, FT_Vector *aTo, void *aObject)
++{
++    FF_path_info *p = (FF_path_info*)aObject;
++    floatp x, y, Controlx, Controly, Control1x, Control1y, Control2x, Control2y;
++
++    /* More complivated than above, we need to do arithmetic on the
++     * co-ordinates, so we want them as floats and we will convert the
++     * result into 16.16 fixed precision for FAPI
++     *
++     * NB this code is funcitonally the same as the original, but I don't believe
++     * the comment (below) to be what the code is actually doing....
++     *
++     * Convert a quadratic spline to a cubic. Do this by changing the three points
++     * A, B and C to A, 1/3(B,A), 1/3(B,C), C - that is, the two cubic control points are
++     * a third of the way from the single quadratic control point to the end points. This
++     * gives the same curve as the original quadratic.
++     */
++
++    x = aTo->x / 64;
++    p->x = float2fixed(x) << 8;
++    y = aTo->y / 64;
++    p->y = float2fixed(y) << 8;
++    Controlx = aControl->x / 64;
++    Controly = aControl->y / 64;
++
++    Control1x = float2fixed((x + Controlx * 2) / 3) << 8;
++    Control1y = float2fixed((y + Controly * 2) / 3) << 8;
++    Control2x = float2fixed((x + Controlx * 2) / 3) << 8;
++    Control2y = float2fixed((y + Controly * 2) / 3) << 8;
++
++    return p->path->curveto(p->path, Control1x,
++	    Control1y,
++	    Control2x,
++	    Control2y,
++	    p->x, p->y) ? -1 : 0;
++}
++
++static int cubic_to(FT_Vector *aControl1, FT_Vector *aControl2, FT_Vector *aTo, void *aObject)
++{
++    FF_path_info *p = (FF_path_info*)aObject;
++    unsigned long Control1x, Control1y, Control2x, Control2y;
++
++    /* See move_to() above */
++    p->x = aTo->x << 10;
++    p->y = aTo->y << 10;
++
++    Control1x = aControl1->x << 10;
++    Control1y = aControl1->y << 10;
++    Control2x = aControl2->x << 10;
++    Control2y = aControl2->y << 10;
++    return p->path->curveto(p->path, Control1x, Control1y, Control2x, Control2y, p->x, p->y) ? -1 : 0;
++
++    p->x = aTo->x;
++    p->y = aTo->y;
++    return p->path->curveto(p->path, aControl1->x, aControl1->y, aControl2->x, aControl2->y, aTo->x, aTo->y) ? -1 : 0;
++}
+ 
+ static const FT_Outline_Funcs TheFtOutlineFuncs =
+-	{
+-	move_to,
+-	line_to,
+-	conic_to,
+-	cubic_to,
+-	0,
+-	0
+-	};
++{
++    move_to,
++    line_to,
++    conic_to,
++    cubic_to,
++    0,
++    0
++};
+ 
+-/**
+-Return the outline created by the last call to get_char_outline_metrics.
+-*/
+-static FAPI_retcode get_char_outline(FAPI_server *a_server,FAPI_path *a_path)
+-	{
+-	FF_server* s = (FF_server*)a_server;
+-	FF_path_info p;
+-	FT_Error ft_error = 0;
+-	p.m_path = a_path;
+-	p.m_x = 0;
+-	p.m_y = 0;
+-	ft_error = FT_Outline_Decompose(&s->m_outline_glyph->outline,&TheFtOutlineFuncs,&p);
+-	a_path->closepath(a_path);
+-	return ft_to_gs_error(ft_error);
+-	}
++/*
++ * Return the outline created by the last call to get_char_outline_metrics.
++ */
++static FAPI_retcode
++get_char_outline(FAPI_server *a_server, FAPI_path *a_path)
++{
++    FF_server *s = (FF_server*)a_server;
++    FF_path_info p;
++    FT_Error ft_error = 0;
++    p.path = a_path;
++    p.x = 0;
++    p.y = 0;
++    ft_error = FT_Outline_Decompose(&s->outline_glyph->outline, &TheFtOutlineFuncs, &p);
++    a_path->closepath(a_path);
++    return ft_to_gs_error(ft_error);
++}
+ 
+ static FAPI_retcode release_char_data(FAPI_server *a_server)
+-	{
+-	FF_server* s = (FF_server*)a_server;
+-	FT_Done_Glyph(&s->m_outline_glyph->root);
+-	FT_Done_Glyph(&s->m_bitmap_glyph->root);
+-	s->m_outline_glyph = NULL;
+-	s->m_bitmap_glyph = NULL;
+-	return 0;
+-	}
++{
++    FF_server *s = (FF_server*)a_server;
++    FT_Done_Glyph(&s->outline_glyph->root);
++    FT_Done_Glyph(&s->bitmap_glyph->root);
++    s->outline_glyph = NULL;
++    s->bitmap_glyph = NULL;
++    return 0;
++}
+ 
+-static FAPI_retcode release_typeface(FAPI_server* a_server,void* a_server_font_data)
+-	{
+-	FF_face* face = (FF_face*)a_server_font_data;
+-	delete_face(face);
+-	return 0;
+-	}
++static FAPI_retcode
++release_typeface(FAPI_server *a_server, void *a_server_font_data)
++{
++    FF_face *face = (FF_face*)a_server_font_data;
++    delete_face(face);
++    return 0;
++}
+ 
+-static void gs_freetype_destroy(i_plugin_instance* a_instance,i_plugin_client_memory* a_memory);
++static FAPI_retcode
++check_cmap_for_GID(FAPI_server *server, uint *index)
++{
++    FF_server *s = (FF_server*)server;
++    FF_face *face = (FF_face*)(server->ff.server_font_data);
++    FT_Face ft_face = face->ft_face;
++
++    *index = FT_Get_Char_Index(ft_face, *index);
++    return 0;
++}
++
++static void gs_freetype_destroy(i_plugin_instance *a_instance, i_plugin_client_memory *a_memory);
+ 
+ static const i_plugin_descriptor TheFreeTypeDescriptor =
+-	{
++{
+     "FAPI",
+     "FreeType",
+     gs_freetype_destroy
+-	};
++};
+ 
+ static const FAPI_server TheFreeTypeServer =
+-	{
++{
+     { &TheFreeTypeDescriptor },
+     16, /* frac_shift */
+     {gs_no_id},
+@@ -863,29 +905,28 @@ static const FAPI_server TheFreeTypeServer =
+     get_char_outline_metrics,
+     get_char_outline,
+     release_char_data,
+-    release_typeface
+-	};
++    release_typeface,
++    check_cmap_for_GID
++};
+ 
+ plugin_instantiation_proc(gs_fapi_ft_instantiate);
+ 
+-int gs_fapi_ft_instantiate( i_plugin_client_memory *a_memory,
+-						   i_plugin_instance **a_plugin_instance)
+-	{
+-	FF_server *server = (FF_server *)a_memory->alloc(a_memory,
+-		sizeof(FF_server),"FF_server");
++int gs_fapi_ft_instantiate( i_plugin_client_memory *a_memory, i_plugin_instance **a_plugin_instance)
++{
++    FF_server *server = (FF_server*) a_memory->alloc(a_memory, sizeof (FF_server), "FF_server");
+     if (!server)
+-        return e_VMerror;
+-    memset(server,0,sizeof(*server));
+-    server->m_fapi_server = TheFreeTypeServer;
+-	*a_plugin_instance = &server->m_fapi_server.ig;
++	return e_VMerror;
++    memset(server, 0, sizeof(*server));
++    server->fapi_server = TheFreeTypeServer;
++    *a_plugin_instance = &server->fapi_server.ig;
+     return 0;
+-	}
++}
+ 
+-static void gs_freetype_destroy(i_plugin_instance *a_plugin_instance,i_plugin_client_memory *a_memory)
+-	{
+-	FF_server *server = (FF_server *)a_plugin_instance;
+-	FT_Done_Glyph(&server->m_outline_glyph->root);
+-	FT_Done_Glyph(&server->m_bitmap_glyph->root);
+-	FT_Done_FreeType(server->m_freetype_library);
+-	a_memory->free(a_memory,server,"FF_server");
+-	}
++static void gs_freetype_destroy(i_plugin_instance *a_plugin_instance, i_plugin_client_memory *a_memory)
++{
++    FF_server *server = (FF_server *)a_plugin_instance;
++    FT_Done_Glyph(&server->outline_glyph->root);
++    FT_Done_Glyph(&server->bitmap_glyph->root);
++    FT_Done_FreeType(server->freetype_library);
++    a_memory->free(a_memory, server, "FF_server");
++}
+diff --git a/psi/fapiufst.c b/psi/fapiufst.c
+--- a/psi/fapiufst.c
++++ b/psi/fapiufst.c
+@@ -1265,6 +1265,11 @@ static FAPI_retcode release_typeface(FAPI_server *server, void *font_data)
+     return code;
+ }
+ 
++static FAPI_retcode check_cmap_for_GID(FAPI_server *server, uint index)
++{
++    return 0;
++}
++
+ /* --------------------- The plugin definition : ------------------------- */
+ 
+ 
+@@ -1295,7 +1300,8 @@ static const FAPI_server If0 = {
+     get_char_outline_metrics,
+     get_char_outline,
+     release_char_data,
+-    release_typeface
++    release_typeface,
++    check_cmap_for_GID
+ };
+ 
+ plugin_instantiation_proc(gs_fapiufst_instantiate);      /* check prototype */
+diff --git a/psi/ibnum.c b/psi/ibnum.c
+--- a/psi/ibnum.c
++++ b/psi/ibnum.c
+@@ -124,11 +124,11 @@ sdecode_number(const byte * str, int format, ref * np)
+ 	case num_int32:
+ 	case num_int32 + 16:
+ 	    if ((format & 31) == 0) {
+-		np->value.intval = sdecodelong(str, format);
++		np->value.intval = sdecodeint32(str, format);
+ 		return t_integer;
+ 	    } else {
+ 		np->value.realval =
+-		    (double)sdecodelong(str, format) *
++		    (double)sdecodeint32(str, format) *
+ 		    binary_scale[format & 31];
+ 		return t_real;
+ 	    }
+@@ -178,18 +178,13 @@ sdecodeshort(const byte * p, int format)
+ }
+ 
+ /* Decode a (32-bit, signed) long. */
+-long
+-sdecodelong(const byte * p, int format)
++int
++sdecodeint32(const byte * p, int format)
+ {
+     int a = p[0], b = p[1], c = p[2], d = p[3];
+-    long v = (num_is_lsb(format) ?
+-	      ((long)d << 24) + ((long)c << 16) + (b << 8) + a :
+-	      ((long)a << 24) + ((long)b << 16) + (c << 8) + d);
+-
+-#if arch_sizeof_long > 4
+-    /* Propagate bit 31 as the sign. */
+-    v = (v ^ 0x80000000L) - 0x80000000L;
+-#endif
++    int v = (num_is_lsb(format) ?
++	      ((int)d << 24) + ((int)c << 16) + (b << 8) + a :
++	      ((int)a << 24) + ((int)b << 16) + (c << 8) + d);
+     return v;
+ }
+ 
+diff --git a/psi/ibnum.h b/psi/ibnum.h
+--- a/psi/ibnum.h
++++ b/psi/ibnum.h
+@@ -72,7 +72,7 @@ int num_array_get(const gs_memory_t *mem, const ref *, int, uint, ref *);
+ int sdecode_number(const byte *, int, ref *);
+ int sdecodeshort(const byte *, int);
+ uint sdecodeushort(const byte *, int);
+-long sdecodelong(const byte *, int);
++int sdecodeint32(const byte *, int);
+ int sdecode_float(const byte *, int, float *);
+ 
+ #endif /* ibnum_INCLUDED */
+diff --git a/psi/idebug.c b/psi/idebug.c
+--- a/psi/idebug.c
++++ b/psi/idebug.c
+@@ -85,7 +85,7 @@ debug_print_full_ref(const gs_memory_t *mem, const ref * pref)
+ 	case t_fontID:
+ 	    goto strct;
+ 	case t_integer:
+-	    dprintf1("int %ld", pref->value.intval);
++	    dprintf1("int %d", pref->value.intval);
+ 	    break;
+ 	case t_mark:
+ 	    dprintf("mark");
+diff --git a/psi/idict.c b/psi/idict.c
+--- a/psi/idict.c
++++ b/psi/idict.c
+@@ -444,12 +444,11 @@ dict_put(ref * pdref /* t_dictionary */ , const ref * pkey, const ref * pvalue,
+     gs_memory_t *pmem = dict_mem(pdict);
+     int rcode = 0;
+     int code;
+-    ref *pvslot;
++    ref *pvslot, kname;
+ 
+     /* Check the value. */
+     store_check_dest(pdref, pvalue);
+   top:if ((code = dict_find(pdref, pkey, &pvslot)) <= 0) {	/* not found *//* Check for overflow */
+-	ref kname;
+ 	uint index;
+ 
+ 	switch (code) {
+diff --git a/psi/idparam.c b/psi/idparam.c
+--- a/psi/idparam.c
++++ b/psi/idparam.c
+@@ -58,8 +58,7 @@ dict_int_null_param(const ref * pdict, const char *kstr, int minval,
+ 		    int maxval, int defaultval, int *pvalue)
+ {
+     ref *pdval;
+-    int code;
+-    long ival;
++    int code, ival;
+ 
+     if (pdict == 0 || dict_find_string(pdict, kstr, &pdval) <= 0) {
+ 	ival = defaultval;
+@@ -378,7 +377,7 @@ dict_uid_param(const ref * pdict, gs_uid * puid, int defaultval,
+     } else {
+ 	if (!r_has_type(puniqueid, t_integer))
+ 	   return_error(e_typecheck);
+- 	if (puniqueid->value.intval < 0 || puniqueid->value.intval > 0xffffffL)
++ 	if (puniqueid->value.intval < 0 || puniqueid->value.intval > 0xffffff)
+ 	   return_error(e_rangecheck);
+ 	/* Apparently fonts created by Fontographer often have */
+ 	/* a UniqueID of 0, contrary to Adobe's specifications. */
+diff --git a/psi/ifapi.h b/psi/ifapi.h
+--- a/psi/ifapi.h
++++ b/psi/ifapi.h
+@@ -58,9 +58,25 @@ typedef enum {
+     FAPI_FONT_FEATURE_ForceBold,
+     FAPI_FONT_FEATURE_LanguageGroup,
+     FAPI_FONT_FEATURE_lenIV,
++    FAPI_FONT_FEATURE_GlobalSubrs_count,
+     FAPI_FONT_FEATURE_Subrs_count,
+     FAPI_FONT_FEATURE_Subrs_total_size,
+-    FAPI_FONT_FEATURE_TT_size
++    FAPI_FONT_FEATURE_TT_size,
++    /* Multiple Master specifics */
++    FAPI_FONT_FEATURE_DollarBlend,
++    FAPI_FONT_FEATURE_DollarBlend_length,
++    FAPI_FONT_FEATURE_BlendAxisTypes_count,
++    FAPI_FONT_FEATURE_BlendAxisTypes,
++    FAPI_FONT_FEATURE_BlendPrivate_count,
++    FAPI_FONT_FEATURE_BlendFontInfo_count,
++    FAPI_FONT_FEATURE_WeightVector_count,
++    FAPI_FONT_FEATURE_WeightVector,
++    FAPI_FONT_FEATURE_BlendDesignPositionsArrays_count,
++    FAPI_FONT_FEATURE_BlendDesignPositionsArrayValue,
++    FAPI_FONT_FEATURE_BlendDesignMapArrays_count,
++    FAPI_FONT_FEATURE_BlendDesignMapSubArrays_count,
++    FAPI_FONT_FEATURE_BlendDesignMapArrayValue,
++    /* End MM specifics */
+ } fapi_font_feature;
+ 
+ typedef enum {
+@@ -106,6 +122,9 @@ struct FAPI_font_s {
+     unsigned short (*get_word )(FAPI_font *ff, fapi_font_feature var_id, int index);
+     unsigned long  (*get_long )(FAPI_font *ff, fapi_font_feature var_id, int index);
+     float          (*get_float)(FAPI_font *ff, fapi_font_feature var_id, int index);
++    int            (*get_name) (FAPI_font *ff, fapi_font_feature var_id, int index, char *buffer, int len);
++    int		   (*get_proc) (FAPI_font *ff, fapi_font_feature var_id, int index, char *Buffer);
++    unsigned short (*get_gsubr)(FAPI_font *ff, int index,     byte *buf, ushort buf_length);
+     unsigned short (*get_subr) (FAPI_font *ff, int index,     byte *buf, ushort buf_length);
+     unsigned short (*get_glyph)(FAPI_font *ff, int char_code, byte *buf, ushort buf_length);
+     unsigned short (*serialize_tt_font)(FAPI_font *ff, void *buf, int buf_size);
+@@ -182,6 +201,7 @@ struct FAPI_server_s {
+     FAPI_retcode (*get_char_outline)(FAPI_server *server, FAPI_path *p);
+     FAPI_retcode (*release_char_data)(FAPI_server *server);
+     FAPI_retcode (*release_typeface)(FAPI_server *server, void *server_font_data);
++    FAPI_retcode (*check_cmap_for_GID)(FAPI_server *server, uint *index);
+     /*  Some people get confused with terms "font cache" and "character cache".
+         "font cache" means a cache for scaled font objects, which mainly
+         keep the font header information and rules for adjusting it to specific raster.
+diff --git a/psi/int.mak b/psi/int.mak
+--- a/psi/int.mak
++++ b/psi/int.mak
+@@ -458,7 +458,7 @@ $(PSOBJ)zcolor.$(OBJ) : $(PSSRC)zcolor.c $(OP)\
+  $(gzstate_h) $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxcmap_h)\
+  $(gxcspace_h) $(gxcolor2_h) $(gxpcolor_h)\
+  $(idict_h) $(icolor_h) $(idparam_h) $(iname_h) $(iutil_h) $(icsmap_h)\
+- $(ifunc_h) $(zht2_h) $(zcolor_h) $(zcie_h) $(zicc_h)
++ $(ifunc_h) $(zht2_h) $(zcolor_h) $(zcie_h) $(zicc_h) $(gscspace_h)
+ 	$(PSCC) $(PSO_)zcolor.$(OBJ) $(C_) $(PSSRC)zcolor.c 
+ 
+ $(PSOBJ)zdevice.$(OBJ) : $(PSSRC)zdevice.c $(OP) $(string__h)\
+@@ -1801,43 +1801,37 @@ $(PSD)fapiu.dev : $(INT_MAK) $(ECHOGS_XE)
+ 
+ # FreeType bridge :
+ 
+-FT_LIB=$(FT_ROOT)$(D)objs$(D)freetype214MT_D
+-FT_INC=$(I_)$(FT_ROOT)$(D)include$(_I)
++# the top-level makefile should define
++# FT_CFLAGS for the include directive and other switches, and
++# FT_LIBS for the the library link command
+ 
+ wrfont_h=$(stdpre_h) $(PSSRC)wrfont.h
+ write_t1_h=$(ifapi_h) $(PSSRC)write_t1.h
+ write_t2_h=$(ifapi_h) $(PSSRC)write_t2.h
+ 
+-$(PSD)fapif1.dev : $(INT_MAK) $(ECHOGS_XE) \
+- $(FT_LIB)$(FT_LIB_EXT) \
+- $(PSOBJ)fapi_ft.$(OBJ) \
++$(PSD)fapif1.dev : $(INT_MAK) $(ECHOGS_XE) $(PSOBJ)fapi_ft.$(OBJ) \
+  $(PSOBJ)write_t1.$(OBJ) $(PSOBJ)write_t2.$(OBJ) $(PSOBJ)wrfont.$(OBJ)
+ 	$(SETMOD) $(PSD)fapif1 $(PSOBJ)fapi_ft.$(OBJ) $(PSOBJ)write_t1.$(OBJ)
+ 	$(ADDMOD) $(PSD)fapif1 $(PSOBJ)write_t2.$(OBJ) $(PSOBJ)wrfont.$(OBJ)
+ 	$(ADDMOD) $(PSD)fapif1 -plugin fapi_ft
+-	$(ADDMOD) $(PSD)fapif1 -link $(FT_LIB)$(FT_LIB_EXT)
++	$(ADDMOD) $(PSD)fapif1 -link $(FT_LIBS)
+ 
+ $(PSOBJ)fapi_ft.$(OBJ) : $(PSSRC)fapi_ft.c $(AK)\
+  $(stdio__h) $(math__h) $(ifapi_h) $(gserror_h)\
+- $(FT_ROOT)$(D)include$(D)freetype$(D)freetype.h\
+- $(FT_ROOT)$(D)include$(D)freetype$(D)ftincrem.h\
+- $(FT_ROOT)$(D)include$(D)freetype$(D)ftglyph.h\
+- $(FT_ROOT)$(D)include$(D)freetype$(D)ftoutln.h\
+- $(FT_ROOT)$(D)include$(D)freetype$(D)fttrigon.h\
+  $(write_t1_h) $(write_t2_h)
+-	$(PSCC) $(FT_CFLAGS) $(FT_INC) $(PSO_)fapi_ft.$(OBJ) $(C_) $(PSSRC)fapi_ft.c
++	$(PSCC) $(FT_CFLAGS) $(PSO_)fapi_ft.$(OBJ) $(C_) $(PSSRC)fapi_ft.c
+ 
+ $(PSOBJ)write_t1.$(OBJ) : $(PSSRC)write_t1.c $(AK)\
+  $(wrfont_h) $(write_t1_h) 
+-	$(PSCC) $(FT_CFLAGS) $(FT_INC) $(PSO_)write_t1.$(OBJ) $(C_) $(PSSRC)write_t1.c
++	$(PSCC) $(FT_CFLAGS) $(PSO_)write_t1.$(OBJ) $(C_) $(PSSRC)write_t1.c
+ 
+ $(PSOBJ)write_t2.$(OBJ) : $(PSSRC)write_t2.c $(AK)\
+- $(wrfont_h) $(write_t2_h) $(stdio_h)
+-	$(PSCC) $(FT_CFLAGS) $(FT_INC) $(PSO_)write_t2.$(OBJ) $(C_) $(PSSRC)write_t2.c
++ $(wrfont_h) $(write_t2_h) $(ghost_h) $(gxfont_h) $(gxfont1_h)
++	$(PSCC) $(FT_CFLAGS) $(PSO_)write_t2.$(OBJ) $(C_) $(PSSRC)write_t2.c
+ 
+ $(PSOBJ)wrfont.$(OBJ) : $(PSSRC)wrfont.c $(AK)\
+  $(wrfont_h) $(stdio_h)
+-	$(PSCC) $(FT_CFLAGS) $(FT_INC) $(PSO_)wrfont.$(OBJ) $(C_) $(PSSRC)wrfont.c
++	$(PSCC) $(FT_CFLAGS) $(PSO_)wrfont.$(OBJ) $(C_) $(PSSRC)wrfont.c
+ 
+ # stub for FreeType bridge :
+ 
+diff --git a/psi/interp.c b/psi/interp.c
+--- a/psi/interp.c
++++ b/psi/interp.c
+@@ -688,7 +688,9 @@ set_gc_signal(i_ctx_t *i_ctx_p, int *psignal, int value)
+     }
+ }
+ 
+-/* Copy the contents of an overflowed stack into a (local) array. */
++/* Copy top elements of an overflowed stack into a (local) array. */
++/* Adobe copies only 500 top elements, we copy up to 65535 top elements */
++/* for better debugging, PLRM compliance, and backward compatibility. */
+ static int
+ copy_stack(i_ctx_t *i_ctx_p, const ref_stack_t * pstack, int skip, ref * arr)
+ {
+@@ -696,6 +698,8 @@ copy_stack(i_ctx_t *i_ctx_p, const ref_stack_t * pstack, int skip, ref * arr)
+     uint save_space = ialloc_space(idmemory);
+     int code;
+ 
++    if (size > 65535)
++        size = 65535;
+     ialloc_set_space(idmemory, avm_local);
+     code = ialloc_ref_array(arr, a_all, size, "copy_stack");
+     if (code >= 0)
+diff --git a/psi/iparam.c b/psi/iparam.c
+--- a/psi/iparam.c
++++ b/psi/iparam.c
+@@ -63,7 +63,7 @@ ref_to_key(const ref * pref, gs_param_key_t * key, iparam_list *plist)
+ 	int len;
+ 	byte *buf;
+ 
+-	sprintf(istr, "%ld", pref->value.intval);
++	sprintf(istr, "%d", pref->value.intval);
+ 	len = strlen(istr);
+ 	/* GC will take care of freeing this: */
+ 	buf = gs_alloc_string(plist->memory, len, "ref_to_key");
+@@ -390,7 +390,7 @@ stack_param_enumerate(iparam_list * plist, gs_param_enumerator_t * penum,
+ {
+     int code;
+     stack_param_list *const splist = (stack_param_list *) plist;
+-    long index = penum->intval;
++    int index = penum->intval;
+     ref *stack_element;
+ 
+     do {
+@@ -560,12 +560,6 @@ ref_param_read_int_array(gs_param_list * plist, gs_param_name pkey,
+ 	    code = gs_note_error(e_typecheck);
+ 	    break;
+ 	}
+-#if arch_sizeof_int < arch_sizeof_long
+-	if (elt.value.intval != (int)elt.value.intval) {
+-	    code = gs_note_error(e_rangecheck);
+-	    break;
+-	}
+-#endif
+ 	piv[i] = (int)elt.value.intval;
+     }
+     if (code < 0) {
+diff --git a/psi/iref.h b/psi/iref.h
+--- a/psi/iref.h
++++ b/psi/iref.h
+@@ -380,7 +380,7 @@ struct ref_s {
+     struct tas_s tas;
+ 
+     union v {			/* name the union to keep gdb happy */
+-	long intval;
++	int intval;
+ 	ushort boolval;
+ 	float realval;
+ 	ulong saveid;
+diff --git a/psi/iscan.c b/psi/iscan.c
+--- a/psi/iscan.c
++++ b/psi/iscan.c
+@@ -693,10 +693,10 @@ scan_token(i_ctx_t *i_ctx_p, ref * pref, scanner_state * pstate)
+ 		uint size = ref_stack_count_inline(&o_stack) - pstack;
+ 		ref arr;
+ 
+-		if_debug4('S', "[S}]d=%d, s=%d->%ld, c=%d\n",
++		if_debug4('S', "[S}]d=%d, s=%d->%d, c=%d\n",
+ 			  pdepth, pstack,
+ 			  (pstack == pdepth ? 0 :
+-			   ref_stack_index(&o_stack, size)->value.intval),
++			  ref_stack_index(&o_stack, size)->value.intval),
+ 			  size + pstack);
+ 		myref = (pstack == pdepth ? pref : &arr);
+ 		if (check_only) {
+diff --git a/psi/iscanbin.c b/psi/iscanbin.c
+--- a/psi/iscanbin.c
++++ b/psi/iscanbin.c
+@@ -195,7 +195,7 @@ scan_bos(i_ctx_t *i_ctx_p, ref *pref, scanner_state *pstate)
+ 
+ 	if (top_size == 0) {
+ 	    /* Extended header (2-byte array size, 4-byte length) */
+-	    ulong lsize;
++	    uint lsize;
+ 
+ 	    if (rcnt < 7) {
+ 		s_end_inline(s, p - 1, rlimit);
+@@ -203,7 +203,7 @@ scan_bos(i_ctx_t *i_ctx_p, ref *pref, scanner_state *pstate)
+ 		return scan_Refill;
+ 	    }
+ 	    pbs->top_size = top_size = sdecodeushort(p + 2, num_format);
+-	    pbs->lsize = lsize = sdecodelong(p + 4, num_format);
++	    pbs->lsize = lsize = sdecodeint32(p + 4, num_format);
+ 	    if ((size = lsize) != lsize) {
+ 		scan_bos_error(pstate, "bin obj seq length too large");
+ 		return_error(e_limitcheck);
+@@ -534,8 +534,7 @@ scan_bos_continue(i_ctx_t *i_ctx_p, ref * pref, scanner_state * pstate)
+     for (; index < max_array_index; p += SIZEOF_BIN_SEQ_OBJ, index++) {
+ 	ref *op = abase + index;
+ 	uint osize;
+-	long value;
+-	uint atype, attrs;
++	int value, atype, attrs;
+ 
+ 	s_end_inline(s, p, rlimit);	/* in case of error */
+ 	if (rlimit - p < SIZEOF_BIN_SEQ_OBJ) {
+@@ -555,7 +554,7 @@ scan_bos_continue(i_ctx_t *i_ctx_p, ref * pref, scanner_state * pstate)
+ 	 * syntaxerror if any unused field is non-zero (per PLRM).
+ 	 */
+   	osize = sdecodeushort(p + 3, num_format);
+-	value = sdecodelong(p + 5, num_format);
++	value = sdecodeint32(p + 5, num_format);
+ 	switch (p[1] & 0x7f) {
+ 	    case BS_TYPE_NULL:
+ 		if (osize | value) { /* unused */
+diff --git a/psi/iscannum.c b/psi/iscannum.c
+--- a/psi/iscannum.c
++++ b/psi/iscannum.c
+@@ -53,7 +53,6 @@ scan_number(const byte * str, const byte * end, int sign,
+     };
+ 
+     int ival;
+-    long lval;
+     double dval;
+     int exp10;
+     int code = 0;
+@@ -102,8 +101,26 @@ scan_number(const byte * str, const byte * end, int sign,
+ 	GET_NEXT(c, sp, goto iret);
+ 	if (!IS_DIGIT(d, c))
+ 	    break;
+-        if (WOULD_OVERFLOW(((unsigned)ival), d, max_scan))
+-            goto i2l;
++        if (WOULD_OVERFLOW(((unsigned)ival), d, max_scan)) {
++            //goto i2l;
++	    if (ival == max_int / 10 && d == (max_int % 10) + 1 && sign < 0) {
++		GET_NEXT(c, sp, c = EOFC);
++		dval = -(double)min_int;
++		if (c == 'e' || c == 'E') {
++		    exp10 = 0;
++		    goto fs;
++		} else if (c == '.') {
++                    GET_NEXT(c, sp, c = EOFC);
++		    exp10 = 0;
++		    goto fd;
++                } else if (!IS_DIGIT(d, c)) {
++		    ival = min_int;
++		    break;
++		}
++	    } else
++		dval = ival;
++	    goto l2d;
++        }
+     }
+   ind:				/* We saw a non-digit while accumulating an integer in ival. */
+     switch (c) {
+@@ -113,6 +130,8 @@ scan_number(const byte * str, const byte * end, int sign,
+ 	default:
+ 	    *psp = sp;
+ 	    code = 1;
++            break;
++        case EOFC:
+ 	    break;
+ 	case 'e':
+ 	case 'E':
+@@ -123,8 +142,8 @@ scan_number(const byte * str, const byte * end, int sign,
+ 	    goto fe;
+ 	case '#':
+ 	    {
+-		const uint radix = (uint)ival;
+-		ulong uval = 0, lmax;
++		const int radix = ival;
++		uint uval = 0, imax;
+ 
+ 		if (sign || radix < min_radix || radix > max_radix)
+ 		    return_error(e_syntaxerror);
+@@ -134,19 +153,19 @@ scan_number(const byte * str, const byte * end, int sign,
+ 
+ 		    switch (radix) {
+ 			case 2:
+-			    shift = 1, lmax = max_ulong >> 1;
++			    shift = 1, imax = max_uint >> 1;
+ 			    break;
+ 			case 4:
+-			    shift = 2, lmax = max_ulong >> 2;
++			    shift = 2, imax = max_uint >> 2;
+ 			    break;
+ 			case 8:
+-			    shift = 3, lmax = max_ulong >> 3;
++			    shift = 3, imax = max_uint >> 3;
+ 			    break;
+ 			case 16:
+-			    shift = 4, lmax = max_ulong >> 4;
++			    shift = 4, imax = max_uint >> 4;
+ 			    break;
+ 			case 32:
+-			    shift = 5, lmax = max_ulong >> 5;
++			    shift = 5, imax = max_uint >> 5;
+ 			    break;
+ 			default:	/* can't happen */
+ 			    return_error(e_rangecheck);
+@@ -159,13 +178,13 @@ scan_number(const byte * str, const byte * end, int sign,
+ 			    code = 1;
+ 			    break;
+ 			}
+-			if (uval > lmax)
++			if (uval > imax)
+ 			    return_error(e_limitcheck);
+ 		    }
+ 		} else {
+-		    int lrem = max_ulong % radix;
++		    int irem = max_uint % radix;
+ 
+-		    lmax = max_ulong / radix;
++		    imax = max_uint / radix;
+ 		    for (;; uval = uval * radix + d) {
+ 			GET_NEXT(c, sp, break);
+ 			d = decoder[c];
+@@ -174,8 +193,8 @@ scan_number(const byte * str, const byte * end, int sign,
+ 			    code = 1;
+ 			    break;
+ 			}
+-			if (uval >= lmax &&
+-			    (uval > lmax || d > lrem)
++			if (uval >= imax &&
++			    (uval > imax || d > irem)
+ 			    )
+ 			    return_error(e_limitcheck);
+ 		    }
+@@ -188,59 +207,6 @@ iret:
+     make_int(pref, (sign < 0 ? -ival : ival));
+     return code;
+ 
+-    /* Accumulate a long in lval. */
+-i2l:
+-    for (lval = (unsigned)ival;;) {
+-	if (WOULD_OVERFLOW(((unsigned long)lval), d, ((unsigned long)max_long))) {
+-	    /* Make a special check for entering the smallest */
+-	    /* (most negative) integer. */
+-	    if (lval == max_long / 10 &&
+-		d == (int)(max_long % 10) + 1 && sign < 0
+-		) {
+-		GET_NEXT(c, sp, c = EOFC);
+-		dval = -(double)min_long;
+-		if (c == 'e' || c == 'E') {
+-		    exp10 = 0;
+-		    goto fs;
+-		} else if (c == '.') {
+-                    GET_NEXT(c, sp, c = EOFC);
+-		    exp10 = 0;
+-		    goto fd;
+-                } else if (!IS_DIGIT(d, c)) {
+-		    lval = min_long;
+-		    break;
+-		}
+-	    } else
+-		dval = (unsigned long)lval;
+-	    goto l2d;
+-	}
+-	lval = lval * 10 + d;
+-	GET_NEXT(c, sp, goto lret);
+-	if (!IS_DIGIT(d, c))
+-	    break;
+-    }
+-    switch (c) {
+-	case '.':
+-	    GET_NEXT(c, sp, c = EOFC);
+-	    exp10 = 0;
+-	    goto l2r;
+-	case EOFC:
+-	    break;
+-	default:
+-	    *psp = sp;
+-	    code = 1;
+-	    break;
+-	case 'e':
+-	case 'E':
+-	    exp10 = 0;
+-	    goto le;
+-	case '#':
+-	    return_error(e_syntaxerror);
+-    }
+-lret:
+-    make_int(pref, (sign < 0 ? -lval : lval));
+-    return code;
+-
+     /* Accumulate a double in dval. */
+ l2d:
+     exp10 = 0;
+@@ -291,8 +257,8 @@ i2r:
+ 	    break;
+ 	}
+ 	if (WOULD_OVERFLOW(ival, d, max_int)) {
+-	    lval = ival;
+-	    goto l2r;
++	    dval = ival;
++	    goto fd;
+ 	}
+ 	ival = ival * 10 + d;
+ 	exp10--;
+@@ -310,32 +276,6 @@ i2r:
+     dval = ival;
+     goto fe;
+ 
+-    /* We saw a '.' while accumulating a long in lval. */
+-l2r:
+-    while (IS_DIGIT(d, c) || c == '-') {
+-	/* Handle bogus '-' following '.' as in i2r above.	*/
+-	if (c == '-') {
+-	    if ((scanner_options & SCAN_PDF_INV_NUM) == 0)
+-		break;
+-	    do {
+-		GET_NEXT(c, sp, c = EOFC);
+-	    } while (IS_DIGIT(d, c));
+-	    break;
+-	}
+-	if (WOULD_OVERFLOW(lval, d, max_long)) {
+-	    dval = lval;
+-	    goto fd;
+-	}
+-	lval = lval * 10 + d;
+-	exp10--;
+-	GET_NEXT(c, sp, c = EOFC);
+-    }
+-le:
+-    if (sign < 0)
+-	lval = -lval;
+-    dval = lval;
+-    goto fe;
+-
+     /* Now we are accumulating a double in dval. */
+ fd:
+     while (IS_DIGIT(d, c)) {
+diff --git a/psi/iutil.c b/psi/iutil.c
+--- a/psi/iutil.c
++++ b/psi/iutil.c
+@@ -492,7 +492,7 @@ other:
+ 	data = (const byte *)(op->value.boolval ? "true" : "false");
+ 	break;
+     case t_integer:
+-	sprintf(buf, "%ld", op->value.intval);
++	sprintf(buf, "%d", op->value.intval);
+ 	break;
+     case t_string:
+ 	check_read(*op);
+diff --git a/psi/iutil2.c b/psi/iutil2.c
+--- a/psi/iutil2.c
++++ b/psi/iutil2.c
+@@ -34,11 +34,8 @@ param_read_password(gs_param_list * plist, const char *kstr, password * ppass)
+ {
+     gs_param_string ps;
+     long ipass;
+-    int code;
++    int code = param_read_string(plist, kstr, &ps);
+ 
+-    ps.data = (const byte *)ppass->data, ps.size = ppass->size,
+-	ps.persistent = false;
+-    code = param_read_string(plist, kstr, &ps);
+     switch (code) {
+ 	case 0:		/* OK */
+ 	    if (ps.size > MAX_PASSWORD)
+diff --git a/psi/psromfs.mak b/psi/psromfs.mak
+--- a/psi/psromfs.mak
++++ b/psi/psromfs.mak
+@@ -25,8 +25,7 @@
+ RESOURCE_LIST=CIDFont$(D) CMap$(D) ColorSpace$(D) Decoding$(D) Encoding$(D) Font$(D) IdiomSet$(D) Init$(D) ProcSet$(D) SubstCID$(D)
+ 
+ #	Note: gs_cet.ps is only needed to match Adobe CPSI defaults
+-PS_ROMFS_ARGS=-c -P $(PSRESDIR)$(D) -d Resource/ $(RESOURCE_LIST) \
+-   -d lib/ -P $(PSLIBDIR)$(D) $(EXTRA_INIT_FILES)
++PS_ROMFS_ARGS=-c -P $(PSRESDIR)$(D) -d Resource/ $(RESOURCE_LIST) -d lib/ -P $(PSLIBDIR)$(D) $(EXTRA_INIT_FILES)
+ 
+ # We'd really like to have all of the files in Resourc/Init/ be dependencies
+ # for COMPILE_INITS=1, but we settle for just the main one. "touch" it if
+diff --git a/psi/wrfont.c b/psi/wrfont.c
+new file mode 100644
+--- /dev/null
++++ b/psi/wrfont.c
+@@ -0,0 +1,78 @@
++/* Copyright (C) 2001-2006 Artifex Software, Inc.
++   All Rights Reserved.
++  
++   This software is provided AS-IS with no warranty, either express or
++   implied.
++
++   This software is distributed under license and may not be copied, modified
++   or distributed except as expressly authorized under the terms of that
++   license.  Refer to licensing information at http://www.artifex.com/
++   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
++   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
++*/
++
++/* $Id$ */
++/*
++Support functions to serialize fonts as PostScript code that can
++then be passed to FreeType via the FAPI FreeType bridge.
++Started by Graham Asher, 9th August 2002.
++*/
++
++#include "wrfont.h"
++#include "stdio_.h"
++
++#define EEXEC_KEY 55665
++#define EEXEC_FACTOR 52845
++#define EEXEC_OFFSET 22719
++
++void WRF_init(WRF_output* a_output,unsigned char* a_buffer,long a_buffer_size)
++	{
++	a_output->m_pos = a_buffer;
++	a_output->m_limit = a_buffer_size;
++	a_output->m_count = 0;
++	a_output->m_encrypt = false;
++	a_output->m_key = EEXEC_KEY;
++	}
++
++void WRF_wbyte(WRF_output* a_output,unsigned char a_byte)
++	{
++	if (a_output->m_count < a_output->m_limit)
++		{
++		if (a_output->m_encrypt)
++			{
++			a_byte ^= (a_output->m_key >> 8);
++			a_output->m_key = (unsigned short)((a_output->m_key + a_byte) * EEXEC_FACTOR + EEXEC_OFFSET);
++			}
++		*a_output->m_pos++ = a_byte;
++		}
++	a_output->m_count++;
++	}
++
++void WRF_wtext(WRF_output* a_output,const unsigned char* a_string,long a_length)
++	{
++	while (a_length > 0)
++		{
++		WRF_wbyte(a_output,*a_string++);
++		a_length--;
++		}
++	}
++
++void WRF_wstring(WRF_output* a_output,const char* a_string)
++	{
++	while (*a_string)
++		WRF_wbyte(a_output,*a_string++);
++	}
++
++void WRF_wfloat(WRF_output* a_output,double a_float)
++	{
++	char buffer[32];
++	sprintf(buffer,"%f",a_float);
++	WRF_wstring(a_output,buffer);
++	}
++
++void WRF_wint(WRF_output* a_output,long a_int)
++	{
++	char buffer[32];
++	sprintf(buffer,"%ld",a_int);
++	WRF_wstring(a_output,buffer);
++	}
+diff --git a/psi/wrfont.h b/psi/wrfont.h
+new file mode 100644
+--- /dev/null
++++ b/psi/wrfont.h
+@@ -0,0 +1,42 @@
++/* Copyright (C) 2001-2006 Artifex Software, Inc.
++   All Rights Reserved.
++  
++   This software is provided AS-IS with no warranty, either express or
++   implied.
++
++   This software is distributed under license and may not be copied, modified
++   or distributed except as expressly authorized under the terms of that
++   license.  Refer to licensing information at http://www.artifex.com/
++   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
++   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
++*/
++
++/* $Id$ */
++/*
++Header for support functions to serialize fonts as PostScript code that can
++then be passed to FreeType via the FAPI FreeType bridge.
++Started by Graham Asher, 9th August 2002.
++*/
++
++#ifndef wrfont_INCLUDED
++#define wrfont_INCLUDED
++
++#include "stdpre.h"
++
++typedef struct WRF_output_
++	{
++	unsigned char* m_pos;
++	long m_limit;
++	long m_count;
++	bool m_encrypt;
++	unsigned short m_key;
++	} WRF_output;
++
++void WRF_init(WRF_output* a_output,unsigned char* a_buffer,long a_buffer_size);
++void WRF_wbyte(WRF_output* a_output,unsigned char a_byte);
++void WRF_wtext(WRF_output* a_output,const unsigned char* a_string,long a_length);
++void WRF_wstring(WRF_output* a_output,const char* a_string);
++void WRF_wfloat(WRF_output* a_output,double a_float);
++void WRF_wint(WRF_output* a_output,long a_int);
++
++#endif
+diff --git a/psi/write_t1.c b/psi/write_t1.c
+new file mode 100644
+--- /dev/null
++++ b/psi/write_t1.c
+@@ -0,0 +1,292 @@
++/* Copyright (C) 2001-2006 Artifex Software, Inc.
++   All Rights Reserved.
++  
++   This software is provided AS-IS with no warranty, either express or
++   implied.
++
++   This software is distributed under license and may not be copied, modified
++   or distributed except as expressly authorized under the terms of that
++   license.  Refer to licensing information at http://www.artifex.com/
++   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
++   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
++*/
++
++/* $Id$ */
++
++/*
++Functions to serialize a type 1 font as PostScript code that can then be
++passed to FreeType via the FAPI FreeType bridge.
++Started by Graham Asher, 26th July 2002.
++*/
++
++#include "wrfont.h"
++#include "write_t1.h"
++
++/*
++Public structures and functions in this file are prefixed with FF_ because they are part of
++the FAPI FreeType implementation.
++*/
++
++static void write_word_entry(FAPI_font* a_fapi_font,WRF_output* a_output,const char* a_name,int a_index,int a_divisor)
++	{
++	short x;
++	WRF_wbyte(a_output,'/');
++	WRF_wstring(a_output,a_name);
++	WRF_wbyte(a_output,' ');
++	/* Get the value and convert it from unsigned to signed by assigning it to a short. */
++	x = a_fapi_font->get_word(a_fapi_font,a_index,0);
++	/* Divide by the divisor to bring it back to font units. */
++	x = (short)(x / a_divisor);
++	WRF_wint(a_output,x);
++	WRF_wstring(a_output," def\n");
++	}
++
++static void write_array_entry_with_count(FAPI_font* a_fapi_font,WRF_output* a_output,const char* a_name,int a_index,int a_count,int a_divisor)
++	{
++	int i;
++
++	if (a_count <= 0)
++		return;
++
++	WRF_wbyte(a_output,'/');
++	WRF_wstring(a_output,a_name);
++	WRF_wstring(a_output," [");
++	for (i = 0; i < a_count; i++)
++		{
++		/* Get the value and convert it from unsigned to signed by assigning it to a short. */
++		short x = a_fapi_font->get_word(a_fapi_font,a_index,i);
++		/* Divide by the divisor to bring it back to font units. */
++		x = (short)(x / a_divisor);
++		WRF_wint(a_output,x);
++		WRF_wbyte(a_output,(byte)(i == a_count - 1 ? ']' : ' '));
++		}
++	WRF_wstring(a_output," def\n");
++	}
++
++
++static void write_array_entry(FAPI_font* a_fapi_font,WRF_output* a_output,const char* a_name,int a_index,int a_divisor)
++	{
++	/* NOTE that the feature index must be preceded by the count index for this to work. */
++	int count = a_fapi_font->get_word(a_fapi_font,a_index - 1,0);
++	write_array_entry_with_count(a_fapi_font,a_output,a_name,a_index,count,a_divisor);
++	}
++
++static void write_subrs(FAPI_font* a_fapi_font,WRF_output* a_output)
++	{
++	int i;
++	int count = a_fapi_font->get_word(a_fapi_font,FAPI_FONT_FEATURE_Subrs_count,0);
++	if (count <= 0)
++		return;
++
++	WRF_wstring(a_output,"/Subrs ");
++	WRF_wint(a_output,count);
++	WRF_wstring(a_output," array\n");
++
++	for (i = 0; i < count; i++)
++		{
++		long length = a_fapi_font->get_subr(a_fapi_font,i,0,0);
++		long buffer_size;
++		WRF_wstring(a_output,"dup ");
++		WRF_wint(a_output,i);
++		WRF_wbyte(a_output,' ');
++		WRF_wint(a_output,length);
++		WRF_wstring(a_output," RD ");
++		
++		/* Get the subroutine into the buffer and encrypt it in place. */
++		buffer_size = a_output->m_limit - a_output->m_count;
++		if (buffer_size >= length)
++			{
++			a_fapi_font->get_subr(a_fapi_font,i,a_output->m_pos,(ushort)length);
++			WRF_wtext(a_output,a_output->m_pos,length);
++			}
++		else
++			a_output->m_count += length;
++
++		WRF_wstring(a_output," NP\n");
++		}
++
++	WRF_wstring(a_output,"ND\n");
++	}
++
++static int is_MM_font(FAPI_font *a_fapi_font)
++{
++    return a_fapi_font->get_word(a_fapi_font,FAPI_FONT_FEATURE_DollarBlend,0);
++}
++
++static void write_private_dictionary(FAPI_font* a_fapi_font,WRF_output* a_output)
++	{
++	a_output->m_encrypt = true;
++
++	/* Write 4 bytes that must encrypt to at least one character that cannot be a valid hexadecimal character. */
++	WRF_wstring(a_output,"XXXX");
++
++	/*+ to do: correct size of dictionary from 8. */	
++	WRF_wstring(a_output,"dup /Private 8 dict dup begin\n");
++
++	WRF_wstring(a_output,"/MinFeature {16 16} def\n");
++	WRF_wstring(a_output,"/password 5839 def\n");
++	WRF_wstring(a_output,"/lenIV -1 def\n"); /* indicate that /subrs are not encoded. */
++	write_word_entry(a_fapi_font,a_output,"BlueFuzz",FAPI_FONT_FEATURE_BlueFuzz,16);
++
++	WRF_wstring(a_output,"/BlueScale ");
++	WRF_wfloat(a_output,a_fapi_font->get_long(a_fapi_font,FAPI_FONT_FEATURE_BlueScale,0) / 65536.0);
++	WRF_wstring(a_output," def\n");
++
++	write_word_entry(a_fapi_font,a_output,"BlueShift",FAPI_FONT_FEATURE_BlueShift,16);
++	write_array_entry(a_fapi_font,a_output,"BlueValues",FAPI_FONT_FEATURE_BlueValues,16);
++	write_array_entry(a_fapi_font,a_output,"OtherBlues",FAPI_FONT_FEATURE_OtherBlues,16);
++	write_array_entry(a_fapi_font,a_output,"FamilyBlues",FAPI_FONT_FEATURE_FamilyBlues,16);
++	write_array_entry(a_fapi_font,a_output,"FamilyOtherBlues",FAPI_FONT_FEATURE_FamilyOtherBlues,16);
++	write_word_entry(a_fapi_font,a_output,"ForceBold",FAPI_FONT_FEATURE_ForceBold,1);
++	write_array_entry_with_count(a_fapi_font,a_output,"StdHW",FAPI_FONT_FEATURE_StdHW,1,16);
++	write_array_entry_with_count(a_fapi_font,a_output,"StdVW",FAPI_FONT_FEATURE_StdVW,1,16);
++	write_array_entry(a_fapi_font,a_output,"StemSnapH",FAPI_FONT_FEATURE_StemSnapH,16);
++	write_array_entry(a_fapi_font,a_output,"StemSnapV",FAPI_FONT_FEATURE_StemSnapV,16);
++
++	if (is_MM_font(a_fapi_font)) {
++	    WRF_wstring(a_output,"3 index /Blend get /Private get begin\n");
++	    WRF_wstring(a_output,"|-\n");
++	}
++	write_subrs(a_fapi_font,a_output);
++	}
++
++static void write_blend_dictionary(FAPI_font* a_fapi_font,WRF_output* a_output)
++{
++}
++
++static void write_main_dictionary(FAPI_font* a_fapi_font,WRF_output* a_output)
++	{
++	int i;
++	WRF_wstring(a_output,"5 dict begin\n");
++
++    WRF_wstring(a_output,"/FontType 1 def\n");
++
++	WRF_wstring(a_output,"/FontMatrix [");
++	for (i = 0; i < 6; i++)
++		{
++		WRF_wfloat(a_output,a_fapi_font->get_float(a_fapi_font,FAPI_FONT_FEATURE_FontMatrix,i));
++		WRF_wbyte(a_output,(byte)(i == 5 ? ']' : ' '));
++		}
++	WRF_wbyte(a_output,'\n');
++
++	/* For now, specify standard encoding - I think GS will pass glyph indices so doesn't matter. */
++	WRF_wstring(a_output,"/Encoding StandardEncoding def\n");
++
++	WRF_wstring(a_output,"/FontBBox {");
++	for (i = 0; i < 4; i++)
++		{
++		short x = a_fapi_font->get_word(a_fapi_font,FAPI_FONT_FEATURE_FontBBox,i);
++		WRF_wint(a_output,x);
++		WRF_wbyte(a_output,(byte)(i == 3 ? '}' : ' '));
++		}
++	WRF_wbyte(a_output,'\n');
++	if (is_MM_font(a_fapi_font)) {
++	    short x,x2;
++	    float x1;
++	    uint i, j, entries;
++	    char Buffer[255];
++
++	    entries = 0;
++    	    x = a_fapi_font->get_word(a_fapi_font,FAPI_FONT_FEATURE_BlendAxisTypes_count,0);
++	    if (x)
++		entries++;
++	    x = a_fapi_font->get_word(a_fapi_font,FAPI_FONT_FEATURE_BlendDesignPositionsArrays_count,0);
++	    if (x)
++		entries++;
++	    x = a_fapi_font->get_word(a_fapi_font,FAPI_FONT_FEATURE_BlendDesignMapArrays_count,0);
++	    if (x)
++		entries++;
++
++	    sprintf(Buffer, "/FontInfo %d dict dup begin\n", entries);
++	    WRF_wstring(a_output, Buffer);
++	    x = a_fapi_font->get_word(a_fapi_font,FAPI_FONT_FEATURE_BlendAxisTypes_count,0);
++	    if (x) {
++		WRF_wstring(a_output, "/BlendAxisTypes [");
++		for (i = 0;i < x;i++) {
++		    WRF_wstring(a_output," /");
++		    a_fapi_font->get_name(a_fapi_font,FAPI_FONT_FEATURE_BlendAxisTypes,i, (char *)&Buffer,255);
++		    WRF_wstring(a_output,Buffer);
++		}
++		WRF_wstring(a_output,"] def\n");
++	    }
++	    x = a_fapi_font->get_word(a_fapi_font,FAPI_FONT_FEATURE_BlendDesignPositionsArrays_count,0);
++	    if (x) {
++		WRF_wstring(a_output, "/BlendDesignPositions [");
++		x2 = a_fapi_font->get_word(a_fapi_font,FAPI_FONT_FEATURE_BlendAxisTypes_count,0);
++		for (i = 0;i < x; i++) {
++		    WRF_wstring(a_output,"[");
++		    for (j = 0; j < x2; j++) {
++			x1 = a_fapi_font->get_float(a_fapi_font,FAPI_FONT_FEATURE_BlendDesignPositionsArrayValue,i*8+j);
++			sprintf(Buffer, "%f ", x1);
++			WRF_wstring(a_output,Buffer);
++		    }
++		    WRF_wstring(a_output,"]");
++		}
++	    WRF_wstring(a_output, "] def\n");
++	    }
++	    x = a_fapi_font->get_word(a_fapi_font,FAPI_FONT_FEATURE_BlendDesignMapArrays_count,0);
++	    if (x) {
++		WRF_wstring(a_output, "/BlendDesignMap [");
++		for (i = 0;i < x;i++) {
++		    x2 = a_fapi_font->get_word(a_fapi_font,FAPI_FONT_FEATURE_BlendDesignMapSubArrays_count,i);
++		    WRF_wstring(a_output,"[");
++		    for (j = 0; j < x2; j++) {
++			WRF_wstring(a_output,"[");
++			x1 = a_fapi_font->get_float(a_fapi_font,FAPI_FONT_FEATURE_BlendDesignPositionsArrayValue,i*64+j*64);
++			sprintf(Buffer, "%f ", x1);
++			WRF_wstring(a_output,Buffer);
++			x1 = a_fapi_font->get_float(a_fapi_font,FAPI_FONT_FEATURE_BlendDesignPositionsArrayValue,i*64+j*64 + 1);
++			sprintf(Buffer, "%f ", x1);
++			WRF_wstring(a_output,Buffer);
++			WRF_wstring(a_output,"]");
++		    }
++		    WRF_wstring(a_output,"]");
++		}
++		WRF_wstring(a_output, "] def\n");
++	    }
++	    WRF_wstring(a_output,"end readonly def\n");
++	    WRF_wstring(a_output,"/$Blend {");
++	    x = a_fapi_font->get_word(a_fapi_font,FAPI_FONT_FEATURE_DollarBlend_length,0);
++	    if(a_output->m_count)
++		a_output->m_count += x;
++	    x = a_fapi_font->get_proc(a_fapi_font,FAPI_FONT_FEATURE_DollarBlend,0,(char *)a_output->m_pos);
++	    if(a_output->m_pos)
++		a_output->m_pos += x;
++	    WRF_wstring(a_output,"} def\n");
++	    WRF_wstring(a_output,"/$Blend {0.1 mul exch 0.45 mul add exch 0.17 mul add add} def\n");
++	    WRF_wstring(a_output,"/WeightVector [");
++	    x = a_fapi_font->get_word(a_fapi_font,FAPI_FONT_FEATURE_WeightVector_count,0);
++	    for (i = 0;i < x;i++) {
++		x1 = a_fapi_font->get_float(a_fapi_font,FAPI_FONT_FEATURE_WeightVector,i);
++		sprintf(Buffer, "%f ", x1);
++		WRF_wstring(a_output,Buffer);
++	    }
++	    WRF_wstring(a_output,"] def\n");
++	}
++	WRF_wstring(a_output,"currentdict end\ncurrentfile eexec\n");
++	write_private_dictionary(a_fapi_font,a_output);
++	if (is_MM_font(a_fapi_font)) {
++	    write_blend_dictionary(a_fapi_font, a_output);
++	}
++	}
++	
++/**
++Write a Type 1 font in textual format and return its length in bytes.
++If a_buffer_size is less than the total length, only a_buffer_size bytes are written, but the total
++length is returned correctly.
++
++The PostScript is non-standard. The main dictionary contains no /Charstrings dictionary. This
++is supplied to FreeType using the incremental interface, There is also no /PaintType entry. This is required
++by PostScript but FreeType doesn't use it.
++*/
++long FF_serialize_type1_font(FAPI_font* a_fapi_font,unsigned char* a_buffer,long a_buffer_size)
++	{
++	WRF_output output;
++	WRF_init(&output,a_buffer,a_buffer_size);
++	
++	/* Leading comment identifying a Type 1 font. */
++	WRF_wstring(&output,"%!PS-AdobeFont-1\n");
++
++	write_main_dictionary(a_fapi_font,&output);
++	return output.m_count;
++	}
+diff --git a/psi/write_t1.h b/psi/write_t1.h
+new file mode 100644
+--- /dev/null
++++ b/psi/write_t1.h
+@@ -0,0 +1,28 @@
++/* Copyright (C) 2001-2006 Artifex Software, Inc.
++   All Rights Reserved.
++  
++   This software is provided AS-IS with no warranty, either express or
++   implied.
++
++   This software is distributed under license and may not be copied, modified
++   or distributed except as expressly authorized under the terms of that
++   license.  Refer to licensing information at http://www.artifex.com/
++   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
++   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
++*/
++
++/* $Id$ */
++/*
++Header for functions to serialize a type 1 font as PostScript code that can
++then be passed to FreeType via the FAPI FreeType bridge.
++Started by Graham Asher, 26th July 2002.
++*/
++
++#ifndef write_t1_INCLUDED
++#define write_t1_INCLUDED
++
++#include "ifapi.h"
++
++long FF_serialize_type1_font(FAPI_font* a_fapi_font,unsigned char* a_buffer,long a_buffer_size);
++
++#endif
+diff --git a/psi/write_t2.c b/psi/write_t2.c
+new file mode 100644
+--- /dev/null
++++ b/psi/write_t2.c
+@@ -0,0 +1,456 @@
++/* Copyright (C) 2001-2006 Artifex Software, Inc.
++   All Rights Reserved.
++  
++   This software is provided AS-IS with no warranty, either express or
++   implied.
++
++   This software is distributed under license and may not be copied, modified
++   or distributed except as expressly authorized under the terms of that
++   license.  Refer to licensing information at http://www.artifex.com/
++   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
++   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
++*/
++
++/* $Id$ */
++
++/*
++Functions to serialize a type 1 font so that it can then be
++passed to FreeType via the FAPI FreeType bridge.
++Started by Graham Asher, 9th August 2002.
++*/
++
++#include "wrfont.h"
++#include "write_t2.h"
++#include "ghost.h"
++#include "gxfont.h"
++#include "gxfont1.h"
++
++/*
++Public structures and functions in this file are prefixed with FF_ because they are part of
++the FAPI FreeType implementation.
++*/
++
++static void write_4_byte_int(unsigned char* a_output,long a_int)
++	{
++	a_output[0] = (unsigned char)(a_int >> 24);
++	a_output[1] = (unsigned char)(a_int >> 16);
++	a_output[2] = (unsigned char)(a_int >> 8);
++	a_output[3] = (unsigned char)(a_int & 0xFF);
++	}
++
++static void write_type2_int(WRF_output* a_output,long a_int)
++	{
++	if (a_int >= -107 && a_int <= 107)
++		WRF_wbyte(a_output,(unsigned char)(a_int + 139));
++	else if (a_int >= -32768 && a_int <= 32767)
++		{
++		if (a_int >= 108 && a_int <= 1131)
++			a_int += 63124;
++		else if (a_int >= -1131 && a_int <= -108)
++			a_int = -a_int + 64148;
++		else
++			WRF_wbyte(a_output,28);
++		WRF_wbyte(a_output,(unsigned char)(a_int >> 8));
++		WRF_wbyte(a_output,(unsigned char)(a_int & 0xFF));
++		}
++	else
++		{
++		unsigned char buffer[4];
++		WRF_wbyte(a_output,29);
++		write_4_byte_int(buffer,a_int);
++		WRF_wtext(a_output,buffer,4);
++		}
++	}
++
++static void write_type2_float(WRF_output* a_output,double a_float)
++	{
++	char buffer[32];
++	const char* p = buffer;
++	int high = true;
++	char c = 0;
++	sprintf(buffer,"%f",a_float);
++	WRF_wbyte(a_output,30);
++	for (;;)
++		{
++		char n = 0;
++		if (*p >= '0' && *p <= '9')
++			n = (char)(*p - '0');
++		else if (*p == '.')
++			n = 0xA;
++		else if (*p == 'e' || *p == 'E')
++			{
++			if (p[1] == '-')
++				{
++				p++;
++				n = 0xC;
++				}
++			else
++				n = 0xB;
++			}
++		else if (*p == '-')
++			n = 0xE;
++		else if (*p == 0)
++			n = 0xF;
++		if (high)
++			{
++			if (*p == 0)
++				WRF_wbyte(a_output,0xFF);
++			else
++				c = (char)(n << 4);
++			}
++		else
++			{
++			c |= n;
++			WRF_wbyte(a_output,c);
++			}
++
++		if (*p == 0)
++			break;
++
++		high = !high;
++		p++;
++		}
++	}
++
++static void write_header(WRF_output* a_output)
++	{
++	WRF_wtext(a_output,(const unsigned char*)"\x1\x0\x4\x1",4);
++	}
++
++static void write_name_index(WRF_output* a_output)
++	{
++	/* Write a dummy name of 'x'. */
++	WRF_wtext(a_output,(const unsigned char*)"\x0\x1\x1\x1\x2""x",6);
++	}
++
++static void write_word_entry(FAPI_font* a_fapi_font,WRF_output* a_output,int a_feature_id,
++							 int a_feature_count,bool a_two_byte_op,int a_op,int a_divisor)
++	{
++	if (a_feature_count > 0)
++		{
++		int i;
++		for (i = 0; i < a_feature_count; i++)
++			{
++			/* Get the value and convert it from unsigned to signed. */
++			short x = a_fapi_font->get_word(a_fapi_font,a_feature_id,i);
++			/* Divide by the divisor to bring it back to font units. */
++			x = (short)(x / a_divisor);
++			write_type2_int(a_output,x);
++			}
++		if (a_two_byte_op)
++			WRF_wbyte(a_output,12);
++		WRF_wbyte(a_output,(unsigned char)a_op);
++		}
++	}
++
++static void write_delta_array_entry(FAPI_font* a_fapi_font,WRF_output* a_output,int a_feature_id,
++									bool a_two_byte_op,int a_op,int a_divisor)
++	{
++	int i;
++	/* NOTE that the feature index (a_feature_id) must be preceded by the count index for this to work. */
++	int count = a_fapi_font->get_word(a_fapi_font,a_feature_id - 1,0);
++	if (count > 0)
++		{
++		short prev_value = 0;
++		for (i = 0; i < count; i++)
++			{
++			/* Get the value and convert it from unsigned to signed. */
++			short value = a_fapi_font->get_word(a_fapi_font,a_feature_id,i); 
++			/* Divide by the divisor to bring it back to font units. */
++			value = (short)(value / a_divisor);
++			write_type2_int(a_output,value - prev_value);
++			prev_value = value;
++			}
++		if (a_two_byte_op)
++			WRF_wbyte(a_output,12);
++		WRF_wbyte(a_output,(unsigned char)a_op);
++		}
++	}
++
++static void write_float_entry(FAPI_font* a_fapi_font,WRF_output* a_output,int a_feature_id,int a_feature_count,bool a_two_byte_op,int a_op)
++	{
++	if (a_feature_count > 0)
++		{
++		int i;
++		for (i = 0; i < a_feature_count; i++)
++			{
++			double x = a_fapi_font->get_float(a_fapi_font,a_feature_id,i);
++			write_type2_float(a_output,x);
++			}
++		if (a_two_byte_op)
++			WRF_wbyte(a_output,12);
++		WRF_wbyte(a_output,(unsigned char)a_op);
++		}
++	}
++
++static void write_font_dict_index(FAPI_font* a_fapi_font,WRF_output* a_output,
++		unsigned char** a_charset_offset_ptr,
++		unsigned char** a_charstrings_offset_ptr,
++		unsigned char** a_private_dict_length_ptr)
++	{
++	unsigned char* data_start = 0;
++	WRF_wtext(a_output,(const unsigned char *)"\x0\x1\x2\x0\x1\x0\x0",7); /* count = 1, offset size = 2, first offset = 1, last offset = 0 (to be filled in later). */
++	if (a_output->m_pos)
++		data_start = a_output->m_pos;
++	write_word_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_FontBBox,4,false,5,1);
++	write_float_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_FontMatrix,6,true,7);
++	write_type2_int(a_output,0); /* 0 = Standard Encoding. */
++	WRF_wbyte(a_output,16); /* 16 = opcode for 'encoding'. */
++	*a_charset_offset_ptr = a_output->m_pos;
++	WRF_wtext(a_output,(const unsigned char *)"\x1d""xxxx",5); /* placeholder for the offset to the charset, which will be a 5-byte integer. */
++	WRF_wbyte(a_output,15); /* opcode for 'charset' */
++	*a_charstrings_offset_ptr = a_output->m_pos;
++	WRF_wtext(a_output,(const unsigned char *)"\x1d""xxxx",5); /* placeholder for the offset to the Charstrings index, which will be a 5-byte integer. */
++	WRF_wbyte(a_output,17); /* opcode for 'Charstrings' */
++	*a_private_dict_length_ptr = a_output->m_pos;
++	WRF_wtext(a_output,(const unsigned char *)"\x1d""xxxx\x1d""yyyy",10); /* placeholder for size and offset of Private dictionary, which will be 5-byte integers. */
++	WRF_wbyte(a_output,18); /* opcode for 'Private' */
++	if (a_output->m_pos)
++		{
++		int last_offset = a_output->m_pos - data_start + 1;
++		data_start[-2] = (unsigned char)(last_offset >> 8);
++		data_start[-1] = (unsigned char)(last_offset & 0xFF);
++		}
++	}
++
++/**
++Write the character set. Return the number of characters.
++For the moment this is always 1. The number cannot be obtained
++via the FAPI interface, and FreeType doesn't need to know anything more
++than the fact that there is at least one character.
++*/
++static int write_charset(WRF_output* a_output,unsigned char* a_charset_offset_ptr)
++	{
++	const int characters = 1;
++	int i = 0;
++
++	/* Write the offset to the start of the charset to the top dictionary. */
++	if (a_output->m_pos)
++		write_4_byte_int(a_charset_offset_ptr + 1,a_output->m_count);
++
++	/*
++	Write the charset. Write one less than the number of characters,
++	because the first one is assumed to be .notdef. For the moment
++	write all the others as .notdef (SID = 0) because we don't actually
++	need the charset at the moment.
++	*/
++	WRF_wbyte(a_output,0); /* format = 0 */
++	for (i = 1; i < characters; i++)
++		{
++		WRF_wbyte(a_output,0);
++		WRF_wbyte(a_output,0);
++		}
++
++	return characters;
++	}
++
++/**
++Write a set of empty charstrings. The only reason for the existence of the charstrings index is to tell
++FreeType how many glyphs there are.
++*/
++static void write_charstrings_index(WRF_output* a_output,int a_characters,unsigned char* a_charstrings_offset_ptr)
++	{
++	/* Write the offset to the charstrings index to the top dictionary. */
++	if (a_output->m_pos)
++		write_4_byte_int(a_charstrings_offset_ptr + 1,a_output->m_count);
++
++	/* Write the index. */
++	WRF_wbyte(a_output,(unsigned char)(a_characters >> 8));
++	WRF_wbyte(a_output,(unsigned char)(a_characters & 0xFF));
++	WRF_wbyte(a_output,1); /* offset size = 1. */
++	while (a_characters-- >= 0)
++		WRF_wbyte(a_output,1); /* offset = 1 */
++	}
++
++static void write_gsubrs_index(FAPI_font* a_fapi_font,WRF_output* a_output)
++	{
++	unsigned char* cur_offset = 0;
++	unsigned char* data_start = 0;
++	int i;
++	int count = a_fapi_font->get_word(a_fapi_font,FAPI_FONT_FEATURE_GlobalSubrs_count,0);
++
++	WRF_wbyte(a_output,(unsigned char)(count >> 8));
++	WRF_wbyte(a_output,(unsigned char)(count & 0xFF));
++
++	if (count <= 0)
++		return;
++
++	WRF_wbyte(a_output,4); /* offset size = 4 bytes */
++	WRF_wtext(a_output,(const unsigned char *)"\x0\x0\x0\x1",4); /* first offset = 1 */
++
++	if (a_output->m_pos)
++		cur_offset = a_output->m_pos;
++
++	/* Write dummy bytes for the offsets at the end of each data item. */
++	for (i = 0; i < count; i++)
++		WRF_wtext(a_output,(const unsigned char *)"xxxx",4);
++
++	if (a_output->m_pos)
++		data_start = a_output->m_pos;
++
++	for (i = 0; i < count; i++)
++		{
++		long buffer_size = a_output->m_limit - a_output->m_count;
++		long length = a_fapi_font->get_gsubr(a_fapi_font,i,a_output->m_pos,(ushort)buffer_size);
++		if (a_output->m_pos)
++			WRF_wtext(a_output,a_output->m_pos,length);
++		else
++			a_output->m_count += length;
++		if (cur_offset)
++			{
++			long pos = a_output->m_pos - data_start + 1;
++			write_4_byte_int(cur_offset,pos);
++			cur_offset += 4;
++			}
++		}
++	}
++
++static void write_subrs_index(FAPI_font* a_fapi_font,WRF_output* a_output)
++	{
++	unsigned char* cur_offset = 0;
++	unsigned char* data_start = 0;
++	int i;
++	int count = a_fapi_font->get_word(a_fapi_font,FAPI_FONT_FEATURE_Subrs_count,0);
++
++	WRF_wbyte(a_output,(unsigned char)(count >> 8));
++	WRF_wbyte(a_output,(unsigned char)(count & 0xFF));
++
++	if (count <= 0)
++		return;
++
++	WRF_wbyte(a_output,4); /* offset size = 4 bytes */
++	WRF_wtext(a_output,(const unsigned char *)"\x0\x0\x0\x1",4); /* first offset = 1 */
++
++	if (a_output->m_pos)
++		cur_offset = a_output->m_pos;
++
++	/* Write dummy bytes for the offsets at the end of each data item. */
++	for (i = 0; i < count; i++)
++		WRF_wtext(a_output,(const unsigned char *)"xxxx",4);
++
++	if (a_output->m_pos)
++		data_start = a_output->m_pos;
++
++	for (i = 0; i < count; i++)
++		{
++		long buffer_size = a_output->m_limit - a_output->m_count;
++		long length = a_fapi_font->get_subr(a_fapi_font,i,a_output->m_pos,(ushort)buffer_size);
++		if (a_output->m_pos)
++			WRF_wtext(a_output,a_output->m_pos,length);
++		else
++			a_output->m_count += length;
++		if (cur_offset)
++			{
++			long pos = a_output->m_pos - data_start + 1;
++			write_4_byte_int(cur_offset,pos);
++			cur_offset += 4;
++			}
++		}
++	}
++
++static void write_private_dict(FAPI_font* a_fapi_font,WRF_output* a_output,unsigned char* a_private_dict_length_ptr)
++	{
++	int count, initial = a_output->m_count;
++	/* Write the offset to the start of the private dictionary to the top dictionary. */
++	unsigned char* start = a_output->m_pos;
++	if (a_output->m_pos)
++		write_4_byte_int(a_private_dict_length_ptr + 6,a_output->m_count);
++
++	write_word_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_BlueFuzz,1,true,11,16);
++
++	write_type2_float(a_output,a_fapi_font->get_long(a_fapi_font,FAPI_FONT_FEATURE_BlueScale,0) / 65536.0);
++	WRF_wbyte(a_output,12);
++	WRF_wbyte(a_output,9);
++	
++	write_word_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_BlueShift,1,true,10,16);
++	write_delta_array_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_BlueValues,false,6,16);
++	write_delta_array_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_OtherBlues,false,7,16);
++	write_delta_array_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_FamilyBlues,false,8,16);
++	write_delta_array_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_FamilyOtherBlues,false,9,16);
++	write_word_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_ForceBold,1,true,14,1);
++	write_word_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_StdHW,1,false,10,16);
++	write_word_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_StdVW,1,false,11,16);
++	write_delta_array_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_StemSnapH,true,12,16);
++	write_delta_array_entry(a_fapi_font,a_output,FAPI_FONT_FEATURE_StemSnapV,true,13,16);
++
++	/*
++	Write the default width and the nominal width. These values are not available via
++	the FAPI interface so we have to get a pointer to the Type 1 font structure and
++	extract them directly.
++	*/
++	{
++	gs_font_type1* t1 = (gs_font_type1*)a_fapi_font->client_font_data;
++    write_type2_float(a_output,fixed2float(t1->data.defaultWidthX));
++	WRF_wbyte(a_output,20);
++    write_type2_float(a_output,fixed2float(t1->data.nominalWidthX));
++	WRF_wbyte(a_output,21);
++	}
++
++	count = a_fapi_font->get_word(a_fapi_font,FAPI_FONT_FEATURE_Subrs_count,0);
++	/* If we have local /Subrs we need to make a new dict ( see calling routine) and
++	 * we also need to add an entry to the Provate dict with an offset to the /Subrs
++	 * dict. This is complicated by the fact that the offset includes the data for
++	 * the offset (its contained in the Private dict) and the size of the data depends 
++	 * on its value (because of number representation).
++	 */
++	if (count) {
++	    int n, n1 = a_output->m_count - initial + 2; /* One for the operator, one for the first try at the data representation */
++
++	    /* We start by assuming one byte is sufficient for the data (less than 107 bytes)
++	     * We run round the loop checking to see if the data is OK to be represented in that many bytes, 
++	     * if it is we stop, otherwise we add the required amount for the representation, and test again.
++	     */
++	    do {
++		n = n1;
++		if (n >= -107 && n <= 107)
++		    n1 = n;
++		else 
++		    if (n >= -32768 && n <= 32767) {   
++			if (n >= 108 && n <= 1131)
++			    n1 = n + 1;
++			else if (n >= -1131 && n <= -108)
++			    n1 = n + 1;
++			else
++			    n1 = n + 2;
++		    } else
++			n1 = n + 3;
++	    } while (n1 != n);
++	    write_type2_int(a_output, n);
++	    WRF_wbyte(a_output,19);
++	}
++
++	/* Write the length in bytes of the private dictionary to the top dictionary. */	
++	if (a_output->m_pos)
++		write_4_byte_int(a_private_dict_length_ptr + 1,a_output->m_pos - start);
++	}
++
++/**
++Write a Type 2 font in binary format and return its length in bytes.
++If a_buffer_size is less than the total length, only a_buffer_size bytes are written, but the total
++length is returned correctly.
++*/
++long FF_serialize_type2_font(FAPI_font* a_fapi_font,unsigned char* a_buffer,long a_buffer_size)
++	{
++	unsigned char* charset_offset_ptr = NULL;
++	unsigned char* charstrings_offset_ptr = NULL;
++	unsigned char* private_dict_length_ptr = NULL;
++	int characters = 0;
++
++	WRF_output output;
++	WRF_init(&output,a_buffer,a_buffer_size);
++
++	write_header(&output);
++	write_name_index(&output);
++	write_font_dict_index(a_fapi_font,&output,&charset_offset_ptr,&charstrings_offset_ptr,&private_dict_length_ptr);
++
++  	/* Write an empty string index. */
++  	WRF_wtext(&output,(const unsigned char *)"\x0\x0",2);
++
++	write_gsubrs_index(a_fapi_font,&output);
++	characters = write_charset(&output,charset_offset_ptr);
++	write_charstrings_index(&output,characters,charstrings_offset_ptr);
++	write_private_dict(a_fapi_font,&output,private_dict_length_ptr);
++	write_subrs_index(a_fapi_font,&output);
++
++	return output.m_count;
++	}
+diff --git a/psi/write_t2.h b/psi/write_t2.h
+new file mode 100644
+--- /dev/null
++++ b/psi/write_t2.h
+@@ -0,0 +1,28 @@
++/* Copyright (C) 2001-2006 Artifex Software, Inc.
++   All Rights Reserved.
++  
++   This software is provided AS-IS with no warranty, either express or
++   implied.
++
++   This software is distributed under license and may not be copied, modified
++   or distributed except as expressly authorized under the terms of that
++   license.  Refer to licensing information at http://www.artifex.com/
++   or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
++   San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
++*/
++
++/* $Id$ */
++/*
++Header for functions to serialize a type 2 (CFF) font so that it can
++then be passed to FreeType via the FAPI FreeType bridge.
++Started by Graham Asher, 9th August 2002.
++*/
++
++#ifndef write_t2_INCLUDED
++#define write_t2_INCLUDED
++
++#include "ifapi.h"
++
++long FF_serialize_type2_font(FAPI_font* a_fapi_font,unsigned char* a_buffer,long a_buffer_size);
++
++#endif
+diff --git a/psi/zarith.c b/psi/zarith.c
+--- a/psi/zarith.c
++++ b/psi/zarith.c
+@@ -27,9 +27,9 @@
+  */
+ 
+ /* Define max and min values for what will fit in value.intval. */
+-#define MIN_INTVAL min_long
+-#define MAX_INTVAL max_long
+-#define MAX_HALF_INTVAL ((1L << (size_of(long) * 4 - 1)) - 1)
++#define MIN_INTVAL 0x80000000
++#define MAX_INTVAL 0x7fffffff
++#define MAX_HALF_INTVAL 0x7fff
+ 
+ /* <num1> <num2> add <sum> */
+ /* We make this into a separate procedure because */
+@@ -59,7 +59,7 @@ zop_add(register os_ptr op)
+ 	    op[-1].value.realval += (double)op->value.intval;
+ 	    break;
+ 	case t_integer: {
+-	    long int2 = op->value.intval;
++	    int int2 = op->value.intval;
+ 
+ 	    if (((op[-1].value.intval += int2) ^ int2) < 0 &&
+ 		((op[-1].value.intval - int2) ^ int2) >= 0
+@@ -153,10 +153,10 @@ zmul(i_ctx_t *i_ctx_p)
+ 	    op[-1].value.realval *= (double)op->value.intval;
+ 	    break;
+ 	case t_integer: {
+-	    long int1 = op[-1].value.intval;
+-	    long int2 = op->value.intval;
+-	    unsigned long abs1 = (unsigned long)(int1 >= 0 ? int1 : -int1);
+-	    unsigned long abs2 = (unsigned long)(int2 >= 0 ? int2 : -int2);
++	    int int1 = op[-1].value.intval;
++	    int int2 = op->value.intval;
++	    uint abs1 = (uint)(int1 >= 0 ? int1 : -int1);
++	    uint abs2 = (uint)(int2 >= 0 ? int2 : -int2);
+ 	    float fprod;
+ 
+ 	    if ((abs1 > MAX_HALF_INTVAL || abs2 > MAX_HALF_INTVAL) &&
+@@ -207,7 +207,7 @@ zop_sub(register os_ptr op)
+ 	    op[-1].value.realval -= (double)op->value.intval;
+ 	    break;
+ 	case t_integer: {
+-	    long int1 = op[-1].value.intval;
++	    int int1 = op[-1].value.intval;
+ 
+ 	    if ((int1 ^ (op[-1].value.intval = int1 - op->value.intval)) < 0 &&
+ 		(int1 ^ op->value.intval) < 0
+diff --git a/psi/zcolor.c b/psi/zcolor.c
+--- a/psi/zcolor.c
++++ b/psi/zcolor.c
+@@ -49,6 +49,8 @@
+ #include "zcolor.h"	/* For the PS_colour_space_t structure */
+ #include "zcie.h"	/* For CIE space function declarations */
+ #include "zicc.h"	/* For declaration of seticc */
++#include "gscspace.h"   /* Needed for checking if current pgs colorspace is CIE */
++#include "iddict.h"	/* for idict_put_string */
+ 
+ /* imported from gsht.c */
+ extern  void    gx_set_effective_transfer(gs_state *);
+@@ -336,13 +338,26 @@ zsetcolor(i_ctx_t * i_ctx_p)
+     return o_push_estack;
+ }
+ 
++/* This is used to detect color space changes due
++   to the changing of UseCIEColor during transparency
++   soft mask processing */
++
++static bool name_is_device_color( char *name )
++{
++
++    return( (strcmp(name, "DeviceGray") == 0) || 
++        (strcmp(name, "DeviceRGB") == 0) || (strcmp(name, "DeviceCMYK") == 0));
++
++}
++
++
+ /*
+  * Given two color space arrays, attempts to determine if they are the 
+  * same space by comparing their contents recursively. For some spaces,
+  * especially CIE based color spaces, it can significantly improve
+  * performance if the same space is frequently re-used.
+  */
+-static int is_same_colorspace(i_ctx_t * i_ctx_p, ref *space1, ref *space2)
++static int is_same_colorspace(i_ctx_t * i_ctx_p, ref *space1, ref *space2, bool isCIE)
+ {
+     PS_colour_space_t *oldcspace = 0, *newcspace = 0;
+     ref oldspace, *poldspace = &oldspace, newspace, *pnewspace = &newspace;
+@@ -376,6 +391,29 @@ static int is_same_colorspace(i_ctx_t * i_ctx_p, ref *space1, ref *space2)
+ 	if (!oldcspace->compareproc(i_ctx_p, poldspace, pnewspace))
+ 	    return 0;
+ 
++        /* See if current space is CIE based (which could happen
++           if UseCIE had been true previously), but UseCIE is false
++           and incoming space is device based.  This can occur
++           when we are now processing a soft mask, which should not
++           use the UseCIEColor option.  
++           
++           Need to detect this case at both transitions
++
++            Device Color UseCIEColor true
++            Soft mask 
++	            Device color UseCIEColor false
++            Soft mask
++            Device color UseCIEColor true
++            */
++
++        if ( name_is_device_color(newcspace->name) ){
++            if ( gs_color_space_is_CIE(i_ctx_p->pgs->color_space) ){
++                if ( !isCIE ) return 0; /*  The color spaces will be different */
++            } else {
++                if ( isCIE ) return 0; /*  The color spaces will be different */
++            }
++        }       
++
+ 	/* The current space is OK, if there is no alternate, then that's
+ 	 * good enough. 
+ 	 */
+@@ -398,6 +436,8 @@ static int is_same_colorspace(i_ctx_t * i_ctx_p, ref *space1, ref *space2)
+     return 1;
+ }
+ 
++
++
+ /*
+  *  <array>   setcolorspace   -
+  *
+@@ -412,6 +452,7 @@ zsetcolorspace(i_ctx_t * i_ctx_p)
+     os_ptr  op = osp;
+     es_ptr ep = esp;
+     int code, depth;
++    bool is_CIE;
+ 
+     /* Make sure we have an operand... */
+     check_op(1);
+@@ -424,8 +465,10 @@ zsetcolorspace(i_ctx_t * i_ctx_p)
+     if (code < 0)
+ 	return code;
+ 
++    is_CIE = istate->use_cie_color.value.boolval;
++
+     /* See if its the same as the current space */
+-    if (is_same_colorspace(i_ctx_p, op, &istate->colorspace.array)) {
++    if (is_same_colorspace(i_ctx_p, op, &istate->colorspace.array, is_CIE)) {
+ 	PS_colour_space_t *cspace;
+ 
+ 	/* Even if its the same space, we still need to set the correct
+@@ -3725,11 +3768,11 @@ static int devicencolorants_cont(i_ctx_t *i_ctx_p)
+ 	     * so that our continuation is ahead of the sub-proc's continuation.
+ 	     */
+ 	    check_estack(1);
++	    push(1);
+ 	    /* The push_op_estack macro increments esp before use, so we don't need to */
+ 	    push_op_estack(devicencolorants_cont);
+ 
+ 	    make_int(pstage, 1);
+-	    push(1);
+ 	    *op = space[1];
+ 	    code = zsetcolorspace(i_ctx_p);
+ 	    if (code != 0)
+@@ -5169,20 +5212,32 @@ static int validateiccspace(i_ctx_t * i_ctx_p, ref **r)
+     } else {
+ 	switch (components) {
+ 	    case 1:
+-		code = name_enter_string(imemory, "DeviceGray", *r);
++		code = name_enter_string(imemory, "DeviceGray", tempref);
+ 		break;
+ 	    case 3:
+-		code = name_enter_string(imemory, "DeviceRGB", *r);
++		code = name_enter_string(imemory, "DeviceRGB", tempref);
+ 		break;
+ 	    case 4:
+-		code = name_enter_string(imemory, "DeviceCMYK", *r);
++		code = name_enter_string(imemory, "DeviceCMYK", tempref);
+ 		break;
+ 	    default:
+ 		return_error(e_rangecheck);
+ 	}
++	/* In case this space is the /ALternate for a previous ICCBased space
++	 * insert the named space into the ICC dictionary. If we simply returned
++	 * the named space, as before, then we are replacing the second ICCBased
++	 * space in the first ICCBased space with the named space!
++	 */
++	code = idict_put_string(&ICCdict, "Alternate", tempref);
++	if (code < 0)
++	    return code;
++
++	/* And now revalidate with the newly updated dictionary */
++	return validateiccspace(i_ctx_p, r);
+     }
+     return code;
+ }
++
+ static int iccalternatespace(i_ctx_t * i_ctx_p, ref *space, ref **r, int *CIESubst)
+ {
+     int components, code = 0;
+@@ -5288,9 +5343,9 @@ static int iccrange(i_ctx_t * i_ctx_p, ref *space, float *ptr)
+ 	    if (code < 0)
+ 		return code;
+ 	    if (r_has_type(&valref, t_integer))
+-		ptr[i * 2] = (float)valref.value.intval;
++		ptr[i] = (float)valref.value.intval;
+ 	    else
+-		ptr[i * 2] = (float)valref.value.realval;
++		ptr[i] = (float)valref.value.realval;
+ 	}
+     } else {
+ 	for (i=0;i<components;i++) {
+@@ -5606,6 +5661,8 @@ setdevicecolor_cont(i_ctx_t *i_ctx_p)
+      * so that our continuation is ahead of the sub-proc's continuation.
+      */
+     check_estack(1);
++    /* May need to push a /Device... name on the stack so make sure we have space */
++    check_ostack(1);
+     /* The push_op_estack macro increments esp before use, so we don't need to */
+     push_op_estack(setdevicecolor_cont);
+ 
+diff --git a/psi/zcontrol.c b/psi/zcontrol.c
+--- a/psi/zcontrol.c
++++ b/psi/zcontrol.c
+@@ -362,7 +362,7 @@ for_pos_int_continue(i_ctx_t *i_ctx_p)
+ {
+     os_ptr op = osp;
+     register es_ptr ep = esp;
+-    long var = ep[-3].value.intval;
++    int var = ep[-3].value.intval;
+ 
+     if (var > ep[-1].value.intval) {
+ 	esp -= 5;		/* pop everything */
+@@ -381,7 +381,7 @@ for_neg_int_continue(i_ctx_t *i_ctx_p)
+ {
+     os_ptr op = osp;
+     register es_ptr ep = esp;
+-    long var = ep[-3].value.intval;
++    int var = ep[-3].value.intval;
+ 
+     if (var < ep[-1].value.intval) {
+ 	esp -= 5;		/* pop everything */
+@@ -454,9 +454,9 @@ for_samples_continue(i_ctx_t *i_ctx_p)
+ {
+     os_ptr op = osp;
+     es_ptr ep = esp;
+-    long var = ep[-4].value.intval;
++    int var = ep[-4].value.intval;
+     float a = ep[-3].value.realval;
+-    long n = ep[-2].value.intval;
++    int n = ep[-2].value.intval;
+     float b = ep[-1].value.realval;
+ 
+     if (var > n) {
+diff --git a/psi/zdict.c b/psi/zdict.c
+--- a/psi/zdict.c
++++ b/psi/zdict.c
+@@ -30,12 +30,8 @@ zdict(i_ctx_t *i_ctx_p)
+     os_ptr op = osp;
+ 
+     check_type(*op, t_integer);
+-#if arch_sizeof_int < arch_sizeof_long
+-    check_int_leu(*op, max_uint);
+-#else
+     if (op->value.intval < 0)
+ 	return_error(e_rangecheck);
+-#endif
+     return dict_create((uint) op->value.intval, op);
+ }
+ 
+@@ -496,12 +492,8 @@ zsetmaxlength(i_ctx_t *i_ctx_p)
+     if (i_ctx_p->in_superexec == 0)
+ 	check_dict_write(*op1);
+     check_type(*op, t_integer);
+-#if arch_sizeof_int < arch_sizeof_long
+-    check_int_leu(*op, max_uint);
+-#else
+     if (op->value.intval < 0)
+ 	return_error(e_rangecheck);
+-#endif
+     new_size = (uint) op->value.intval;
+     if (dict_length(op - 1) > new_size)
+ 	return_error(e_dictfull);
+diff --git a/psi/zdps.c b/psi/zdps.c
+--- a/psi/zdps.c
++++ b/psi/zdps.c
+@@ -41,19 +41,18 @@ zsetscreenphase(i_ctx_t *i_ctx_p)
+ {
+     os_ptr op = osp;
+     int code;
+-    long x, y;
++    int x, y;
+ 
+     check_type(op[-2], t_integer);
+     check_type(op[-1], t_integer);
+     check_type(*op, t_integer);
+     x = op[-1].value.intval;
+     y = op->value.intval;
+-    if (x != (int)x || y != (int)y ||
+-	op[-2].value.intval < -1 ||
++    if (op[-2].value.intval < -1 ||
+ 	op[-2].value.intval >= gs_color_select_count
+ 	)
+ 	return_error(e_rangecheck);
+-    code = gs_setscreenphase(igs, (int)x, (int)y,
++    code = gs_setscreenphase(igs, x, y,
+ 			     (gs_color_select_t) op[-2].value.intval);
+     if (code >= 0)
+ 	pop(3);
+diff --git a/psi/zfapi.c b/psi/zfapi.c
+--- a/psi/zfapi.c
++++ b/psi/zfapi.c
+@@ -15,7 +15,6 @@
+ /* Font API client */
+ 
+ #include "memory_.h"
+-#include "string_.h"
+ #include "math_.h"
+ #include "ghost.h"
+ #include "gp.h"
+@@ -36,8 +35,6 @@
+ #include "dstack.h"
+ #include "ichar.h"
+ #include "idict.h"
+-#include "iddict.h"
+-#include "idparam.h"
+ #include "iname.h"
+ #include "ifont.h"
+ #include "icid.h"
+@@ -49,9 +46,12 @@
+ #include "gzstate.h"
+ #include "gdevpsf.h"
+ #include "stream.h"		/* for files.h */
+-#include "files.h"
+ #include "gscrypt1.h"
+ #include "gxfcid.h"
++#include "gsstype.h"
++#include "gxchar.h"		/* for st_gs_show_enum */
++#include "ipacked.h"	    /* for packed_next */
++#include "iddict.h"
+ 
+ /* -------------------------------------------------------- */
+ 
+@@ -419,21 +419,121 @@ static ushort FAPI_FF_get_word(FAPI_font *ff, fapi_font_feature var_id, int inde
+         case FAPI_FONT_FEATURE_ForceBold: return pfont->data.ForceBold;
+         case FAPI_FONT_FEATURE_LanguageGroup: return pfont->data.LanguageGroup;
+         case FAPI_FONT_FEATURE_lenIV: return (ff->need_decrypt ? 0 : pfont->data.lenIV);
++        case FAPI_FONT_FEATURE_GlobalSubrs_count: 
++            {   ref *Private, *GlobalSubrs;
++                if (dict_find_string(pdr, "Private", &Private) <= 0)
++                    return 0;
++                if (dict_find_string(Private, "GlobalSubrs", &GlobalSubrs) <= 0)
++                    return 0;;
++                return r_size(GlobalSubrs);
++            }
+         case FAPI_FONT_FEATURE_Subrs_count: 
+-            {   ref *Private, *Subrs, *GlobalSubrs;
+-                int n1, n2;
++            {   ref *Private, *Subrs;
+                 if (dict_find_string(pdr, "Private", &Private) <= 0)
+                     return 0;
+                 if (dict_find_string(Private, "Subrs", &Subrs) <= 0)
+-                    Subrs = NULL;
+-                if (dict_find_string(Private, "GlobalSubrs", &GlobalSubrs) <= 0)
+-                    GlobalSubrs = NULL;
+-                n1 = (Subrs != NULL ? r_size(Subrs) : 0);
+-                n2 = (GlobalSubrs != NULL ? r_size(GlobalSubrs) : 0);
+-                /* trick : we return twice maximum of n1, n2 to pass both Subrs and GlobalSubrs in same array.
+-                */
+-                return (n1 < n2 ? n2 : n1) * 2;
++                    return 0;
++                return r_size(Subrs);
+             }
++	    /* Multiple Master specific */
++        case FAPI_FONT_FEATURE_DollarBlend: 
++	    {   ref *DBlend; 
++		if (dict_find_string(pdr, "$Blend", &DBlend) <= 0)
++		    return 0;
++		return 1;
++	    }
++        case FAPI_FONT_FEATURE_BlendAxisTypes_count: 
++	    {   ref *Info, *Axes; 
++		if (dict_find_string(pdr, "FontInfo", &Info) <= 0)
++		    return 0;
++		if (dict_find_string(Info, "BlendAxisTypes", &Axes) <= 0)
++		    return 0;
++		return r_size(Axes);
++	    }
++        case FAPI_FONT_FEATURE_BlendFontInfo_count: 
++	    {   ref *Info, *FontInfo; 
++		if (dict_find_string(pdr, "Blend", &Info) <= 0)
++		    return 0;
++		if (dict_find_string(Info, "FontInfo", &FontInfo) <= 0)
++		    return 0;
++		return dict_length(FontInfo);
++	    }
++        case FAPI_FONT_FEATURE_BlendPrivate_count: 
++	    {   ref *Info, *Private; 
++		if (dict_find_string(pdr, "Blend", &Info) <= 0)
++		    return 0;
++		if (dict_find_string(Info, "Private", &Private) <= 0)
++		    return 0;
++		return dict_length(Private);
++	    }
++        case FAPI_FONT_FEATURE_WeightVector_count: 
++	    {   ref *Array; 
++		if (dict_find_string(pdr, "WeightVector", &Array) <= 0)
++		    return 0;
++		return r_size(Array);
++	    }
++        case FAPI_FONT_FEATURE_BlendDesignPositionsArrays_count: 
++	    {   ref *Info, *Array; 
++		if (dict_find_string(pdr, "FontInfo", &Info) <= 0)
++		    return 0;
++		if (dict_find_string(Info, "BlendDesignPositions", &Array) <= 0)
++		    return 0;
++		return r_size(Array);
++	    }
++        case FAPI_FONT_FEATURE_BlendDesignMapArrays_count: 
++	    {   ref *Info, *Array; 
++		if (dict_find_string(pdr, "FontInfo", &Info) <= 0)
++		    return 0;
++		if (dict_find_string(Info, "BlendDesignMap", &Array) <= 0)
++		    return 0;
++		return r_size(Array);
++	    }
++        case FAPI_FONT_FEATURE_BlendDesignMapSubArrays_count: 
++	    {   ref *Info, *Array, SubArray; 
++		if (dict_find_string(pdr, "FontInfo", &Info) <= 0)
++		    return 0;
++		if (dict_find_string(Info, "BlendDesignMap", &Array) <= 0)
++		    return 0;
++		if (array_get(ff->memory, Array, index, &SubArray) < 0)
++		    return 0;
++		return r_size(&SubArray);
++	    }
++	case FAPI_FONT_FEATURE_DollarBlend_length:
++	    {   ref *DBlend, Element, name, string; 
++		int i, length = 0;
++		char Buffer[32];
++		if (dict_find_string(pdr, "$Blend", &DBlend) <= 0)
++		    return 0;
++		for (i = 0;i < r_size(DBlend);i++) {
++		    if (array_get(ff->memory, DBlend, i, &Element) < 0)
++			return 0;
++		    switch (r_btype(&Element)) {
++			case t_name:
++			    name_string_ref(ff->memory, &name, &string);
++			    length += r_size(&string) + 1;
++			    break;
++			case t_real:
++			    sprintf(Buffer, "%f", Element.value.realval);
++			    length += strlen(Buffer) + 1;
++			    break;
++			case t_integer:
++			    sprintf(Buffer, "%d", Element.value.intval);
++			    length += strlen(Buffer) + 1;
++			    break;
++			case t_operator:
++			    { op_def const *op;
++
++			    op = op_index_def(r_size(&Element));
++			    length += strlen(op->oname + 1) + 1;
++			    }
++			    break;
++			default:
++			    break;
++		    }
++		}
++		return length;
++	    }
++	    /* End MM specifics */
+     }
+     return 0;
+ }
+@@ -470,6 +570,7 @@ static ulong FAPI_FF_get_long(FAPI_font *ff, fapi_font_feature var_id, int index
+ 
+ static float FAPI_FF_get_float(FAPI_font *ff, fapi_font_feature var_id, int index)
+ {   gs_font_base *pbfont = (gs_font_base *)ff->client_font_data;
++    ref *pdr = (ref *)ff->client_font_data2;
+ 
+     switch((int)var_id) {
+         case FAPI_FONT_FEATURE_FontMatrix:
+@@ -483,10 +584,141 @@ static float FAPI_FF_get_float(FAPI_font *ff, fapi_font_feature var_id, int inde
+                     case 5 : return pbfont->base->FontMatrix.ty / FontMatrix_div;
+                 }
+             } 
++        case FAPI_FONT_FEATURE_WeightVector: 
++	    {   ref *Array, value; 
++
++		if (dict_find_string(pdr, "WeightVector", &Array) <= 0)
++		    return 0;
++		if (array_get(ff->memory, Array, index, &value) < 0)
++		    return 0;
++		if (!r_has_type(&value, t_integer)) {
++		    if (r_has_type(&value, t_real)) {
++			return value.value.realval;
++		    } else
++			return 0;
++		}
++		else
++		    return (float)value.value.intval;
++	    }
++	case FAPI_FONT_FEATURE_BlendDesignPositionsArrayValue:
++	    {	ref *Info, *Array, SubArray, value;
++		int array_index = index / 8;
++		index %= 8;
++		if (dict_find_string(pdr, "FontInfo", &Info) <= 0)
++		    return 0;
++		if (dict_find_string(Info, "BlendDesignPositions", &Array) <= 0)
++		    return 0;
++		if (array_get(ff->memory, Array, array_index, &SubArray) < 0)
++		    return 0;
++		if (array_get(ff->memory, &SubArray, index, &value) < 0)
++		    return 0;
++		if (!r_has_type(&value, t_integer)) {
++		    if (r_has_type(&value, t_real)) {
++			return value.value.realval;
++		    } else
++			return 0;
++		}
++		else
++		    return (float)value.value.intval;
++	    }
++	case FAPI_FONT_FEATURE_BlendDesignMapArrayValue:
++	    {	ref *Info, *Array, SubArray, SubSubArray, value;
++		int array_index = index / 64, subarray_index = (index %64) / 8;
++		index %= 8;
++		if (dict_find_string(pdr, "FontInfo", &Info) <= 0)
++		    return 0;
++		if (dict_find_string(Info, "BlendDesignMap", &Array) <= 0)
++		    return 0;
++		if (array_get(ff->memory, Array, array_index, &SubArray) < 0)
++		    return 0;
++		if (array_get(ff->memory, &SubArray, index, &SubSubArray) < 0)
++		    return 0;
++		if (array_get(ff->memory, &SubSubArray, index, &value) < 0)
++		    return 0;
++		if (!r_has_type(&value, t_integer)) {
++		    if (r_has_type(&value, t_real)) {
++			return value.value.realval;
++		    } else
++			return 0;
++		}
++		else
++		    return (float)value.value.intval;
++	    }
+     }
+     return 0;
+ }
+ 
++static int FAPI_FF_get_name(FAPI_font *ff, fapi_font_feature var_id, int index, char *Buffer, int len)
++{
++    ref name, string, *pdr = (ref *)ff->client_font_data2;
++
++    switch((int)var_id) {
++	case FAPI_FONT_FEATURE_BlendAxisTypes:
++	    {   ref *Info, *Axes; 
++		if (dict_find_string(pdr, "FontInfo", &Info) <= 0)
++		    return 0;
++		if (dict_find_string(Info, "BlendAxisTypes", &Axes) <= 0)
++		    return 0;
++		if(!r_has_type(Axes, t_array))
++		    return 0;
++		if (array_get(ff->memory, Axes, index, &name) < 0)
++		    return 0;
++	    }
++    }
++    name_string_ref(ff->memory, &name, &string);
++    if(r_size(&string) >= len)
++	return 0;
++    memcpy(Buffer, string.value.const_bytes, r_size(&string));
++    Buffer[r_size(&string)] = 0x00;
++    return 1;
++}
++
++static int FAPI_FF_get_proc(FAPI_font *ff, fapi_font_feature var_id, int index, char *Buffer)
++{
++    ref *pdr = (ref *)ff->client_font_data2;
++    char *ptr = Buffer;
++
++    if (!Buffer)
++	return 0;
++
++    switch((int)var_id) {
++	case FAPI_FONT_FEATURE_DollarBlend:
++	    {   ref *DBlend, Element; 
++		int i;
++		char Buf[32];
++		if (dict_find_string(pdr, "$Blend", &DBlend) <= 0)
++		    return 0;
++		for (i = 0;i < r_size(DBlend);i++) {
++		    *ptr++ = 0x20;
++		    if (array_get(ff->memory, DBlend, i, &Element) < 0)
++			return 0;
++		    switch (r_btype(&Element)) {
++			case t_real:
++			    sprintf(Buf, "%f", Element.value.realval);
++			    strcpy(ptr, Buf);
++			    ptr += strlen(Buf);
++			    break;
++			case t_integer:
++			    sprintf(Buf, "%d", Element.value.intval);
++			    strcpy(ptr, Buf);
++			    ptr += strlen(Buf);
++			    break;
++			case t_operator:
++			    { op_def const *op;
++
++			    op = op_index_def(r_size(&Element));
++			    strcpy(ptr, op->oname + 1);
++			    ptr += strlen(op->oname + 1);
++			    }
++			    break;
++			default:
++			    break;
++		    }
++		}
++	    }
++    }
++    return ptr - Buffer;
++}
+ static inline void decode_bytes(byte *p, const byte *s, int l, int lenIV)
+ {   ushort state = 4330;
+ 
+@@ -518,30 +750,29 @@ static ushort get_type1_data(FAPI_font *ff, const ref *type1string,
+     return length;
+ }
+ 
++static ushort FAPI_FF_get_gsubr(FAPI_font *ff, int index, byte *buf, ushort buf_length)
++{   ref *pdr = (ref *)ff->client_font_data2;
++    ref *Private, *GlobalSubrs, subr;
++
++    if (dict_find_string(pdr, "Private", &Private) <= 0)
++        return 0;
++    if (dict_find_string(Private, "GlobalSubrs", &GlobalSubrs) <= 0)
++	return 0;
++    if (array_get(ff->memory, 
++	      GlobalSubrs, index, &subr) < 0 || r_type(&subr) != t_string)
++        return 0;
++    return get_type1_data(ff, &subr, buf, buf_length);
++}
++
+ static ushort FAPI_FF_get_subr(FAPI_font *ff, int index, byte *buf, ushort buf_length)
+ {   ref *pdr = (ref *)ff->client_font_data2;
+-    ref *Private, *Subrs, *GlobalSubrs, subr;
+-    int n1, n2, n;
++    ref *Private, *Subrs, subr;
+ 
+     if (dict_find_string(pdr, "Private", &Private) <= 0)
+         return 0;
+     if (dict_find_string(Private, "Subrs", &Subrs) <= 0)
+-        Subrs = NULL;
+-    if (dict_find_string(Private, "GlobalSubrs", &GlobalSubrs) <= 0)
+-        GlobalSubrs = NULL;
+-    n1 = (Subrs != NULL ? r_size(Subrs) : 0);
+-    n2 = (GlobalSubrs != NULL ? r_size(GlobalSubrs) : 0);
+-    /* trick : we use the maximum of n1, n2 to pass both Subrs and GlobalSubrs in same array.
+-    */
+-    n = (n1 < n2 ? n2 : n1);
+-    if (index < n && Subrs != NULL) {
+-        if (array_get(ff->memory, Subrs, index, &subr) < 0 || r_type(&subr) != t_string)
+-            return 0;
+-    } else if (index >= n && GlobalSubrs != NULL) {
+-        if (array_get(ff->memory, 
+-		      GlobalSubrs, index - n, &subr) < 0 || r_type(&subr) != t_string)
+-            return 0;
+-    } else
++	return 0;
++    if (array_get(ff->memory, Subrs, index, &subr) < 0 || r_type(&subr) != t_string)
+         return 0;
+     return get_type1_data(ff, &subr, buf, buf_length);
+ }
+@@ -572,7 +803,12 @@ static int get_GlyphDirectory_data_ptr(const gs_memory_t *mem,
+ 	    && r_type(glyph) == t_string) {
+         *ptr = glyph->value.const_bytes;
+ 	return r_size(glyph);
+-    }
++    } else
++	/* We have a GlyphDirectory, but couldn't find the glyph. If we 
++	 * return -1 then we will attempt to use glyf and loca which 
++	 * will fail. Instead return 0, so we execute an 'empty' glyph.
++	 */
++	return 0;
+     }
+     return -1;
+ }
+@@ -590,20 +826,19 @@ static bool get_MetricsCount(FAPI_font *ff)
+ 
+ static ushort FAPI_FF_get_glyph(FAPI_font *ff, int char_code, byte *buf, ushort buf_length)
+ {   /* 
+-     * We assume that renderer requests glyph data with multiple consequtive
+-     * calls to this function. 
++     * We assume that renderer requests glyph data with multiple
++     * consecutive calls to this function.
+      *
+-     * For a simple glyph it calls this
+-     * function exactly twice : first with buf == NULL for requesting
+-     * the necessary buffer length, and second with
+-     * buf != NULL for requesting the data (the second call may be skept
+-     * if the renderer discontinues the rendering on an exception).
++     * For a simple glyph it calls this function exactly twice: first
++     * with buf == NULL for requesting the necessary buffer length, and
++     * second with buf != NULL for requesting the data (the second call
++     * may be skipped if the renderer discontinues the rendering).
+      *
+      * For a composite glyph it calls this function 2 * (N + 1)
+-     * times : 2 calls for the main glyph (same as above) followed with 
+-     * 2 * N calls for subglyphs, where N is less or equal to the number of
+-     * subglyphs ( N may be less if the renderer caches glyph data,
+-     * or discontinues the rendering on an exception).
++     * times: 2 calls for the main glyph (same as above) followed with
++     * 2 * N calls for subglyphs, where N is less or equal to the number
++     * of subglyphs (N may be less if the renderer caches glyph data,
++     * or discontinues rendering on an exception).
+      */
+     ref *pdr = (ref *)ff->client_font_data2;
+     ushort glyph_length;
+@@ -660,7 +895,7 @@ static ushort FAPI_FF_get_glyph(FAPI_font *ff, int char_code, byte *buf, ushort
+         } else {
+             gs_font_type42 *pfont42 = (gs_font_type42 *)ff->client_font_data;
+             ulong offset0, offset1;
+-            bool error = sfnt_get_glyph_offset(pdr, pfont42, char_code, &offset0, &offset1);
++	    bool error = sfnt_get_glyph_offset(pdr, pfont42, char_code, &offset0, &offset1);
+ 
+             glyph_length = (error ? -1 : offset1 - offset0);
+             if (buf != 0 && !error) {
+@@ -696,6 +931,9 @@ static const FAPI_font ff_stub = {
+     FAPI_FF_get_word,
+     FAPI_FF_get_long,
+     FAPI_FF_get_float,
++    FAPI_FF_get_name,
++    FAPI_FF_get_proc,
++    FAPI_FF_get_gsubr,
+     FAPI_FF_get_subr,
+     FAPI_FF_get_glyph,
+     FAPI_FF_serialize_tt_font
+@@ -936,24 +1174,37 @@ static int FAPI_refine_font(i_ctx_t *i_ctx_p, os_ptr op, gs_font_base *pbfont, c
+ 
+     if (code > 0) {
+ 	/* Refine FontBBox : */
+-	ref *v, x0, y0, x1, y1;
++	ref *v, mat[4], arr;
+ 
+ 	pbfont->FontBBox.p.x = (double)BBox[0] * size1 / size;
+ 	pbfont->FontBBox.p.y = (double)BBox[1] * size1 / size;
+ 	pbfont->FontBBox.q.x = (double)BBox[2] * size1 / size;
+ 	pbfont->FontBBox.q.y = (double)BBox[3] * size1 / size;
+-	if (dict_find_string(op, "FontBBox", &v) <= 0 || !r_has_type(v, t_array))
+-	    return_error(e_invalidfont);
+-	if (r_size(v) < 4)
+-	    return_error(e_invalidfont);
+-	make_real(&x0, pbfont->FontBBox.p.x);
+-	make_real(&y0, pbfont->FontBBox.p.y);
+-	make_real(&x1, pbfont->FontBBox.q.x);
+-	make_real(&y1, pbfont->FontBBox.q.y);
+-	ref_assign_old(v, v->value.refs + 0, &x0, "FAPI_refine_font_BBox");
+-	ref_assign_old(v, v->value.refs + 1, &y0, "FAPI_refine_font_BBox");
+-	ref_assign_old(v, v->value.refs + 2, &x1, "FAPI_refine_font_BBox");
+-	ref_assign_old(v, v->value.refs + 3, &y1, "FAPI_refine_font_BBox");
++	if (dict_find_string(op, "FontBBox", &v) > 0) {
++	    if(!r_has_type(v, t_array) && !r_has_type(v, t_shortarray))
++		return_error(e_invalidfont);
++	    if (r_size(v) < 4)
++		return_error(e_invalidfont);
++
++	    make_real(&mat[0], pbfont->FontBBox.p.x);
++	    make_real(&mat[1], pbfont->FontBBox.p.y);
++	    make_real(&mat[2], pbfont->FontBBox.q.x);
++	    make_real(&mat[3], pbfont->FontBBox.q.y);
++	    if(r_has_type(v, t_shortarray)) {
++		/* Create a new full blown array in case the values are reals */
++		code = ialloc_ref_array(&arr, a_all, 4, "array");
++		if (code < 0)
++		    return code;
++		v = &arr;
++		code = idict_put_string(op, "FontBBox", &arr);
++		if (code < 0)
++		    return code;
++	    }
++	    ref_assign_old(v, v->value.refs + 0, &mat[0], "FAPI_refine_font_BBox");
++	    ref_assign_old(v, v->value.refs + 1, &mat[1], "FAPI_refine_font_BBox");
++	    ref_assign_old(v, v->value.refs + 2, &mat[2], "FAPI_refine_font_BBox");
++	    ref_assign_old(v, v->value.refs + 3, &mat[3], "FAPI_refine_font_BBox");
++	}
+     }
+ 
+     /* Assign a Decoding : */
+@@ -1051,10 +1302,13 @@ static int zFAPIrebuildfont(i_ctx_t *i_ctx_p)
+     if (pfont->FontType == ft_CID_encrypted && v == NULL) {
+         if ((code = build_proc_name_refs(imemory, &build, ".FAPIBuildGlyph9", ".FAPIBuildGlyph9")) < 0)
+ 	    return code;
++	pop(1);
++	return 0;
+     } else
+         if ((code = build_proc_name_refs(imemory, &build, ".FAPIBuildChar", ".FAPIBuildGlyph")) < 0)
+ 	    return code;
+-    if (name_index(imemory, &pdata->BuildChar) == name_index(imemory, &build.BuildChar)) {
++    if (pdata->BuildChar.value.pname && build.BuildChar.value.pname &&
++	name_index(imemory, &pdata->BuildChar) == name_index(imemory, &build.BuildChar)) {
+         /* Already rebuilt - maybe a substituted font. */
+     } else {
+         ref_assign_new(&pdata->BuildChar, &build.BuildChar);
+@@ -1141,12 +1395,34 @@ static const int frac_pixel_shift = 4;
+ static int fapi_finish_render_aux(i_ctx_t *i_ctx_p, gs_font_base *pbfont, FAPI_server *I)
+ {   gs_text_enum_t *penum = op_show_find(i_ctx_p);
+     gs_show_enum *penum_s = (gs_show_enum *)penum;
+-    gs_state *pgs = penum_s->pgs;
+-    gx_device *dev1 = gs_currentdevice_inline(pgs); /* Possibly changed by zchar_set_cache. */
+-    gx_device *dev = penum_s->dev;
++    gs_state *pgs;
++    gx_device *dev1;
++    gx_device *dev;
+     const int import_shift_v = _fixed_shift - I->frac_shift;
+     FAPI_raster rast;
+     int code;
++    extern_st(st_gs_show_enum);
++    extern_st(st_gs_state);
++
++    if(penum == NULL) {
++	return_error(e_undefined);
++    }
++    dev = penum_s->dev;
++
++    /* Ensure that pis points to a st_gs_gstate (graphics state) structure */
++    if (gs_object_type(penum->memory, penum->pis) != &st_gs_state) {
++	/* If pis is not a graphics state, see if the text enumerator is a 
++	 * show enumerator, in which case we have a pointer to the graphics state there
++	 */
++	if (gs_object_type(penum->memory, penum) == &st_gs_show_enum) {
++	    pgs = penum_s->pgs;
++	} else
++	    /* No graphics state, give up... */
++	    return_error(e_undefined);
++    } else 
++	pgs = (gs_state *)penum->pis;
++
++    dev1 = gs_currentdevice_inline(pgs); /* Possibly changed by zchar_set_cache. */
+ 
+     if (SHOW_IS(penum, TEXT_DO_NONE)) {
+         /* do nothing */
+@@ -1155,7 +1431,7 @@ static int fapi_finish_render_aux(i_ctx_t *i_ctx_p, gs_font_base *pbfont, FAPI_s
+ 	    return code;
+     } else {
+         int code = I->get_char_raster(I, &rast);
+-        if (code == e_limitcheck) {
++        if (code == e_limitcheck || pbfont->PaintType) {
+             /* The server provides an outline instead the raster. */
+             gs_imager_state *pis = (gs_imager_state *)pgs->show_gstate;
+             gs_point pt;
+@@ -1204,19 +1480,31 @@ static int fapi_finish_render_aux(i_ctx_t *i_ctx_p, gs_font_base *pbfont, FAPI_s
+ 				dy + rast.top_indent, dy + rast.top_indent + rast.black_height - dev1->height);
+ 		    if ((code = fapi_copy_mono(dev1, &rast, dx, dy)) < 0)
+ 			return code;
+-		    penum_s->cc->offset.x += float2fixed(penum_s->fapi_glyph_shift.x);
+-		    penum_s->cc->offset.y += float2fixed(penum_s->fapi_glyph_shift.y);
++
++		    if (gs_object_type(penum->memory, penum) == &st_gs_show_enum) {
++			penum_s->cc->offset.x += float2fixed(penum_s->fapi_glyph_shift.x);
++			penum_s->cc->offset.y += float2fixed(penum_s->fapi_glyph_shift.y);
++		    }
+ 		}
+             } else { /* Not using GS cache */
+ 	        const gx_clip_path * pcpath = i_ctx_p->pgs->clip_path; 
+                 const gx_drawing_color * pdcolor = penum->pdcolor;
+ 
+-		if ((code = gx_image_fill_masked(dev, rast.p, 0, rast.line_step, 0,
+-			          (int)(penum_s->pgs->ctm.tx + (double)rast_orig_x / (1 << frac_pixel_shift) + penum_s->fapi_glyph_shift.x + 0.5), 
+-			          (int)(penum_s->pgs->ctm.ty + (double)rast_orig_y / (1 << frac_pixel_shift) + penum_s->fapi_glyph_shift.y + 0.5), 
++		if (gs_object_type(penum->memory, penum) == &st_gs_show_enum) {
++		    if ((code = gx_image_fill_masked(dev, rast.p, 0, rast.line_step, 0,
++			          (int)(pgs->ctm.tx + (double)rast_orig_x / (1 << frac_pixel_shift) + penum_s->fapi_glyph_shift.x + 0.5), 
++			          (int)(pgs->ctm.ty + (double)rast_orig_y / (1 << frac_pixel_shift) + penum_s->fapi_glyph_shift.y + 0.5), 
+ 			          rast.width, rast.height,
+ 			          pdcolor, 1, rop3_default, pcpath)) < 0)
+ 				    return code;
++		} else {
++		    if ((code = gx_image_fill_masked(dev, rast.p, 0, rast.line_step, 0,
++			          (int)(pgs->ctm.tx + (double)rast_orig_x / (1 << frac_pixel_shift) + 0.5), 
++			          (int)(pgs->ctm.ty + (double)rast_orig_y / (1 << frac_pixel_shift) + 0.5), 
++			          rast.width, rast.height,
++			          pdcolor, 1, rop3_default, pcpath)) < 0)
++				    return code;
++		}
+             }
+         }
+     }
+@@ -1300,15 +1588,15 @@ static int FAPI_do_char(i_ctx_t *i_ctx_p, gs_font_base *pbfont, gx_device *dev,
+     } else
+         check_type(*op, t_integer);
+ 
+-    /* Compute the sacle : */
++    if (penum == 0)
++        return_error(e_undefined);
++    /* Compute the scale : */
+     if (!SHOW_IS(penum, TEXT_DO_NONE) && !igs->in_charpath) {
+         gs_currentcharmatrix(igs, NULL, 1); /* make char_tm valid */
+         penum_s->fapi_log2_scale.x = -1;
+         gx_compute_text_oversampling(penum_s, (gs_font *)pbfont, alpha_bits, &log2_scale);
+         penum_s->fapi_log2_scale = log2_scale;
+     }
+-    if (penum == 0)
+-        return_error(e_undefined);
+     scale = 1 << I->frac_shift;
+ retry_oversampling:
+     if (I->face.font_id != pbfont->id ||
+@@ -1392,7 +1680,8 @@ retry_oversampling:
+ 	ref *Encoding;
+ 	int_param(op, 0xFF, &client_char_code);
+         if (dict_find_string(pdr, "Encoding", &Encoding) > 0 && 
+-            (r_has_type(Encoding, t_array) || r_has_type(Encoding, t_shortarray))) {
++            (r_has_type(Encoding, t_array) || 
++	    r_has_type(Encoding, t_shortarray) || r_has_type(Encoding, t_mixedarray))) {
+ 	    if (array_get(imemory, Encoding, client_char_code, &char_name) < 0)
+ 	        if ((code = name_ref(imemory, (const byte *)".notdef", 7, &char_name, -1)) < 0)
+ 		    return code;
+@@ -1405,20 +1694,61 @@ retry_oversampling:
+     cr.char_codes_count = 1;
+     if (bCID) {
+         if (font_file_path != NULL) {
+-            ref *Decoding, *SubstNWP, src_type, dst_type;
++            ref *Decoding, *TT_cmap, *SubstNWP;
++            ref src_type, dst_type;
++	    bool is_glyph_index = true;
+ 	    uint c;
+ 
+             if (dict_find_string(pdr, "Decoding", &Decoding) <= 0 || !r_has_type(Decoding, t_dictionary))
+                 return_error(e_invalidfont);
+             if (dict_find_string(pdr, "SubstNWP", &SubstNWP) <= 0 || !r_has_type(SubstNWP, t_array))
+                 return_error(e_invalidfont);
++	    if (dict_find_string(pdr, "TT_cmap", &TT_cmap) <= 0 || !r_has_type(TT_cmap, t_dictionary)) {
++		ref *DecodingArray, char_code, char_code1, ih;
++		int i = client_char_code % 256, n;
+ 
+-	    code = cid_to_TT_charcode(imemory, Decoding, NULL, SubstNWP, 
++		make_int(&ih, client_char_code / 256);
++		/* Check the Decoding array for this block of CIDs */
++		if (dict_find(Decoding, &ih, &DecodingArray) <= 0 || 
++			!r_has_type(DecodingArray, t_array) ||
++			array_get(imemory, DecodingArray, i, &char_code) < 0)
++		    return_error(e_invalidfont);
++		
++		/* Check the Decoding entry */
++		if (r_has_type(&char_code, t_integer))
++		    n = 1; 
++		else if (r_has_type(&char_code, t_array)) {
++		    DecodingArray = &char_code;
++		    i = 0;
++		    n = r_size(DecodingArray);
++		} else
++		    return_error(e_invalidfont);
++
++		for (;n--; i++) {
++		    if (array_get(imemory, DecodingArray, i, &char_code1) < 0 ||
++			!r_has_type(&char_code1, t_integer))
++			return_error(e_invalidfont);
++
++		    c = char_code1.value.intval;
++		    I->check_cmap_for_GID(I, &c);
++		    if (c != 0)
++		        break;
++		}
++	    } else {
++		code = cid_to_TT_charcode(imemory, Decoding, TT_cmap, SubstNWP,
+ 				      client_char_code, &c, &src_type, &dst_type);
+-	    if (code < 0)
+-		return code;
++		if (code < 0)
++		    return code;
++
++		/* cid_to_TT_charcode() returns 1 if it found a 
++                 * matching character code. Otherwise it returns
++                 * zero after setting c to zero (.notdef glyph id)
++                 * or a negative value on error. */
++		if (code > 0)
++		    is_glyph_index = false;
++	    }
+ 	    cr.char_codes[0] = c;
+-	    cr.is_glyph_index = (code == 0);
++	    cr.is_glyph_index = is_glyph_index;
+             /* fixme : process the narrow/wide/proportional mapping type,
+ 	       using src_type, dst_type. Should adjust the 'matrix' above.
+                Call get_font_proportional_feature for proper choice.
+@@ -1835,6 +2165,7 @@ static int do_FAPIpassfont(i_ctx_t *i_ctx_p, char *font_file_path, bool *success
+     FAPI_font_scale font_scale = {{1, 0, 0, 1, 0, 0}, {0, 0}, {1, 1}, true};
+     const char *decodingID = NULL;
+ 
++
+     if (code < 0)
+ 	return code;
+     code = FAPI_get_xlatmap(i_ctx_p, &xlatmap);	/* Useful for emulated fonts hooked with FAPI. */
+diff --git a/psi/zfcid0.c b/psi/zfcid0.c
+--- a/psi/zfcid0.c
++++ b/psi/zfcid0.c
+@@ -542,7 +542,7 @@ ztype9mapcid(i_ctx_t *i_ctx_p)
+     if (code < 0) { /* failed to load glyph data, put CID 0 */
+        int default_fallback_CID = 0 ;
+ 
+-       if_debug2('J', "[J]ztype9cidmap() use CID %d instead of glyph-missing CID %ld\n", default_fallback_CID, op->value.intval);
++       if_debug2('J', "[J]ztype9cidmap() use CID %d instead of glyph-missing CID %d\n", default_fallback_CID, op->value.intval);
+ 
+        op->value.intval = default_fallback_CID;
+ 
+@@ -553,7 +553,7 @@ ztype9mapcid(i_ctx_t *i_ctx_p)
+                                    &gdata, &fidx);
+ 
+        if (code < 0) {
+-           if_debug1('J', "[J]ztype9cidmap() could not load default glyph (CID %ld)\n", op->value.intval);
++           if_debug1('J', "[J]ztype9cidmap() could not load default glyph (CID %d)\n", op->value.intval);
+            return_error(e_invalidfont);
+        }
+ 
+diff --git a/psi/zfile.c b/psi/zfile.c
+--- a/psi/zfile.c
++++ b/psi/zfile.c
+@@ -381,7 +381,7 @@ file_continue(i_ctx_t *i_ctx_p)
+     os_ptr op = osp;
+     es_ptr pscratch = esp - 2;
+     file_enum *pfen = r_ptr(esp - 1, file_enum);
+-    long devlen = esp[-3].value.intval;
++    int devlen = esp[-3].value.intval;
+     gx_io_device *iodev = r_ptr(esp - 4, gx_io_device);
+     uint len = r_size(pscratch);
+     uint code;
+@@ -679,7 +679,7 @@ ztempfile(i_ctx_t *i_ctx_p)
+     uint fnlen;
+     FILE *sfile;
+     stream *s;
+-    byte *buf;
++    byte *buf, *sbody;
+ 
+     if (code < 0)
+ 	return code;
+@@ -720,15 +720,21 @@ ztempfile(i_ctx_t *i_ctx_p)
+ 	return_error(e_invalidfileaccess);
+     }
+     fnlen = strlen(fname);
++    sbody = ialloc_string(fnlen, ".tempfile(fname)");
++    if (sbody == 0) {
++	gs_free_object(imemory, buf, "ztempfile(buffer)");
++	return_error(e_VMerror);
++    }
++    memcpy(sbody, fname, fnlen);
+     file_init_stream(s, sfile, fmode, buf, file_default_buffer_size);
+     code = ssetfilename(s, (const unsigned char*) fname, fnlen);
+     if (code < 0) {
+ 	sclose(s);
+ 	iodev_default->procs.delete_file(iodev_default, fname);
++	ifree_string(sbody, fnlen, ".tempfile(fname)");
+ 	return_error(e_VMerror);
+     }
+-    make_const_string(op - 1, a_readonly | icurrent_space, fnlen,
+-		      s->file_name.data);
++    make_string(op - 1, a_readonly | icurrent_space, fnlen, sbody);
+     make_stream_file(op, s, fmode);
+     return code;
+ }
+diff --git a/psi/zfjbig2.c b/psi/zfjbig2.c
+--- a/psi/zfjbig2.c
++++ b/psi/zfjbig2.c
+@@ -77,11 +77,8 @@ z_jbig2decode(i_ctx_t * i_ctx_p)
+     }
+     	
+     /* we pass npop=0, since we've no arguments left to consume */
+-    /* we pass 0 instead of the usual rspace(sop) which will allocate storage
+-       for filter state from the same memory pool as the stream it's coding.
+-       this causes no trouble because we maintain no pointers */
+     return filter_read(i_ctx_p, 0, &s_jbig2decode_template,
+-		       (stream_state *) & state, 0);
++		       (stream_state *) & state, (sop ? r_space(sop) : 0));
+ }
+ 
+ 
+diff --git a/psi/zfunc4.c b/psi/zfunc4.c
+--- a/psi/zfunc4.c
++++ b/psi/zfunc4.c
+@@ -172,10 +172,6 @@ check_psc_function(i_ctx_t *i_ctx_p, const ref *pref, int depth, byte *ops, int
+ 	case t_integer: {
+ 	    int i = elt.value.intval;
+ 
+-#if ARCH_SIZEOF_INT < ARCH_SIZEOF_LONG
+-	    if (i != elt.value.intval) /* check for truncation */
+-		return_error(e_rangecheck);
+-#endif
+ 	    if (i == (byte)i) {
+ 		*p = PtCr_byte;
+ 		p[1] = (byte)i;
+diff --git a/psi/zgeneric.c b/psi/zgeneric.c
+--- a/psi/zgeneric.c
++++ b/psi/zgeneric.c
+@@ -71,7 +71,7 @@ zcopy_integer(i_ctx_t *i_ctx_p)
+     int count, i;
+     int code;
+ 
+-    if ((ulong) op->value.intval > (ulong)(op - osbot)) {
++    if ((uint) op->value.intval > (uint)(op - osbot)) {
+ 	/* There might be enough elements in other blocks. */
+ 	check_type(*op, t_integer);
+         if (op->value.intval >= (int)ref_stack_count(&o_stack)) 
+@@ -478,7 +478,7 @@ dict_continue(i_ctx_t *i_ctx_p)
+ {
+     os_ptr op = osp;
+     es_ptr obj = esp - 2;
+-    int index = (int)esp->value.intval;
++    int index = esp->value.intval;
+ 
+     push(2);			/* make room for key and value */
+     if ((index = dict_next(obj, index, op - 1)) >= 0) {	/* continue */
+diff --git a/psi/zimage.c b/psi/zimage.c
+--- a/psi/zimage.c
++++ b/psi/zimage.c
+@@ -455,7 +455,7 @@ image_file_continue(i_ctx_t *i_ctx_p)
+ 	int code;
+ 	int px;
+ 	const ref *pp;
+-	bool at_eof = false;
++	int at_eof_count = 0;
+ 
+ 	/*
+ 	 * Do a first pass through the files to ensure that at least
+@@ -481,7 +481,7 @@ image_file_continue(i_ctx_t *i_ctx_p)
+ 		    s_process_read_buf(s);
+ 		    continue;
+ 		case EOFC:
+-		    at_eof = true;
++		    at_eof_count++;
+ 		    break;	/* with no data available */
+ 		case INTC:
+ 		case CALLC:
+@@ -526,7 +526,7 @@ image_file_continue(i_ctx_t *i_ctx_p)
+ 	    if (code == e_RemapColor)
+ 		return code;
+ 	}
+-	if (at_eof)
++	if (at_eof_count >= num_sources)
+ 	    code = 1;
+ 	if (code) {
+ 	    int code1;
+diff --git a/psi/ziodev.c b/psi/ziodev.c
+--- a/psi/ziodev.c
++++ b/psi/ziodev.c
+@@ -74,8 +74,6 @@ zgetiodevice(i_ctx_t *i_ctx_p)
+     const byte *dname;
+ 
+     check_type(*op, t_integer);
+-    if (op->value.intval != (int)op->value.intval)
+-	return_error(e_rangecheck);
+     iodev = gs_getiodevice((int)(op->value.intval));
+     if (iodev == 0)		/* index out of range */
+ 	return_error(e_rangecheck);
+diff --git a/psi/zmath.c b/psi/zmath.c
+--- a/psi/zmath.c
++++ b/psi/zmath.c
+@@ -225,14 +225,10 @@ static int
+ zsrand(i_ctx_t *i_ctx_p)
+ {
+     os_ptr op = osp;
+-    long state;
++    int state;
+ 
+     check_type(*op, t_integer);
+     state = op->value.intval;
+-#if arch_sizeof_long > 4
+-    /* Trim the state back to 32 bits. */
+-    state = (int)state;
+-#endif
+     /*
+      * The following somewhat bizarre adjustments are according to
+      * public information from Adobe describing their implementation.
+diff --git a/psi/zpcolor.c b/psi/zpcolor.c
+--- a/psi/zpcolor.c
++++ b/psi/zpcolor.c
+@@ -110,6 +110,10 @@ zbuildpattern1(i_ctx_t *i_ctx_p)
+     if (code < 0)
+         return code;
+     
++    code = dict_bool_param(op1, ".pattern_uses_transparency", 0, &template.uses_transparency);
++    if (code < 0)
++        return code;
++
+     code = dict_floats_param(imemory, op1, "BBox", 4, BBox, NULL);
+     if (code < 0)
+         return code;
+@@ -231,9 +235,14 @@ pattern_paint_prepare(i_ctx_t *i_ctx_p)
+ 	return code;
+     }
+     /* gx_set_device_only(pgs, (gx_device *) pdev); */
+-    if (internal_accum)
++    if (internal_accum) {
+ 	gs_setdevice_no_init(pgs, (gx_device *)pdev);
+-    else {
++	if (pinst->template.uses_transparency) {
++	    if_debug0('v', "   pushing the pdf14 compositor device into this graphics state\n");
++	    if ((code = gs_push_pdf14trans_device(pgs)) < 0)
++		return code;
++	}
++    } else {
+ 	gs_matrix m;
+ 	gs_rect bbox;
+ 	gs_fixed_rect clip_box;
+@@ -279,11 +288,22 @@ pattern_paint_finish(i_ctx_t *i_ctx_p)
+ {
+     int o_stack_adjust = ref_stack_count(&o_stack) - esp->value.intval;
+     gx_device_forward *pdev = r_ptr(esp - 1, gx_device_forward);
++    gs_pattern1_instance_t *pinst =
++	(gs_pattern1_instance_t *)gs_currentcolor(igs->saved)->pattern;
+ 
+     if (pdev != NULL) {
+ 	gx_color_tile *ctile;
+-	int code = gx_pattern_cache_add_entry((gs_imager_state *)igs,
+-					  pdev, &ctile);
++	int code;
++
++	if (pinst->template.uses_transparency) {
++	    gs_state *pgs = igs;
++	    int code;
++
++	    if_debug0('v', "   popping the pdf14 compositor device into this graphics state\n");
++	    if ((code = gs_pop_pdf14trans_device(pgs)) < 0)
++		return code;
++	} 
++	code = gx_pattern_cache_add_entry((gs_imager_state *)igs, pdev, &ctile);
+ 	if (code < 0)
+ 	    return code;
+     }
+diff --git a/psi/zstack.c b/psi/zstack.c
+--- a/psi/zstack.c
++++ b/psi/zstack.c
+@@ -112,7 +112,7 @@ zroll(i_ctx_t *i_ctx_p)
+ 
+     check_type(*op1, t_integer);
+     check_type(*op, t_integer);
+-    if ((ulong) op1->value.intval > (ulong)(op1 - osbot)) {
++    if ((uint) op1->value.intval > (uint)(op1 - osbot)) {
+ 	/*
+ 	 * The data might span multiple stack blocks.
+ 	 * There are efficient ways to handle this situation,
+diff --git a/psi/ztrans.c b/psi/ztrans.c
+--- a/psi/ztrans.c
++++ b/psi/ztrans.c
+@@ -207,6 +207,7 @@ zbegintransparencygroup(i_ctx_t *i_ctx_p)
+     os_ptr dop = op - 4;
+     gs_transparency_group_params_t params;
+     gs_rect bbox;
++    ref *dummy;
+     int code;
+ 
+     check_type(*dop, t_dictionary);
+@@ -220,7 +221,14 @@ zbegintransparencygroup(i_ctx_t *i_ctx_p)
+     code = rect_param(&bbox, op);
+     if (code < 0)
+ 	return code;
+-    params.ColorSpace = gs_currentcolorspace(igs);
++    /* If the CS is not given in the transparency group dict, set to NULL   */
++    /* so that the transparency code knows to inherit from the parent layer */
++    if (dict_find_string(dop, "CS", &dummy) <= 0) {
++	params.ColorSpace = NULL;
++    } else {
++	/* the PDF interpreter set the colorspace, so use it */
++	params.ColorSpace = gs_currentcolorspace(igs);
++    }
+     code = gs_begin_transparency_group(igs, &params, &bbox);
+     if (code < 0)
+ 	return code;
+@@ -244,7 +252,8 @@ zendtransparencygroup(i_ctx_t *i_ctx_p)
+     return gs_end_transparency_group(igs);
+ }
+ 
+-/* <paramdict> <llx> <lly> <urx> <ury> .begintransparencymaskgroup - */
++/* <cs_set?> <paramdict> <llx> <lly> <urx> <ury> .begintransparencymaskgroup -	*/
++/*             cs_set == false if we are inheriting the colorspace		*/
+ static int tf_using_function(floatp, float *, void *);
+ static int
+ zbegintransparencymaskgroup(i_ctx_t *i_ctx_p)
+@@ -269,16 +278,14 @@ zbegintransparencymaskgroup(i_ctx_t *i_ctx_p)
+     params.replacing = true;
+     if ((code = dict_floats_param(imemory, dop, "Background",
+ 		    cs_num_components(gs_currentcolorspace(i_ctx_p->pgs)),
+-				  params.Background, NULL)) < 0
+-	)
++				  params.Background, NULL)) < 0)
+ 	return code;
+     else if (code > 0)
+ 	params.Background_components = code;
+     if ((code = dict_floats_param(imemory, dop, "GrayBackground",
+-		    1, &params.GrayBackground, NULL)) < 0
+-	)
++		    1, &params.GrayBackground, NULL)) < 0)
+ 	return code;
+-    if (dict_find_string(dop, "TransferFunction", &pparam) >0) {
++    if (dict_find_string(dop, "TransferFunction", &pparam) > 0) {
+ 	gs_function_t *pfn = ref_function(pparam);
+ 
+ 	if (pfn == 0 || pfn->params.m != 1 || pfn->params.n != 1)
+@@ -289,10 +296,16 @@ zbegintransparencymaskgroup(i_ctx_t *i_ctx_p)
+     code = rect_param(&bbox, op);
+     if (code < 0)
+ 	return code;
++    /* Is the colorspace set for this mask ? */
++    if (op[-5].value.boolval) {
++		params.ColorSpace = gs_currentcolorspace(igs);
++    } else {
++	params.ColorSpace = NULL;
++    }
+     code = gs_begin_transparency_mask(igs, &params, &bbox, false);
+     if (code < 0)
+ 	return code;
+-    pop(5);
++    pop(6);
+     return code;
+ }
+ 
+@@ -303,11 +316,16 @@ zbegintransparencymaskimage(i_ctx_t *i_ctx_p)
+     gs_transparency_mask_params_t params;
+     gs_rect bbox = { { 0, 0} , { 1, 1} };
+     int code;
++    gs_color_space *gray_cs = gs_cspace_new_DeviceGray(imemory);
+ 
++    if (!gray_cs)
++	return_error(e_VMerror);
++    params.ColorSpace = gray_cs;	/* per PDF spec, Image SMask is alway DeviceGray */
+     gs_trans_mask_params_init(&params, TRANSPARENCY_MASK_Luminosity);
+     code = gs_begin_transparency_mask(igs, &params, &bbox, true);
+     if (code < 0)
+ 	return code;
++    rc_decrement(gray_cs, "zbegintransparencymaskimage");
+     return code;
+ }
+ 
+diff --git a/psi/ztype.c b/psi/ztype.c
+--- a/psi/ztype.c
++++ b/psi/ztype.c
+@@ -48,10 +48,10 @@ static int convert_to_string(const gs_memory_t *mem, os_ptr, os_ptr);
+  * constant expressions, so we can't use min_long and max_long.
+  * What a nuisance!
+  */
+-#define ALT_MIN_LONG (-1L << (arch_sizeof_long * 8 - 1))
+-#define ALT_MAX_LONG (~(ALT_MIN_LONG))
+-static const double min_int_real = (ALT_MIN_LONG * 1.0 - 1);
+-static const double max_int_real = (ALT_MAX_LONG * 1.0 + 1);
++#define ALT_MIN_INT (-1 << 31)
++#define ALT_MAX_INT (~(ALT_MIN_INT))
++static const double min_int_real = (ALT_MIN_INT * 1.0 - 1);
++static const double max_int_real = (ALT_MAX_INT * 1.0 + 1);
+ 
+ #define REAL_CAN_BE_INT(v)\
+   ((v) > min_int_real && (v) < max_int_real)
+@@ -357,14 +357,14 @@ zcvrs(i_ctx_t *i_ctx_p)
+ 		return_error(e_rangecheck); /* CET 24-05 wants rangecheck */
+ 	}
+     } else {
+-	ulong ival;
++	uint ival;
+ 	byte digits[sizeof(ulong) * 8];
+ 	byte *endp = &digits[countof(digits)];
+ 	byte *dp = endp;
+ 
+ 	switch (r_type(op - 2)) {
+ 	    case t_integer:
+-		ival = (ulong) op[-2].value.intval;
++		ival = (uint) op[-2].value.intval;
+ 		break;
+ 	    case t_real:
+ 		{
+diff --git a/psi/zupath.c b/psi/zupath.c
+--- a/psi/zupath.c
++++ b/psi/zupath.c
+@@ -652,15 +652,14 @@ zgetpath(i_ctx_t *i_ctx_p)
+                     k = 0;
+                     ref_assign(&leaf_ref[j], operators[pe]);
+                     pe = gs_path_enum_next(&penum, pts);
+-                    if (pe == 0)
+-                        goto out;
++                    if (pe <= 0)
++                        return pe;
+                     if (pe >= 5)
+                         return_error(e_unregistered);
+                 }
+             }
+         }
+      }
+-  out:
+   return 0;
+ }
+ 
+diff --git a/toolbin/pdf_info.ps b/toolbin/pdf_info.ps
+--- a/toolbin/pdf_info.ps
++++ b/toolbin/pdf_info.ps
+@@ -83,10 +83,11 @@ systemdict /DumpMediaSizes known
+     /Resources pget {

+       /Font knownoget {

+ 	{ exch pop oforce

+-	  dup

+-	  /FontDescriptor knownoget

+-	  {

+-	    dup /FontFile known 1 index /FontFile2 known or exch /FontFile3 known or

++          dup /DescendantFonts knownoget {

++            exch pop 0 get oforce

++          } if

++       	  dup /FontDescriptor knownoget {

++            dup /FontFile known 1 index /FontFile2 known or exch /FontFile3 known or

+ 	    /ShowEmbeddedFonts where { pop pop false} if {

+ 	      pop			% skip embedded fonts

+ 	    } {

+@@ -107,7 +108,7 @@ systemdict /DumpMediaSizes known
+ 

+ systemdict /DumpFontsUsed known

+ {

+-  (\nFonts Used:) =

++  (\nFont or CIDFont resources used:) =

+   getPDFfonts { = } forall

+ } if

+ 

diff --git a/recipes/gs/gs/0002_svn_snapshot_jbig2dec.patch b/recipes/gs/gs/0002_svn_snapshot_jbig2dec.patch
new file mode 100644
index 0000000000..8858856fd6
--- /dev/null
+++ b/recipes/gs/gs/0002_svn_snapshot_jbig2dec.patch
@@ -0,0 +1,17181 @@
+Description: /jbig2dec changes r9437 → r9781 (release 8.64 → 2009-06-08)
+Author: Jonas Smedegaard <dr@jones.dk>
+diff --git a/jbig2dec/Makefile.am b/jbig2dec/Makefile.am
+--- a/jbig2dec/Makefile.am
++++ b/jbig2dec/Makefile.am
+@@ -1,4 +1,3 @@
+-# $Id: Makefile.am 6300 2005-12-28 19:56:24Z giles $
+ ## process this file with automake to generate Makefile.in
+ 
+ # require automake 1.7
+@@ -12,12 +11,13 @@ libjbig2dec_a_SOURCES = jbig2.c \
+ 	jbig2_segment.c jbig2_page.c \
+ 	jbig2_symbol_dict.c jbig2_text.c \
+ 	jbig2_generic.c jbig2_refinement.c jbig2_mmr.c \
++	jbig2_halftone.c \
+ 	jbig2_image.c jbig2_image_pbm.c \
+ 	os_types.h config_types.h config_win32.h \
+ 	jbig2.h jbig2_priv.h jbig2_image.h \
+ 	jbig2_arith.h jbig2_arith_iaid.h jbig2_arith_int.h \
+ 	jbig2_huffman.h jbig2_hufftab.h jbig2_mmr.h \
+-	jbig2_generic.h jbig2_symbol_dict.h \
++	jbig2_generic.h jbig2_symbol_dict.h jbig2_text.h \
+ 	jbig2_metadata.c jbig2_metadata.h
+ 
+ bin_PROGRAMS = jbig2dec
+diff --git a/jbig2dec/Makefile.in b/jbig2dec/Makefile.in
+--- a/jbig2dec/Makefile.in
++++ b/jbig2dec/Makefile.in
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.10.2 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005  Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,21 +14,13 @@
+ 
+ @SET_MAKE@
+ 
+-# $Id: Makefile.in 6300 2005-12-28 19:56:24Z giles $
+ 
+ 
+-
+-SOURCES = $(libjbig2dec_a_SOURCES) $(jbig2dec_SOURCES) $(test_sha1_SOURCES)
+-
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = .
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -41,7 +33,10 @@ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ bin_PROGRAMS = jbig2dec$(EXEEXT)
+-noinst_PROGRAMS = test_sha1$(EXEEXT)
++noinst_PROGRAMS = test_sha1$(EXEEXT) test_huffman$(EXEEXT) \
++	test_arith$(EXEEXT)
++TESTS = test_sha1$(EXEEXT) test_jbig2dec.py test_huffman$(EXEEXT) \
++	test_arith$(EXEEXT)
+ subdir = .
+ DIST_COMMON = README $(am__configure_deps) $(include_HEADERS) \
+ 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+@@ -54,7 +49,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ 	$(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+- configure.lineno configure.status.lineno
++ configure.lineno config.status.lineno
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES = config_types.h
+@@ -78,18 +73,30 @@ am_libjbig2dec_a_OBJECTS = jbig2.$(OBJEXT) jbig2_arith.$(OBJEXT) \
+ 	jbig2_page.$(OBJEXT) jbig2_symbol_dict.$(OBJEXT) \
+ 	jbig2_text.$(OBJEXT) jbig2_generic.$(OBJEXT) \
+ 	jbig2_refinement.$(OBJEXT) jbig2_mmr.$(OBJEXT) \
+-	jbig2_image.$(OBJEXT) jbig2_image_pbm.$(OBJEXT) \
+-	jbig2_metadata.$(OBJEXT)
++	jbig2_halftone.$(OBJEXT) jbig2_image.$(OBJEXT) \
++	jbig2_image_pbm.$(OBJEXT) jbig2_metadata.$(OBJEXT)
+ libjbig2dec_a_OBJECTS = $(am_libjbig2dec_a_OBJECTS)
+ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+ PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+ am_jbig2dec_OBJECTS = jbig2dec.$(OBJEXT) sha1.$(OBJEXT)
+ jbig2dec_OBJECTS = $(am_jbig2dec_OBJECTS)
+ jbig2dec_DEPENDENCIES = libjbig2dec.a @LIBOBJS@
++am_test_arith_OBJECTS = test_arith-jbig2_arith.$(OBJEXT)
++test_arith_OBJECTS = $(am_test_arith_OBJECTS)
++test_arith_DEPENDENCIES = libjbig2dec.a
++test_arith_LINK = $(CCLD) $(test_arith_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
++am_test_huffman_OBJECTS = test_huffman-jbig2_huffman.$(OBJEXT)
++test_huffman_OBJECTS = $(am_test_huffman_OBJECTS)
++test_huffman_DEPENDENCIES = libjbig2dec.a
++test_huffman_LINK = $(CCLD) $(test_huffman_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ am_test_sha1_OBJECTS = test_sha1-sha1.$(OBJEXT)
+ test_sha1_OBJECTS = $(am_test_sha1_OBJECTS)
+ test_sha1_LDADD = $(LDADD)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
++test_sha1_LINK = $(CCLD) $(test_sha1_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++	$(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I.@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -97,8 +104,10 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libjbig2dec_a_SOURCES) $(jbig2dec_SOURCES) \
++	$(test_arith_SOURCES) $(test_huffman_SOURCES) \
+ 	$(test_sha1_SOURCES)
+ DIST_SOURCES = $(libjbig2dec_a_SOURCES) $(jbig2dec_SOURCES) \
++	$(test_arith_SOURCES) $(test_huffman_SOURCES) \
+ 	$(test_sha1_SOURCES)
+ includeHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(include_HEADERS)
+@@ -116,8 +125,6 @@ GZIP_ENV = --best
+ distuninstallcheck_listfiles = find . -type f -print
+ distcleancheck_listfiles = find . -type f -print
+ ACLOCAL = @ACLOCAL@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+@@ -136,6 +143,8 @@ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
++GREP = @GREP@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -149,6 +158,7 @@ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+@@ -162,11 +172,11 @@ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+-ac_ct_RANLIB = @ac_ct_RANLIB@
+-ac_ct_STRIP = @ac_ct_STRIP@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -174,24 +184,36 @@ am__tar = @am__tar@
+ am__untar = @am__untar@
+ bindir = @bindir@
+ build_alias = @build_alias@
++builddir = @builddir@
+ datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host_alias = @host_alias@
++htmldir = @htmldir@
+ includedir = @includedir@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
++localedir = @localedir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
++psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_build_prefix = @top_build_prefix@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ 
+ # require automake 1.7
+ AUTOMAKE_OPTIONS = foreign 1.7 dist-bzip2 dist-zip -Wall
+@@ -202,12 +224,13 @@ libjbig2dec_a_SOURCES = jbig2.c \
+ 	jbig2_segment.c jbig2_page.c \
+ 	jbig2_symbol_dict.c jbig2_text.c \
+ 	jbig2_generic.c jbig2_refinement.c jbig2_mmr.c \
++	jbig2_halftone.c \
+ 	jbig2_image.c jbig2_image_pbm.c \
+ 	os_types.h config_types.h config_win32.h \
+ 	jbig2.h jbig2_priv.h jbig2_image.h \
+ 	jbig2_arith.h jbig2_arith_iaid.h jbig2_arith_int.h \
+ 	jbig2_huffman.h jbig2_hufftab.h jbig2_mmr.h \
+-	jbig2_generic.h jbig2_symbol_dict.h \
++	jbig2_generic.h jbig2_symbol_dict.h jbig2_text.h \
+ 	jbig2_metadata.c jbig2_metadata.h
+ 
+ jbig2dec_SOURCES = jbig2dec.c sha1.c sha1.h \
+@@ -215,11 +238,16 @@ jbig2dec_SOURCES = jbig2dec.c sha1.c sha1.h \
+ 	os_types.h config_types.h config_win32.h
+ 
+ jbig2dec_LDADD = libjbig2dec.a @LIBOBJS@
++EXTRA_DIST = test_jbig2dec.py msvc.mak LICENSE CHANGES
++MAINTAINERCLEANFILES = config_types.h.in
+ test_sha1_SOURCES = sha1.c sha1.h
+ test_sha1_CFLAGS = -DTEST
+-TESTS = test_sha1 test_jbig2dec.py
+-EXTRA_DIST = test_jbig2dec.py msvc.mak LICENSE
+-MAINTAINERCLEANFILES = config_types.h.in
++test_arith_SOURCES = jbig2_arith.c
++test_arith_CFLAGS = -DTEST
++test_arith_LDADD = libjbig2dec.a
++test_huffman_SOURCES = jbig2_huffman.c
++test_huffman_CFLAGS = -DTEST
++test_huffman_LDADD = libjbig2dec.a
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+@@ -262,7 +290,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+ config.h: stamp-h1
+ 	@if test ! -f $@; then \
+ 	  rm -f stamp-h1; \
+-	  $(MAKE) stamp-h1; \
++	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+ 	else :; fi
+ 
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+@@ -279,7 +307,7 @@ config_types.h: $(top_builddir)/config.status $(srcdir)/config_types.h.in
+ 	cd $(top_builddir) && $(SHELL) ./config.status $@
+ install-libLIBRARIES: $(lib_LIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    f=$(am__strip_dir) \
+@@ -312,7 +340,7 @@ libjbig2dec.a: $(libjbig2dec_a_OBJECTS) $(libjbig2dec_a_DEPENDENCIES)
+ 	$(RANLIB) libjbig2dec.a
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+@@ -338,10 +366,16 @@ clean-noinstPROGRAMS:
+ 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+ jbig2dec$(EXEEXT): $(jbig2dec_OBJECTS) $(jbig2dec_DEPENDENCIES) 
+ 	@rm -f jbig2dec$(EXEEXT)
+-	$(LINK) $(jbig2dec_LDFLAGS) $(jbig2dec_OBJECTS) $(jbig2dec_LDADD) $(LIBS)
++	$(LINK) $(jbig2dec_OBJECTS) $(jbig2dec_LDADD) $(LIBS)
++test_arith$(EXEEXT): $(test_arith_OBJECTS) $(test_arith_DEPENDENCIES) 
++	@rm -f test_arith$(EXEEXT)
++	$(test_arith_LINK) $(test_arith_OBJECTS) $(test_arith_LDADD) $(LIBS)
++test_huffman$(EXEEXT): $(test_huffman_OBJECTS) $(test_huffman_DEPENDENCIES) 
++	@rm -f test_huffman$(EXEEXT)
++	$(test_huffman_LINK) $(test_huffman_OBJECTS) $(test_huffman_LDADD) $(LIBS)
+ test_sha1$(EXEEXT): $(test_sha1_OBJECTS) $(test_sha1_DEPENDENCIES) 
+ 	@rm -f test_sha1$(EXEEXT)
+-	$(LINK) $(test_sha1_LDFLAGS) $(test_sha1_OBJECTS) $(test_sha1_LDADD) $(LIBS)
++	$(test_sha1_LINK) $(test_sha1_OBJECTS) $(test_sha1_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -359,6 +393,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jbig2_arith_iaid.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jbig2_arith_int.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jbig2_generic.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jbig2_halftone.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jbig2_huffman.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jbig2_image.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jbig2_image_pbm.Po@am__quote@
+@@ -371,39 +406,68 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jbig2_text.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jbig2dec.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha1.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_arith-jbig2_arith.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_huffman-jbig2_huffman.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_sha1-sha1.Po@am__quote@
+ 
+ .c.o:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c $<
+ 
+ .c.obj:
+-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+ 
++test_arith-jbig2_arith.o: jbig2_arith.c
++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_arith_CFLAGS) $(CFLAGS) -MT test_arith-jbig2_arith.o -MD -MP -MF $(DEPDIR)/test_arith-jbig2_arith.Tpo -c -o test_arith-jbig2_arith.o `test -f 'jbig2_arith.c' || echo '$(srcdir)/'`jbig2_arith.c
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/test_arith-jbig2_arith.Tpo $(DEPDIR)/test_arith-jbig2_arith.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='jbig2_arith.c' object='test_arith-jbig2_arith.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_arith_CFLAGS) $(CFLAGS) -c -o test_arith-jbig2_arith.o `test -f 'jbig2_arith.c' || echo '$(srcdir)/'`jbig2_arith.c
++
++test_arith-jbig2_arith.obj: jbig2_arith.c
++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_arith_CFLAGS) $(CFLAGS) -MT test_arith-jbig2_arith.obj -MD -MP -MF $(DEPDIR)/test_arith-jbig2_arith.Tpo -c -o test_arith-jbig2_arith.obj `if test -f 'jbig2_arith.c'; then $(CYGPATH_W) 'jbig2_arith.c'; else $(CYGPATH_W) '$(srcdir)/jbig2_arith.c'; fi`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/test_arith-jbig2_arith.Tpo $(DEPDIR)/test_arith-jbig2_arith.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='jbig2_arith.c' object='test_arith-jbig2_arith.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_arith_CFLAGS) $(CFLAGS) -c -o test_arith-jbig2_arith.obj `if test -f 'jbig2_arith.c'; then $(CYGPATH_W) 'jbig2_arith.c'; else $(CYGPATH_W) '$(srcdir)/jbig2_arith.c'; fi`
++
++test_huffman-jbig2_huffman.o: jbig2_huffman.c
++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_huffman_CFLAGS) $(CFLAGS) -MT test_huffman-jbig2_huffman.o -MD -MP -MF $(DEPDIR)/test_huffman-jbig2_huffman.Tpo -c -o test_huffman-jbig2_huffman.o `test -f 'jbig2_huffman.c' || echo '$(srcdir)/'`jbig2_huffman.c
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/test_huffman-jbig2_huffman.Tpo $(DEPDIR)/test_huffman-jbig2_huffman.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='jbig2_huffman.c' object='test_huffman-jbig2_huffman.o' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_huffman_CFLAGS) $(CFLAGS) -c -o test_huffman-jbig2_huffman.o `test -f 'jbig2_huffman.c' || echo '$(srcdir)/'`jbig2_huffman.c
++
++test_huffman-jbig2_huffman.obj: jbig2_huffman.c
++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_huffman_CFLAGS) $(CFLAGS) -MT test_huffman-jbig2_huffman.obj -MD -MP -MF $(DEPDIR)/test_huffman-jbig2_huffman.Tpo -c -o test_huffman-jbig2_huffman.obj `if test -f 'jbig2_huffman.c'; then $(CYGPATH_W) 'jbig2_huffman.c'; else $(CYGPATH_W) '$(srcdir)/jbig2_huffman.c'; fi`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/test_huffman-jbig2_huffman.Tpo $(DEPDIR)/test_huffman-jbig2_huffman.Po
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='jbig2_huffman.c' object='test_huffman-jbig2_huffman.obj' libtool=no @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_huffman_CFLAGS) $(CFLAGS) -c -o test_huffman-jbig2_huffman.obj `if test -f 'jbig2_huffman.c'; then $(CYGPATH_W) 'jbig2_huffman.c'; else $(CYGPATH_W) '$(srcdir)/jbig2_huffman.c'; fi`
++
+ test_sha1-sha1.o: sha1.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sha1_CFLAGS) $(CFLAGS) -MT test_sha1-sha1.o -MD -MP -MF "$(DEPDIR)/test_sha1-sha1.Tpo" -c -o test_sha1-sha1.o `test -f 'sha1.c' || echo '$(srcdir)/'`sha1.c; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/test_sha1-sha1.Tpo" "$(DEPDIR)/test_sha1-sha1.Po"; else rm -f "$(DEPDIR)/test_sha1-sha1.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sha1_CFLAGS) $(CFLAGS) -MT test_sha1-sha1.o -MD -MP -MF $(DEPDIR)/test_sha1-sha1.Tpo -c -o test_sha1-sha1.o `test -f 'sha1.c' || echo '$(srcdir)/'`sha1.c
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/test_sha1-sha1.Tpo $(DEPDIR)/test_sha1-sha1.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sha1.c' object='test_sha1-sha1.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sha1_CFLAGS) $(CFLAGS) -c -o test_sha1-sha1.o `test -f 'sha1.c' || echo '$(srcdir)/'`sha1.c
+ 
+ test_sha1-sha1.obj: sha1.c
+-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sha1_CFLAGS) $(CFLAGS) -MT test_sha1-sha1.obj -MD -MP -MF "$(DEPDIR)/test_sha1-sha1.Tpo" -c -o test_sha1-sha1.obj `if test -f 'sha1.c'; then $(CYGPATH_W) 'sha1.c'; else $(CYGPATH_W) '$(srcdir)/sha1.c'; fi`; \
+-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/test_sha1-sha1.Tpo" "$(DEPDIR)/test_sha1-sha1.Po"; else rm -f "$(DEPDIR)/test_sha1-sha1.Tpo"; exit 1; fi
++@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sha1_CFLAGS) $(CFLAGS) -MT test_sha1-sha1.obj -MD -MP -MF $(DEPDIR)/test_sha1-sha1.Tpo -c -o test_sha1-sha1.obj `if test -f 'sha1.c'; then $(CYGPATH_W) 'sha1.c'; else $(CYGPATH_W) '$(srcdir)/sha1.c'; fi`
++@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/test_sha1-sha1.Tpo $(DEPDIR)/test_sha1-sha1.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='sha1.c' object='test_sha1-sha1.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(test_sha1_CFLAGS) $(CFLAGS) -c -o test_sha1-sha1.obj `if test -f 'sha1.c'; then $(CYGPATH_W) 'sha1.c'; else $(CYGPATH_W) '$(srcdir)/sha1.c'; fi`
+-uninstall-info-am:
+ install-includeHEADERS: $(include_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"
++	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
+ 	@list='$(include_HEADERS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  f=$(am__strip_dir) \
+@@ -424,8 +488,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	mkid -fID $$unique
+ tags: TAGS
+ 
+@@ -437,8 +501,8 @@ TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ 	  test -n "$$unique" || unique=$$empty_fix; \
+ 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+@@ -448,13 +512,12 @@ ctags: CTAGS
+ CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+ 		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+-	here=`pwd`; \
+ 	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
+ 	unique=`for i in $$list; do \
+ 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ 	  done | \
+-	  $(AWK) '    { files[$$0] = 1; } \
+-	       END { for (i in files) print i; }'`; \
++	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
++	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ 	     $$tags $$unique
+@@ -470,7 +533,7 @@ distclean-tags:
+ check-TESTS: $(TESTS)
+ 	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+ 	srcdir=$(srcdir); export srcdir; \
+-	list='$(TESTS)'; \
++	list=' $(TESTS) '; \
+ 	if test -n "$$list"; then \
+ 	  for tst in $$list; do \
+ 	    if test -f ./$$tst; then dir=./; \
+@@ -479,7 +542,7 @@ check-TESTS: $(TESTS)
+ 	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ 	      all=`expr $$all + 1`; \
+ 	      case " $(XFAIL_TESTS) " in \
+-	      *" $$tst "*) \
++	      *[\ \	]$$tst[\ \	]*) \
+ 		xpass=`expr $$xpass + 1`; \
+ 		failed=`expr $$failed + 1`; \
+ 		echo "XPASS: $$tst"; \
+@@ -491,7 +554,7 @@ check-TESTS: $(TESTS)
+ 	    elif test $$? -ne 77; then \
+ 	      all=`expr $$all + 1`; \
+ 	      case " $(XFAIL_TESTS) " in \
+-	      *" $$tst "*) \
++	      *[\ \	]$$tst[\ \	]*) \
+ 		xfail=`expr $$xfail + 1`; \
+ 		echo "XFAIL: $$tst"; \
+ 	      ;; \
+@@ -505,23 +568,36 @@ check-TESTS: $(TESTS)
+ 	      echo "SKIP: $$tst"; \
+ 	    fi; \
+ 	  done; \
++	  if test "$$all" -eq 1; then \
++	    tests="test"; \
++	    All=""; \
++	  else \
++	    tests="tests"; \
++	    All="All "; \
++	  fi; \
+ 	  if test "$$failed" -eq 0; then \
+ 	    if test "$$xfail" -eq 0; then \
+-	      banner="All $$all tests passed"; \
++	      banner="$$All$$all $$tests passed"; \
+ 	    else \
+-	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
++	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
++	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+ 	    fi; \
+ 	  else \
+ 	    if test "$$xpass" -eq 0; then \
+-	      banner="$$failed of $$all tests failed"; \
++	      banner="$$failed of $$all $$tests failed"; \
+ 	    else \
+-	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
++	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
++	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+ 	    fi; \
+ 	  fi; \
+ 	  dashes="$$banner"; \
+ 	  skipped=""; \
+ 	  if test "$$skip" -ne 0; then \
+-	    skipped="($$skip tests were not run)"; \
++	    if test "$$skip" -eq 1; then \
++	      skipped="($$skip test was not run)"; \
++	    else \
++	      skipped="($$skip tests were not run)"; \
++	    fi; \
+ 	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+ 	      dashes="$$skipped"; \
+ 	  fi; \
+@@ -542,24 +618,22 @@ check-TESTS: $(TESTS)
+ 
+ distdir: $(DISTFILES)
+ 	$(am__remove_distdir)
+-	mkdir $(distdir)
+-	$(mkdir_p) $(distdir)/.
+-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+-	list='$(DISTFILES)'; for file in $$list; do \
+-	  case $$file in \
+-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+-	  esac; \
++	test -d $(distdir) || mkdir $(distdir)
++	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++	list='$(DISTFILES)'; \
++	  dist_files=`for file in $$list; do echo $$file; done | \
++	  sed -e "s|^$$srcdirstrip/||;t" \
++	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++	case $$dist_files in \
++	  */*) $(MKDIR_P) `echo "$$dist_files" | \
++			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++			   sort -u` ;; \
++	esac; \
++	for file in $$dist_files; do \
+ 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+-	    dir="/$$dir"; \
+-	    $(mkdir_p) "$(distdir)$$dir"; \
+-	  else \
+-	    dir=''; \
+-	  fi; \
+ 	  if test -d $$d/$$file; then \
++	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ 	    fi; \
+@@ -573,7 +647,7 @@ distdir: $(DISTFILES)
+ 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
++	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+ 	|| chmod -R a+r $(distdir)
+ dist-gzip: distdir
+ 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+@@ -582,6 +656,10 @@ dist-bzip2: distdir
+ 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ 	$(am__remove_distdir)
+ 
++dist-lzma: distdir
++	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
++	$(am__remove_distdir)
++
+ dist-tarZ: distdir
+ 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ 	$(am__remove_distdir)
+@@ -610,6 +688,8 @@ distcheck: dist
+ 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
+ 	*.tar.bz2*) \
+ 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++	*.tar.lzma*) \
++	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
+ 	*.tar.Z*) \
+ 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ 	*.shar.gz*) \
+@@ -649,7 +729,7 @@ distcheck: dist
+ 	$(am__remove_distdir)
+ 	@(echo "$(distdir) archives ready for distribution: "; \
+ 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
++	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+ distuninstallcheck:
+ 	@cd $(distuninstallcheck_dir) \
+ 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+@@ -674,7 +754,7 @@ check: check-am
+ all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) config.h
+ installdirs:
+ 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(includedir)"; do \
+-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
+ install-exec: install-exec-am
+@@ -725,12 +805,20 @@ info-am:
+ 
+ install-data-am: install-includeHEADERS
+ 
++install-dvi: install-dvi-am
++
+ install-exec-am: install-binPROGRAMS install-libLIBRARIES
+ 
++install-html: install-html-am
++
+ install-info: install-info-am
+ 
+ install-man:
+ 
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
+@@ -753,23 +841,27 @@ ps: ps-am
+ ps-am:
+ 
+ uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \
+-	uninstall-info-am uninstall-libLIBRARIES
++	uninstall-libLIBRARIES
++
++.MAKE: install-am install-strip
+ 
+ .PHONY: CTAGS GTAGS all all-am am--refresh check check-TESTS check-am \
+ 	clean clean-binPROGRAMS clean-generic clean-libLIBRARIES \
+ 	clean-noinstPROGRAMS ctags dist dist-all dist-bzip2 dist-gzip \
+-	dist-shar dist-tarZ dist-zip distcheck distclean \
++	dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \
+ 	distclean-compile distclean-generic distclean-hdr \
+ 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+ 	dvi-am html html-am info info-am install install-am \
+-	install-binPROGRAMS install-data install-data-am install-exec \
+-	install-exec-am install-includeHEADERS install-info \
+-	install-info-am install-libLIBRARIES install-man install-strip \
++	install-binPROGRAMS install-data install-data-am install-dvi \
++	install-dvi-am install-exec install-exec-am install-html \
++	install-html-am install-includeHEADERS install-info \
++	install-info-am install-libLIBRARIES install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
+ 	installcheck installcheck-am installdirs maintainer-clean \
+ 	maintainer-clean-generic mostlyclean mostlyclean-compile \
+ 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
+ 	uninstall-am uninstall-binPROGRAMS uninstall-includeHEADERS \
+-	uninstall-info-am uninstall-libLIBRARIES
++	uninstall-libLIBRARIES
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff --git a/jbig2dec/aclocal.m4 b/jbig2dec/aclocal.m4
+--- a/jbig2dec/aclocal.m4
++++ b/jbig2dec/aclocal.m4
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
++# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
+ 
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005  Free Software Foundation, Inc.
++# 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -11,7 +11,15 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
+-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
++m4_ifndef([AC_AUTOCONF_VERSION],
++  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
++[m4_warning([this file was generated for autoconf 2.63.
++You have another version of autoconf.  It may work, but is not guaranteed to.
++If you have problems, you may need to regenerate the build system entirely.
++To do so, use the procedure documented by the package, typically `autoreconf'.])])
++
++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -21,14 +29,31 @@
+ # ----------------------------
+ # Automake X.Y traces this macro to ensure aclocal.m4 has been
+ # generated from the m4 files accompanying Automake X.Y.
+-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
++# (This private macro should not be called outside this file.)
++AC_DEFUN([AM_AUTOMAKE_VERSION],
++[am__api_version='1.10'
++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
++dnl require some minimum version.  Point them to the right macro.
++m4_if([$1], [1.10.2], [],
++      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
++])
++
++# _AM_AUTOCONF_VERSION(VERSION)
++# -----------------------------
++# aclocal traces this macro to find the Autoconf version.
++# This is a private macro too.  Using m4_define simplifies
++# the logic in aclocal, which can simply ignore this definition.
++m4_define([_AM_AUTOCONF_VERSION], [])
+ 
+ # AM_SET_CURRENT_AUTOMAKE_VERSION
+ # -------------------------------
+-# Call AM_AUTOMAKE_VERSION so it can be traced.
+-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
++# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-	 [AM_AUTOMAKE_VERSION([1.9.5])])
++[AM_AUTOMAKE_VERSION([1.10.2])dnl
++m4_ifndef([AC_AUTOCONF_VERSION],
++  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+ 
+ # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
+ 
+@@ -85,14 +110,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
+ 
+ # AM_CONDITIONAL                                            -*- Autoconf -*-
+ 
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 7
++# serial 8
+ 
+ # AM_CONDITIONAL(NAME, SHELL-CONDITION)
+ # -------------------------------------
+@@ -101,8 +126,10 @@ AC_DEFUN([AM_CONDITIONAL],
+ [AC_PREREQ(2.52)dnl
+  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+ 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+-AC_SUBST([$1_TRUE])
+-AC_SUBST([$1_FALSE])
++AC_SUBST([$1_TRUE])dnl
++AC_SUBST([$1_FALSE])dnl
++_AM_SUBST_NOTMAKE([$1_TRUE])dnl
++_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+ if $2; then
+   $1_TRUE=
+   $1_FALSE='#'
+@@ -116,15 +143,14 @@ AC_CONFIG_COMMANDS_PRE(
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])
+ 
+-
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 8
++# serial 9
+ 
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+@@ -152,6 +178,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
+ ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
++       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
+ 
+@@ -217,6 +244,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+          >/dev/null 2>conftest.err &&
++       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+@@ -269,61 +297,74 @@ if test "x$enable_dependency_tracking" != xno; then
+   AMDEPBACKSLASH='\'
+ fi
+ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+-AC_SUBST([AMDEPBACKSLASH])
++AC_SUBST([AMDEPBACKSLASH])dnl
++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+ ])
+ 
+ # Generate code to set up dependency tracking.              -*- Autoconf -*-
+ 
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-#serial 3
++#serial 5
+ 
+ # _AM_OUTPUT_DEPENDENCY_COMMANDS
+ # ------------------------------
+ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[for mf in $CONFIG_FILES; do
+-  # Strip MF so we end up with the name of the file.
+-  mf=`echo "$mf" | sed -e 's/:.*$//'`
+-  # Check whether this is an Automake generated Makefile or not.
+-  # We used to match only the files named `Makefile.in', but
+-  # some people rename them; so instead we look at the file content.
+-  # Grep'ing the first line is not enough: some people post-process
+-  # each Makefile.in and add a new line on top of each file to say so.
+-  # So let's grep whole file.
+-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+-    dirpart=`AS_DIRNAME("$mf")`
+-  else
+-    continue
+-  fi
+-  # Extract the definition of DEPDIR, am__include, and am__quote
+-  # from the Makefile without running `make'.
+-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+-  test -z "$DEPDIR" && continue
+-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+-  test -z "am__include" && continue
+-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+-  # When using ansi2knr, U may be empty or an underscore; expand it
+-  U=`sed -n 's/^U = //p' < "$mf"`
+-  # Find all dependency output files, they are included files with
+-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+-  # simplest approach to changing $(DEPDIR) to its actual value in the
+-  # expansion.
+-  for file in `sed -n "
+-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+-    # Make sure the directory exists.
+-    test -f "$dirpart/$file" && continue
+-    fdir=`AS_DIRNAME(["$file"])`
+-    AS_MKDIR_P([$dirpart/$fdir])
+-    # echo "creating $dirpart/$file"
+-    echo '# dummy' > "$dirpart/$file"
++[{
++  # Autoconf 2.62 quotes --file arguments for eval, but not when files
++  # are listed without --file.  Let's play safe and only enable the eval
++  # if we detect the quoting.
++  case $CONFIG_FILES in
++  *\'*) eval set x "$CONFIG_FILES" ;;
++  *)   set x $CONFIG_FILES ;;
++  esac
++  shift
++  for mf
++  do
++    # Strip MF so we end up with the name of the file.
++    mf=`echo "$mf" | sed -e 's/:.*$//'`
++    # Check whether this is an Automake generated Makefile or not.
++    # We used to match only the files named `Makefile.in', but
++    # some people rename them; so instead we look at the file content.
++    # Grep'ing the first line is not enough: some people post-process
++    # each Makefile.in and add a new line on top of each file to say so.
++    # Grep'ing the whole file is not good either: AIX grep has a line
++    # limit of 2048, but all sed's we know have understand at least 4000.
++    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++      dirpart=`AS_DIRNAME("$mf")`
++    else
++      continue
++    fi
++    # Extract the definition of DEPDIR, am__include, and am__quote
++    # from the Makefile without running `make'.
++    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++    test -z "$DEPDIR" && continue
++    am__include=`sed -n 's/^am__include = //p' < "$mf"`
++    test -z "am__include" && continue
++    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++    # When using ansi2knr, U may be empty or an underscore; expand it
++    U=`sed -n 's/^U = //p' < "$mf"`
++    # Find all dependency output files, they are included files with
++    # $(DEPDIR) in their names.  We invoke sed twice because it is the
++    # simplest approach to changing $(DEPDIR) to its actual value in the
++    # expansion.
++    for file in `sed -n "
++      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++      # Make sure the directory exists.
++      test -f "$dirpart/$file" && continue
++      fdir=`AS_DIRNAME(["$file"])`
++      AS_MKDIR_P([$dirpart/$fdir])
++      # echo "creating $dirpart/$file"
++      echo '# dummy' > "$dirpart/$file"
++    done
+   done
+-done
++}
+ ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+ 
+ 
+@@ -354,14 +395,14 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+ 
+ # Do all the work for Automake.                             -*- Autoconf -*-
+ 
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005, 2006, 2008 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 12
++# serial 13
+ 
+ # This macro actually does too much.  Some checks are only needed if
+ # your package does certain things.  But this isn't really a big deal.
+@@ -378,16 +419,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+ # arguments mandatory, and then we can depend on a new Autoconf
+ # release and drop the old call support.
+ AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_PREREQ([2.58])dnl
++[AC_PREREQ([2.60])dnl
+ dnl Autoconf wants to disallow AM_ names.  We explicitly allow
+ dnl the ones we care about.
+ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+ AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+-# test to see if srcdir already configured
+-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+-   test -f $srcdir/config.status; then
+-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++if test "`cd $srcdir && pwd`" != "`pwd`"; then
++  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
++  # is not polluted with repeated "-I."
++  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
++  # test to see if srcdir already configured
++  if test -f $srcdir/config.status; then
++    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++  fi
+ fi
+ 
+ # test whether we have cygpath
+@@ -407,6 +452,9 @@ m4_ifval([$2],
+  AC_SUBST([PACKAGE], [$1])dnl
+  AC_SUBST([VERSION], [$2])],
+ [_AM_SET_OPTIONS([$1])dnl
++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
++  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+ 
+@@ -442,6 +490,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                   [_AM_DEPENDENCIES(CXX)],
+                   [define([AC_PROG_CXX],
+                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_OBJC],
++                  [_AM_DEPENDENCIES(OBJC)],
++                  [define([AC_PROG_OBJC],
++                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ ])
+ ])
+ 
+@@ -455,16 +507,17 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
+ # our stamp files there.
+ AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+ [# Compute $1's index in $config_headers.
++_am_arg=$1
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+   case $_am_header in
+-    $1 | $1:* )
++    $_am_arg | $_am_arg:* )
+       break ;;
+     * )
+       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+   esac
+ done
+-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+ 
+ # Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+ #
+@@ -477,7 +530,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+ # Define $install_sh.
+ AC_DEFUN([AM_PROG_INSTALL_SH],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-install_sh=${install_sh-"$am_aux_dir/install-sh"}
++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+ AC_SUBST(install_sh)])
+ 
+ # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+@@ -553,16 +606,51 @@ AC_MSG_RESULT([$_am_result])
+ rm -f confinc confmf
+ ])
+ 
++# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 6
++
++# AM_PROG_CC_C_O
++# --------------
++# Like AC_PROG_CC_C_O, but changed for automake.
++AC_DEFUN([AM_PROG_CC_C_O],
++[AC_REQUIRE([AC_PROG_CC_C_O])dnl
++AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++AC_REQUIRE_AUX_FILE([compile])dnl
++# FIXME: we rely on the cache variable name because
++# there is no other way.
++set dummy $CC
++am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
++eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
++if test "$am_t" != yes; then
++   # Losing compiler, so override with the script.
++   # FIXME: It is wrong to rewrite CC.
++   # But if we don't then we get into trouble of one sort or another.
++   # A longer-term fix would be to have automake use am__CC in this case,
++   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
++   CC="$am_aux_dir/compile $CC"
++fi
++dnl Make sure AC_PROG_CC is never called again, or it will override our
++dnl setting of CC.
++m4_define([AC_PROG_CC],
++          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
++])
++
+ # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
+ 
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 4
++# serial 5
+ 
+ # AM_MISSING_PROG(NAME, PROGRAM)
+ # ------------------------------
+@@ -578,6 +666,7 @@ AC_SUBST($1)])
+ # If it does, set am_missing_run to use it, otherwise, to nothing.
+ AC_DEFUN([AM_MISSING_HAS_RUN],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++AC_REQUIRE_AUX_FILE([missing])dnl
+ test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+ # Use eval to expand $SHELL
+ if eval "$MISSING --run true"; then
+@@ -588,7 +677,7 @@ else
+ fi
+ ])
+ 
+-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
++# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -596,70 +685,33 @@ fi
+ 
+ # AM_PROG_MKDIR_P
+ # ---------------
+-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+-#
+-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+-# created by `make install' are always world readable, even if the
+-# installer happens to have an overly restrictive umask (e.g. 077).
+-# This was a mistake.  There are at least two reasons why we must not
+-# use `-m 0755':
+-#   - it causes special bits like SGID to be ignored,
+-#   - it may be too restrictive (some setups expect 775 directories).
+-#
+-# Do not use -m 0755 and let people choose whatever they expect by
+-# setting umask.
+-#
+-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+-# Some implementations (such as Solaris 8's) are not thread-safe: if a
+-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+-# concurrently, both version can detect that a/ is missing, but only
+-# one can create it and the other will error out.  Consequently we
+-# restrict ourselves to GNU make (using the --version option ensures
+-# this.)
++# Check for `mkdir -p'.
+ AC_DEFUN([AM_PROG_MKDIR_P],
+-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+-  # We used to keeping the `.' as first argument, in order to
+-  # allow $(mkdir_p) to be used without argument.  As in
+-  #   $(mkdir_p) $(somedir)
+-  # where $(somedir) is conditionally defined.  However this is wrong
+-  # for two reasons:
+-  #  1. if the package is installed by a user who cannot write `.'
+-  #     make install will fail,
+-  #  2. the above comment should most certainly read
+-  #     $(mkdir_p) $(DESTDIR)$(somedir)
+-  #     so it does not work when $(somedir) is undefined and
+-  #     $(DESTDIR) is not.
+-  #  To support the latter case, we have to write
+-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+-  #  so the `.' trick is pointless.
+-  mkdir_p='mkdir -p --'
+-else
+-  # On NextStep and OpenStep, the `mkdir' command does not
+-  # recognize any option.  It will interpret all options as
+-  # directories to create, and then abort because `.' already
+-  # exists.
+-  for d in ./-p ./--version;
+-  do
+-    test -d $d && rmdir $d
+-  done
+-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+-  if test -f "$ac_aux_dir/mkinstalldirs"; then
+-    mkdir_p='$(mkinstalldirs)'
+-  else
+-    mkdir_p='$(install_sh) -d'
+-  fi
+-fi
+-AC_SUBST([mkdir_p])])
++[AC_PREREQ([2.60])dnl
++AC_REQUIRE([AC_PROG_MKDIR_P])dnl
++dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
++dnl while keeping a definition of mkdir_p for backward compatibility.
++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
++dnl Makefile.ins that do not define MKDIR_P, so we do our own
++dnl adjustment using top_builddir (which is defined more often than
++dnl MKDIR_P).
++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
++case $mkdir_p in
++  [[\\/$]]* | ?:[[\\/]]*) ;;
++  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
++])
+ 
+ # Helper functions for option handling.                     -*- Autoconf -*-
+ 
+-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
++# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+ 
+-# serial 3
++# serial 4
+ 
+ # _AM_MANGLE_OPTION(NAME)
+ # -----------------------
+@@ -676,7 +728,7 @@ AC_DEFUN([_AM_SET_OPTION],
+ # ----------------------------------
+ # OPTIONS is a space-separated list of Automake options.
+ AC_DEFUN([_AM_SET_OPTIONS],
+-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+ 
+ # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+ # -------------------------------------------
+@@ -761,9 +813,21 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+ if test "$cross_compiling" != no; then
+   AC_CHECK_TOOL([STRIP], [strip], :)
+ fi
+-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+ 
++# Copyright (C) 2006  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# _AM_SUBST_NOTMAKE(VARIABLE)
++# ---------------------------
++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
++# This macro is traced by Automake.
++AC_DEFUN([_AM_SUBST_NOTMAKE])
++
+ # Check how to create a tarball.                            -*- Autoconf -*-
+ 
+ # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+diff --git a/jbig2dec/compile b/jbig2dec/compile
+--- a/jbig2dec/compile
++++ b/jbig2dec/compile
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # Wrapper for compilers which do not understand `-c -o'.
+ 
+-scriptversion=2005-02-03.08
++scriptversion=2005-05-14.22
+ 
+ # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
+ # Written by Tom Tromey <tromey@cygnus.com>.
+@@ -18,7 +18,7 @@ scriptversion=2005-02-03.08
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ 
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+diff --git a/jbig2dec/config.h b/jbig2dec/config.h
+--- a/jbig2dec/config.h
++++ b/jbig2dec/config.h
+@@ -1,8 +1,11 @@
+-/* config.h.  Generated by configure.  */
++/* config.h.  Generated from config.h.in by configure.  */
+ /* config.h.in.  Generated from configure.ac by autoheader.  */
+ 
++/* Define if building universal (internal helper macro) */
++/* #undef AC_APPLE_UNIVERSAL_BUILD */
++
+ /* Define if the local libc includes getopt_long() */
+-#define HAVE_GETOPT_LONG 
++#define HAVE_GETOPT_LONG /**/
+ 
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #define HAVE_INTTYPES_H 1
+@@ -11,7 +14,7 @@
+ #define HAVE_LIBINTL_H 1
+ 
+ /* Define if libpng is available (-lpng) */
+-/* #undef HAVE_LIBPNG */
++#define HAVE_LIBPNG 1
+ 
+ /* Define to 1 if you have the <memory.h> header file. */
+ #define HAVE_MEMORY_H 1
+@@ -52,6 +55,9 @@
+ /* set by configure if an alternate header with the stdint.h types is found */
+ /* #undef JBIG2_REPLACE_STDINT_H */
+ 
++/* Define to 1 if your C compiler doesn't accept -c and -o together. */
++/* #undef NO_MINUS_C_MINUS_O */
++
+ /* Name of package */
+ #define PACKAGE "jbig2dec"
+ 
+@@ -62,38 +68,46 @@
+ #define PACKAGE_NAME "jbig2dec"
+ 
+ /* Define to the full name and version of this package. */
+-#define PACKAGE_STRING "jbig2dec 0.9pre"
++#define PACKAGE_STRING "jbig2dec 0.10"
+ 
+ /* Define to the one symbol short name of this package. */
+ #define PACKAGE_TARNAME "jbig2dec"
+ 
+ /* Define to the version of this package. */
+-#define PACKAGE_VERSION "0.9pre"
++#define PACKAGE_VERSION "0.10"
+ 
+-/* The size of a `char', as computed by sizeof. */
++/* The size of `char', as computed by sizeof. */
+ #define SIZEOF_CHAR 1
+ 
+-/* The size of a `int', as computed by sizeof. */
++/* The size of `int', as computed by sizeof. */
+ #define SIZEOF_INT 4
+ 
+-/* The size of a `long', as computed by sizeof. */
+-#define SIZEOF_LONG 4
++/* The size of `long', as computed by sizeof. */
++#define SIZEOF_LONG 8
+ 
+-/* The size of a `short', as computed by sizeof. */
++/* The size of `short', as computed by sizeof. */
+ #define SIZEOF_SHORT 2
+ 
+ /* Define to 1 if you have the ANSI C header files. */
+ #define STDC_HEADERS 1
+ 
+ /* Version number of package */
+-#define VERSION "0.9pre"
+-
+-/* Define to 1 if your processor stores words with the most significant byte
+-   first (like Motorola and SPARC, unlike Intel and VAX). */
+-/* #undef WORDS_BIGENDIAN */
++#define VERSION "0.10"
++
++/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
++   significant byte first (like Motorola and SPARC, unlike Intel). */
++#if defined AC_APPLE_UNIVERSAL_BUILD
++# if defined __BIG_ENDIAN__
++#  define WORDS_BIGENDIAN 1
++# endif
++#else
++# ifndef WORDS_BIGENDIAN
++/* #  undef WORDS_BIGENDIAN */
++# endif
++#endif
+ 
+ /* Define to empty if `const' does not conform to ANSI C. */
+ /* #undef const */
+ 
+-/* Define to `unsigned' if <sys/types.h> does not define. */
++/* Define to `unsigned int' if <sys/types.h> does not define. */
+ /* #undef size_t */
+diff --git a/jbig2dec/config.h.in b/jbig2dec/config.h.in
+--- a/jbig2dec/config.h.in
++++ b/jbig2dec/config.h.in
+@@ -1,5 +1,8 @@
+ /* config.h.in.  Generated from configure.ac by autoheader.  */
+ 
++/* Define if building universal (internal helper macro) */
++#undef AC_APPLE_UNIVERSAL_BUILD
++
+ /* Define if the local libc includes getopt_long() */
+ #undef HAVE_GETOPT_LONG
+ 
+@@ -51,6 +54,9 @@
+ /* set by configure if an alternate header with the stdint.h types is found */
+ #undef JBIG2_REPLACE_STDINT_H
+ 
++/* Define to 1 if your C compiler doesn't accept -c and -o together. */
++#undef NO_MINUS_C_MINUS_O
++
+ /* Name of package */
+ #undef PACKAGE
+ 
+@@ -69,16 +75,16 @@
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+ 
+-/* The size of a `char', as computed by sizeof. */
++/* The size of `char', as computed by sizeof. */
+ #undef SIZEOF_CHAR
+ 
+-/* The size of a `int', as computed by sizeof. */
++/* The size of `int', as computed by sizeof. */
+ #undef SIZEOF_INT
+ 
+-/* The size of a `long', as computed by sizeof. */
++/* The size of `long', as computed by sizeof. */
+ #undef SIZEOF_LONG
+ 
+-/* The size of a `short', as computed by sizeof. */
++/* The size of `short', as computed by sizeof. */
+ #undef SIZEOF_SHORT
+ 
+ /* Define to 1 if you have the ANSI C header files. */
+@@ -87,12 +93,20 @@
+ /* Version number of package */
+ #undef VERSION
+ 
+-/* Define to 1 if your processor stores words with the most significant byte
+-   first (like Motorola and SPARC, unlike Intel and VAX). */
+-#undef WORDS_BIGENDIAN
++/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
++   significant byte first (like Motorola and SPARC, unlike Intel). */
++#if defined AC_APPLE_UNIVERSAL_BUILD
++# if defined __BIG_ENDIAN__
++#  define WORDS_BIGENDIAN 1
++# endif
++#else
++# ifndef WORDS_BIGENDIAN
++#  undef WORDS_BIGENDIAN
++# endif
++#endif
+ 
+ /* Define to empty if `const' does not conform to ANSI C. */
+ #undef const
+ 
+-/* Define to `unsigned' if <sys/types.h> does not define. */
++/* Define to `unsigned int' if <sys/types.h> does not define. */
+ #undef size_t
+diff --git a/jbig2dec/config_win32.h b/jbig2dec/config_win32.h
+--- a/jbig2dec/config_win32.h
++++ b/jbig2dec/config_win32.h
+@@ -7,13 +7,10 @@
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: config_win32.h 8735 2008-05-15 16:17:48Z mvrhel $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+ /* configuration header file for compiling under Microsoft Windows */
+@@ -28,18 +25,17 @@
+   typedef short int               int16_t;
+   typedef int                     int32_t;
+   typedef __int64                 int64_t;
+- 
++
+   typedef unsigned char             uint8_t;
+   typedef unsigned short int        uint16_t;
+   typedef unsigned int              uint32_t;
+   /* no uint64_t */
+ 
+-#if defined(_MSC_VER)
+-	#if _MSC_VER < 1500  /* Visual Studio 2008 has definition for vsnprintf */
+-		#define vsnprintf _vsnprintf
+-	#endif
+-#endif
+-
++#  if defined(_MSC_VER)
++#   if _MSC_VER < 1500	/* VS 2008 has vsnprintf */
++#    define vsnprintf _vsnprintf
++#   endif
++#  endif
+ #  define snprintf _snprintf
+ 
+ #endif /* _MSC_VER */
+diff --git a/jbig2dec/configure b/jbig2dec/configure
+--- a/jbig2dec/configure
++++ b/jbig2dec/configure
+@@ -1,27 +1,84 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.59 for jbig2dec 0.9pre.
++# Generated by GNU Autoconf 2.63 for jbig2dec 0.10.
+ #
+ # Report bugs to <jbig2-dev@ghostscript.com>.
+ #
+-# Copyright (C) 2003 Free Software Foundation, Inc.
++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## --------------------- ##
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
+-# Be Bourne compatible
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
++fi
++
++
++
++
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++as_nl='
++'
++export as_nl
++# Printing a long string crashes Solaris 7 /usr/bin/printf.
++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
++if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
++  as_echo='printf %s\n'
++  as_echo_n='printf %s'
++else
++  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
++    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
++    as_echo_n='/usr/ucb/echo -n'
++  else
++    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
++    as_echo_n_body='eval
++      arg=$1;
++      case $arg in
++      *"$as_nl"*)
++	expr "X$arg" : "X\\(.*\\)$as_nl";
++	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
++      esac;
++      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
++    '
++    export as_echo_n_body
++    as_echo_n='sh -c $as_echo_n_body as_echo'
++  fi
++  export as_echo_body
++  as_echo='sh -c $as_echo_body as_echo'
++fi
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  PATH_SEPARATOR=:
++  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
++    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
++      PATH_SEPARATOR=';'
++  }
+ fi
+-DUALCASE=1; export DUALCASE # for MKS sh
+ 
+ # Support unset when possible.
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+@@ -31,33 +88,60 @@ else
+ fi
+ 
+ 
++# IFS
++# We need space, tab and new line, in precisely that order.  Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++IFS=" ""	$as_nl"
++
++# Find who we are.  Look in the path if we contain no directory separator.
++case $0 in
++  *[\\/]* ) as_myself=$0 ;;
++  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++IFS=$as_save_IFS
++
++     ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++  as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  { (exit 1); exit 1; }
++fi
++
+ # Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
++for as_var in ENV MAIL MAILPATH
++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+ 
+ # NLS nuisances.
+-for as_var in \
+-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+-  LC_TELEPHONE LC_TIME
+-do
+-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+-    eval $as_var=C; export $as_var
+-  else
+-    $as_unset $as_var
+-  fi
+-done
++LC_ALL=C
++export LC_ALL
++LANGUAGE=C
++export LANGUAGE
+ 
+ # Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+   as_basename=basename
+ else
+   as_basename=false
+@@ -65,157 +149,391 @@ fi
+ 
+ 
+ # Name of the executable.
+-as_me=`$as_basename "$0" ||
++as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)$' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\/\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+ 
++# CDPATH.
++$as_unset CDPATH
+ 
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+ 
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
+-  else
+-    PATH_SEPARATOR=:
+-  fi
+-  rm -f conf$$.sh
++if test "x$CONFIG_SHELL" = x; then
++  if (eval ":") 2>/dev/null; then
++  as_have_required=yes
++else
++  as_have_required=no
+ fi
+ 
++  if test $as_have_required = yes &&	 (eval ":
++(as_func_return () {
++  (exit \$1)
++}
++as_func_success () {
++  as_func_return 0
++}
++as_func_failure () {
++  as_func_return 1
++}
++as_func_ret_success () {
++  return 0
++}
++as_func_ret_failure () {
++  return 1
++}
+ 
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+-  # Find who we are.  Look in the path if we contain no path at all
+-  # relative or not.
+-  case $0 in
+-    *[\\/]* ) as_myself=$0 ;;
+-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
++exitcode=0
++if as_func_success; then
++  :
++else
++  exitcode=1
++  echo as_func_success failed.
++fi
+ 
+-       ;;
+-  esac
+-  # We did not find ourselves, most probably we were run as `sh COMMAND'
+-  # in which case we are not to be found in the path.
+-  if test "x$as_myself" = x; then
+-    as_myself=$0
+-  fi
+-  if test ! -f "$as_myself"; then
+-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+-   { (exit 1); exit 1; }; }
+-  fi
+-  case $CONFIG_SHELL in
+-  '')
++if as_func_failure; then
++  exitcode=1
++  echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++  :
++else
++  exitcode=1
++  echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++  exitcode=1
++  echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
++  :
++else
++  exitcode=1
++  echo positional parameters were not saved.
++fi
++
++test \$exitcode = 0) || { (exit 1); exit 1; }
++
++(
++  as_lineno_1=\$LINENO
++  as_lineno_2=\$LINENO
++  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
++  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
++") 2> /dev/null; then
++  :
++else
++  as_candidate_shells=
+     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for as_base in sh bash ksh sh5; do
+-	 case $as_dir in
++  case $as_dir in
+ 	 /*)
+-	   if ("$as_dir/$as_base" -c '
++	   for as_base in sh bash ksh sh5; do
++	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
++	   done;;
++       esac
++done
++IFS=$as_save_IFS
++
++
++      for as_shell in $as_candidate_shells $SHELL; do
++	 # Try only shells that exist, to save several forks.
++	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
++		{ ("$as_shell") 2> /dev/null <<\_ASEOF
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
++fi
++
++
++:
++_ASEOF
++}; then
++  CONFIG_SHELL=$as_shell
++	       as_have_required=yes
++	       if { "$as_shell" 2> /dev/null <<\_ASEOF
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
++fi
++
++
++:
++(as_func_return () {
++  (exit $1)
++}
++as_func_success () {
++  as_func_return 0
++}
++as_func_failure () {
++  as_func_return 1
++}
++as_func_ret_success () {
++  return 0
++}
++as_func_ret_failure () {
++  return 1
++}
++
++exitcode=0
++if as_func_success; then
++  :
++else
++  exitcode=1
++  echo as_func_success failed.
++fi
++
++if as_func_failure; then
++  exitcode=1
++  echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++  :
++else
++  exitcode=1
++  echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++  exitcode=1
++  echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = "$1" ); then
++  :
++else
++  exitcode=1
++  echo positional parameters were not saved.
++fi
++
++test $exitcode = 0) || { (exit 1); exit 1; }
++
++(
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+-	     CONFIG_SHELL=$as_dir/$as_base
+-	     export CONFIG_SHELL
+-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+-	   fi;;
+-	 esac
+-       done
+-done
+-;;
+-  esac
++  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
++
++_ASEOF
++}; then
++  break
++fi
++
++fi
++
++      done
++
++      if test "x$CONFIG_SHELL" != x; then
++  for as_var in BASH_ENV ENV
++	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++	done
++	export CONFIG_SHELL
++	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
++fi
++
++
++    if test $as_have_required = no; then
++  echo This script requires a shell more modern than all the
++      echo shells that I found on your system.  Please install a
++      echo modern shell, or manually run the script under such a
++      echo shell if you do have one.
++      { (exit 1); exit 1; }
++fi
++
++
++fi
++
++fi
++
++
++
++(eval "as_func_return () {
++  (exit \$1)
++}
++as_func_success () {
++  as_func_return 0
++}
++as_func_failure () {
++  as_func_return 1
++}
++as_func_ret_success () {
++  return 0
++}
++as_func_ret_failure () {
++  return 1
++}
++
++exitcode=0
++if as_func_success; then
++  :
++else
++  exitcode=1
++  echo as_func_success failed.
++fi
++
++if as_func_failure; then
++  exitcode=1
++  echo as_func_failure succeeded.
++fi
++
++if as_func_ret_success; then
++  :
++else
++  exitcode=1
++  echo as_func_ret_success failed.
++fi
++
++if as_func_ret_failure; then
++  exitcode=1
++  echo as_func_ret_failure succeeded.
++fi
++
++if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
++  :
++else
++  exitcode=1
++  echo positional parameters were not saved.
++fi
++
++test \$exitcode = 0") || {
++  echo No shell found that supports shell functions.
++  echo Please tell bug-autoconf@gnu.org about your system,
++  echo including any error possibly output before this message.
++  echo This can help us improve future autoconf versions.
++  echo Configuration will now proceed without shell functions.
++}
++
++
++
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+ 
+   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+   # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line before each line; the second 'sed' does the real
+-  # work.  The second script uses 'N' to pair each line-number line
+-  # with the numbered line, and appends trailing '-' during
+-  # substitution so that $LINENO is not a special case at line end.
++  # line-number line after each line using $LINENO; the second 'sed'
++  # does the real work.  The second script uses 'N' to pair each
++  # line-number line with the line containing $LINENO, and appends
++  # trailing '-' during substitution so that $LINENO is not a special
++  # case at line end.
+   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+-  sed '=' <$as_myself |
++  # scripts with optimization help from Paolo Bonzini.  Blame Lee
++  # E. McMahon (1931-1989) for sed's syntax.  :-)
++  sed -n '
++    p
++    /[$]LINENO/=
++  ' <$as_myself |
+     sed '
++      s/[$]LINENO.*/&-/
++      t lineno
++      b
++      :lineno
+       N
+-      s,$,-,
+-      : loop
+-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      :loop
++      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+       t loop
+-      s,-$,,
+-      s,^['$as_cr_digits']*\n,,
++      s/-\n.*//
+     ' >$as_me.lineno &&
+-  chmod +x $as_me.lineno ||
+-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
++  chmod +x "$as_me.lineno" ||
++    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensible to this).
+-  . ./$as_me.lineno
++  # original and so on.  Autoconf is especially sensitive to this).
++  . "./$as_me.lineno"
+   # Exit status is that of the last command.
+   exit
+ }
+ 
+ 
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+-  *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T='	' ;;
+-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+-esac
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++  as_dirname=dirname
++else
++  as_dirname=false
++fi
+ 
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in
++-n*)
++  case `echo 'x\c'` in
++  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
++  *)   ECHO_C='\c';;
++  esac;;
++*)
++  ECHO_N='-n';;
++esac
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ rm -f conf$$ conf$$.exe conf$$.file
+-echo >conf$$.file
+-if ln -s conf$$.file conf$$ 2>/dev/null; then
+-  # We could just check for DJGPP; but this test a) works b) is more generic
+-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+-  if test -f conf$$.exe; then
+-    # Don't use ln at all; we don't have any links
+-    as_ln_s='cp -p'
+-  else
++if test -d conf$$.dir; then
++  rm -f conf$$.dir/conf$$.file
++else
++  rm -f conf$$.dir
++  mkdir conf$$.dir 2>/dev/null
++fi
++if (echo >conf$$.file) 2>/dev/null; then
++  if ln -s conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s='ln -s'
++    # ... but there are two gotchas:
++    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++    # In both cases, we have to default to `cp -p'.
++    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
++      as_ln_s='cp -p'
++  elif ln conf$$.file conf$$ 2>/dev/null; then
++    as_ln_s=ln
++  else
++    as_ln_s='cp -p'
+   fi
+-elif ln conf$$.file conf$$ 2>/dev/null; then
+-  as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
+ 
+ if mkdir -p . 2>/dev/null; then
+   as_mkdir_p=:
+@@ -224,7 +542,28 @@ else
+   as_mkdir_p=false
+ fi
+ 
+-as_executable_p="test -f"
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
++else
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
++  else
++    as_ls_L_option=
++  fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++	test -d "$1/.";
++      else
++	case $1 in
++	-*)set "./$1";;
++	esac;
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++	???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
++fi
++as_executable_p=$as_test_x
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -233,90 +572,179 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" 	$as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+ 
++exec 7<&0 </dev/null 6>&1
+ 
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+ 
+-exec 6>&1
+-
+ #
+ # Initializations.
+ #
+ ac_default_prefix=/usr/local
++ac_clean_files=
+ ac_config_libobj_dir=.
++LIBOBJS=
+ cross_compiling=no
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+ SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+-# Maximum number of lines to put in a shell here document.
+-# This variable seems obsolete.  It should probably be removed, and
+-# only ac_max_sed_lines should be used.
+-: ${ac_max_here_lines=38}
+-
+ # Identity of this package.
+ PACKAGE_NAME='jbig2dec'
+ PACKAGE_TARNAME='jbig2dec'
+-PACKAGE_VERSION='0.9pre'
+-PACKAGE_STRING='jbig2dec 0.9pre'
++PACKAGE_VERSION='0.10'
++PACKAGE_STRING='jbig2dec 0.10'
+ PACKAGE_BUGREPORT='jbig2-dev@ghostscript.com'
+ 
+ ac_unique_file="jbig2dec.c"
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+-#if HAVE_SYS_TYPES_H
++#ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
+ #endif
+-#if HAVE_SYS_STAT_H
++#ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+-#if STDC_HEADERS
++#ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #else
+-# if HAVE_STDLIB_H
++# ifdef HAVE_STDLIB_H
+ #  include <stdlib.h>
+ # endif
+ #endif
+-#if HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
++#ifdef HAVE_STRING_H
++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+ #  include <memory.h>
+ # endif
+ # include <string.h>
+ #endif
+-#if HAVE_STRINGS_H
++#ifdef HAVE_STRINGS_H
+ # include <strings.h>
+ #endif
+-#if HAVE_INTTYPES_H
++#ifdef HAVE_INTTYPES_H
+ # include <inttypes.h>
+-#else
+-# if HAVE_STDINT_H
+-#  include <stdint.h>
+-# endif
+ #endif
+-#if HAVE_UNISTD_H
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
++#endif
++#ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif"
+ 
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB LIBOBJS CPP EGREP JBIG2_INT32_T JBIG2_INT16_T JBIG2_INT8_T JBIG2_STDINT_H LTLIBOBJS'
++ac_subst_vars='LTLIBOBJS
++JBIG2_STDINT_H
++JBIG2_INT8_T
++JBIG2_INT16_T
++JBIG2_INT32_T
++EGREP
++GREP
++CPP
++LIBOBJS
++RANLIB
++am__fastdepCC_FALSE
++am__fastdepCC_TRUE
++CCDEPMODE
++AMDEPBACKSLASH
++AMDEP_FALSE
++AMDEP_TRUE
++am__quote
++am__include
++DEPDIR
++OBJEXT
++EXEEXT
++ac_ct_CC
++CPPFLAGS
++LDFLAGS
++CFLAGS
++CC
++am__untar
++am__tar
++AMTAR
++am__leading_dot
++SET_MAKE
++AWK
++mkdir_p
++MKDIR_P
++INSTALL_STRIP_PROGRAM
++STRIP
++install_sh
++MAKEINFO
++AUTOHEADER
++AUTOMAKE
++AUTOCONF
++ACLOCAL
++VERSION
++PACKAGE
++CYGPATH_W
++am__isrc
++INSTALL_DATA
++INSTALL_SCRIPT
++INSTALL_PROGRAM
++target_alias
++host_alias
++build_alias
++LIBS
++ECHO_T
++ECHO_N
++ECHO_C
++DEFS
++mandir
++localedir
++libdir
++psdir
++pdfdir
++dvidir
++htmldir
++infodir
++docdir
++oldincludedir
++includedir
++localstatedir
++sharedstatedir
++sysconfdir
++datadir
++datarootdir
++libexecdir
++sbindir
++bindir
++program_transform_name
++prefix
++exec_prefix
++PACKAGE_BUGREPORT
++PACKAGE_STRING
++PACKAGE_VERSION
++PACKAGE_TARNAME
++PACKAGE_NAME
++PATH_SEPARATOR
++SHELL'
+ ac_subst_files=''
++ac_user_opts='
++enable_option_checking
++enable_dependency_tracking
++with_libpng
++'
++      ac_precious_vars='build_alias
++host_alias
++target_alias
++CC
++CFLAGS
++LDFLAGS
++LIBS
++CPPFLAGS
++CPP'
++
+ 
+ # Initialize some variables set by options.
+ ac_init_help=
+ ac_init_version=false
++ac_unrecognized_opts=
++ac_unrecognized_sep=
+ # The variables have the same names as the options, with
+ # dashes changed to underlines.
+ cache_file=/dev/null
+@@ -339,34 +767,48 @@ x_libraries=NONE
+ # and all the variables that are supposed to be based on exec_prefix
+ # by default will actually change.
+ # Use braces instead of parens because sh, perl, etc. also accept them.
++# (The list follows the same order as the GNU Coding Standards.)
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+-datadir='${prefix}/share'
++datarootdir='${prefix}/share'
++datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+-libdir='${exec_prefix}/lib'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+-infodir='${prefix}/info'
+-mandir='${prefix}/man'
++docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
++infodir='${datarootdir}/info'
++htmldir='${docdir}'
++dvidir='${docdir}'
++pdfdir='${docdir}'
++psdir='${docdir}'
++libdir='${exec_prefix}/lib'
++localedir='${datarootdir}/locale'
++mandir='${datarootdir}/man'
+ 
+ ac_prev=
++ac_dashdash=
+ for ac_option
+ do
+   # If the previous option needs an argument, assign it.
+   if test -n "$ac_prev"; then
+-    eval "$ac_prev=\$ac_option"
++    eval $ac_prev=\$ac_option
+     ac_prev=
+     continue
+   fi
+ 
+-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
++  case $ac_option in
++  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++  *)	ac_optarg=yes ;;
++  esac
+ 
+   # Accept the important Cygnus configure options, so we can diagnose typos.
+ 
+-  case $ac_option in
++  case $ac_dashdash$ac_option in
++  --)
++    ac_dashdash=yes ;;
+ 
+   -bindir | --bindir | --bindi | --bind | --bin | --bi)
+     ac_prev=bindir ;;
+@@ -388,33 +830,61 @@ do
+   --config-cache | -C)
+     cache_file=config.cache ;;
+ 
+-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
++  -datadir | --datadir | --datadi | --datad)
+     ac_prev=datadir ;;
+-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+-  | --da=*)
++  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+     datadir=$ac_optarg ;;
+ 
++  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
++  | --dataroo | --dataro | --datar)
++    ac_prev=datarootdir ;;
++  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
++  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
++    datarootdir=$ac_optarg ;;
++
+   -disable-* | --disable-*)
+-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+    { (exit 1); exit 1; }; }
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+-    eval "enable_$ac_feature=no" ;;
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"enable_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
++    esac
++    eval enable_$ac_useropt=no ;;
++
++  -docdir | --docdir | --docdi | --doc | --do)
++    ac_prev=docdir ;;
++  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
++    docdir=$ac_optarg ;;
++
++  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
++    ac_prev=dvidir ;;
++  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
++    dvidir=$ac_optarg ;;
+ 
+   -enable-* | --enable-*)
+-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+    { (exit 1); exit 1; }; }
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+-    case $ac_option in
+-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+-      *) ac_optarg=yes ;;
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"enable_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
+     esac
+-    eval "enable_$ac_feature='$ac_optarg'" ;;
++    eval enable_$ac_useropt=\$ac_optarg ;;
+ 
+   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+@@ -441,6 +911,12 @@ do
+   -host=* | --host=* | --hos=* | --ho=*)
+     host_alias=$ac_optarg ;;
+ 
++  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
++    ac_prev=htmldir ;;
++  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
++  | --ht=*)
++    htmldir=$ac_optarg ;;
++
+   -includedir | --includedir | --includedi | --included | --include \
+   | --includ | --inclu | --incl | --inc)
+     ac_prev=includedir ;;
+@@ -465,13 +941,16 @@ do
+   | --libexe=* | --libex=* | --libe=*)
+     libexecdir=$ac_optarg ;;
+ 
++  -localedir | --localedir | --localedi | --localed | --locale)
++    ac_prev=localedir ;;
++  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
++    localedir=$ac_optarg ;;
++
+   -localstatedir | --localstatedir | --localstatedi | --localstated \
+-  | --localstate | --localstat | --localsta | --localst \
+-  | --locals | --local | --loca | --loc | --lo)
++  | --localstate | --localstat | --localsta | --localst | --locals)
+     ac_prev=localstatedir ;;
+   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
++  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+     localstatedir=$ac_optarg ;;
+ 
+   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+@@ -536,6 +1015,16 @@ do
+   | --progr-tra=* | --program-tr=* | --program-t=*)
+     program_transform_name=$ac_optarg ;;
+ 
++  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
++    ac_prev=pdfdir ;;
++  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
++    pdfdir=$ac_optarg ;;
++
++  -psdir | --psdir | --psdi | --psd | --ps)
++    ac_prev=psdir ;;
++  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
++    psdir=$ac_optarg ;;
++
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+@@ -586,26 +1075,38 @@ do
+     ac_init_version=: ;;
+ 
+   -with-* | --with-*)
+-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid package name: $ac_package" >&2
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+    { (exit 1); exit 1; }; }
+-    ac_package=`echo $ac_package| sed 's/-/_/g'`
+-    case $ac_option in
+-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+-      *) ac_optarg=yes ;;
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"with_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
+     esac
+-    eval "with_$ac_package='$ac_optarg'" ;;
++    eval with_$ac_useropt=\$ac_optarg ;;
+ 
+   -without-* | --without-*)
+-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
++    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid package name: $ac_package" >&2
++    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
++      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+    { (exit 1); exit 1; }; }
+-    ac_package=`echo $ac_package | sed 's/-/_/g'`
+-    eval "with_$ac_package=no" ;;
++    ac_useropt_orig=$ac_useropt
++    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
++    case $ac_user_opts in
++      *"
++"with_$ac_useropt"
++"*) ;;
++      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
++	 ac_unrecognized_sep=', ';;
++    esac
++    eval with_$ac_useropt=no ;;
+ 
+   --x)
+     # Obsolete; use --with-x.
+@@ -625,7 +1126,7 @@ do
+   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+     x_libraries=$ac_optarg ;;
+ 
+-  -*) { echo "$as_me: error: unrecognized option: $ac_option
++  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+ Try \`$0 --help' for more information." >&2
+    { (exit 1); exit 1; }; }
+     ;;
+@@ -634,17 +1135,16 @@ Try \`$0 --help' for more information." >&2
+     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
++      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+    { (exit 1); exit 1; }; }
+-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+-    eval "$ac_envvar='$ac_optarg'"
++    eval $ac_envvar=\$ac_optarg
+     export $ac_envvar ;;
+ 
+   *)
+     # FIXME: should be removed in autoconf 3.0.
+-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
++    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
++      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+     : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+     ;;
+ 
+@@ -653,31 +1153,39 @@ done
+ 
+ if test -n "$ac_prev"; then
+   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+-  { echo "$as_me: error: missing argument to $ac_option" >&2
++  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-# Be sure to have absolute paths.
+-for ac_var in exec_prefix prefix
+-do
+-  eval ac_val=$`echo $ac_var`
+-  case $ac_val in
+-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; };;
++if test -n "$ac_unrecognized_opts"; then
++  case $enable_option_checking in
++    no) ;;
++    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
++   { (exit 1); exit 1; }; } ;;
++    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+   esac
+-done
++fi
+ 
+-# Be sure to have absolute paths.
+-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+-	      localstatedir libdir includedir oldincludedir infodir mandir
++# Check all directory arguments for consistency.
++for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
++		datadir sysconfdir sharedstatedir localstatedir includedir \
++		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
++		libdir localedir mandir
+ do
+-  eval ac_val=$`echo $ac_var`
++  eval ac_val=\$$ac_var
++  # Remove trailing slashes.
+   case $ac_val in
+-    [\\/$]* | ?:[\\/]* ) ;;
+-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; };;
++    */ )
++      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
++      eval $ac_var=\$ac_val;;
++  esac
++  # Be sure to have absolute directory names.
++  case $ac_val in
++    [\\/$]* | ?:[\\/]* )  continue;;
++    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+   esac
++  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++   { (exit 1); exit 1; }; }
+ done
+ 
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -691,7 +1199,7 @@ target=$target_alias
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+     cross_compiling=maybe
+-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
++    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+     If a cross compiler is detected then cross compile mode will be used." >&2
+   elif test "x$build_alias" != "x$host_alias"; then
+     cross_compiling=yes
+@@ -704,74 +1212,76 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias-
+ test "$silent" = yes && exec 6>/dev/null
+ 
+ 
++ac_pwd=`pwd` && test -n "$ac_pwd" &&
++ac_ls_di=`ls -di .` &&
++ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
++  { $as_echo "$as_me: error: working directory cannot be determined" >&2
++   { (exit 1); exit 1; }; }
++test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
++  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
++   { (exit 1); exit 1; }; }
++
++
+ # Find the source files, if location was not specified.
+ if test -z "$srcdir"; then
+   ac_srcdir_defaulted=yes
+-  # Try the directory containing this script, then its parent.
+-  ac_confdir=`(dirname "$0") 2>/dev/null ||
+-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$0" : 'X\(//\)[^/]' \| \
+-	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$0" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++  # Try the directory containing this script, then the parent directory.
++  ac_confdir=`$as_dirname -- "$as_myself" ||
++$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_myself" : 'X\(//\)[^/]' \| \
++	 X"$as_myself" : 'X\(//\)$' \| \
++	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$as_myself" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+   srcdir=$ac_confdir
+-  if test ! -r $srcdir/$ac_unique_file; then
++  if test ! -r "$srcdir/$ac_unique_file"; then
+     srcdir=..
+   fi
+ else
+   ac_srcdir_defaulted=no
+ fi
+-if test ! -r $srcdir/$ac_unique_file; then
+-  if test "$ac_srcdir_defaulted" = yes; then
+-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
++if test ! -r "$srcdir/$ac_unique_file"; then
++  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
++  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+    { (exit 1); exit 1; }; }
+-  else
+-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+-   { (exit 1); exit 1; }; }
+-  fi
+ fi
+-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
++ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
++ac_abs_confdir=`(
++	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
+    { (exit 1); exit 1; }; }
+-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+-ac_env_build_alias_set=${build_alias+set}
+-ac_env_build_alias_value=$build_alias
+-ac_cv_env_build_alias_set=${build_alias+set}
+-ac_cv_env_build_alias_value=$build_alias
+-ac_env_host_alias_set=${host_alias+set}
+-ac_env_host_alias_value=$host_alias
+-ac_cv_env_host_alias_set=${host_alias+set}
+-ac_cv_env_host_alias_value=$host_alias
+-ac_env_target_alias_set=${target_alias+set}
+-ac_env_target_alias_value=$target_alias
+-ac_cv_env_target_alias_set=${target_alias+set}
+-ac_cv_env_target_alias_value=$target_alias
+-ac_env_CC_set=${CC+set}
+-ac_env_CC_value=$CC
+-ac_cv_env_CC_set=${CC+set}
+-ac_cv_env_CC_value=$CC
+-ac_env_CFLAGS_set=${CFLAGS+set}
+-ac_env_CFLAGS_value=$CFLAGS
+-ac_cv_env_CFLAGS_set=${CFLAGS+set}
+-ac_cv_env_CFLAGS_value=$CFLAGS
+-ac_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_env_LDFLAGS_value=$LDFLAGS
+-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
+-ac_cv_env_LDFLAGS_value=$LDFLAGS
+-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_env_CPPFLAGS_value=$CPPFLAGS
+-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
+-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
+-ac_env_CPP_set=${CPP+set}
+-ac_env_CPP_value=$CPP
+-ac_cv_env_CPP_set=${CPP+set}
+-ac_cv_env_CPP_value=$CPP
++	pwd)`
++# When building in place, set srcdir=.
++if test "$ac_abs_confdir" = "$ac_pwd"; then
++  srcdir=.
++fi
++# Remove unnecessary trailing slashes from srcdir.
++# Double slashes in file names in object file debugging info
++# mess up M-x gdb in Emacs.
++case $srcdir in
++*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
++esac
++for ac_var in $ac_precious_vars; do
++  eval ac_env_${ac_var}_set=\${${ac_var}+set}
++  eval ac_env_${ac_var}_value=\$${ac_var}
++  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
++  eval ac_cv_env_${ac_var}_value=\$${ac_var}
++done
+ 
+ #
+ # Report the --help message.
+@@ -780,7 +1290,7 @@ if test "$ac_init_help" = "long"; then
+   # Omit some internal or obsolete options to make the list less imposing.
+   # This message is too long to be a string in the A/UX 3.1 sh.
+   cat <<_ACEOF
+-\`configure' configures jbig2dec 0.9pre to adapt to many kinds of systems.
++\`configure' configures jbig2dec 0.10 to adapt to many kinds of systems.
+ 
+ Usage: $0 [OPTION]... [VAR=VALUE]...
+ 
+@@ -800,14 +1310,11 @@ Configuration:
+   -n, --no-create         do not create output files
+       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+ 
+-_ACEOF
+-
+-  cat <<_ACEOF
+ Installation directories:
+   --prefix=PREFIX         install architecture-independent files in PREFIX
+-			  [$ac_default_prefix]
++                          [$ac_default_prefix]
+   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+-			  [PREFIX]
++                          [PREFIX]
+ 
+ By default, \`make install' will install all the files in
+ \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+@@ -817,18 +1324,25 @@ for instance \`--prefix=\$HOME'.
+ For better control, use the options below.
+ 
+ Fine tuning of the installation directories:
+-  --bindir=DIR           user executables [EPREFIX/bin]
+-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
+-  --libexecdir=DIR       program executables [EPREFIX/libexec]
+-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
+-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
+-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
+-  --libdir=DIR           object code libraries [EPREFIX/lib]
+-  --includedir=DIR       C header files [PREFIX/include]
+-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
+-  --infodir=DIR          info documentation [PREFIX/info]
+-  --mandir=DIR           man documentation [PREFIX/man]
++  --bindir=DIR            user executables [EPREFIX/bin]
++  --sbindir=DIR           system admin executables [EPREFIX/sbin]
++  --libexecdir=DIR        program executables [EPREFIX/libexec]
++  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
++  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
++  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
++  --libdir=DIR            object code libraries [EPREFIX/lib]
++  --includedir=DIR        C header files [PREFIX/include]
++  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
++  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
++  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
++  --infodir=DIR           info documentation [DATAROOTDIR/info]
++  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
++  --mandir=DIR            man documentation [DATAROOTDIR/man]
++  --docdir=DIR            documentation root [DATAROOTDIR/doc/jbig2dec]
++  --htmldir=DIR           html documentation [DOCDIR]
++  --dvidir=DIR            dvi documentation [DOCDIR]
++  --pdfdir=DIR            pdf documentation [DOCDIR]
++  --psdir=DIR             ps documentation [DOCDIR]
+ _ACEOF
+ 
+   cat <<\_ACEOF
+@@ -842,11 +1356,12 @@ fi
+ 
+ if test -n "$ac_init_help"; then
+   case $ac_init_help in
+-     short | recursive ) echo "Configuration of jbig2dec 0.9pre:";;
++     short | recursive ) echo "Configuration of jbig2dec 0.10:";;
+    esac
+   cat <<\_ACEOF
+ 
+ Optional Features:
++  --disable-option-checking  ignore unrecognized --enable/--with options
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+   --disable-dependency-tracking  speeds up one-time build
+@@ -855,7 +1370,7 @@ Optional Features:
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+-  --with-libpng=prefix  include support for png output (if libpng is
++  --with-libpng=prefix    include support for png output (if libpng is
+                           available)
+ 
+ Some influential environment variables:
+@@ -863,8 +1378,9 @@ Some influential environment variables:
+   CFLAGS      C compiler flags
+   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+               nonstandard directory <lib dir>
+-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+-              headers in a nonstandard directory <include dir>
++  LIBS        libraries to pass to the linker, e.g. -l<library>
++  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++              you have headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
+ 
+ Use these variables to override the choices made by `configure' or to help
+@@ -872,120 +1388,88 @@ it to find libraries and programs with nonstandard names/locations.
+ 
+ Report bugs to <jbig2-dev@ghostscript.com>.
+ _ACEOF
++ac_status=$?
+ fi
+ 
+ if test "$ac_init_help" = "recursive"; then
+   # If there are subdirs, report their specific --help.
+-  ac_popdir=`pwd`
+   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+-    test -d $ac_dir || continue
++    test -d "$ac_dir" ||
++      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
++      continue
+     ac_builddir=.
+ 
+-if test "$ac_dir" != .; then
+-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
++  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
++  # A ".." for each directory in $ac_dir_suffix.
++  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
++  case $ac_top_builddir_sub in
++  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++  esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
+ 
+ case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
++  .)  # We are building in place.
+     ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_top_srcdir=$ac_top_builddir_sub
++    ac_abs_top_srcdir=$ac_pwd ;;
++  [\\/]* | ?:[\\/]* )  # Absolute name.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
+-
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+-  case "$ac_dir" in
+-  .) ac_abs_builddir=`pwd`;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+-  case ${ac_top_builddir}. in
+-  .) ac_abs_top_builddir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+-  case $ac_srcdir in
+-  .) ac_abs_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+-  esac;;
++    ac_top_srcdir=$srcdir
++    ac_abs_top_srcdir=$srcdir ;;
++  *) # Relative name.
++    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_build_prefix$srcdir
++    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+ esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+-  case $ac_top_srcdir in
+-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+-  esac;;
+-esac
+-
+-    cd $ac_dir
+-    # Check for guested configure; otherwise get Cygnus style configure.
+-    if test -f $ac_srcdir/configure.gnu; then
+-      echo
+-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
+-    elif test -f $ac_srcdir/configure; then
+-      echo
+-      $SHELL $ac_srcdir/configure  --help=recursive
+-    elif test -f $ac_srcdir/configure.ac ||
+-	   test -f $ac_srcdir/configure.in; then
+-      echo
+-      $ac_configure --help
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
++
++    cd "$ac_dir" || { ac_status=$?; continue; }
++    # Check for guested configure.
++    if test -f "$ac_srcdir/configure.gnu"; then
++      echo &&
++      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
++    elif test -f "$ac_srcdir/configure"; then
++      echo &&
++      $SHELL "$ac_srcdir/configure" --help=recursive
+     else
+-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+-    fi
+-    cd $ac_popdir
++      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++    fi || ac_status=$?
++    cd "$ac_pwd" || { ac_status=$?; break; }
+   done
+ fi
+ 
+-test -n "$ac_init_help" && exit 0
++test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+   cat <<\_ACEOF
+-jbig2dec configure 0.9pre
+-generated by GNU Autoconf 2.59
++jbig2dec configure 0.10
++generated by GNU Autoconf 2.63
+ 
+-Copyright (C) 2003 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+-  exit 0
++  exit
+ fi
+-exec 5>config.log
+-cat >&5 <<_ACEOF
++cat >config.log <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ 
+-It was created by jbig2dec $as_me 0.9pre, which was
+-generated by GNU Autoconf 2.59.  Invocation command line was
++It was created by jbig2dec $as_me 0.10, which was
++generated by GNU Autoconf 2.63.  Invocation command line was
+ 
+   $ $0 $@
+ 
+ _ACEOF
++exec 5>>config.log
+ {
+ cat <<_ASUNAME
+ ## --------- ##
+@@ -1004,7 +1488,7 @@ uname -v = `(uname -v) 2>/dev/null || echo unknown`
+ /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+ /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+ /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
++/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+ /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+ /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+ /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+@@ -1016,8 +1500,9 @@ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  echo "PATH: $as_dir"
++  $as_echo "PATH: $as_dir"
+ done
++IFS=$as_save_IFS
+ 
+ } >&5
+ 
+@@ -1039,7 +1524,6 @@ _ACEOF
+ ac_configure_args=
+ ac_configure_args0=
+ ac_configure_args1=
+-ac_sep=
+ ac_must_keep_next=false
+ for ac_pass in 1 2
+ do
+@@ -1050,8 +1534,8 @@ do
+     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+     | -silent | --silent | --silen | --sile | --sil)
+       continue ;;
+-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    *\'*)
++      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     esac
+     case $ac_pass in
+     1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+@@ -1072,9 +1556,7 @@ do
+ 	  -* ) ac_must_keep_next=true ;;
+ 	esac
+       fi
+-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+-      # Get rid of the leading space.
+-      ac_sep=" "
++      ac_configure_args="$ac_configure_args '$ac_arg'"
+       ;;
+     esac
+   done
+@@ -1085,8 +1567,8 @@ $as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_
+ # When interrupted or exit'd, cleanup temporary files, and complete
+ # config.log.  We remove comments because anyway the quotes in there
+ # would cause problems or look ugly.
+-# WARNING: Be sure not to use single quotes in there, as some shells,
+-# such as our DU 5.0 friend, will then `close' the trap.
++# WARNING: Use '\'' to represent an apostrophe within the trap.
++# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+ trap 'exit_status=$?
+   # Save into config.log some information that might help in debugging.
+   {
+@@ -1099,20 +1581,35 @@ trap 'exit_status=$?
+ _ASBOX
+     echo
+     # The following way of writing the cache mishandles newlines in values,
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) $as_unset $ac_var ;;
++      esac ;;
++    esac
++  done
+   (set) 2>&1 |
+-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
++    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
+       sed -n \
+-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+-      ;;
++	"s/'\''/'\''\\\\'\'''\''/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
++      ;; #(
+     *)
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-}
++    esac |
++    sort
++)
+     echo
+ 
+     cat <<\_ASBOX
+@@ -1123,22 +1620,28 @@ _ASBOX
+     echo
+     for ac_var in $ac_subst_vars
+     do
+-      eval ac_val=$`echo $ac_var`
+-      echo "$ac_var='"'"'$ac_val'"'"'"
++      eval ac_val=\$$ac_var
++      case $ac_val in
++      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++      esac
++      $as_echo "$ac_var='\''$ac_val'\''"
+     done | sort
+     echo
+ 
+     if test -n "$ac_subst_files"; then
+       cat <<\_ASBOX
+-## ------------- ##
+-## Output files. ##
+-## ------------- ##
++## ------------------- ##
++## File substitutions. ##
++## ------------------- ##
+ _ASBOX
+       echo
+       for ac_var in $ac_subst_files
+       do
+-	eval ac_val=$`echo $ac_var`
+-	echo "$ac_var='"'"'$ac_val'"'"'"
++	eval ac_val=\$$ac_var
++	case $ac_val in
++	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
++	esac
++	$as_echo "$ac_var='\''$ac_val'\''"
+       done | sort
+       echo
+     fi
+@@ -1150,26 +1653,24 @@ _ASBOX
+ ## ----------- ##
+ _ASBOX
+       echo
+-      sed "/^$/d" confdefs.h | sort
++      cat confdefs.h
+       echo
+     fi
+     test "$ac_signal" != 0 &&
+-      echo "$as_me: caught signal $ac_signal"
+-    echo "$as_me: exit $exit_status"
++      $as_echo "$as_me: caught signal $ac_signal"
++    $as_echo "$as_me: exit $exit_status"
+   } >&5
+-  rm -f core *.core &&
+-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
++  rm -f core *.core core.conftest.* &&
++    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+     exit $exit_status
+-     ' 0
++' 0
+ for ac_signal in 1 2 13 15; do
+   trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+ done
+ ac_signal=0
+ 
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+-rm -rf conftest* confdefs.h
+-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+-echo >confdefs.h
++rm -f -r conftest* confdefs.h
+ 
+ # Predefined preprocessor variables.
+ 
+@@ -1199,18 +1700,24 @@ _ACEOF
+ 
+ 
+ # Let the site file select an alternate cache file if it wants to.
+-# Prefer explicitly selected file to automatically selected ones.
+-if test -z "$CONFIG_SITE"; then
+-  if test "x$prefix" != xNONE; then
+-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+-  else
+-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+-  fi
+-fi
+-for ac_site_file in $CONFIG_SITE; do
++# Prefer an explicitly selected file to automatically selected ones.
++ac_site_file1=NONE
++ac_site_file2=NONE
++if test -n "$CONFIG_SITE"; then
++  ac_site_file1=$CONFIG_SITE
++elif test "x$prefix" != xNONE; then
++  ac_site_file1=$prefix/share/config.site
++  ac_site_file2=$prefix/etc/config.site
++else
++  ac_site_file1=$ac_default_prefix/share/config.site
++  ac_site_file2=$ac_default_prefix/etc/config.site
++fi
++for ac_site_file in "$ac_site_file1" "$ac_site_file2"
++do
++  test "x$ac_site_file" = xNONE && continue
+   if test -r "$ac_site_file"; then
+-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+-echo "$as_me: loading site script $ac_site_file" >&6;}
++    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
++$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+     sed 's/^/| /' "$ac_site_file" >&5
+     . "$ac_site_file"
+   fi
+@@ -1220,54 +1727,61 @@ if test -r "$cache_file"; then
+   # Some versions of bash will fail to source /dev/null (special
+   # files actually), so we avoid doing that.
+   if test -f "$cache_file"; then
+-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+-echo "$as_me: loading cache $cache_file" >&6;}
++    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
++$as_echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+-      [\\/]* | ?:[\\/]* ) . $cache_file;;
+-      *)                      . ./$cache_file;;
++      [\\/]* | ?:[\\/]* ) . "$cache_file";;
++      *)                      . "./$cache_file";;
+     esac
+   fi
+ else
+-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+-echo "$as_me: creating cache $cache_file" >&6;}
++  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
++$as_echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+ 
+ # Check that the precious variables saved in the cache have kept the same
+ # value.
+ ac_cache_corrupted=false
+-for ac_var in `(set) 2>&1 |
+-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
++for ac_var in $ac_precious_vars; do
+   eval ac_old_set=\$ac_cv_env_${ac_var}_set
+   eval ac_new_set=\$ac_env_${ac_var}_set
+-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+-  eval ac_new_val="\$ac_env_${ac_var}_value"
++  eval ac_old_val=\$ac_cv_env_${ac_var}_value
++  eval ac_new_val=\$ac_env_${ac_var}_value
+   case $ac_old_set,$ac_new_set in
+     set,)
+-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
++      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
++      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
++$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+-echo "$as_me:   former value:  $ac_old_val" >&2;}
+-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+-echo "$as_me:   current value: $ac_new_val" >&2;}
+-	ac_cache_corrupted=:
++	# differences in whitespace do not lead to failure.
++	ac_old_val_w=`echo x $ac_old_val`
++	ac_new_val_w=`echo x $ac_new_val`
++	if test "$ac_old_val_w" != "$ac_new_val_w"; then
++	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
++$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
++	  ac_cache_corrupted=:
++	else
++	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
++$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
++	  eval $ac_var=\$ac_old_val
++	fi
++	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
++$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
++	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
++$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+       fi;;
+   esac
+   # Pass precious variables to config.status.
+   if test "$ac_new_set" = set; then
+     case $ac_new_val in
+-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+     *) ac_arg=$ac_var=$ac_new_val ;;
+     esac
+     case " $ac_configure_args " in
+@@ -1277,18 +1791,15 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
+   fi
+ done
+ if $ac_cache_corrupted; then
+-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
++  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
++$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
++  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
++$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ 
+@@ -1313,37 +1824,48 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ 
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ 
+ 
+ 
++am__api_version='1.10'
+ 
+-am__api_version="1.9"
+ ac_aux_dir=
+-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+-  if test -f $ac_dir/install-sh; then
++for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
++  if test -f "$ac_dir/install-sh"; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/install-sh -c"
+     break
+-  elif test -f $ac_dir/install.sh; then
++  elif test -f "$ac_dir/install.sh"; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/install.sh -c"
+     break
+-  elif test -f $ac_dir/shtool; then
++  elif test -f "$ac_dir/shtool"; then
+     ac_aux_dir=$ac_dir
+     ac_install_sh="$ac_aux_dir/shtool install -c"
+     break
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
++  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
++$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
++
++# These three variables are undocumented and unsupported,
++# and are intended to be withdrawn in a future Autoconf release.
++# They can cause serious problems if a builder's source tree is in a directory
++# whose full name contains unusual characters.
++ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
++ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
++ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
++
+ 
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+@@ -1358,11 +1880,12 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # OS/2's system install, which has a completely different semantic
+ # ./install, which can be erroneously created by make from ./install.sh.
+-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
++# Reject install programs that cannot install multiple files.
++{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++$as_echo_n "checking for a BSD-compatible install... " >&6; }
+ if test -z "$INSTALL"; then
+ if test "${ac_cv_path_install+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -1381,7 +1904,7 @@ case $as_dir/ in
+     # by default.
+     for ac_prog in ginstall scoinst install; do
+       for ac_exec_ext in '' $ac_executable_extensions; do
+-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ 	  if test $ac_prog = install &&
+ 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ 	    # AIX install.  It has an incompatible calling convention.
+@@ -1391,30 +1914,43 @@ case $as_dir/ in
+ 	    # program-specific install script used by HP pwplus--don't use.
+ 	    :
+ 	  else
+-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+-	    break 3
++	    rm -rf conftest.one conftest.two conftest.dir
++	    echo one > conftest.one
++	    echo two > conftest.two
++	    mkdir conftest.dir
++	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
++	      test -s conftest.one && test -s conftest.two &&
++	      test -s conftest.dir/conftest.one &&
++	      test -s conftest.dir/conftest.two
++	    then
++	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
++	      break 3
++	    fi
+ 	  fi
+ 	fi
+       done
+     done
+     ;;
+ esac
++
+ done
++IFS=$as_save_IFS
+ 
++rm -rf conftest.one conftest.two conftest.dir
+ 
+ fi
+   if test "${ac_cv_path_install+set}" = set; then
+     INSTALL=$ac_cv_path_install
+   else
+-    # As a last resort, use the slow shell script.  We don't cache a
+-    # path for INSTALL within a source directory, because that will
++    # As a last resort, use the slow shell script.  Don't cache a
++    # value for INSTALL within a source directory, because that will
+     # break other packages using the cache if that directory is
+-    # removed, or if the path is relative.
++    # removed, or if the value is a relative name.
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-echo "$as_me:$LINENO: result: $INSTALL" >&5
+-echo "${ECHO_T}$INSTALL" >&6
++{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
++$as_echo "$INSTALL" >&6; }
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+ # It thinks the first close brace ends the variable substitution.
+@@ -1424,8 +1960,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
++$as_echo_n "checking whether build environment is sane... " >&6; }
+ # Just in case
+ sleep 1
+ echo timestamp > conftest.file
+@@ -1448,9 +1984,9 @@ if (
+       # if, for instance, CONFIG_SHELL is bash and it inherits a
+       # broken ls alias from the environment.  This has actually
+       # happened.  Such a system could not be considered "sane".
+-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
++      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+ alias in your environment" >&5
+-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
++$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+ alias in your environment" >&2;}
+    { (exit 1); exit 1; }; }
+    fi
+@@ -1461,26 +1997,23 @@ then
+    # Ok.
+    :
+ else
+-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
++   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+ Check your system clock" >&5
+-echo "$as_me: error: newly created file is older than distributed files!
++$as_echo "$as_me: error: newly created file is older than distributed files!
+ Check your system clock" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++{ $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
+ test "$program_prefix" != NONE &&
+-  program_transform_name="s,^,$program_prefix,;$program_transform_name"
++  program_transform_name="s&^&$program_prefix&;$program_transform_name"
+ # Use a double $ so make ignores it.
+ test "$program_suffix" != NONE &&
+-  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
+-# Double any \ or $.  echo might interpret backslashes.
++  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
++# Double any \ or $.
+ # By default was `s,x,x', remove it if useless.
+-cat <<\_ACEOF >conftest.sed
+-s/[\\$]/&&/g;s/;s,x,x,$//
+-_ACEOF
+-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+-rm conftest.sed
++ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
++program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
+ 
+ # expand $ac_aux_dir to an absolute path
+ am_aux_dir=`cd $ac_aux_dir && pwd`
+@@ -1491,51 +2024,66 @@ if eval "$MISSING --run true"; then
+   am_missing_run="$MISSING --run "
+ else
+   am_missing_run=
+-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
+-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+-fi
+-
+-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+-  # We used to keeping the `.' as first argument, in order to
+-  # allow $(mkdir_p) to be used without argument.  As in
+-  #   $(mkdir_p) $(somedir)
+-  # where $(somedir) is conditionally defined.  However this is wrong
+-  # for two reasons:
+-  #  1. if the package is installed by a user who cannot write `.'
+-  #     make install will fail,
+-  #  2. the above comment should most certainly read
+-  #     $(mkdir_p) $(DESTDIR)$(somedir)
+-  #     so it does not work when $(somedir) is undefined and
+-  #     $(DESTDIR) is not.
+-  #  To support the latter case, we have to write
+-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+-  #  so the `.' trick is pointless.
+-  mkdir_p='mkdir -p --'
+-else
+-  # On NextStep and OpenStep, the `mkdir' command does not
+-  # recognize any option.  It will interpret all options as
+-  # directories to create, and then abort because `.' already
+-  # exists.
+-  for d in ./-p ./--version;
+-  do
+-    test -d $d && rmdir $d
+-  done
+-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+-  if test -f "$ac_aux_dir/mkinstalldirs"; then
+-    mkdir_p='$(mkinstalldirs)'
++  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
++$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
++fi
++
++{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
++$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
++if test -z "$MKDIR_P"; then
++  if test "${ac_cv_path_mkdir+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_prog in mkdir gmkdir; do
++	 for ac_exec_ext in '' $ac_executable_extensions; do
++	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
++	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
++	     'mkdir (GNU coreutils) '* | \
++	     'mkdir (coreutils) '* | \
++	     'mkdir (fileutils) '4.1*)
++	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
++	       break 3;;
++	   esac
++	 done
++       done
++done
++IFS=$as_save_IFS
++
++fi
++
++  if test "${ac_cv_path_mkdir+set}" = set; then
++    MKDIR_P="$ac_cv_path_mkdir -p"
+   else
+-    mkdir_p='$(install_sh) -d'
++    # As a last resort, use the slow shell script.  Don't cache a
++    # value for MKDIR_P within a source directory, because that will
++    # break other packages using the cache if that directory is
++    # removed, or if the value is a relative name.
++    test -d ./--version && rmdir ./--version
++    MKDIR_P="$ac_install_sh -d"
+   fi
+ fi
++{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
++$as_echo "$MKDIR_P" >&6; }
++
++mkdir_p="$MKDIR_P"
++case $mkdir_p in
++  [\\/$]* | ?:[\\/]*) ;;
++  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
+ 
+ for ac_prog in gawk mawk nawk awk
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_AWK+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$AWK"; then
+   ac_cv_prog_AWK="$AWK" # Let the user override the test.
+@@ -1546,54 +2094,58 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AWK="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  echo "$as_me:$LINENO: result: $AWK" >&5
+-echo "${ECHO_T}$AWK" >&6
++  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
++$as_echo "$AWK" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
++
+   test -n "$AWK" && break
+ done
+ 
+-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
++set x ${MAKE-make}
++ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.make <<\_ACEOF
++SHELL = /bin/sh
+ all:
+-	@echo 'ac_maketemp="$(MAKE)"'
++	@echo '@@@%%%=$(MAKE)=@@@%%%'
+ _ACEOF
+ # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+-if test -n "$ac_maketemp"; then
+-  eval ac_cv_prog_make_${ac_make}_set=yes
+-else
+-  eval ac_cv_prog_make_${ac_make}_set=no
+-fi
++case `${MAKE-make} -f conftest.make 2>/dev/null` in
++  *@@@%%%=?*=@@@%%%*)
++    eval ac_cv_prog_make_${ac_make}_set=yes;;
++  *)
++    eval ac_cv_prog_make_${ac_make}_set=no;;
++esac
+ rm -f conftest.make
+ fi
+-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
++  { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
+   SET_MAKE=
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+@@ -1606,12 +2158,16 @@ else
+ fi
+ rmdir .tst 2>/dev/null
+ 
+-# test to see if srcdir already configured
+-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+-   test -f $srcdir/config.status; then
+-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
++if test "`cd $srcdir && pwd`" != "`pwd`"; then
++  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
++  # is not polluted with repeated "-I."
++  am__isrc=' -I$(srcdir)'
++  # test to see if srcdir already configured
++  if test -f $srcdir/config.status; then
++    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
++$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+    { (exit 1); exit 1; }; }
++  fi
+ fi
+ 
+ # test whether we have cygpath
+@@ -1626,7 +2182,7 @@ fi
+ 
+ # Define the identity of the package.
+  PACKAGE='jbig2dec'
+- VERSION='0.9pre'
++ VERSION='0.10'
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -1654,7 +2210,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+ 
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+ 
+-install_sh=${install_sh-"$am_aux_dir/install-sh"}
++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+ 
+ # Installed binaries are usually stripped using `strip' when the user
+ # run `make install-strip'.  However `strip' might not be the right
+@@ -1664,10 +2220,10 @@ if test "$cross_compiling" != no; then
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_STRIP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$STRIP"; then
+   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+@@ -1678,34 +2234,36 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+-  echo "$as_me:$LINENO: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
++  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
++$as_echo "$STRIP" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$ac_cv_prog_STRIP"; then
+   ac_ct_STRIP=$STRIP
+   # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_STRIP"; then
+   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+@@ -1716,33 +2274,43 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++$as_echo "$ac_ct_STRIP" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+-  STRIP=$ac_ct_STRIP
++  if test "x$ac_ct_STRIP" = x; then
++    STRIP=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    STRIP=$ac_ct_STRIP
++  fi
+ else
+   STRIP="$ac_cv_prog_STRIP"
+ fi
+ 
+ fi
+-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ 
+ # We need awk for the "check" target.  The system "awk" is bad on
+ # some platforms.
+@@ -1756,8 +2324,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+ 
+ 
+ 
+-          ac_config_headers="$ac_config_headers config.h"
+-
++ac_config_headers="$ac_config_headers config.h"
+ 
+ 
+ # Checks for programs.
+@@ -1769,10 +2336,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -1783,34 +2350,36 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$ac_cv_prog_CC"; then
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+@@ -1821,38 +2390,49 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="gcc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++$as_echo "$ac_ct_CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+-  CC=$ac_ct_CC
++  if test "x$ac_ct_CC" = x; then
++    CC=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    CC=$ac_ct_CC
++  fi
+ else
+   CC="$ac_cv_prog_CC"
+ fi
+ 
+ if test -z "$CC"; then
+-  if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++          if test -n "$ac_tool_prefix"; then
++    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -1863,76 +2443,36 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-fi
+-if test -z "$ac_cv_prog_CC"; then
+-  ac_ct_CC=$CC
+-  # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+-  if test -n "$ac_ct_CC"; then
+-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_CC="cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-
+-fi
+-fi
+-ac_ct_CC=$ac_cv_prog_ac_ct_CC
+-if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+-  CC=$ac_ct_CC
+-else
+-  CC="$ac_cv_prog_CC"
+-fi
+ 
++  fi
+ fi
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -1944,17 +2484,18 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+      fi
+     ac_cv_prog_CC="cc"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ if test $ac_prog_rejected = yes; then
+   # We found a bogon in the path, so make sure we never use it.
+@@ -1972,24 +2513,25 @@ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$CC"; then
+   if test -n "$ac_tool_prefix"; then
+-  for ac_prog in cl
++  for ac_prog in cl.exe
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+@@ -2000,38 +2542,40 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  echo "$as_me:$LINENO: result: $CC" >&5
+-echo "${ECHO_T}$CC" >&6
++  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++$as_echo "$CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
++
+     test -n "$CC" && break
+   done
+ fi
+ if test -z "$CC"; then
+   ac_ct_CC=$CC
+-  for ac_prog in cl
++  for ac_prog in cl.exe
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+@@ -2042,58 +2586,90 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+-echo "${ECHO_T}$ac_ct_CC" >&6
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++$as_echo "$ac_ct_CC" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
++
+   test -n "$ac_ct_CC" && break
+ done
+ 
+-  CC=$ac_ct_CC
++  if test "x$ac_ct_CC" = x; then
++    CC=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    CC=$ac_ct_CC
++  fi
+ fi
+ 
+ fi
+ 
+ 
+-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: no acceptable C compiler found in \$PATH
++$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
+ 
+ # Provide some information about the compiler.
+-echo "$as_me:$LINENO:" \
+-     "checking for C compiler version" >&5
+-ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+-  (eval $ac_compiler --version </dev/null >&5) 2>&5
++$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
++set X $ac_compile
++ac_compiler=$2
++{ (ac_try="$ac_compiler --version >&5"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compiler --version >&5") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
++{ (ac_try="$ac_compiler -v >&5"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compiler -v >&5") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
++{ (ac_try="$ac_compiler -V >&5"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compiler -V >&5") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -2112,111 +2688,150 @@ main ()
+ }
+ _ACEOF
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.exe b.out"
++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
+-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+-  (eval $ac_link_default) 2>&5
++{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
++ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
++
++# The possible output files:
++ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
++
++ac_rmfiles=
++for ac_file in $ac_files
++do
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
++    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
++  esac
++done
++rm -f $ac_rmfiles
++
++if { (ac_try="$ac_link_default"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link_default") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  # Find the output, starting from the most likely.  This scheme is
+-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
+-# resort.
+-
+-# Be careful to initialize this variable, since it used to be cached.
+-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+-ac_cv_exeext=
+-# b.out is created by i960 compilers.
+-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
++# in a Makefile.  We should not override ac_cv_exeext if it was cached,
++# so that the user can short-circuit this test for compilers unknown to
++# Autoconf.
++for ac_file in $ac_files ''
+ do
+   test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
+-	;;
+-    conftest.$ac_ext )
+-	# This is the source file.
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+ 	;;
+     [ab].out )
+ 	# We found the default executable, but exeext='' is most
+ 	# certainly right.
+ 	break;;
+     *.* )
+-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-	# FIXME: I believe we export ac_cv_exeext for Libtool,
+-	# but it would be cool to find out if it's true.  Does anybody
+-	# maintain Libtool? --akim.
+-	export ac_cv_exeext
++        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
++	then :; else
++	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	fi
++	# We set ac_cv_exeext here because the later test for it is not
++	# safe: cross compilers may not add the suffix if given an `-o'
++	# argument, so we may need to know it at that point already.
++	# Even if this section looks crufty: it has the advantage of
++	# actually working.
+ 	break;;
+     * )
+ 	break;;
+   esac
+ done
++test "$ac_cv_exeext" = no && ac_cv_exeext=
++
+ else
+-  echo "$as_me: failed program was:" >&5
++  ac_file=''
++fi
++
++{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
++$as_echo "$ac_file" >&6; }
++if test -z "$ac_file"; then
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
++{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: C compiler cannot create executables
++$as_echo "$as_me: error: C compiler cannot create executables
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }
++   { (exit 77); exit 77; }; }; }
+ fi
+ 
+ ac_exeext=$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6
+ 
+-# Check the compiler produces executables we can run.  If not, either
++# Check that the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
++$as_echo_n "checking whether the C compiler works... " >&6; }
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+ if test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+     cross_compiling=no
+   else
+     if test "$cross_compiling" = maybe; then
+ 	cross_compiling=yes
+     else
+-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
++	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run C compiled programs.
++$as_echo "$as_me: error: cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
+     fi
+   fi
+ fi
+-echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++{ $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
+ 
+-rm -f a.out a.exe conftest$ac_cv_exeext b.out
++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+-# Check the compiler produces executables we can run.  If not, either
++# Check that the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-echo "${ECHO_T}$cross_compiling" >&6
+-
+-echo "$as_me:$LINENO: checking for suffix of executables" >&5
+-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
++$as_echo_n "checking whether we are cross compiling... " >&6; }
++{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
++$as_echo "$cross_compiling" >&6; }
++
++{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
++$as_echo_n "checking for suffix of executables... " >&6; }
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   # If both `conftest.exe' and `conftest' are `present' (well, observable)
+ # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+@@ -2225,32 +2840,33 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ for ac_file in conftest.exe conftest conftest.*; do
+   test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-	  export ac_cv_exeext
+ 	  break;;
+     * ) break;;
+   esac
+ done
+ else
+-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
++$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
+ fi
+ 
+ rm -f conftest$ac_cv_exeext
+-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+-echo "${ECHO_T}$ac_cv_exeext" >&6
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++$as_echo "$ac_cv_exeext" >&6; }
+ 
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-echo "$as_me:$LINENO: checking for suffix of object files" >&5
+-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
++$as_echo_n "checking for suffix of object files... " >&6; }
+ if test "${ac_cv_objext+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -2268,39 +2884,48 @@ main ()
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
++  for ac_file in conftest.o conftest.obj conftest.*; do
++  test -f "$ac_file" || continue;
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+        break;;
+   esac
+ done
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
++{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute suffix of object files: cannot compile
++$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
+ fi
+ 
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+-echo "${ECHO_T}$ac_cv_objext" >&6
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++$as_echo "$ac_cv_objext" >&6; }
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -2321,50 +2946,54 @@ main ()
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_compiler_gnu=no
++	ac_compiler_gnu=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
+-GCC=`test $ac_compiler_gnu = yes && echo yes`
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++$as_echo "$ac_cv_c_compiler_gnu" >&6; }
++if test $ac_compiler_gnu = yes; then
++  GCC=yes
++else
++  GCC=
++fi
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-CFLAGS="-g"
+-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++$as_echo_n "checking whether $CC accepts -g... " >&6; }
+ if test "${ac_cv_prog_cc_g+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
++  ac_save_c_werror_flag=$ac_c_werror_flag
++   ac_c_werror_flag=yes
++   ac_cv_prog_cc_g=no
++   CFLAGS="-g"
++   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -2380,38 +3009,121 @@ main ()
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  ac_cv_prog_cc_g=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	CFLAGS=""
++      cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  :
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_c_werror_flag=$ac_save_c_werror_flag
++	 CFLAGS="-g"
++	 cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_g=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_prog_cc_g=no
++
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++   ac_c_werror_flag=$ac_save_c_werror_flag
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++$as_echo "$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+@@ -2427,12 +3139,12 @@ else
+     CFLAGS=
+   fi
+ fi
+-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
++if test "${ac_cv_prog_cc_c89+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
+-  ac_cv_prog_cc_stdc=no
++  ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -2466,12 +3178,17 @@ static char *f (char * (*g) (char **, int), char **p, ...)
+ /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+    function prototypes and stuff, but not '\xHH' hex character constants.
+    These don't provoke an error unfortunately, instead are silently treated
+-   as 'x'.  The following induces an error, until -std1 is added to get
++   as 'x'.  The following induces an error, until -std is added to get
+    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+    array size at least.  It's necessary to write '\x00'==0 to get something
+-   that's true only with -std1.  */
++   that's true only with -std.  */
+ int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+ 
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++   inside strings and character constants.  */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++
+ int test (int i, double x);
+ struct s1 {int (*f) (int a);};
+ struct s2 {int (*f) (double a);};
+@@ -2486,205 +3203,58 @@ return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+   return 0;
+ }
+ _ACEOF
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX			-qlanglvl=ansi
+-# Ultrix and OSF/1	-std1
+-# HP-UX 10.20 and later	-Ae
+-# HP-UX older versions	-Aa -D_HPUX_SOURCE
+-# SVR4			-Xc -D__EXTENSIONS__
+-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_prog_cc_stdc=$ac_arg
+-break
+-else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  ac_cv_prog_cc_c89=$ac_arg
++else
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext
++
++rm -f core conftest.err conftest.$ac_objext
++  test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+-rm -f conftest.$ac_ext conftest.$ac_objext
++rm -f conftest.$ac_ext
+ CC=$ac_save_CC
+ 
+ fi
+-
+-case "x$ac_cv_prog_cc_stdc" in
+-  x|xno)
+-    echo "$as_me:$LINENO: result: none needed" >&5
+-echo "${ECHO_T}none needed" >&6 ;;
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++  x)
++    { $as_echo "$as_me:$LINENO: result: none needed" >&5
++$as_echo "none needed" >&6; } ;;
++  xno)
++    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
++$as_echo "unsupported" >&6; } ;;
+   *)
+-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+-    CC="$CC $ac_cv_prog_cc_stdc" ;;
++    CC="$CC $ac_cv_prog_cc_c89"
++    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
+ 
+-# Some people use a C++ compiler to compile C.  Since we use `exit',
+-# in C++ we need to declare it.  In case someone uses the same compiler
+-# for both compiling C and C++ we need to have the C++ compiler decide
+-# the declaration of exit, since it's the most demanding environment.
+-cat >conftest.$ac_ext <<_ACEOF
+-#ifndef __cplusplus
+-  choke me
+-#endif
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  for ac_declaration in \
+-   '' \
+-   'extern "C" void std::exit (int) throw (); using std::exit;' \
+-   'extern "C" void std::exit (int); using std::exit;' \
+-   'extern "C" void exit (int) throw ();' \
+-   'extern "C" void exit (int);' \
+-   'void exit (int);'
+-do
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_declaration
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-exit (42);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  :
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-continue
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_declaration
+-int
+-main ()
+-{
+-exit (42);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-rm -f conftest*
+-if test -n "$ac_declaration"; then
+-  echo '#ifdef __cplusplus' >>confdefs.h
+-  echo $ac_declaration      >>confdefs.h
+-  echo '#endif'             >>confdefs.h
+-fi
+-
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -2692,7 +3262,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ DEPDIR="${am__leading_dot}deps"
+ 
+-          ac_config_commands="$ac_config_commands depfiles"
++ac_config_commands="$ac_config_commands depfiles"
+ 
+ 
+ am_make=${MAKE-make}
+@@ -2702,8 +3272,8 @@ am__doit:
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
++$as_echo_n "checking for style of include used by $am_make... " >&6; }
+ am__include="#"
+ am__quote=
+ _am_result=none
+@@ -2730,22 +3300,20 @@ if test "$am__include" = "#"; then
+ fi
+ 
+ 
+-echo "$as_me:$LINENO: result: $_am_result" >&5
+-echo "${ECHO_T}$_am_result" >&6
++{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
++$as_echo "$_am_result" >&6; }
+ rm -f confinc confmf
+ 
+-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
++# Check whether --enable-dependency-tracking was given.
+ if test "${enable_dependency_tracking+set}" = set; then
+-  enableval="$enable_dependency_tracking"
++  enableval=$enable_dependency_tracking;
++fi
+ 
+-fi;
+ if test "x$enable_dependency_tracking" != xno; then
+   am_depcomp="$ac_aux_dir/depcomp"
+   AMDEPBACKSLASH='\'
+ fi
+-
+-
+-if test "x$enable_dependency_tracking" != xno; then
++ if test "x$enable_dependency_tracking" != xno; then
+   AMDEP_TRUE=
+   AMDEP_FALSE='#'
+ else
+@@ -2755,13 +3323,12 @@ fi
+ 
+ 
+ 
+-
+ depcc="$CC"   am_compiler_list=
+ 
+-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++$as_echo_n "checking dependency style of $depcc... " >&6; }
+ if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+   # We make a subdir and do the tests there.  Otherwise we can end up
+@@ -2823,6 +3390,7 @@ else
+        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+          >/dev/null 2>conftest.err &&
++       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+@@ -2848,13 +3416,11 @@ else
+ fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
++{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+ 
+-
+-
+-if
++ if
+   test "x$enable_dependency_tracking" != xno \
+   && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+   am__fastdepCC_TRUE=
+@@ -2865,13 +3431,145 @@ else
+ fi
+ 
+ 
++if test "x$CC" != xcc; then
++  { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
++$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
++else
++  { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
++$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
++fi
++set dummy $CC; ac_cc=`$as_echo "$2" |
++		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
++if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
++  $as_echo_n "(cached) " >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++# Make sure it works both with $CC and with simple cc.
++# We do the test twice because some compilers refuse to overwrite an
++# existing .o file with -o, though they will create one.
++ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
++rm -f conftest2.*
++if { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++   test -f conftest2.$ac_objext && { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); };
++then
++  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
++  if test "x$CC" != xcc; then
++    # Test first that cc exists at all.
++    if { ac_try='cc -c conftest.$ac_ext >&5'
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
++      rm -f conftest2.*
++      if { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); };
++      then
++	# cc works too.
++	:
++      else
++	# cc exists but doesn't like -o.
++	eval ac_cv_prog_cc_${ac_cc}_c_o=no
++      fi
++    fi
++  fi
++else
++  eval ac_cv_prog_cc_${ac_cc}_c_o=no
++fi
++rm -f core conftest*
++
++fi
++if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
++  { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
++else
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
++
++cat >>confdefs.h <<\_ACEOF
++#define NO_MINUS_C_MINUS_O 1
++_ACEOF
++
++fi
++
++# FIXME: we rely on the cache variable name because
++# there is no other way.
++set dummy $CC
++am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
++eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
++if test "$am_t" != yes; then
++   # Losing compiler, so override with the script.
++   # FIXME: It is wrong to rewrite CC.
++   # But if we don't then we get into trouble of one sort or another.
++   # A longer-term fix would be to have automake use am__CC in this case,
++   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
++   CC="$am_aux_dir/compile $CC"
++fi
++
++
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_RANLIB+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$RANLIB"; then
+   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+@@ -2882,34 +3580,36 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+ fi
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  echo "$as_me:$LINENO: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
++  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
++$as_echo "$RANLIB" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
++
+ fi
+ if test -z "$ac_cv_prog_RANLIB"; then
+   ac_ct_RANLIB=$RANLIB
+   # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
+ if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_RANLIB"; then
+   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
+@@ -2920,27 +3620,37 @@ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_RANLIB="ranlib"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
++IFS=$as_save_IFS
+ 
+-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+ fi
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+-echo "${ECHO_T}$ac_ct_RANLIB" >&6
++  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++$as_echo "$ac_ct_RANLIB" >&6; }
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  { $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+ 
+-  RANLIB=$ac_ct_RANLIB
++  if test "x$ac_ct_RANLIB" = x; then
++    RANLIB=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    RANLIB=$ac_ct_RANLIB
++  fi
+ else
+   RANLIB="$ac_cv_prog_RANLIB"
+ fi
+@@ -2953,13 +3663,13 @@ fi
+ 
+ # Checks for libraries.
+ 
+-# Check whether --with-libpng or --without-libpng was given.
++# Check whether --with-libpng was given.
+ if test "${with_libpng+set}" = set; then
+-  withval="$with_libpng"
+-  ac_cv_want_libpng="$withval"
++  withval=$with_libpng; ac_cv_want_libpng="$withval"
+ else
+   ac_cv_want_libpng="yes"
+-fi;
++fi
++
+ save_cflags="$CFLAGS"
+ save_ldflags="$LDFLAGS"
+ have_libpng="no"
+@@ -2969,13 +3679,12 @@ if test "x$ac_cv_want_libpng" != "xno"; then
+     LDFLAGS="$LDFLAGS -L$ac_cv_want_libpng/lib"
+   fi
+ 
+-echo "$as_me:$LINENO: checking for library containing pow" >&5
+-echo $ECHO_N "checking for library containing pow... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for library containing pow" >&5
++$as_echo_n "checking for library containing pow... " >&6; }
+ if test "${ac_cv_search_pow+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_pow=no
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -2983,122 +3692,84 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char pow ();
+ int
+ main ()
+ {
+-pow ();
++return pow ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++for ac_lib in '' m; do
++  if test -z "$ac_lib"; then
++    ac_res="none required"
++  else
++    ac_res=-l$ac_lib
++    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
++  fi
++  rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_search_pow="none required"
+-else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
++  ac_cv_search_pow=$ac_res
++else
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-if test "$ac_cv_search_pow" = no; then
+-  for ac_lib in m; do
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char pow ();
+-int
+-main ()
+-{
+-pow ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_search_pow="-l$ac_lib"
+-break
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++fi
+ 
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext
++  if test "${ac_cv_search_pow+set}" = set; then
++  break
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  done
++done
++if test "${ac_cv_search_pow+set}" = set; then
++  :
++else
++  ac_cv_search_pow=no
+ fi
++rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_search_pow" >&5
+-echo "${ECHO_T}$ac_cv_search_pow" >&6
+-if test "$ac_cv_search_pow" != no; then
+-  test "$ac_cv_search_pow" = "none required" || LIBS="$ac_cv_search_pow $LIBS"
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_pow" >&5
++$as_echo "$ac_cv_search_pow" >&6; }
++ac_res=$ac_cv_search_pow
++if test "$ac_res" != no; then
++  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ 
+ fi
+ 
+-  echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
+-echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6
++  { $as_echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
++$as_echo_n "checking for png_check_sig in -lpng... " >&6; }
+ if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpng  $LIBS"
+@@ -3109,62 +3780,63 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char png_check_sig ();
+ int
+ main ()
+ {
+-png_check_sig ();
++return png_check_sig ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
+   ac_cv_lib_png_png_check_sig=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_png_png_check_sig=no
++	ac_cv_lib_png_png_check_sig=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
+-echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6
+-if test $ac_cv_lib_png_png_check_sig = yes; then
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
++$as_echo "$ac_cv_lib_png_png_check_sig" >&6; }
++if test "x$ac_cv_lib_png_png_check_sig" = x""yes; then
+ 
+-    echo "$as_me:$LINENO: checking for deflate in -lz" >&5
+-echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6
++    { $as_echo "$as_me:$LINENO: checking for deflate in -lz" >&5
++$as_echo_n "checking for deflate in -lz... " >&6; }
+ if test "${ac_cv_lib_z_deflate+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lz  $LIBS"
+@@ -3175,57 +3847,58 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char deflate ();
+ int
+ main ()
+ {
+-deflate ();
++return deflate ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
+   ac_cv_lib_z_deflate=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_z_deflate=no
++	ac_cv_lib_z_deflate=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5
+-echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6
+-if test $ac_cv_lib_z_deflate = yes; then
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5
++$as_echo "$ac_cv_lib_z_deflate" >&6; }
++if test "x$ac_cv_lib_z_deflate" = x""yes; then
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -3233,12 +3906,10 @@ cat >>confdefs.h <<\_ACEOF
+ _ACEOF
+ 
+       LIBS="-lpng -lz $LIBS"
+-      case $LIBOBJS in
+-    "jbig2_image_png.$ac_objext"   | \
+-  *" jbig2_image_png.$ac_objext"   | \
+-    "jbig2_image_png.$ac_objext "* | \
++      case " $LIBOBJS " in
+   *" jbig2_image_png.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS jbig2_image_png.$ac_objext" ;;
++  *) LIBOBJS="$LIBOBJS jbig2_image_png.$ac_objext"
++ ;;
+ esac
+ 
+       have_libpng="yes"
+@@ -3260,15 +3931,15 @@ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++$as_echo_n "checking how to run the C preprocessor... " >&6; }
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+   if test "${ac_cv_prog_CPP+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+       # Double quotes because CPP needs to be expanded
+     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+@@ -3295,35 +3966,35 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   # Broken: fails on valid input.
+ continue
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+-  # OK, works on sane cases.  Now check whether non-existent headers
++  # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3333,34 +4004,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
+ continue
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   # Passes both tests.
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -3378,8 +4049,8 @@ fi
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-echo "$as_me:$LINENO: result: $CPP" >&5
+-echo "${ECHO_T}$CPP" >&6
++{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
++$as_echo "$CPP" >&6; }
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+ do
+@@ -3402,35 +4073,35 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   # Broken: fails on valid input.
+ continue
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+-  # OK, works on sane cases.  Now check whether non-existent headers
++  # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3440,34 +4111,34 @@ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
+ continue
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   # Passes both tests.
+ ac_preproc_ok=:
+ break
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+@@ -3476,11 +4147,13 @@ rm -f conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
++$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
++   { (exit 1); exit 1; }; }; }
+ fi
+ 
+ ac_ext=c
+@@ -3490,25 +4163,144 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
++$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
++if test "${ac_cv_path_GREP+set}" = set; then
++  $as_echo_n "(cached) " >&6
++else
++  if test -z "$GREP"; then
++  ac_path_GREP_found=false
++  # Loop through the user's path and test for each of PROGNAME-LIST
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_prog in grep ggrep; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
++      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
++# Check for GNU ac_path_GREP and select it if it is found.
++  # Check for GNU $ac_path_GREP
++case `"$ac_path_GREP" --version 2>&1` in
++*GNU*)
++  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
++*)
++  ac_count=0
++  $as_echo_n 0123456789 >"conftest.in"
++  while :
++  do
++    cat "conftest.in" "conftest.in" >"conftest.tmp"
++    mv "conftest.tmp" "conftest.in"
++    cp "conftest.in" "conftest.nl"
++    $as_echo 'GREP' >> "conftest.nl"
++    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++    ac_count=`expr $ac_count + 1`
++    if test $ac_count -gt ${ac_path_GREP_max-0}; then
++      # Best one so far, save it but keep looking for a better one
++      ac_cv_path_GREP="$ac_path_GREP"
++      ac_path_GREP_max=$ac_count
++    fi
++    # 10*(2^10) chars as input seems more than enough
++    test $ac_count -gt 10 && break
++  done
++  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++      $ac_path_GREP_found && break 3
++    done
++  done
++done
++IFS=$as_save_IFS
++  if test -z "$ac_cv_path_GREP"; then
++    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++   { (exit 1); exit 1; }; }
++  fi
++else
++  ac_cv_path_GREP=$GREP
++fi
++
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
++$as_echo "$ac_cv_path_GREP" >&6; }
++ GREP="$ac_cv_path_GREP"
++
++
++{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
++$as_echo_n "checking for egrep... " >&6; }
++if test "${ac_cv_path_EGREP+set}" = set; then
++  $as_echo_n "(cached) " >&6
+ else
+-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+-    then ac_cv_prog_egrep='grep -E'
+-    else ac_cv_prog_egrep='egrep'
++  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
++   then ac_cv_path_EGREP="$GREP -E"
++   else
++     if test -z "$EGREP"; then
++  ac_path_EGREP_found=false
++  # Loop through the user's path and test for each of PROGNAME-LIST
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_prog in egrep; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
++      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
++# Check for GNU ac_path_EGREP and select it if it is found.
++  # Check for GNU $ac_path_EGREP
++case `"$ac_path_EGREP" --version 2>&1` in
++*GNU*)
++  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
++*)
++  ac_count=0
++  $as_echo_n 0123456789 >"conftest.in"
++  while :
++  do
++    cat "conftest.in" "conftest.in" >"conftest.tmp"
++    mv "conftest.tmp" "conftest.in"
++    cp "conftest.in" "conftest.nl"
++    $as_echo 'EGREP' >> "conftest.nl"
++    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
++    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
++    ac_count=`expr $ac_count + 1`
++    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
++      # Best one so far, save it but keep looking for a better one
++      ac_cv_path_EGREP="$ac_path_EGREP"
++      ac_path_EGREP_max=$ac_count
+     fi
++    # 10*(2^10) chars as input seems more than enough
++    test $ac_count -gt 10 && break
++  done
++  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
++esac
++
++      $ac_path_EGREP_found && break 3
++    done
++  done
++done
++IFS=$as_save_IFS
++  if test -z "$ac_cv_path_EGREP"; then
++    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
++$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
++   { (exit 1); exit 1; }; }
++  fi
++else
++  ac_cv_path_EGREP=$EGREP
++fi
++
++   fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
++$as_echo "$ac_cv_path_EGREP" >&6; }
++ EGREP="$ac_cv_path_EGREP"
+ 
+ 
+-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++$as_echo_n "checking for ANSI C header files... " >&6; }
+ if test "${ac_cv_header_stdc+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3530,35 +4322,32 @@ main ()
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_header_stdc=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_header_stdc=no
++	ac_cv_header_stdc=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+@@ -3614,6 +4403,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <ctype.h>
++#include <stdlib.h>
+ #if ((' ' & 0x0FF) == 0x020)
+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+@@ -3633,36 +4423,50 @@ main ()
+   for (i = 0; i < 256; i++)
+     if (XOR (islower (i), ISLOWER (i))
+ 	|| toupper (i) != TOUPPER (i))
+-      exit(2);
+-  exit (0);
++      return 2;
++  return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   :
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: program exited with status $ac_status" >&5
++$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -rf conftest.dSYM
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+-echo "${ECHO_T}$ac_cv_header_stdc" >&6
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++$as_echo "$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+@@ -3684,11 +4488,11 @@ fi
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ 		  inttypes.h stdint.h unistd.h
+ do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
++$as_echo_n "checking for $ac_header... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -3701,41 +4505,42 @@ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   eval "$as_ac_Header=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_Header=no"
++	eval "$as_ac_Header=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
++ac_res=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++as_val=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -3749,19 +4554,21 @@ done
+ 
+ for ac_header in libintl.h stddef.h unistd.h strings.h
+ do
+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
++$as_echo_n "checking for $ac_header... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  $as_echo_n "(cached) " >&6
++fi
++ac_res=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
++$as_echo_n "checking $ac_header usability... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -3772,41 +4579,38 @@ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++$as_echo "$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
++$as_echo_n "checking $ac_header presence... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -3815,81 +4619,83 @@ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++$as_echo "$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
++$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
++$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
++$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
++$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
++    ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to jbig2-dev@ghostscript.com ##
+ ## ---------------------------------------- ##
+ _ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++     ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for $ac_header" >&5
+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
++$as_echo_n "checking for $ac_header... " >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  $as_echo_n "(cached) " >&6
+ else
+   eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++ac_res=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
+ 
+ fi
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
++as_val=`eval 'as_val=${'$as_ac_Header'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+@@ -3900,73 +4706,15 @@ done
+ 
+ stdint_types_in="no_replacement_found"
+ stdint_types_discovered="yes"
+-echo "$as_me:$LINENO: checking for char" >&5
+-echo $ECHO_N "checking for char... $ECHO_C" >&6
+-if test "${ac_cv_type_char+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if ((char *) 0)
+-  return 0;
+-if (sizeof (char))
+-  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_type_char=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-ac_cv_type_char=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
+-echo "${ECHO_T}$ac_cv_type_char" >&6
+-
+-echo "$as_me:$LINENO: checking size of char" >&5
+-echo $ECHO_N "checking size of char... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:$LINENO: checking size of char" >&5
++$as_echo_n "checking size of char... " >&6; }
+ if test "${ac_cv_sizeof_char+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+-  if test "$ac_cv_type_char" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -3979,7 +4727,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -3987,27 +4735,23 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -4020,7 +4764,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -4028,46 +4772,43 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -4077,7 +4818,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (char))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -4085,27 +4826,23 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -4118,7 +4855,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (char))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -4126,50 +4863,49 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -4183,7 +4919,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (char))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -4191,52 +4927,48 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_char=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77
++'') if test "$ac_cv_type_char" = yes; then
++     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char), 77
++$as_echo "$as_me: error: cannot compute sizeof (char)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; }; }
++   else
++     ac_cv_sizeof_char=0
++   fi ;;
+ esac
+ else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -4244,8 +4976,8 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (char)); }
+-unsigned long ulongval () { return (long) (sizeof (char)); }
++static long int longval () { return (long int) (sizeof (char)); }
++static unsigned long int ulongval () { return (long int) (sizeof (char)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -4254,133 +4986,94 @@ main ()
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (char))) < 0)
++    return 1;
++  if (((long int) (sizeof (char))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (char))))
+-	exit (1);
+-      fprintf (f, "%ld\n", i);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (char))))
++	return 1;
++      fprintf (f, "%ld", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (char))))
+-	exit (1);
+-      fprintf (f, "%lu\n", i);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (char))))
++	return 1;
++      fprintf (f, "%lu", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  /* Do not output a trailing newline, as this causes \r\n confusion
++     on some platforms.  */
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_char=`cat conftest.val`
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: program exited with status $ac_status" >&5
++$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77
++if test "$ac_cv_type_char" = yes; then
++     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (char)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (char), 77
++$as_echo "$as_me: error: cannot compute sizeof (char)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }; }
++   else
++     ac_cv_sizeof_char=0
++   fi
+ fi
++rm -rf conftest.dSYM
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_char=0
+ fi
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_char" >&6
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_CHAR $ac_cv_sizeof_char
+-_ACEOF
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
++$as_echo "$ac_cv_sizeof_char" >&6; }
+ 
+ 
+-echo "$as_me:$LINENO: checking for short" >&5
+-echo $ECHO_N "checking for short... $ECHO_C" >&6
+-if test "${ac_cv_type_short+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if ((short *) 0)
+-  return 0;
+-if (sizeof (short))
+-  return 0;
+-  ;
+-  return 0;
+-}
++
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_CHAR $ac_cv_sizeof_char
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_type_short=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_short=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
+-echo "${ECHO_T}$ac_cv_type_short" >&6
+ 
+-echo "$as_me:$LINENO: checking size of short" >&5
+-echo $ECHO_N "checking size of short... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:$LINENO: checking size of short" >&5
++$as_echo_n "checking size of short... " >&6; }
+ if test "${ac_cv_sizeof_short+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+-  if test "$ac_cv_type_short" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -4393,7 +5086,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -4401,27 +5094,23 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -4434,7 +5123,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -4442,46 +5131,43 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -4491,7 +5177,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (short))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -4499,27 +5185,23 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -4532,7 +5214,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (short))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -4540,50 +5222,49 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -4597,7 +5278,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (short))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -4605,52 +5286,48 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_short=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++'') if test "$ac_cv_type_short" = yes; then
++     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (short), 77
++$as_echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; }; }
++   else
++     ac_cv_sizeof_short=0
++   fi ;;
+ esac
+ else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -4658,8 +5335,8 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (short)); }
+-unsigned long ulongval () { return (long) (sizeof (short)); }
++static long int longval () { return (long int) (sizeof (short)); }
++static unsigned long int ulongval () { return (long int) (sizeof (short)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -4668,133 +5345,94 @@ main ()
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (short))) < 0)
++    return 1;
++  if (((long int) (sizeof (short))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (short))))
+-	exit (1);
+-      fprintf (f, "%ld\n", i);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (short))))
++	return 1;
++      fprintf (f, "%ld", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (short))))
+-	exit (1);
+-      fprintf (f, "%lu\n", i);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (short))))
++	return 1;
++      fprintf (f, "%lu", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  /* Do not output a trailing newline, as this causes \r\n confusion
++     on some platforms.  */
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_short=`cat conftest.val`
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: program exited with status $ac_status" >&5
++$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++if test "$ac_cv_type_short" = yes; then
++     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (short), 77
++$as_echo "$as_me: error: cannot compute sizeof (short)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }; }
++   else
++     ac_cv_sizeof_short=0
++   fi
+ fi
++rm -rf conftest.dSYM
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_short=0
+ fi
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_short" >&6
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_SHORT $ac_cv_sizeof_short
+-_ACEOF
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
++$as_echo "$ac_cv_sizeof_short" >&6; }
+ 
+ 
+-echo "$as_me:$LINENO: checking for int" >&5
+-echo $ECHO_N "checking for int... $ECHO_C" >&6
+-if test "${ac_cv_type_int+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if ((int *) 0)
+-  return 0;
+-if (sizeof (int))
+-  return 0;
+-  ;
+-  return 0;
+-}
++
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_SHORT $ac_cv_sizeof_short
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_type_int=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_int=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+-echo "${ECHO_T}$ac_cv_type_int" >&6
+ 
+-echo "$as_me:$LINENO: checking size of int" >&5
+-echo $ECHO_N "checking size of int... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:$LINENO: checking size of int" >&5
++$as_echo_n "checking size of int... " >&6; }
+ if test "${ac_cv_sizeof_int+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+-  if test "$ac_cv_type_int" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -4807,7 +5445,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -4815,27 +5453,23 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -4848,7 +5482,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -4856,46 +5490,43 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -4905,7 +5536,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (int))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -4913,27 +5544,23 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -4946,7 +5573,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (int))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -4954,50 +5581,49 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -5011,7 +5637,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (int))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -5019,52 +5645,48 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_int=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++'') if test "$ac_cv_type_int" = yes; then
++     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77
++$as_echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; }; }
++   else
++     ac_cv_sizeof_int=0
++   fi ;;
+ esac
+ else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -5072,8 +5694,8 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (int)); }
+-unsigned long ulongval () { return (long) (sizeof (int)); }
++static long int longval () { return (long int) (sizeof (int)); }
++static unsigned long int ulongval () { return (long int) (sizeof (int)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -5082,133 +5704,94 @@ main ()
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (int))) < 0)
++    return 1;
++  if (((long int) (sizeof (int))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (int))))
+-	exit (1);
+-      fprintf (f, "%ld\n", i);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (int))))
++	return 1;
++      fprintf (f, "%ld", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (int))))
+-	exit (1);
+-      fprintf (f, "%lu\n", i);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (int))))
++	return 1;
++      fprintf (f, "%lu", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  /* Do not output a trailing newline, as this causes \r\n confusion
++     on some platforms.  */
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_int=`cat conftest.val`
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: program exited with status $ac_status" >&5
++$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++if test "$ac_cv_type_int" = yes; then
++     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77
++$as_echo "$as_me: error: cannot compute sizeof (int)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }; }
++   else
++     ac_cv_sizeof_int=0
++   fi
+ fi
++rm -rf conftest.dSYM
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_int=0
+-fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_int" >&6
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_INT $ac_cv_sizeof_int
+-_ACEOF
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
++$as_echo "$ac_cv_sizeof_int" >&6; }
+ 
+ 
+-echo "$as_me:$LINENO: checking for long" >&5
+-echo $ECHO_N "checking for long... $ECHO_C" >&6
+-if test "${ac_cv_type_long+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-if ((long *) 0)
+-  return 0;
+-if (sizeof (long))
+-  return 0;
+-  ;
+-  return 0;
+-}
++
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_INT $ac_cv_sizeof_int
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_type_long=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_long=no
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
+-echo "${ECHO_T}$ac_cv_type_long" >&6
+ 
+-echo "$as_me:$LINENO: checking size of long" >&5
+-echo $ECHO_N "checking size of long... $ECHO_C" >&6
++# The cast to long int works around a bug in the HP C Compiler
++# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
++# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
++# This bug is HP SR number 8606223364.
++{ $as_echo "$as_me:$LINENO: checking size of long" >&5
++$as_echo_n "checking size of long... " >&6; }
+ if test "${ac_cv_sizeof_long+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+-  if test "$ac_cv_type_long" = yes; then
+-  # The cast to unsigned long works around a bug in the HP C Compiler
+-  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+-  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+-  # This bug is HP SR number 8606223364.
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+@@ -5221,7 +5804,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -5229,27 +5812,23 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -5262,7 +5841,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -5270,46 +5849,43 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr $ac_mid + 1`
+-		    if test $ac_lo -le $ac_mid; then
+-		      ac_lo= ac_hi=
+-		      break
+-		    fi
+-		    ac_mid=`expr 2 '*' $ac_mid + 1`
++	ac_lo=`expr $ac_mid + 1`
++			if test $ac_lo -le $ac_mid; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-cat >conftest.$ac_ext <<_ACEOF
++	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -5319,7 +5895,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (long))) < 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -5327,27 +5903,23 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -5360,7 +5932,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (long))) >= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -5368,50 +5940,49 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_hi=`expr '(' $ac_mid ')' - 1`
+-		       if test $ac_mid -le $ac_hi; then
+-			 ac_lo= ac_hi=
+-			 break
+-		       fi
+-		       ac_mid=`expr 2 '*' $ac_mid`
++	ac_hi=`expr '(' $ac_mid ')' - 1`
++			if test $ac_mid -le $ac_hi; then
++			  ac_lo= ac_hi=
++			  break
++			fi
++			ac_mid=`expr 2 '*' $ac_mid`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo= ac_hi=
++	ac_lo= ac_hi=
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+@@ -5425,7 +5996,7 @@ $ac_includes_default
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (long))) <= $ac_mid)];
+ test_array [0] = 0
+ 
+   ;
+@@ -5433,52 +6004,48 @@ test_array [0] = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_lo=`expr '(' $ac_mid ')' + 1`
++	ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_long=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++'') if test "$ac_cv_type_long" = yes; then
++     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
++$as_echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; } ;;
++   { (exit 77); exit 77; }; }; }
++   else
++     ac_cv_sizeof_long=0
++   fi ;;
+ esac
+ else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -5486,8 +6053,8 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-long longval () { return (long) (sizeof (long)); }
+-unsigned long ulongval () { return (long) (sizeof (long)); }
++static long int longval () { return (long int) (sizeof (long)); }
++static unsigned long int ulongval () { return (long int) (sizeof (long)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+ int
+@@ -5496,61 +6063,80 @@ main ()
+ 
+   FILE *f = fopen ("conftest.val", "w");
+   if (! f)
+-    exit (1);
+-  if (((long) (sizeof (long))) < 0)
++    return 1;
++  if (((long int) (sizeof (long))) < 0)
+     {
+-      long i = longval ();
+-      if (i != ((long) (sizeof (long))))
+-	exit (1);
+-      fprintf (f, "%ld\n", i);
++      long int i = longval ();
++      if (i != ((long int) (sizeof (long))))
++	return 1;
++      fprintf (f, "%ld", i);
+     }
+   else
+     {
+-      unsigned long i = ulongval ();
+-      if (i != ((long) (sizeof (long))))
+-	exit (1);
+-      fprintf (f, "%lu\n", i);
++      unsigned long int i = ulongval ();
++      if (i != ((long int) (sizeof (long))))
++	return 1;
++      fprintf (f, "%lu", i);
+     }
+-  exit (ferror (f) || fclose (f) != 0);
++  /* Do not output a trailing newline, as this causes \r\n confusion
++     on some platforms.  */
++  return ferror (f) || fclose (f) != 0;
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_sizeof_long=`cat conftest.val`
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: program exited with status $ac_status" >&5
++$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
++if test "$ac_cv_type_long" = yes; then
++     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute sizeof (long), 77
++$as_echo "$as_me: error: cannot compute sizeof (long)
+ See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++   { (exit 77); exit 77; }; }; }
++   else
++     ac_cv_sizeof_long=0
++   fi
+ fi
++rm -rf conftest.dSYM
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
+-else
+-  ac_cv_sizeof_long=0
+-fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
++$as_echo "$ac_cv_sizeof_long" >&6; }
++
++
++
+ cat >>confdefs.h <<_ACEOF
+ #define SIZEOF_LONG $ac_cv_sizeof_long
+ _ACEOF
+@@ -5573,17 +6159,17 @@ case 4 in
+   *) stdint_types_discovered="no";;
+ esac
+ if test "${ac_cv_header_stdint_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for stdint.h" >&5
+-echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6
++  { $as_echo "$as_me:$LINENO: checking for stdint.h" >&5
++$as_echo_n "checking for stdint.h... " >&6; }
+ if test "${ac_cv_header_stdint_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdint_h" >&5
+-echo "${ECHO_T}$ac_cv_header_stdint_h" >&6
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdint_h" >&5
++$as_echo "$ac_cv_header_stdint_h" >&6; }
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking stdint.h usability" >&5
+-echo $ECHO_N "checking stdint.h usability... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking stdint.h usability" >&5
++$as_echo_n "checking stdint.h usability... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -5594,41 +6180,38 @@ $ac_includes_default
+ #include <stdint.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_header_compiler=no
++	ac_header_compiler=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-echo "${ECHO_T}$ac_header_compiler" >&6
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++$as_echo "$ac_header_compiler" >&6; }
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking stdint.h presence" >&5
+-echo $ECHO_N "checking stdint.h presence... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking stdint.h presence" >&5
++$as_echo_n "checking stdint.h presence... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -5637,84 +6220,82 @@ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <stdint.h>
+ _ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
++if { (ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+   ac_header_preproc=no
+ fi
++
+ rm -f conftest.err conftest.$ac_ext
+-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-echo "${ECHO_T}$ac_header_preproc" >&6
++{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
++$as_echo "$ac_header_preproc" >&6; }
+ 
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+   yes:no: )
+-    { echo "$as_me:$LINENO: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the compiler's result" >&5
+-echo "$as_me: WARNING: stdint.h: proceeding with the compiler's result" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&5
++$as_echo "$as_me: WARNING: stdint.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: stdint.h: proceeding with the compiler's result" >&2;}
+     ac_header_preproc=yes
+     ;;
+   no:yes:* )
+-    { echo "$as_me:$LINENO: WARNING: stdint.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: stdint.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: stdint.h:     check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: stdint.h:     check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: stdint.h: see the Autoconf documentation" >&5
+-echo "$as_me: WARNING: stdint.h: see the Autoconf documentation" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: stdint.h:     section \"Present But Cannot Be Compiled\"" >&5
+-echo "$as_me: WARNING: stdint.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: stdint.h: proceeding with the preprocessor's result" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: stdint.h: in the future, the compiler will take precedence" >&5
+-echo "$as_me: WARNING: stdint.h: in the future, the compiler will take precedence" >&2;}
+-    (
+-      cat <<\_ASBOX
++    { $as_echo "$as_me:$LINENO: WARNING: stdint.h: present but cannot be compiled" >&5
++$as_echo "$as_me: WARNING: stdint.h: present but cannot be compiled" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: stdint.h:     check for missing prerequisite headers?" >&5
++$as_echo "$as_me: WARNING: stdint.h:     check for missing prerequisite headers?" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: stdint.h: see the Autoconf documentation" >&5
++$as_echo "$as_me: WARNING: stdint.h: see the Autoconf documentation" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: stdint.h:     section \"Present But Cannot Be Compiled\"" >&5
++$as_echo "$as_me: WARNING: stdint.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: stdint.h: proceeding with the preprocessor's result" >&5
++$as_echo "$as_me: WARNING: stdint.h: proceeding with the preprocessor's result" >&2;}
++    { $as_echo "$as_me:$LINENO: WARNING: stdint.h: in the future, the compiler will take precedence" >&5
++$as_echo "$as_me: WARNING: stdint.h: in the future, the compiler will take precedence" >&2;}
++    ( cat <<\_ASBOX
+ ## ---------------------------------------- ##
+ ## Report this to jbig2-dev@ghostscript.com ##
+ ## ---------------------------------------- ##
+ _ASBOX
+-    ) |
+-      sed "s/^/$as_me: WARNING:     /" >&2
++     ) | sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for stdint.h" >&5
+-echo $ECHO_N "checking for stdint.h... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for stdint.h" >&5
++$as_echo_n "checking for stdint.h... " >&6; }
+ if test "${ac_cv_header_stdint_h+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   ac_cv_header_stdint_h=$ac_header_preproc
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_stdint_h" >&5
+-echo "${ECHO_T}$ac_cv_header_stdint_h" >&6
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdint_h" >&5
++$as_echo "$ac_cv_header_stdint_h" >&6; }
+ 
+ fi
+ 
+ 
+ if test "x$ac_cv_header_stdint_h" != "xyes"; then
+   for include in sys/types.h inttypes.h sys/inttypes.h sys/int_types.h ; do
+-    echo "$as_me:$LINENO: checking for uint32_t in $include" >&5
+-echo $ECHO_N "checking for uint32_t in $include... $ECHO_C" >&6
++    { $as_echo "$as_me:$LINENO: checking for uint32_t in $include" >&5
++$as_echo_n "checking for uint32_t in $include... " >&6; }
+     cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -5731,58 +6312,55 @@ uint32_t canary;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-
+-      echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++
++      { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "yes" >&6; }
+       stdint_types_in="$include"
+       break;
+ 
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++	{ $as_echo "$as_me:$LINENO: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+   if test "x$stdint_types_in" != "xno_replacement_found"; then
+-    echo "$as_me:$LINENO: result: Adding $stdint_types_in to config header for stdint types" >&5
+-echo "${ECHO_T}Adding $stdint_types_in to config header for stdint types" >&6
++    { $as_echo "$as_me:$LINENO: result: Adding $stdint_types_in to config header for stdint types" >&5
++$as_echo "Adding $stdint_types_in to config header for stdint types" >&6; }
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define JBIG2_REPLACE_STDINT_H
++#define JBIG2_REPLACE_STDINT_H /**/
+ _ACEOF
+ 
+   elif test "x$stdint_types_discovered" = "xno"; then
+-    { { echo "$as_me:$LINENO: error:
++    { { $as_echo "$as_me:$LINENO: error:
+ Unable to find suitable definitions of the stdint.h types (uint32_t and friends)
+ You will have to define these yourself in a separate header.
+ See config_win32.h for an example.
+     " >&5
+-echo "$as_me: error:
++$as_echo "$as_me: error:
+ Unable to find suitable definitions of the stdint.h types (uint32_t and friends)
+ You will have to define these yourself in a separate header.
+ See config_win32.h for an example.
+@@ -5800,10 +6378,10 @@ JBIG2_STDINT_H=$stdint_types_in
+ 
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+-echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
++$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+ if test "${ac_cv_c_const+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -5819,10 +6397,10 @@ main ()
+ #ifndef __cplusplus
+   /* Ultrix mips cc rejects this.  */
+   typedef int charset[2];
+-  const charset x;
++  const charset cs;
+   /* SunOS 4.1.1 cc rejects this.  */
+-  char const *const *ccp;
+-  char **p;
++  char const *const *pcpcc;
++  char **ppc;
+   /* NEC SVR4.0.2 mips cc rejects this.  */
+   struct point {int x, y;};
+   static struct point const zero = {0,0};
+@@ -5831,16 +6409,17 @@ main ()
+      an arm of an if-expression whose if-part is not a constant
+      expression */
+   const char *g = "string";
+-  ccp = &g + (g ? g-g : 0);
++  pcpcc = &g + (g ? g-g : 0);
+   /* HPUX 7.0 cc rejects these. */
+-  ++ccp;
+-  p = (char**) ccp;
+-  ccp = (char const *const *) p;
++  ++pcpcc;
++  ppc = (char**) pcpcc;
++  pcpcc = (char const *const *) ppc;
+   { /* SCO 3.2v4 cc rejects this.  */
+     char *t;
+     char const *s = 0 ? (char *) 0 : (char const *) 0;
+ 
+     *t++ = 0;
++    if (s) return 0;
+   }
+   { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+     int x[] = {25, 17};
+@@ -5859,7 +6438,9 @@ main ()
+   }
+   { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+     const int foo = 10;
++    if (!foo) return 0;
+   }
++  return !cs[0] && !zero.x;
+ #endif
+ 
+   ;
+@@ -5867,52 +6448,50 @@ main ()
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_c_const=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_c_const=no
++	ac_cv_c_const=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+-echo "${ECHO_T}$ac_cv_c_const" >&6
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
++$as_echo "$ac_cv_c_const" >&6; }
+ if test $ac_cv_c_const = no; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define const
++#define const /**/
+ _ACEOF
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking for size_t" >&5
+-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
++$as_echo_n "checking for size_t... " >&6; }
+ if test "${ac_cv_type_size_t+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
++  ac_cv_type_size_t=no
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -5922,223 +6501,412 @@ $ac_includes_default
+ int
+ main ()
+ {
+-if ((size_t *) 0)
+-  return 0;
+ if (sizeof (size_t))
+-  return 0;
++       return 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if (sizeof ((size_t)))
++	  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_type_size_t=yes
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  :
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_type_size_t=no
++	ac_cv_type_size_t=yes
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+-echo "${ECHO_T}$ac_cv_type_size_t" >&6
+-if test $ac_cv_type_size_t = yes; then
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
++$as_echo "$ac_cv_type_size_t" >&6; }
++if test "x$ac_cv_type_size_t" = x""yes; then
+   :
+ else
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define size_t unsigned
++#define size_t unsigned int
+ _ACEOF
+ 
+ fi
+ 
+-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
++
++ { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+ if test "${ac_cv_c_bigendian+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+-  # See if sys/param.h defines the BYTE_ORDER macro.
+-cat >conftest.$ac_ext <<_ACEOF
++  ac_cv_c_bigendian=unknown
++    # See if we're dealing with a universal compiler.
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifndef __APPLE_CC__
++	       not a universal capable compiler
++	     #endif
++	     typedef int dummy;
++
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++
++	# Check for potential -arch flags.  It is not universal unless
++	# there are some -arch flags.  Note that *ppc* also matches
++	# ppc64.  This check is also rather less than ideal.
++	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
++	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
++	esac
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    if test $ac_cv_c_bigendian = unknown; then
++      # See if sys/param.h defines the BYTE_ORDER macro.
++      cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+-#include <sys/param.h>
++	     #include <sys/param.h>
+ 
+ int
+ main ()
+ {
+-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+- bogus endian macros
+-#endif
++#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
++		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
++		     && LITTLE_ENDIAN)
++	      bogus endian macros
++	     #endif
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   # It does; now see whether it defined to BIG_ENDIAN or not.
+-cat >conftest.$ac_ext <<_ACEOF
++	 cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+-#include <sys/param.h>
++		#include <sys/param.h>
+ 
+ int
+ main ()
+ {
+ #if BYTE_ORDER != BIG_ENDIAN
+- not big endian
+-#endif
++		 not big endian
++		#endif
+ 
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_c_bigendian=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_c_bigendian=no
++	ac_cv_c_bigendian=no
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-# It does not; compile a test program.
+-if test "$cross_compiling" = yes; then
+-  # try to guess the endianness by grepping values into an object file
+-  ac_cv_c_bigendian=unknown
+-  cat >conftest.$ac_ext <<_ACEOF
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    fi
++    if test $ac_cv_c_bigendian = unknown; then
++      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
++      cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
+-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
++#include <limits.h>
++
+ int
+ main ()
+ {
+- _ascii (); _ebcdic ();
++#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
++	      bogus endian macros
++	     #endif
++
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  # It does; now see whether it defined to _BIG_ENDIAN or not.
++	 cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <limits.h>
++
++int
++main ()
++{
++#ifndef _BIG_ENDIAN
++		 not big endian
++		#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_c_bigendian=yes
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_c_bigendian=no
+ fi
+-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+-  if test "$ac_cv_c_bigendian" = unknown; then
+-    ac_cv_c_bigendian=no
+-  else
+-    # finding both strings is unlikely to happen, but who knows?
+-    ac_cv_c_bigendian=unknown
+-  fi
+-fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++    fi
++    if test $ac_cv_c_bigendian = unknown; then
++      # Compile a test program.
++      if test "$cross_compiling" = yes; then
++  # Try to guess by grepping values from an object file.
++	 cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++short int ascii_mm[] =
++		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++		short int ascii_ii[] =
++		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++		int use_ascii (int i) {
++		  return ascii_mm[i] + ascii_ii[i];
++		}
++		short int ebcdic_ii[] =
++		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++		short int ebcdic_mm[] =
++		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++		int use_ebcdic (int i) {
++		  return ebcdic_mm[i] + ebcdic_ii[i];
++		}
++		extern int foo;
++
++int
++main ()
++{
++return use_ascii (foo) == use_ebcdic (foo);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
++	      ac_cv_c_bigendian=yes
++	    fi
++	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++	      if test "$ac_cv_c_bigendian" = unknown; then
++		ac_cv_c_bigendian=no
++	      else
++		# finding both strings is unlikely to happen, but who knows?
++		ac_cv_c_bigendian=unknown
++	      fi
++	    fi
++else
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
++
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -6146,69 +6914,93 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++$ac_includes_default
+ int
+ main ()
+ {
+-  /* Are we little or big endian?  From Harbison&Steele.  */
+-  union
+-  {
+-    long l;
+-    char c[sizeof (long)];
+-  } u;
+-  u.l = 1;
+-  exit (u.c[sizeof (long) - 1] == 1);
++
++	     /* Are we little or big endian?  From Harbison&Steele.  */
++	     union
++	     {
++	       long int l;
++	       char c[sizeof (long int)];
++	     } u;
++	     u.l = 1;
++	     return u.c[sizeof (long int) - 1] == 1;
++
++  ;
++  return 0;
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_c_bigendian=no
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: program exited with status $ac_status" >&5
++$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ ac_cv_c_bigendian=yes
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
++rm -rf conftest.dSYM
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++
++    fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
+-case $ac_cv_c_bigendian in
+-  yes)
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
++$as_echo "$ac_cv_c_bigendian" >&6; }
++ case $ac_cv_c_bigendian in #(
++   yes)
++     cat >>confdefs.h <<\_ACEOF
++#define WORDS_BIGENDIAN 1
++_ACEOF
++;; #(
++   no)
++      ;; #(
++   universal)
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define WORDS_BIGENDIAN 1
++#define AC_APPLE_UNIVERSAL_BUILD 1
+ _ACEOF
+- ;;
+-  no)
+-     ;;
+-  *)
+-    { { echo "$as_me:$LINENO: error: unknown endianness
+-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+-echo "$as_me: error: unknown endianness
+-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
++
++     ;; #(
++   *)
++     { { $as_echo "$as_me:$LINENO: error: unknown endianness
++ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
++$as_echo "$as_me: error: unknown endianness
++ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+    { (exit 1); exit 1; }; } ;;
+-esac
++ esac
+ 
+ 
+ # Checks for library functions.
+-echo "$as_me:$LINENO: checking for working memcmp" >&5
+-echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for working memcmp" >&5
++$as_echo_n "checking for working memcmp... " >&6; }
+ if test "${ac_cv_func_memcmp_working+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then
+   ac_cv_func_memcmp_working=no
+@@ -6225,9 +7017,9 @@ main ()
+ {
+ 
+   /* Some versions of memcmp are not 8-bit clean.  */
+-  char c0 = 0x40, c1 = 0x80, c2 = 0x81;
++  char c0 = '\100', c1 = '\200', c2 = '\201';
+   if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
+-    exit (1);
++    return 1;
+ 
+   /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
+      or more and with at least one buffer not starting on a 4-byte boundary.
+@@ -6243,9 +7035,9 @@ main ()
+ 	strcpy (a, "--------01111111");
+ 	strcpy (b, "--------10000000");
+ 	if (memcmp (a, b, 16) >= 0)
+-	  exit (1);
++	  return 1;
+       }
+-    exit (0);
++    return 0;
+   }
+ 
+   ;
+@@ -6253,47 +7045,59 @@ main ()
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
++  { (case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_try") 2>&5
+   ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   ac_cv_func_memcmp_working=yes
+ else
+-  echo "$as_me: program exited with status $ac_status" >&5
+-echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: program exited with status $ac_status" >&5
++$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ ( exit $ac_status )
+ ac_cv_func_memcmp_working=no
+ fi
+-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -rf conftest.dSYM
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
++
++
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
+-echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
+-test $ac_cv_func_memcmp_working = no && case $LIBOBJS in
+-    "memcmp.$ac_objext"   | \
+-  *" memcmp.$ac_objext"   | \
+-    "memcmp.$ac_objext "* | \
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
++$as_echo "$ac_cv_func_memcmp_working" >&6; }
++test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
+   *" memcmp.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS memcmp.$ac_objext" ;;
++  *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
++ ;;
+ esac
+ 
+ 
+ 
+ for ac_func in snprintf
+ do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
++$as_echo_n "checking for $ac_func... " >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -6318,80 +7122,77 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
+   eval "$as_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
++	eval "$as_ac_var=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
++ac_res=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++as_val=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+-  case $LIBOBJS in
+-    "$ac_func.$ac_objext"   | \
+-  *" $ac_func.$ac_objext"   | \
+-    "$ac_func.$ac_objext "* | \
++  case " $LIBOBJS " in
+   *" $ac_func.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
++  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
++ ;;
+ esac
+ 
+ fi
+@@ -6403,11 +7204,11 @@ done
+ 
+ for ac_func in memset strdup
+ do
+-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:$LINENO: checking for $ac_func" >&5
+-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+-if eval "test \"\${$as_ac_var+set}\" = set"; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
++$as_echo_n "checking for $ac_func... " >&6; }
++if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -6432,81 +7233,80 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 
+ #undef $ac_func
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++#if defined __stub_$ac_func || defined __stub___$ac_func
+ choke me
+-#else
+-char (*f) () = $ac_func;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != $ac_func;
++return $ac_func ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
+   eval "$as_ac_var=yes"
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-eval "$as_ac_var=no"
++	eval "$as_ac_var=no"
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+-if test `eval echo '${'$as_ac_var'}'` = yes; then
++ac_res=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++as_val=`eval 'as_val=${'$as_ac_var'}
++		 $as_echo "$as_val"'`
++   if test "x$as_val" = x""yes; then
+   cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ fi
+ done
+ 
+ 
+-echo "$as_me:$LINENO: checking for getopt_long" >&5
+-echo $ECHO_N "checking for getopt_long... $ECHO_C" >&6
++{ $as_echo "$as_me:$LINENO: checking for getopt_long" >&5
++$as_echo_n "checking for getopt_long... " >&6; }
+ if test "${ac_cv_func_getopt_long+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -6531,90 +7331,81 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 
+ #undef getopt_long
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+-{
+ #endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+ char getopt_long ();
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_getopt_long) || defined (__stub___getopt_long)
++#if defined __stub_getopt_long || defined __stub___getopt_long
+ choke me
+-#else
+-char (*f) () = getopt_long;
+-#endif
+-#ifdef __cplusplus
+-}
+ #endif
+ 
+ int
+ main ()
+ {
+-return f != getopt_long;
++return getopt_long ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then
+   ac_cv_func_getopt_long=yes
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_func_getopt_long=no
++	ac_cv_func_getopt_long=no
+ fi
+-rm -f conftest.err conftest.$ac_objext \
++
++rm -rf conftest.dSYM
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+       conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_func_getopt_long" >&5
+-echo "${ECHO_T}$ac_cv_func_getopt_long" >&6
+-if test $ac_cv_func_getopt_long = yes; then
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_getopt_long" >&5
++$as_echo "$ac_cv_func_getopt_long" >&6; }
++if test "x$ac_cv_func_getopt_long" = x""yes; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETOPT_LONG
++#define HAVE_GETOPT_LONG /**/
+ _ACEOF
+ 
+ else
+ 
+-	case $LIBOBJS in
+-    "getopt.$ac_objext"   | \
+-  *" getopt.$ac_objext"   | \
+-    "getopt.$ac_objext "* | \
++	case " $LIBOBJS " in
+   *" getopt.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS getopt.$ac_objext" ;;
++  *) LIBOBJS="$LIBOBJS getopt.$ac_objext"
++ ;;
+ esac
+ 
+-	case $LIBOBJS in
+-    "getopt1.$ac_objext"   | \
+-  *" getopt1.$ac_objext"   | \
+-    "getopt1.$ac_objext "* | \
++	case " $LIBOBJS " in
+   *" getopt1.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS getopt1.$ac_objext" ;;
++  *) LIBOBJS="$LIBOBJS getopt1.$ac_objext"
++ ;;
+ esac
+ 
+ 
+@@ -6622,7 +7413,7 @@ fi
+ 
+ 
+ # generate output
+-                    ac_config_files="$ac_config_files Makefile config_types.h"
++ac_config_files="$ac_config_files Makefile config_types.h"
+ 
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -6642,39 +7433,59 @@ _ACEOF
+ 
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
++# So, we kill variables containing newlines.
+ # Ultrix sh set writes to stderr and can't be redirected directly,
+ # and sets the high bit in the cache file unless we assign to the vars.
+-{
++(
++  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
++    eval ac_val=\$$ac_var
++    case $ac_val in #(
++    *${as_nl}*)
++      case $ac_var in #(
++      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
++$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
++      esac
++      case $ac_var in #(
++      _ | IFS | as_nl) ;; #(
++      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
++      *) $as_unset $ac_var ;;
++      esac ;;
++    esac
++  done
++
+   (set) 2>&1 |
+-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-    *ac_space=\ *)
++    case $as_nl`(ac_space=' '; set) 2>&1` in #(
++    *${as_nl}ac_space=\ *)
+       # `set' does not quote correctly, so add quotes (double-quote
+       # substitution turns \\\\ into \\, and sed turns \\ into \).
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+-      ;;
++      ;; #(
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+-      sed -n \
+-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+       ;;
+-    esac;
+-} |
++    esac |
++    sort
++) |
+   sed '
++     /^ac_cv_env_/b end
+      t clear
+-     : clear
++     :clear
+      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+      t end
+-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+-     : end' >>confcache
+-if diff $cache_file confcache >/dev/null 2>&1; then :; else
+-  if test -w $cache_file; then
+-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
++     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     :end' >>confcache
++if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
++  if test -w "$cache_file"; then
++    test "x$cache_file" != "x/dev/null" &&
++      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
++$as_echo "$as_me: updating cache $cache_file" >&6;}
+     cat confcache >$cache_file
+   else
+-    echo "not updating unwritable cache $cache_file"
++    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
++$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+@@ -6683,32 +7494,18 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
+ # Let make expand exec_prefix.
+ test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+ 
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+-# trailing colons and then remove the whole line if VPATH becomes empty
+-# (actually we leave an empty line to preserve line numbers).
+-if test "x$srcdir" = x.; then
+-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+-s/:*\$(srcdir):*/:/;
+-s/:*\${srcdir}:*/:/;
+-s/:*@srcdir@:*/:/;
+-s/^\([^=]*=[	 ]*\):*/\1/;
+-s/:*$//;
+-s/^[^=]*=[	 ]*$//;
+-}'
+-fi
+-
+ DEFS=-DHAVE_CONFIG_H
+ 
+ ac_libobjs=
+ ac_ltlibobjs=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+   # 1. Remove the extension, and $U if already installed.
+-  ac_i=`echo "$ac_i" |
+-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+-  # 2. Add them.
+-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
+-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
++  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
++  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
++  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
++  #    will be set to the directory where LIBOBJS objects are built.
++  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
++  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
+ done
+ LIBOBJS=$ac_libobjs
+ 
+@@ -6716,26 +7513,28 @@ LTLIBOBJS=$ac_ltlibobjs
+ 
+ 
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
++  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"AMDEP\" was never defined.
++$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
++  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
++$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
++
+ : ${CONFIG_STATUS=./config.status}
++ac_write_fail=0
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+-echo "$as_me: creating $CONFIG_STATUS" >&6;}
+-cat >$CONFIG_STATUS <<_ACEOF
++{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
++$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
++cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ #! $SHELL
+ # Generated by $as_me.
+ # Run this file to recreate the current configuration.
+@@ -6748,22 +7547,78 @@ ac_cs_silent=false
+ SHELL=\${CONFIG_SHELL-$SHELL}
+ _ACEOF
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ ## --------------------- ##
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
+-# Be Bourne compatible
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
+-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+   # is contrary to our usage.  Disable this feature.
+   alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+-  set -o posix
++  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
++fi
++
++
++
++
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++as_nl='
++'
++export as_nl
++# Printing a long string crashes Solaris 7 /usr/bin/printf.
++as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
++as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
++if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
++  as_echo='printf %s\n'
++  as_echo_n='printf %s'
++else
++  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
++    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
++    as_echo_n='/usr/ucb/echo -n'
++  else
++    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
++    as_echo_n_body='eval
++      arg=$1;
++      case $arg in
++      *"$as_nl"*)
++	expr "X$arg" : "X\\(.*\\)$as_nl";
++	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
++      esac;
++      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
++    '
++    export as_echo_n_body
++    as_echo_n='sh -c $as_echo_n_body as_echo'
++  fi
++  export as_echo_body
++  as_echo='sh -c $as_echo_body as_echo'
++fi
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  PATH_SEPARATOR=:
++  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
++    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
++      PATH_SEPARATOR=';'
++  }
+ fi
+-DUALCASE=1; export DUALCASE # for MKS sh
+ 
+ # Support unset when possible.
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+@@ -6773,33 +7628,60 @@ else
+ fi
+ 
+ 
++# IFS
++# We need space, tab and new line, in precisely that order.  Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++IFS=" ""	$as_nl"
++
++# Find who we are.  Look in the path if we contain no directory separator.
++case $0 in
++  *[\\/]* ) as_myself=$0 ;;
++  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++IFS=$as_save_IFS
++
++     ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++  as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++  { (exit 1); exit 1; }
++fi
++
+ # Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
++for as_var in ENV MAIL MAILPATH
++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+ 
+ # NLS nuisances.
+-for as_var in \
+-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+-  LC_TELEPHONE LC_TIME
+-do
+-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+-    eval $as_var=C; export $as_var
+-  else
+-    $as_unset $as_var
+-  fi
+-done
++LC_ALL=C
++export LC_ALL
++LANGUAGE=C
++export LANGUAGE
+ 
+ # Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+   as_basename=basename
+ else
+   as_basename=false
+@@ -6807,159 +7689,122 @@ fi
+ 
+ 
+ # Name of the executable.
+-as_me=`$as_basename "$0" ||
++as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)$' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\/\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-
+-
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
++	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+ 
+-# The user is always right.
+-if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conf$$.sh
+-  echo  "exit 0"   >>conf$$.sh
+-  chmod +x conf$$.sh
+-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+-    PATH_SEPARATOR=';'
+-  else
+-    PATH_SEPARATOR=:
+-  fi
+-  rm -f conf$$.sh
+-fi
++# CDPATH.
++$as_unset CDPATH
+ 
+ 
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
+-  # Find who we are.  Look in the path if we contain no path at all
+-  # relative or not.
+-  case $0 in
+-    *[\\/]* ) as_myself=$0 ;;
+-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
+ 
+-       ;;
+-  esac
+-  # We did not find ourselves, most probably we were run as `sh COMMAND'
+-  # in which case we are not to be found in the path.
+-  if test "x$as_myself" = x; then
+-    as_myself=$0
+-  fi
+-  if test ! -f "$as_myself"; then
+-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
+-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
+-   { (exit 1); exit 1; }; }
+-  fi
+-  case $CONFIG_SHELL in
+-  '')
+-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for as_base in sh bash ksh sh5; do
+-	 case $as_dir in
+-	 /*)
+-	   if ("$as_dir/$as_base" -c '
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
+-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
+-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+-	     CONFIG_SHELL=$as_dir/$as_base
+-	     export CONFIG_SHELL
+-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+-	   fi;;
+-	 esac
+-       done
+-done
+-;;
+-  esac
++  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+ 
+   # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+   # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line before each line; the second 'sed' does the real
+-  # work.  The second script uses 'N' to pair each line-number line
+-  # with the numbered line, and appends trailing '-' during
+-  # substitution so that $LINENO is not a special case at line end.
++  # line-number line after each line using $LINENO; the second 'sed'
++  # does the real work.  The second script uses 'N' to pair each
++  # line-number line with the line containing $LINENO, and appends
++  # trailing '-' during substitution so that $LINENO is not a special
++  # case at line end.
+   # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
+-  sed '=' <$as_myself |
++  # scripts with optimization help from Paolo Bonzini.  Blame Lee
++  # E. McMahon (1931-1989) for sed's syntax.  :-)
++  sed -n '
++    p
++    /[$]LINENO/=
++  ' <$as_myself |
+     sed '
++      s/[$]LINENO.*/&-/
++      t lineno
++      b
++      :lineno
+       N
+-      s,$,-,
+-      : loop
+-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      :loop
++      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+       t loop
+-      s,-$,,
+-      s,^['$as_cr_digits']*\n,,
++      s/-\n.*//
+     ' >$as_me.lineno &&
+-  chmod +x $as_me.lineno ||
+-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
+-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
++  chmod +x "$as_me.lineno" ||
++    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+    { (exit 1); exit 1; }; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensible to this).
+-  . ./$as_me.lineno
++  # original and so on.  Autoconf is especially sensitive to this).
++  . "./$as_me.lineno"
+   # Exit status is that of the last command.
+   exit
+ }
+ 
+ 
+-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+-  *c*,-n*) ECHO_N= ECHO_C='
+-' ECHO_T='	' ;;
+-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+-esac
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++  as_dirname=dirname
++else
++  as_dirname=false
++fi
+ 
+-if expr a : '\(a\)' >/dev/null 2>&1; then
++ECHO_C= ECHO_N= ECHO_T=
++case `echo -n x` in
++-n*)
++  case `echo 'x\c'` in
++  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
++  *)   ECHO_C='\c';;
++  esac;;
++*)
++  ECHO_N='-n';;
++esac
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+ else
+   as_expr=false
+ fi
+ 
+ rm -f conf$$ conf$$.exe conf$$.file
+-echo >conf$$.file
+-if ln -s conf$$.file conf$$ 2>/dev/null; then
+-  # We could just check for DJGPP; but this test a) works b) is more generic
+-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+-  if test -f conf$$.exe; then
+-    # Don't use ln at all; we don't have any links
+-    as_ln_s='cp -p'
+-  else
++if test -d conf$$.dir; then
++  rm -f conf$$.dir/conf$$.file
++else
++  rm -f conf$$.dir
++  mkdir conf$$.dir 2>/dev/null
++fi
++if (echo >conf$$.file) 2>/dev/null; then
++  if ln -s conf$$.file conf$$ 2>/dev/null; then
+     as_ln_s='ln -s'
++    # ... but there are two gotchas:
++    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
++    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
++    # In both cases, we have to default to `cp -p'.
++    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
++      as_ln_s='cp -p'
++  elif ln conf$$.file conf$$ 2>/dev/null; then
++    as_ln_s=ln
++  else
++    as_ln_s='cp -p'
+   fi
+-elif ln conf$$.file conf$$ 2>/dev/null; then
+-  as_ln_s=ln
+ else
+   as_ln_s='cp -p'
+ fi
+-rm -f conf$$ conf$$.exe conf$$.file
++rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
++rmdir conf$$.dir 2>/dev/null
+ 
+ if mkdir -p . 2>/dev/null; then
+   as_mkdir_p=:
+@@ -6968,7 +7813,28 @@ else
+   as_mkdir_p=false
+ fi
+ 
+-as_executable_p="test -f"
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
++else
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
++  else
++    as_ls_L_option=
++  fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++	test -d "$1/.";
++      else
++	case $1 in
++	-*)set "./$1";;
++	esac;
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++	???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
++fi
++as_executable_p=$as_test_x
+ 
+ # Sed expression to map a string onto a valid CPP name.
+ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+@@ -6977,31 +7843,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+-# IFS
+-# We need space, tab and new line, in precisely that order.
+-as_nl='
+-'
+-IFS=" 	$as_nl"
+-
+-# CDPATH.
+-$as_unset CDPATH
+-
+ exec 6>&1
+ 
+-# Open the log real soon, to keep \$[0] and so on meaningful, and to
++# Save the log message, to keep $[0] and so on meaningful, and to
+ # report actual input values of CONFIG_FILES etc. instead of their
+-# values after options handling.  Logging --version etc. is OK.
+-exec 5>>config.log
+-{
+-  echo
+-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+-## Running $as_me. ##
+-_ASBOX
+-} >&5
+-cat >&5 <<_CSEOF
+-
+-This file was extended by jbig2dec $as_me 0.9pre, which was
+-generated by GNU Autoconf 2.59.  Invocation command line was
++# values after options handling.
++ac_log="
++This file was extended by jbig2dec $as_me 0.10, which was
++generated by GNU Autoconf 2.63.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -7009,45 +7858,45 @@ generated by GNU Autoconf 2.59.  Invocation command line was
+   CONFIG_COMMANDS = $CONFIG_COMMANDS
+   $ $0 $@
+ 
+-_CSEOF
+-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
+-echo >&5
++on `(hostname || uname -n) 2>/dev/null | sed 1q`
++"
++
+ _ACEOF
+ 
+-# Files that config.status was made for.
+-if test -n "$ac_config_files"; then
+-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
+-fi
++case $ac_config_files in *"
++"*) set x $ac_config_files; shift; ac_config_files=$*;;
++esac
+ 
+-if test -n "$ac_config_headers"; then
+-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
+-fi
++case $ac_config_headers in *"
++"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
++esac
+ 
+-if test -n "$ac_config_links"; then
+-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
+-fi
+ 
+-if test -n "$ac_config_commands"; then
+-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
+-fi
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++# Files that config.status was made for.
++config_files="$ac_config_files"
++config_headers="$ac_config_headers"
++config_commands="$ac_config_commands"
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF
++_ACEOF
+ 
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ ac_cs_usage="\
+ \`$as_me' instantiates files from templates according to the
+ current configuration.
+ 
+-Usage: $0 [OPTIONS] [FILE]...
++Usage: $0 [OPTION]... [FILE]...
+ 
+   -h, --help       print this help, then exit
+-  -V, --version    print version number, then exit
+-  -q, --quiet      do not print progress messages
++  -V, --version    print version number and configuration settings, then exit
++  -q, --quiet, --silent
++                   do not print progress messages
+   -d, --debug      don't remove temporary files
+       --recheck    update $as_me by reconfiguring in the same conditions
+-  --file=FILE[:TEMPLATE]
+-		   instantiate the configuration file FILE
+-  --header=FILE[:TEMPLATE]
+-		   instantiate the configuration header FILE
++      --file=FILE[:TEMPLATE]
++                   instantiate the configuration file FILE
++      --header=FILE[:TEMPLATE]
++                   instantiate the configuration header FILE
+ 
+ Configuration files:
+ $config_files
+@@ -7059,83 +7908,84 @@ Configuration commands:
+ $config_commands
+ 
+ Report bugs to <bug-autoconf@gnu.org>."
+-_ACEOF
+ 
+-cat >>$CONFIG_STATUS <<_ACEOF
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ ac_cs_version="\\
+-jbig2dec config.status 0.9pre
+-configured by $0, generated by GNU Autoconf 2.59,
+-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
++jbig2dec config.status 0.10
++configured by $0, generated by GNU Autoconf 2.63,
++  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+ 
+-Copyright (C) 2003 Free Software Foundation, Inc.
++Copyright (C) 2008 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+-srcdir=$srcdir
+-INSTALL="$INSTALL"
++
++ac_pwd='$ac_pwd'
++srcdir='$srcdir'
++INSTALL='$INSTALL'
++MKDIR_P='$MKDIR_P'
++AWK='$AWK'
++test -n "\$AWK" || AWK=awk
+ _ACEOF
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-# If no file are specified by the user, then we need to provide default
+-# value.  By we need to know if files were specified by the user.
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++# The default lists apply if the user does not specify any file.
+ ac_need_defaults=:
+ while test $# != 0
+ do
+   case $1 in
+   --*=*)
+-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
+-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
++    ac_option=`expr "X$1" : 'X\([^=]*\)='`
++    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+     ac_shift=:
+     ;;
+-  -*)
++  *)
+     ac_option=$1
+     ac_optarg=$2
+     ac_shift=shift
+     ;;
+-  *) # This is not an option, so the user has probably given explicit
+-     # arguments.
+-     ac_option=$1
+-     ac_need_defaults=false;;
+   esac
+ 
+   case $ac_option in
+   # Handling of the options.
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+     ac_cs_recheck=: ;;
+-  --version | --vers* | -V )
+-    echo "$ac_cs_version"; exit 0 ;;
+-  --he | --h)
+-    # Conflict between --help and --header
+-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&2;}
+-   { (exit 1); exit 1; }; };;
+-  --help | --hel | -h )
+-    echo "$ac_cs_usage"; exit 0 ;;
+-  --debug | --d* | -d )
++  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
++    $as_echo "$ac_cs_version"; exit ;;
++  --debug | --debu | --deb | --de | --d | -d )
+     debug=: ;;
+   --file | --fil | --fi | --f )
+     $ac_shift
+-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
++    case $ac_optarg in
++    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    esac
++    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
+     ac_need_defaults=false;;
+   --header | --heade | --head | --hea )
+     $ac_shift
+-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
++    case $ac_optarg in
++    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    esac
++    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
+     ac_need_defaults=false;;
++  --he | --h)
++    # Conflict between --help and --header
++    { $as_echo "$as_me: error: ambiguous option: $1
++Try \`$0 --help' for more information." >&2
++   { (exit 1); exit 1; }; };;
++  --help | --hel | -h )
++    $as_echo "$ac_cs_usage"; exit ;;
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+   | -silent | --silent | --silen | --sile | --sil | --si | --s)
+     ac_cs_silent=: ;;
+ 
+   # This is an error.
+-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&5
+-echo "$as_me: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&2;}
++  -*) { $as_echo "$as_me: error: unrecognized option: $1
++Try \`$0 --help' for more information." >&2
+    { (exit 1); exit 1; }; } ;;
+ 
+-  *) ac_config_targets="$ac_config_targets $1" ;;
++  *) ac_config_targets="$ac_config_targets $1"
++     ac_need_defaults=false ;;
+ 
+   esac
+   shift
+@@ -7149,40 +7999,54 @@ if $ac_cs_silent; then
+ fi
+ 
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ if \$ac_cs_recheck; then
+-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++  shift
++  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
++  CONFIG_SHELL='$SHELL'
++  export CONFIG_SHELL
++  exec "\$@"
+ fi
+ 
+ _ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++exec 5>>config.log
++{
++  echo
++  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
++## Running $as_me. ##
++_ASBOX
++  $as_echo "$ac_log"
++} >&5
+ 
+-cat >>$CONFIG_STATUS <<_ACEOF
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ #
+-# INIT-COMMANDS section.
++# INIT-COMMANDS
+ #
+-
+ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+ 
+ _ACEOF
+ 
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ 
+-
+-cat >>$CONFIG_STATUS <<\_ACEOF
++# Handling of arguments.
+ for ac_config_target in $ac_config_targets
+ do
+-  case "$ac_config_target" in
+-  # Handling of arguments.
+-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+-  "config_types.h" ) CONFIG_FILES="$CONFIG_FILES config_types.h" ;;
+-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
++  case $ac_config_target in
++    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
++    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
++    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
++    "config_types.h") CONFIG_FILES="$CONFIG_FILES config_types.h" ;;
++
++  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
++$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+    { (exit 1); exit 1; }; };;
+   esac
+ done
+ 
++
+ # If the user did not use the arguments to specify the items to instantiate,
+ # then the envvar interface is used.  Set only those that are not.
+ # We use the long form for the default assignment because of an extremely
+@@ -7194,815 +8058,791 @@ if $ac_need_defaults; then
+ fi
+ 
+ # Have a temporary directory for convenience.  Make it in the build tree
+-# simply because there is no reason to put it here, and in addition,
++# simply because there is no reason against having it here, and in addition,
+ # creating and moving files from /tmp can sometimes cause problems.
+-# Create a temporary directory, and hook for its removal unless debugging.
++# Hook for its removal unless debugging.
++# Note that there is a small window in which the directory will not be cleaned:
++# after its creation but before its name has been assigned to `$tmp'.
+ $debug ||
+ {
+-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
++  tmp=
++  trap 'exit_status=$?
++  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
++' 0
+   trap '{ (exit 1); exit 1; }' 1 2 13 15
+ }
+-
+ # Create a (secure) tmp directory for tmp files.
+ 
+ {
+-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
++  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+   test -n "$tmp" && test -d "$tmp"
+ }  ||
+ {
+-  tmp=./confstat$$-$RANDOM
+-  (umask 077 && mkdir $tmp)
++  tmp=./conf$$-$RANDOM
++  (umask 077 && mkdir "$tmp")
+ } ||
+ {
+-   echo "$me: cannot create a temporary directory in ." >&2
++   $as_echo "$as_me: cannot create a temporary directory in ." >&2
+    { (exit 1); exit 1; }
+ }
+ 
++# Set up the scripts for CONFIG_FILES section.
++# No need to generate them if there are no CONFIG_FILES.
++# This happens for instance with `./config.status config.h'.
++if test -n "$CONFIG_FILES"; then
++
++
++ac_cr='
'
++ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
++if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
++  ac_cs_awk_cr='\\r'
++else
++  ac_cs_awk_cr=$ac_cr
++fi
++
++echo 'BEGIN {' >"$tmp/subs1.awk" &&
+ _ACEOF
+ 
+-cat >>$CONFIG_STATUS <<_ACEOF
+ 
+-#
+-# CONFIG_FILES section.
+-#
++{
++  echo "cat >conf$$subs.awk <<_ACEOF" &&
++  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
++  echo "_ACEOF"
++} >conf$$subs.sh ||
++  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
++ac_delim='%!_!# '
++for ac_last_try in false false false false false :; do
++  . ./conf$$subs.sh ||
++    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
+ 
+-# No need to generate the scripts if there are no CONFIG_FILES.
+-# This happens for instance when ./config.status config.h
+-if test -n "\$CONFIG_FILES"; then
+-  # Protect against being on the right side of a sed subst in config.status.
+-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
+-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
+-s,@SHELL@,$SHELL,;t t
+-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
+-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
+-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
+-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
+-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
+-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
+-s,@exec_prefix@,$exec_prefix,;t t
+-s,@prefix@,$prefix,;t t
+-s,@program_transform_name@,$program_transform_name,;t t
+-s,@bindir@,$bindir,;t t
+-s,@sbindir@,$sbindir,;t t
+-s,@libexecdir@,$libexecdir,;t t
+-s,@datadir@,$datadir,;t t
+-s,@sysconfdir@,$sysconfdir,;t t
+-s,@sharedstatedir@,$sharedstatedir,;t t
+-s,@localstatedir@,$localstatedir,;t t
+-s,@libdir@,$libdir,;t t
+-s,@includedir@,$includedir,;t t
+-s,@oldincludedir@,$oldincludedir,;t t
+-s,@infodir@,$infodir,;t t
+-s,@mandir@,$mandir,;t t
+-s,@build_alias@,$build_alias,;t t
+-s,@host_alias@,$host_alias,;t t
+-s,@target_alias@,$target_alias,;t t
+-s,@DEFS@,$DEFS,;t t
+-s,@ECHO_C@,$ECHO_C,;t t
+-s,@ECHO_N@,$ECHO_N,;t t
+-s,@ECHO_T@,$ECHO_T,;t t
+-s,@LIBS@,$LIBS,;t t
+-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
+-s,@CYGPATH_W@,$CYGPATH_W,;t t
+-s,@PACKAGE@,$PACKAGE,;t t
+-s,@VERSION@,$VERSION,;t t
+-s,@ACLOCAL@,$ACLOCAL,;t t
+-s,@AUTOCONF@,$AUTOCONF,;t t
+-s,@AUTOMAKE@,$AUTOMAKE,;t t
+-s,@AUTOHEADER@,$AUTOHEADER,;t t
+-s,@MAKEINFO@,$MAKEINFO,;t t
+-s,@install_sh@,$install_sh,;t t
+-s,@STRIP@,$STRIP,;t t
+-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
+-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+-s,@mkdir_p@,$mkdir_p,;t t
+-s,@AWK@,$AWK,;t t
+-s,@SET_MAKE@,$SET_MAKE,;t t
+-s,@am__leading_dot@,$am__leading_dot,;t t
+-s,@AMTAR@,$AMTAR,;t t
+-s,@am__tar@,$am__tar,;t t
+-s,@am__untar@,$am__untar,;t t
+-s,@CC@,$CC,;t t
+-s,@CFLAGS@,$CFLAGS,;t t
+-s,@LDFLAGS@,$LDFLAGS,;t t
+-s,@CPPFLAGS@,$CPPFLAGS,;t t
+-s,@ac_ct_CC@,$ac_ct_CC,;t t
+-s,@EXEEXT@,$EXEEXT,;t t
+-s,@OBJEXT@,$OBJEXT,;t t
+-s,@DEPDIR@,$DEPDIR,;t t
+-s,@am__include@,$am__include,;t t
+-s,@am__quote@,$am__quote,;t t
+-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
+-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
+-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
+-s,@CCDEPMODE@,$CCDEPMODE,;t t
+-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
+-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+-s,@RANLIB@,$RANLIB,;t t
+-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+-s,@LIBOBJS@,$LIBOBJS,;t t
+-s,@CPP@,$CPP,;t t
+-s,@EGREP@,$EGREP,;t t
+-s,@JBIG2_INT32_T@,$JBIG2_INT32_T,;t t
+-s,@JBIG2_INT16_T@,$JBIG2_INT16_T,;t t
+-s,@JBIG2_INT8_T@,$JBIG2_INT8_T,;t t
+-s,@JBIG2_STDINT_H@,$JBIG2_STDINT_H,;t t
+-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+-CEOF
+-
+-_ACEOF
+-
+-  cat >>$CONFIG_STATUS <<\_ACEOF
+-  # Split the substitutions into bite-sized pieces for seds with
+-  # small command number limits, like on Digital OSF/1 and HP-UX.
+-  ac_max_sed_lines=48
+-  ac_sed_frag=1 # Number of current file.
+-  ac_beg=1 # First line for current file.
+-  ac_end=$ac_max_sed_lines # Line after last line for current file.
+-  ac_more_lines=:
+-  ac_sed_cmds=
+-  while $ac_more_lines; do
+-    if test $ac_beg -gt 1; then
+-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+-    else
+-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
+-    fi
+-    if test ! -s $tmp/subs.frag; then
+-      ac_more_lines=false
+-    else
+-      # The purpose of the label and of the branching condition is to
+-      # speed up the sed processing (if there are no `@' at all, there
+-      # is no need to browse any of the substitutions).
+-      # These are the two extra sed commands mentioned above.
+-      (echo ':t
+-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+-      if test -z "$ac_sed_cmds"; then
+-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+-      else
+-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+-      fi
+-      ac_sed_frag=`expr $ac_sed_frag + 1`
+-      ac_beg=$ac_end
+-      ac_end=`expr $ac_end + $ac_max_sed_lines`
+-    fi
+-  done
+-  if test -z "$ac_sed_cmds"; then
+-    ac_sed_cmds=cat
++  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
++  if test $ac_delim_n = $ac_delim_num; then
++    break
++  elif $ac_last_try; then
++    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
++$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+   fi
++done
++rm -f conf$$subs.sh
++
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
++_ACEOF
++sed -n '
++h
++s/^/S["/; s/!.*/"]=/
++p
++g
++s/^[^!]*!//
++:repl
++t repl
++s/'"$ac_delim"'$//
++t delim
++:nl
++h
++s/\(.\{148\}\).*/\1/
++t more1
++s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
++p
++n
++b repl
++:more1
++s/["\\]/\\&/g; s/^/"/; s/$/"\\/
++p
++g
++s/.\{148\}//
++t nl
++:delim
++h
++s/\(.\{148\}\).*/\1/
++t more2
++s/["\\]/\\&/g; s/^/"/; s/$/"/
++p
++b
++:more2
++s/["\\]/\\&/g; s/^/"/; s/$/"\\/
++p
++g
++s/.\{148\}//
++t delim
++' <conf$$subs.awk | sed '
++/^[^""]/{
++  N
++  s/\n//
++}
++' >>$CONFIG_STATUS || ac_write_fail=1
++rm -f conf$$subs.awk
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++_ACAWK
++cat >>"\$tmp/subs1.awk" <<_ACAWK &&
++  for (key in S) S_is_set[key] = 1
++  FS = ""
++
++}
++{
++  line = $ 0
++  nfields = split(line, field, "@")
++  substed = 0
++  len = length(field[1])
++  for (i = 2; i < nfields; i++) {
++    key = field[i]
++    keylen = length(key)
++    if (S_is_set[key]) {
++      value = S[key]
++      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
++      len += length(value) + length(field[++i])
++      substed = 1
++    } else
++      len += 1 + keylen
++  }
++
++  print line
++}
++
++_ACAWK
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
++  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
++else
++  cat
++fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
++  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
++$as_echo "$as_me: error: could not setup config files machinery" >&2;}
++   { (exit 1); exit 1; }; }
++_ACEOF
++
++# VPATH may cause trouble with some makes, so we remove $(srcdir),
++# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# trailing colons and then remove the whole line if VPATH becomes empty
++# (actually we leave an empty line to preserve line numbers).
++if test "x$srcdir" = x.; then
++  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
++s/:*\$(srcdir):*/:/
++s/:*\${srcdir}:*/:/
++s/:*@srcdir@:*/:/
++s/^\([^=]*=[	 ]*\):*/\1/
++s/:*$//
++s/^[^=]*=[	 ]*$//
++}'
++fi
++
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ fi # test -n "$CONFIG_FILES"
+ 
++# Set up the scripts for CONFIG_HEADERS section.
++# No need to generate them if there are no CONFIG_HEADERS.
++# This happens for instance with `./config.status Makefile'.
++if test -n "$CONFIG_HEADERS"; then
++cat >"$tmp/defines.awk" <<\_ACAWK ||
++BEGIN {
+ _ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
+-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+-  case $ac_file in
+-  - | *:- | *:-:* ) # input from stdin
+-	cat >$tmp/stdin
+-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  * )   ac_file_in=$ac_file.in ;;
++
++# Transform confdefs.h into an awk script `defines.awk', embedded as
++# here-document in config.status, that substitutes the proper values into
++# config.h.in to produce config.h.
++
++# Create a delimiter string that does not exist in confdefs.h, to ease
++# handling of long lines.
++ac_delim='%!_!# '
++for ac_last_try in false false :; do
++  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
++  if test -z "$ac_t"; then
++    break
++  elif $ac_last_try; then
++    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
++$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
++   { (exit 1); exit 1; }; }
++  else
++    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++  fi
++done
++
++# For the awk script, D is an array of macro values keyed by name,
++# likewise P contains macro parameters if any.  Preserve backslash
++# newline sequences.
++
++ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
++sed -n '
++s/.\{148\}/&'"$ac_delim"'/g
++t rset
++:rset
++s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
++t def
++d
++:def
++s/\\$//
++t bsnl
++s/["\\]/\\&/g
++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
++D["\1"]=" \3"/p
++s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
++d
++:bsnl
++s/["\\]/\\&/g
++s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
++D["\1"]=" \3\\\\\\n"\\/p
++t cont
++s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
++t cont
++d
++:cont
++n
++s/.\{148\}/&'"$ac_delim"'/g
++t clear
++:clear
++s/\\$//
++t bsnlc
++s/["\\]/\\&/g; s/^/"/; s/$/"/p
++d
++:bsnlc
++s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
++b cont
++' <confdefs.h | sed '
++s/'"$ac_delim"'/"\\\
++"/g' >>$CONFIG_STATUS || ac_write_fail=1
++
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++  for (key in D) D_is_set[key] = 1
++  FS = ""
++}
++/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
++  line = \$ 0
++  split(line, arg, " ")
++  if (arg[1] == "#") {
++    defundef = arg[2]
++    mac1 = arg[3]
++  } else {
++    defundef = substr(arg[1], 2)
++    mac1 = arg[2]
++  }
++  split(mac1, mac2, "(") #)
++  macro = mac2[1]
++  prefix = substr(line, 1, index(line, defundef) - 1)
++  if (D_is_set[macro]) {
++    # Preserve the white space surrounding the "#".
++    print prefix "define", macro P[macro] D[macro]
++    next
++  } else {
++    # Replace #undef with comments.  This is necessary, for example,
++    # in the case of _POSIX_SOURCE, which is predefined and required
++    # on some systems where configure will not decide to define it.
++    if (defundef == "undef") {
++      print "/*", prefix defundef, macro, "*/"
++      next
++    }
++  }
++}
++{ print }
++_ACAWK
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
++$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
++   { (exit 1); exit 1; }; }
++fi # test -n "$CONFIG_HEADERS"
++
++
++eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
++shift
++for ac_tag
++do
++  case $ac_tag in
++  :[FHLC]) ac_mode=$ac_tag; continue;;
++  esac
++  case $ac_mode$ac_tag in
++  :[FHL]*:*);;
++  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
++$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
++   { (exit 1); exit 1; }; };;
++  :[FH]-) ac_tag=-:-;;
++  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
++  esac
++  ac_save_IFS=$IFS
++  IFS=:
++  set x $ac_tag
++  IFS=$ac_save_IFS
++  shift
++  ac_file=$1
++  shift
++
++  case $ac_mode in
++  :L) ac_source=$1;;
++  :[FH])
++    ac_file_inputs=
++    for ac_f
++    do
++      case $ac_f in
++      -) ac_f="$tmp/stdin";;
++      *) # Look for the file first in the build tree, then in the source tree
++	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
++	 # because $ac_f cannot contain `:'.
++	 test -f "$ac_f" ||
++	   case $ac_f in
++	   [\\/$]*) false;;
++	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
++	   esac ||
++	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
++$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
++   { (exit 1); exit 1; }; };;
++      esac
++      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
++      ac_file_inputs="$ac_file_inputs '$ac_f'"
++    done
++
++    # Let's still pretend it is `configure' which instantiates (i.e., don't
++    # use $as_me), people would be surprised to read:
++    #    /* config.h.  Generated by config.status.  */
++    configure_input='Generated from '`
++	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
++	`' by configure.'
++    if test x"$ac_file" != x-; then
++      configure_input="$ac_file.  $configure_input"
++      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
++$as_echo "$as_me: creating $ac_file" >&6;}
++    fi
++    # Neutralize special characters interpreted by sed in replacement strings.
++    case $configure_input in #(
++    *\&* | *\|* | *\\* )
++       ac_sed_conf_input=`$as_echo "$configure_input" |
++       sed 's/[\\\\&|]/\\\\&/g'`;; #(
++    *) ac_sed_conf_input=$configure_input;;
++    esac
++
++    case $ac_tag in
++    *:-:* | *:-) cat >"$tmp/stdin" \
++      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
++$as_echo "$as_me: error: could not create $ac_file" >&2;}
++   { (exit 1); exit 1; }; } ;;
++    esac
++    ;;
+   esac
+ 
+-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
++  ac_dir=`$as_dirname -- "$ac_file" ||
+ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$ac_file" : 'X\(//\)[^/]' \| \
+ 	 X"$ac_file" : 'X\(//\)$' \| \
+-	 X"$ac_file" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$ac_file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-  { if $as_mkdir_p; then
+-    mkdir -p "$ac_dir"
+-  else
+-    as_dir="$ac_dir"
++	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$ac_file" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++  { as_dir="$ac_dir"
++  case $as_dir in #(
++  -*) as_dir=./$as_dir;;
++  esac
++  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+     as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++    while :; do
++      case $as_dir in #(
++      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
++      *) as_qdir=$as_dir;;
++      esac
++      as_dirs="'$as_qdir' $as_dirs"
++      as_dir=`$as_dirname -- "$as_dir" ||
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$as_dir" : 'X\(//\)[^/]' \| \
+ 	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++      test -d "$as_dir" && break
+     done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++    test -z "$as_dirs" || eval "mkdir $as_dirs"
++  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+    { (exit 1); exit 1; }; }; }
+-
+   ac_builddir=.
+ 
+-if test "$ac_dir" != .; then
+-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
++case "$ac_dir" in
++.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
++*)
++  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
++  # A ".." for each directory in $ac_dir_suffix.
++  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
++  case $ac_top_builddir_sub in
++  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
++  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
++  esac ;;
++esac
++ac_abs_top_builddir=$ac_pwd
++ac_abs_builddir=$ac_pwd$ac_dir_suffix
++# for backward compatibility:
++ac_top_builddir=$ac_top_build_prefix
+ 
+ case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
++  .)  # We are building in place.
+     ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_top_srcdir=$ac_top_builddir_sub
++    ac_abs_top_srcdir=$ac_pwd ;;
++  [\\/]* | ?:[\\/]* )  # Absolute name.
+     ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
++    ac_top_srcdir=$srcdir
++    ac_abs_top_srcdir=$srcdir ;;
++  *) # Relative name.
++    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_build_prefix$srcdir
++    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+ esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+ 
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+-  case "$ac_dir" in
+-  .) ac_abs_builddir=`pwd`;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+-  case ${ac_top_builddir}. in
+-  .) ac_abs_top_builddir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+-  case $ac_srcdir in
+-  .) ac_abs_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+-  case $ac_top_srcdir in
+-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+-  esac;;
+-esac
+ 
++  case $ac_mode in
++  :F)
++  #
++  # CONFIG_FILE
++  #
+ 
+   case $INSTALL in
+   [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
++  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+   esac
++  ac_MKDIR_P=$MKDIR_P
++  case $MKDIR_P in
++  [\\/$]* | ?:[\\/]* ) ;;
++  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
++  esac
++_ACEOF
+ 
+-  if test x"$ac_file" != x-; then
+-    { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-    rm -f "$ac_file"
+-  fi
+-  # Let's still pretend it is `configure' which instantiates (i.e., don't
+-  # use $as_me), people would be surprised to read:
+-  #    /* config.h.  Generated by config.status.  */
+-  if test x"$ac_file" = x-; then
+-    configure_input=
+-  else
+-    configure_input="$ac_file.  "
+-  fi
+-  configure_input=$configure_input"Generated from `echo $ac_file_in |
+-				     sed 's,.*/,,'` by configure."
+-
+-  # First look for the input files in the build tree, otherwise in the
+-  # src tree.
+-  ac_file_inputs=`IFS=:
+-    for f in $ac_file_in; do
+-      case $f in
+-      -) echo $tmp/stdin ;;
+-      [\\/$]*)
+-	 # Absolute (can't be DOS-style, as IFS=:)
+-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 echo "$f";;
+-      *) # Relative
+-	 if test -f "$f"; then
+-	   # Build tree
+-	   echo "$f"
+-	 elif test -f "$srcdir/$f"; then
+-	   # Source tree
+-	   echo "$srcdir/$f"
+-	 else
+-	   # /dev/null tree
+-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 fi;;
+-      esac
+-    done` || { (exit 1); exit 1; }
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++# If the template does not know about datarootdir, expand it.
++# FIXME: This hack should be removed a few years after 2.60.
++ac_datarootdir_hack=; ac_datarootdir_seen=
++
++ac_sed_dataroot='
++/datarootdir/ {
++  p
++  q
++}
++/@datadir@/p
++/@docdir@/p
++/@infodir@/p
++/@localedir@/p
++/@mandir@/p
++'
++case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
++*datarootdir*) ac_datarootdir_seen=yes;;
++*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
++  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
++$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++  ac_datarootdir_hack='
++  s&@datadir@&$datadir&g
++  s&@docdir@&$docdir&g
++  s&@infodir@&$infodir&g
++  s&@localedir@&$localedir&g
++  s&@mandir@&$mandir&g
++    s&\\\${datarootdir}&$datarootdir&g' ;;
++esac
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF
+-  sed "$ac_vpsub
++
++# Neutralize VPATH when `$srcdir' = `.'.
++# Shell code in configure.ac might set extrasub.
++# FIXME: do we really want to maintain this feature?
++cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_sed_extra="$ac_vpsub
+ $extrasub
+ _ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ :t
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+-s,@configure_input@,$configure_input,;t t
+-s,@srcdir@,$ac_srcdir,;t t
+-s,@abs_srcdir@,$ac_abs_srcdir,;t t
+-s,@top_srcdir@,$ac_top_srcdir,;t t
+-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
+-s,@builddir@,$ac_builddir,;t t
+-s,@abs_builddir@,$ac_abs_builddir,;t t
+-s,@top_builddir@,$ac_top_builddir,;t t
+-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
+-s,@INSTALL@,$ac_INSTALL,;t t
+-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
+-  rm -f $tmp/stdin
+-  if test x"$ac_file" != x-; then
+-    mv $tmp/out $ac_file
+-  else
+-    cat $tmp/out
+-    rm -f $tmp/out
+-  fi
++s|@configure_input@|$ac_sed_conf_input|;t t
++s&@top_builddir@&$ac_top_builddir_sub&;t t
++s&@top_build_prefix@&$ac_top_build_prefix&;t t
++s&@srcdir@&$ac_srcdir&;t t
++s&@abs_srcdir@&$ac_abs_srcdir&;t t
++s&@top_srcdir@&$ac_top_srcdir&;t t
++s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
++s&@builddir@&$ac_builddir&;t t
++s&@abs_builddir@&$ac_abs_builddir&;t t
++s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
++s&@INSTALL@&$ac_INSTALL&;t t
++s&@MKDIR_P@&$ac_MKDIR_P&;t t
++$ac_datarootdir_hack
++"
++eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
++  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
++$as_echo "$as_me: error: could not create $ac_file" >&2;}
++   { (exit 1); exit 1; }; }
+ 
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
++test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
++  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
++  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
++  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++which seems to be undefined.  Please make sure it is defined." >&5
++$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++which seems to be undefined.  Please make sure it is defined." >&2;}
+ 
+-#
+-# CONFIG_HEADER section.
+-#
+-
+-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+-# NAME is the cpp macro being defined and VALUE is the value it is being given.
+-#
+-# ac_d sets the value in "#define NAME VALUE" lines.
+-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
+-ac_dB='[	 ].*$,\1#\2'
+-ac_dC=' '
+-ac_dD=',;t'
+-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
+-ac_uB='$,\1#\2define\3'
+-ac_uC=' '
+-ac_uD=',;t'
+-
+-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
+-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  rm -f "$tmp/stdin"
+   case $ac_file in
+-  - | *:- | *:-:* ) # input from stdin
+-	cat >$tmp/stdin
+-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+-  * )   ac_file_in=$ac_file.in ;;
+-  esac
+-
+-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
+-echo "$as_me: creating $ac_file" >&6;}
+-
+-  # First look for the input files in the build tree, otherwise in the
+-  # src tree.
+-  ac_file_inputs=`IFS=:
+-    for f in $ac_file_in; do
+-      case $f in
+-      -) echo $tmp/stdin ;;
+-      [\\/$]*)
+-	 # Absolute (can't be DOS-style, as IFS=:)
+-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
+-   { (exit 1); exit 1; }; }
+-	 # Do quote $f, to prevent DOS paths from being IFS'd.
+-	 echo "$f";;
+-      *) # Relative
+-	 if test -f "$f"; then
+-	   # Build tree
+-	   echo "$f"
+-	 elif test -f "$srcdir/$f"; then
+-	   # Source tree
+-	   echo "$srcdir/$f"
+-	 else
+-	   # /dev/null tree
+-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+-echo "$as_me: error: cannot find input file: $f" >&2;}
++  -) cat "$tmp/out" && rm -f "$tmp/out";;
++  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
++  esac \
++  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
++$as_echo "$as_me: error: could not create $ac_file" >&2;}
+    { (exit 1); exit 1; }; }
+-	 fi;;
+-      esac
+-    done` || { (exit 1); exit 1; }
+-  # Remove the trailing spaces.
+-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
+-
+-_ACEOF
+-
+-# Transform confdefs.h into two sed scripts, `conftest.defines' and
+-# `conftest.undefs', that substitutes the proper values into
+-# config.h.in to produce config.h.  The first handles `#define'
+-# templates, and the second `#undef' templates.
+-# And first: Protect against being on the right side of a sed subst in
+-# config.status.  Protect against being in an unquoted here document
+-# in config.status.
+-rm -f conftest.defines conftest.undefs
+-# Using a here document instead of a string reduces the quoting nightmare.
+-# Putting comments in sed scripts is not portable.
+-#
+-# `end' is used to avoid that the second main sed command (meant for
+-# 0-ary CPP macros) applies to n-ary macro definitions.
+-# See the Autoconf documentation for `clear'.
+-cat >confdef2sed.sed <<\_ACEOF
+-s/[\\&,]/\\&/g
+-s,[\\$`],\\&,g
+-t clear
+-: clear
+-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+-t end
+-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+-: end
+-_ACEOF
+-# If some macros were called several times there might be several times
+-# the same #defines, which is useless.  Nevertheless, we may not want to
+-# sort them, since we want the *last* AC-DEFINE to be honored.
+-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
+-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
+-rm -f confdef2sed.sed
+-
+-# This sed command replaces #undef with comments.  This is necessary, for
+-# example, in the case of _POSIX_SOURCE, which is predefined and required
+-# on some systems where configure will not decide to define it.
+-cat >>conftest.undefs <<\_ACEOF
+-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+-_ACEOF
+-
+-# Break up conftest.defines because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+-echo '  :' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.defines >/dev/null
+-do
+-  # Write a limited-size here document to $tmp/defines.sed.
+-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+-  # Speed up: don't consider the non `#define' lines.
+-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
+-  # Work around the forget-to-reset-the-flag bug.
+-  echo 't clr' >>$CONFIG_STATUS
+-  echo ': clr' >>$CONFIG_STATUS
+-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
+-  echo 'CEOF
+-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
+-  rm -f $tmp/in
+-  mv $tmp/out $tmp/in
+-' >>$CONFIG_STATUS
+-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
+-  rm -f conftest.defines
+-  mv conftest.tail conftest.defines
+-done
+-rm -f conftest.defines
+-echo '  fi # grep' >>$CONFIG_STATUS
+-echo >>$CONFIG_STATUS
+-
+-# Break up conftest.undefs because some shells have a limit on the size
+-# of here documents, and old seds have small limits too (100 cmds).
+-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
+-rm -f conftest.tail
+-while grep . conftest.undefs >/dev/null
+-do
+-  # Write a limited-size here document to $tmp/undefs.sed.
+-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
+-  # Speed up: don't consider the non `#undef'
+-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
+-  # Work around the forget-to-reset-the-flag bug.
+-  echo 't clr' >>$CONFIG_STATUS
+-  echo ': clr' >>$CONFIG_STATUS
+-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
+-  echo 'CEOF
+-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
+-  rm -f $tmp/in
+-  mv $tmp/out $tmp/in
+-' >>$CONFIG_STATUS
+-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
+-  rm -f conftest.undefs
+-  mv conftest.tail conftest.undefs
+-done
+-rm -f conftest.undefs
+-
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-  # Let's still pretend it is `configure' which instantiates (i.e., don't
+-  # use $as_me), people would be surprised to read:
+-  #    /* config.h.  Generated by config.status.  */
+-  if test x"$ac_file" = x-; then
+-    echo "/* Generated by configure.  */" >$tmp/config.h
+-  else
+-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
+-  fi
+-  cat $tmp/in >>$tmp/config.h
+-  rm -f $tmp/in
++ ;;
++  :H)
++  #
++  # CONFIG_HEADER
++  #
+   if test x"$ac_file" != x-; then
+-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
+-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+-echo "$as_me: $ac_file is unchanged" >&6;}
++    {
++      $as_echo "/* $configure_input  */" \
++      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
++    } >"$tmp/config.h" \
++      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
++$as_echo "$as_me: error: could not create $ac_file" >&2;}
++   { (exit 1); exit 1; }; }
++    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
++      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
++$as_echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$ac_file" : 'X\(//\)[^/]' \| \
+-	 X"$ac_file" : 'X\(//\)$' \| \
+-	 X"$ac_file" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$ac_file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-      { if $as_mkdir_p; then
+-    mkdir -p "$ac_dir"
+-  else
+-    as_dir="$ac_dir"
+-    as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$as_dir" : 'X\(//\)[^/]' \| \
+-	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-    done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+-   { (exit 1); exit 1; }; }; }
+-
+-      rm -f $ac_file
+-      mv $tmp/config.h $ac_file
++      rm -f "$ac_file"
++      mv "$tmp/config.h" "$ac_file" \
++	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
++$as_echo "$as_me: error: could not create $ac_file" >&2;}
++   { (exit 1); exit 1; }; }
+     fi
+   else
+-    cat $tmp/config.h
+-    rm -f $tmp/config.h
++    $as_echo "/* $configure_input  */" \
++      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
++      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
++$as_echo "$as_me: error: could not create -" >&2;}
++   { (exit 1); exit 1; }; }
+   fi
+-# Compute $ac_file's index in $config_headers.
++# Compute "$ac_file"'s index in $config_headers.
++_am_arg="$ac_file"
+ _am_stamp_count=1
+ for _am_header in $config_headers :; do
+   case $_am_header in
+-    $ac_file | $ac_file:* )
++    $_am_arg | $_am_arg:* )
+       break ;;
+     * )
+       _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+   esac
+ done
+-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
+-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X$ac_file : 'X\(//\)[^/]' \| \
+-	 X$ac_file : 'X\(//\)$' \| \
+-	 X$ac_file : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X$ac_file |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
+-done
+-_ACEOF
+-cat >>$CONFIG_STATUS <<\_ACEOF
+-
+-#
+-# CONFIG_COMMANDS section.
+-#
+-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
+-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
+-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
+-	 X"$ac_dest" : 'X\(//\)$' \| \
+-	 X"$ac_dest" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$ac_dest" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-  { if $as_mkdir_p; then
+-    mkdir -p "$ac_dir"
+-  else
+-    as_dir="$ac_dir"
+-    as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
+-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-	 X"$as_dir" : 'X\(//\)[^/]' \| \
+-	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-    done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+-   { (exit 1); exit 1; }; }; }
+-
+-  ac_builddir=.
+-
+-if test "$ac_dir" != .; then
+-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+-  # A "../" for each directory in $ac_dir_suffix.
+-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+-else
+-  ac_dir_suffix= ac_top_builddir=
+-fi
+-
+-case $srcdir in
+-  .)  # No --srcdir option.  We are building in place.
+-    ac_srcdir=.
+-    if test -z "$ac_top_builddir"; then
+-       ac_top_srcdir=.
+-    else
+-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+-    fi ;;
+-  [\\/]* | ?:[\\/]* )  # Absolute path.
+-    ac_srcdir=$srcdir$ac_dir_suffix;
+-    ac_top_srcdir=$srcdir ;;
+-  *) # Relative path.
+-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
+-esac
++echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
++$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$_am_arg" : 'X\(//\)[^/]' \| \
++	 X"$_am_arg" : 'X\(//\)$' \| \
++	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$_am_arg" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`/stamp-h$_am_stamp_count
++ ;;
+ 
+-# Do not use `cd foo && pwd` to compute absolute paths, because
+-# the directories may not exist.
+-case `pwd` in
+-.) ac_abs_builddir="$ac_dir";;
+-*)
+-  case "$ac_dir" in
+-  .) ac_abs_builddir=`pwd`;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
+-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_builddir=${ac_top_builddir}.;;
+-*)
+-  case ${ac_top_builddir}. in
+-  .) ac_abs_top_builddir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
+-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_srcdir=$ac_srcdir;;
+-*)
+-  case $ac_srcdir in
+-  .) ac_abs_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
+-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
+-  esac;;
+-esac
+-case $ac_abs_builddir in
+-.) ac_abs_top_srcdir=$ac_top_srcdir;;
+-*)
+-  case $ac_top_srcdir in
+-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
+-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
+-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
+-  esac;;
+-esac
++  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
++$as_echo "$as_me: executing $ac_file commands" >&6;}
++ ;;
++  esac
+ 
+ 
+-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+-echo "$as_me: executing $ac_dest commands" >&6;}
+-  case $ac_dest in
+-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+-  # Strip MF so we end up with the name of the file.
+-  mf=`echo "$mf" | sed -e 's/:.*$//'`
+-  # Check whether this is an Automake generated Makefile or not.
+-  # We used to match only the files named `Makefile.in', but
+-  # some people rename them; so instead we look at the file content.
+-  # Grep'ing the first line is not enough: some people post-process
+-  # each Makefile.in and add a new line on top of each file to say so.
+-  # So let's grep whole file.
+-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+-    dirpart=`(dirname "$mf") 2>/dev/null ||
++  case $ac_file$ac_mode in
++    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
++  # Autoconf 2.62 quotes --file arguments for eval, but not when files
++  # are listed without --file.  Let's play safe and only enable the eval
++  # if we detect the quoting.
++  case $CONFIG_FILES in
++  *\'*) eval set x "$CONFIG_FILES" ;;
++  *)   set x $CONFIG_FILES ;;
++  esac
++  shift
++  for mf
++  do
++    # Strip MF so we end up with the name of the file.
++    mf=`echo "$mf" | sed -e 's/:.*$//'`
++    # Check whether this is an Automake generated Makefile or not.
++    # We used to match only the files named `Makefile.in', but
++    # some people rename them; so instead we look at the file content.
++    # Grep'ing the first line is not enough: some people post-process
++    # each Makefile.in and add a new line on top of each file to say so.
++    # Grep'ing the whole file is not good either: AIX grep has a line
++    # limit of 2048, but all sed's we know have understand at least 4000.
++    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++      dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$mf" : 'X\(//\)[^/]' \| \
+ 	 X"$mf" : 'X\(//\)$' \| \
+-	 X"$mf" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$mf" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-  else
+-    continue
+-  fi
+-  # Extract the definition of DEPDIR, am__include, and am__quote
+-  # from the Makefile without running `make'.
+-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+-  test -z "$DEPDIR" && continue
+-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
+-  test -z "am__include" && continue
+-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+-  # When using ansi2knr, U may be empty or an underscore; expand it
+-  U=`sed -n 's/^U = //p' < "$mf"`
+-  # Find all dependency output files, they are included files with
+-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
+-  # simplest approach to changing $(DEPDIR) to its actual value in the
+-  # expansion.
+-  for file in `sed -n "
+-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+-    # Make sure the directory exists.
+-    test -f "$dirpart/$file" && continue
+-    fdir=`(dirname "$file") 2>/dev/null ||
++	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$mf" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++    else
++      continue
++    fi
++    # Extract the definition of DEPDIR, am__include, and am__quote
++    # from the Makefile without running `make'.
++    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++    test -z "$DEPDIR" && continue
++    am__include=`sed -n 's/^am__include = //p' < "$mf"`
++    test -z "am__include" && continue
++    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++    # When using ansi2knr, U may be empty or an underscore; expand it
++    U=`sed -n 's/^U = //p' < "$mf"`
++    # Find all dependency output files, they are included files with
++    # $(DEPDIR) in their names.  We invoke sed twice because it is the
++    # simplest approach to changing $(DEPDIR) to its actual value in the
++    # expansion.
++    for file in `sed -n "
++      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++      # Make sure the directory exists.
++      test -f "$dirpart/$file" && continue
++      fdir=`$as_dirname -- "$file" ||
+ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$file" : 'X\(//\)[^/]' \| \
+ 	 X"$file" : 'X\(//\)$' \| \
+-	 X"$file" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$file" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
+-    { if $as_mkdir_p; then
+-    mkdir -p $dirpart/$fdir
+-  else
+-    as_dir=$dirpart/$fdir
++	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$file" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++      { as_dir=$dirpart/$fdir
++  case $as_dir in #(
++  -*) as_dir=./$as_dir;;
++  esac
++  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
+     as_dirs=
+-    while test ! -d "$as_dir"; do
+-      as_dirs="$as_dir $as_dirs"
+-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++    while :; do
++      case $as_dir in #(
++      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
++      *) as_qdir=$as_dir;;
++      esac
++      as_dirs="'$as_qdir' $as_dirs"
++      as_dir=`$as_dirname -- "$as_dir" ||
+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ 	 X"$as_dir" : 'X\(//\)[^/]' \| \
+ 	 X"$as_dir" : 'X\(//\)$' \| \
+-	 X"$as_dir" : 'X\(/\)' \| \
+-	 .     : '\(.\)' 2>/dev/null ||
+-echo X"$as_dir" |
+-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+-  	  /^X\(\/\/\)$/{ s//\1/; q; }
+-  	  /^X\(\/\).*/{ s//\1/; q; }
+-  	  s/.*/./; q'`
++	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)[^/].*/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
++      test -d "$as_dir" && break
+     done
+-    test ! -n "$as_dirs" || mkdir $as_dirs
+-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
+-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
++    test -z "$as_dirs" || eval "mkdir $as_dirs"
++  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
++$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+    { (exit 1); exit 1; }; }; }
+-
+-    # echo "creating $dirpart/$file"
+-    echo '# dummy' > "$dirpart/$file"
++      # echo "creating $dirpart/$file"
++      echo '# dummy' > "$dirpart/$file"
++    done
+   done
+-done
++}
+  ;;
++
+   esac
+-done
+-_ACEOF
++done # for ac_tag
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF
+ 
+ { (exit 0); exit 0; }
+ _ACEOF
+ chmod +x $CONFIG_STATUS
+ ac_clean_files=$ac_clean_files_save
+ 
++test $ac_write_fail = 0 ||
++  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
++$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
++   { (exit 1); exit 1; }; }
++
+ 
+ # configure is writing to config.log, and then calls config.status.
+ # config.status does its own redirection, appending to config.log.
+@@ -8024,4 +8864,8 @@ if test "$no_create" != yes; then
+   # would make configure fail if this is the last instruction.
+   $ac_cs_success || { (exit 1); exit 1; }
+ fi
++if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
++  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
++$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
++fi
+ 
+diff --git a/jbig2dec/configure.ac b/jbig2dec/configure.ac
+--- a/jbig2dec/configure.ac
++++ b/jbig2dec/configure.ac
+@@ -1,16 +1,15 @@
+ # Process this file with autoconf to produce a configure script.
+ 
+-AC_INIT([jbig2dec], [0.9pre], [jbig2-dev@ghostscript.com])
++AC_INIT([jbig2dec], [0.10], [jbig2-dev@ghostscript.com])
+ AC_PREREQ(2.53)
+ AC_CONFIG_SRCDIR([jbig2dec.c])
+ 
+ AM_INIT_AUTOMAKE([-Wall])
+ AM_CONFIG_HEADER(config.h)
+ 
+-dnl AC_REVISION([$Rev: 8022 $])
+-
+ # Checks for programs.
+ AC_PROG_CC
++AM_PROG_CC_C_O
+ AC_PROG_RANLIB
+ 
+ # platform specific compiler flags
+diff --git a/jbig2dec/depcomp b/jbig2dec/depcomp
+--- a/jbig2dec/depcomp
++++ b/jbig2dec/depcomp
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+ 
+-scriptversion=2005-02-09.22
++scriptversion=2007-03-29.01
+ 
+-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
++# Foundation, Inc.
+ 
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -17,8 +18,8 @@ scriptversion=2005-02-09.22
+ 
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ 
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -91,7 +92,20 @@ gcc3)
+ ## gcc 3 implements dependency tracking that does exactly what
+ ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+ ## it if -MD -MP comes after the -MF stuff.  Hmm.
+-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
++## Unfortunately, FreeBSD c89 acceptance of flags depends upon
++## the command line argument order; so add the flags where they
++## appear in depend2.am.  Note that the slowdown incurred here
++## affects only configure: in makefiles, %FASTDEP% shortcuts this.
++  for arg
++  do
++    case $arg in
++    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
++    *)  set fnord "$@" "$arg" ;;
++    esac
++    shift # fnord
++    shift # $arg
++  done
++  "$@"
+   stat=$?
+   if test $stat -eq 0; then :
+   else
+@@ -201,34 +215,39 @@ aix)
+   # current directory.  Also, the AIX compiler puts `$object:' at the
+   # start of each line; $object doesn't have directory information.
+   # Version 6 uses the directory in both cases.
+-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
+-  tmpdepfile="$stripped.u"
++  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++  test "x$dir" = "x$object" && dir=
++  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+   if test "$libtool" = yes; then
++    tmpdepfile1=$dir$base.u
++    tmpdepfile2=$base.u
++    tmpdepfile3=$dir.libs/$base.u
+     "$@" -Wc,-M
+   else
++    tmpdepfile1=$dir$base.u
++    tmpdepfile2=$dir$base.u
++    tmpdepfile3=$dir$base.u
+     "$@" -M
+   fi
+   stat=$?
+ 
+-  if test -f "$tmpdepfile"; then :
+-  else
+-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
+-    tmpdepfile="$stripped.u"
+-  fi
+-
+   if test $stat -eq 0; then :
+   else
+-    rm -f "$tmpdepfile"
++    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+     exit $stat
+   fi
+ 
++  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
++  do
++    test -f "$tmpdepfile" && break
++  done
+   if test -f "$tmpdepfile"; then
+-    outname="$stripped.o"
+     # Each line is of the form `foo.o: dependent.h'.
+     # Do two passes, one to just change these to
+     # `$object: dependent.h' and one to simply `dependent.h:'.
+-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
+-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
++    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
++    # That's a tab and a space in the [].
++    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+   else
+     # The sourcefile does not contain any dependencies, so just
+     # store a dummy comment line, to avoid errors with the Makefile
+@@ -276,6 +295,46 @@ icc)
+   rm -f "$tmpdepfile"
+   ;;
+ 
++hp2)
++  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
++  # compilers, which have integrated preprocessors.  The correct option
++  # to use with these is +Maked; it writes dependencies to a file named
++  # 'foo.d', which lands next to the object file, wherever that
++  # happens to be.
++  # Much of this is similar to the tru64 case; see comments there.
++  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++  test "x$dir" = "x$object" && dir=
++  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
++  if test "$libtool" = yes; then
++    tmpdepfile1=$dir$base.d
++    tmpdepfile2=$dir.libs/$base.d
++    "$@" -Wc,+Maked
++  else
++    tmpdepfile1=$dir$base.d
++    tmpdepfile2=$dir$base.d
++    "$@" +Maked
++  fi
++  stat=$?
++  if test $stat -eq 0; then :
++  else
++     rm -f "$tmpdepfile1" "$tmpdepfile2"
++     exit $stat
++  fi
++
++  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
++  do
++    test -f "$tmpdepfile" && break
++  done
++  if test -f "$tmpdepfile"; then
++    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
++    # Add `dependent.h:' lines.
++    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
++  else
++    echo "#dummy" > "$depfile"
++  fi
++  rm -f "$tmpdepfile" "$tmpdepfile2"
++  ;;
++
+ tru64)
+    # The Tru64 compiler uses -MD to generate dependencies as a side
+    # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+@@ -288,13 +347,13 @@ tru64)
+ 
+    if test "$libtool" = yes; then
+       # With Tru64 cc, shared objects can also be used to make a
+-      # static library.  This mecanism is used in libtool 1.4 series to
++      # static library.  This mechanism is used in libtool 1.4 series to
+       # handle both shared and static libraries in a single compilation.
+       # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+       #
+       # With libtool 1.5 this exception was removed, and libtool now
+       # generates 2 separate objects for the 2 libraries.  These two
+-      # compilations output dependencies in in $dir.libs/$base.o.d and
++      # compilations output dependencies in $dir.libs/$base.o.d and
+       # in $dir$base.o.d.  We have to check for both files, because
+       # one of the two compilations can be disabled.  We should prefer
+       # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+@@ -467,7 +526,8 @@ cpp)
+   done
+ 
+   "$@" -E |
+-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
++    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
++       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+     sed '$ s: \\$::' > "$tmpdepfile"
+   rm -f "$depfile"
+   echo "$object : \\" > "$depfile"
+diff --git a/jbig2dec/install-sh b/jbig2dec/install-sh
+--- a/jbig2dec/install-sh
++++ b/jbig2dec/install-sh
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # install - install a program, script, or datafile
+ 
+-scriptversion=2005-02-02.21
++scriptversion=2006-12-25.00
+ 
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
+@@ -39,38 +39,68 @@ scriptversion=2005-02-02.21
+ # when there is no Makefile.
+ #
+ # This script is compatible with the BSD install script, but was written
+-# from scratch.  It can only install one file at a time, a restriction
+-# shared with many OS's install programs.
++# from scratch.
++
++nl='
++'
++IFS=" ""	$nl"
+ 
+ # set DOITPROG to echo to test this script
+ 
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+-doit="${DOITPROG-}"
++doit=${DOITPROG-}
++if test -z "$doit"; then
++  doit_exec=exec
++else
++  doit_exec=$doit
++fi
+ 
+-# put in absolute paths if you don't have them in your path; or use env. vars.
++# Put in absolute file names if you don't have them in your path;
++# or use environment vars.
++
++chgrpprog=${CHGRPPROG-chgrp}
++chmodprog=${CHMODPROG-chmod}
++chownprog=${CHOWNPROG-chown}
++cmpprog=${CMPPROG-cmp}
++cpprog=${CPPROG-cp}
++mkdirprog=${MKDIRPROG-mkdir}
++mvprog=${MVPROG-mv}
++rmprog=${RMPROG-rm}
++stripprog=${STRIPPROG-strip}
++
++posix_glob='?'
++initialize_posix_glob='
++  test "$posix_glob" != "?" || {
++    if (set -f) 2>/dev/null; then
++      posix_glob=
++    else
++      posix_glob=:
++    fi
++  }
++'
+ 
+-mvprog="${MVPROG-mv}"
+-cpprog="${CPPROG-cp}"
+-chmodprog="${CHMODPROG-chmod}"
+-chownprog="${CHOWNPROG-chown}"
+-chgrpprog="${CHGRPPROG-chgrp}"
+-stripprog="${STRIPPROG-strip}"
+-rmprog="${RMPROG-rm}"
+-mkdirprog="${MKDIRPROG-mkdir}"
++posix_mkdir=
++
++# Desired mode of installed file.
++mode=0755
+ 
+-chmodcmd="$chmodprog 0755"
+-chowncmd=
+ chgrpcmd=
+-stripcmd=
++chmodcmd=$chmodprog
++chowncmd=
++mvcmd=$mvprog
+ rmcmd="$rmprog -f"
+-mvcmd="$mvprog"
++stripcmd=
++
+ src=
+ dst=
+ dir_arg=
+-dstarg=
++dst_arg=
++
++copy_on_change=false
+ no_target_directory=
+ 
+-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++usage="\
++Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+    or: $0 [OPTION]... SRCFILES... DIRECTORY
+    or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+    or: $0 [OPTION]... -d DIRECTORIES...
+@@ -80,81 +110,86 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+ In the 4th, create DIRECTORIES.
+ 
+ Options:
+--c         (ignored)
+--d         create directories instead of installing files.
+--g GROUP   $chgrpprog installed files to GROUP.
+--m MODE    $chmodprog installed files to MODE.
+--o USER    $chownprog installed files to USER.
+--s         $stripprog installed files.
+--t DIRECTORY  install into DIRECTORY.
+--T         report an error if DSTFILE is a directory.
+---help     display this help and exit.
+---version  display version info and exit.
++     --help     display this help and exit.
++     --version  display version info and exit.
++
++  -c            (ignored)
++  -C            install only if different (preserve the last data modification time)
++  -d            create directories instead of installing files.
++  -g GROUP      $chgrpprog installed files to GROUP.
++  -m MODE       $chmodprog installed files to MODE.
++  -o USER       $chownprog installed files to USER.
++  -s            $stripprog installed files.
++  -t DIRECTORY  install into DIRECTORY.
++  -T            report an error if DSTFILE is a directory.
+ 
+ Environment variables override the default commands:
+-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
++  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
++  RMPROG STRIPPROG
+ "
+ 
+-while test -n "$1"; do
++while test $# -ne 0; do
+   case $1 in
+-    -c) shift
+-        continue;;
++    -c) ;;
++
++    -C) copy_on_change=true;;
+ 
+-    -d) dir_arg=true
+-        shift
+-        continue;;
++    -d) dir_arg=true;;
+ 
+     -g) chgrpcmd="$chgrpprog $2"
+-        shift
+-        shift
+-        continue;;
++	shift;;
+ 
+     --help) echo "$usage"; exit $?;;
+ 
+-    -m) chmodcmd="$chmodprog $2"
+-        shift
+-        shift
+-        continue;;
++    -m) mode=$2
++	case $mode in
++	  *' '* | *'	'* | *'
++'*	  | *'*'* | *'?'* | *'['*)
++	    echo "$0: invalid mode: $mode" >&2
++	    exit 1;;
++	esac
++	shift;;
+ 
+     -o) chowncmd="$chownprog $2"
+-        shift
+-        shift
+-        continue;;
++	shift;;
+ 
+-    -s) stripcmd=$stripprog
+-        shift
+-        continue;;
++    -s) stripcmd=$stripprog;;
+ 
+-    -t) dstarg=$2
+-	shift
+-	shift
+-	continue;;
++    -t) dst_arg=$2
++	shift;;
+ 
+-    -T) no_target_directory=true
+-	shift
+-	continue;;
++    -T) no_target_directory=true;;
+ 
+     --version) echo "$0 $scriptversion"; exit $?;;
+ 
+-    *)  # When -d is used, all remaining arguments are directories to create.
+-	# When -t is used, the destination is already specified.
+-	test -n "$dir_arg$dstarg" && break
+-        # Otherwise, the last argument is the destination.  Remove it from $@.
+-	for arg
+-	do
+-          if test -n "$dstarg"; then
+-	    # $@ is not empty: it contains at least $arg.
+-	    set fnord "$@" "$dstarg"
+-	    shift # fnord
+-	  fi
+-	  shift # arg
+-	  dstarg=$arg
+-	done
++    --)	shift
+ 	break;;
++
++    -*)	echo "$0: invalid option: $1" >&2
++	exit 1;;
++
++    *)  break;;
+   esac
++  shift
+ done
+ 
+-if test -z "$1"; then
++if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
++  # When -d is used, all remaining arguments are directories to create.
++  # When -t is used, the destination is already specified.
++  # Otherwise, the last argument is the destination.  Remove it from $@.
++  for arg
++  do
++    if test -n "$dst_arg"; then
++      # $@ is not empty: it contains at least $arg.
++      set fnord "$@" "$dst_arg"
++      shift # fnord
++    fi
++    shift # arg
++    dst_arg=$arg
++  done
++fi
++
++if test $# -eq 0; then
+   if test -z "$dir_arg"; then
+     echo "$0: no input file specified." >&2
+     exit 1
+@@ -164,24 +199,47 @@ if test -z "$1"; then
+   exit 0
+ fi
+ 
++if test -z "$dir_arg"; then
++  trap '(exit $?); exit' 1 2 13 15
++
++  # Set umask so as not to create temps with too-generous modes.
++  # However, 'strip' requires both read and write access to temps.
++  case $mode in
++    # Optimize common cases.
++    *644) cp_umask=133;;
++    *755) cp_umask=22;;
++
++    *[0-7])
++      if test -z "$stripcmd"; then
++	u_plus_rw=
++      else
++	u_plus_rw='% 200'
++      fi
++      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
++    *)
++      if test -z "$stripcmd"; then
++	u_plus_rw=
++      else
++	u_plus_rw=,u+rw
++      fi
++      cp_umask=$mode$u_plus_rw;;
++  esac
++fi
++
+ for src
+ do
+   # Protect names starting with `-'.
+   case $src in
+-    -*) src=./$src ;;
++    -*) src=./$src;;
+   esac
+ 
+   if test -n "$dir_arg"; then
+     dst=$src
+-    src=
+-
+-    if test -d "$dst"; then
+-      mkdircmd=:
+-      chmodcmd=
+-    else
+-      mkdircmd=$mkdirprog
+-    fi
++    dstdir=$dst
++    test -d "$dstdir"
++    dstdir_status=$?
+   else
++
+     # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+     # might cause directories to be created, which would be especially bad
+     # if $src (and thus $dsttmp) contains '*'.
+@@ -190,71 +248,199 @@ do
+       exit 1
+     fi
+ 
+-    if test -z "$dstarg"; then
++    if test -z "$dst_arg"; then
+       echo "$0: no destination specified." >&2
+       exit 1
+     fi
+ 
+-    dst=$dstarg
++    dst=$dst_arg
+     # Protect names starting with `-'.
+     case $dst in
+-      -*) dst=./$dst ;;
++      -*) dst=./$dst;;
+     esac
+ 
+     # If destination is a directory, append the input filename; won't work
+     # if double slashes aren't ignored.
+     if test -d "$dst"; then
+       if test -n "$no_target_directory"; then
+-	echo "$0: $dstarg: Is a directory" >&2
++	echo "$0: $dst_arg: Is a directory" >&2
+ 	exit 1
+       fi
+-      dst=$dst/`basename "$src"`
++      dstdir=$dst
++      dst=$dstdir/`basename "$src"`
++      dstdir_status=0
++    else
++      # Prefer dirname, but fall back on a substitute if dirname fails.
++      dstdir=`
++	(dirname "$dst") 2>/dev/null ||
++	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	     X"$dst" : 'X\(//\)[^/]' \| \
++	     X"$dst" : 'X\(//\)$' \| \
++	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
++	echo X"$dst" |
++	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++		   s//\1/
++		   q
++		 }
++		 /^X\(\/\/\)[^/].*/{
++		   s//\1/
++		   q
++		 }
++		 /^X\(\/\/\)$/{
++		   s//\1/
++		   q
++		 }
++		 /^X\(\/\).*/{
++		   s//\1/
++		   q
++		 }
++		 s/.*/./; q'
++      `
++
++      test -d "$dstdir"
++      dstdir_status=$?
+     fi
+   fi
+ 
+-  # This sed command emulates the dirname command.
+-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
++  obsolete_mkdir_used=false
++
++  if test $dstdir_status != 0; then
++    case $posix_mkdir in
++      '')
++	# Create intermediate dirs using mode 755 as modified by the umask.
++	# This is like FreeBSD 'install' as of 1997-10-28.
++	umask=`umask`
++	case $stripcmd.$umask in
++	  # Optimize common cases.
++	  *[2367][2367]) mkdir_umask=$umask;;
++	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
++
++	  *[0-7])
++	    mkdir_umask=`expr $umask + 22 \
++	      - $umask % 100 % 40 + $umask % 20 \
++	      - $umask % 10 % 4 + $umask % 2
++	    `;;
++	  *) mkdir_umask=$umask,go-w;;
++	esac
++
++	# With -d, create the new directory with the user-specified mode.
++	# Otherwise, rely on $mkdir_umask.
++	if test -n "$dir_arg"; then
++	  mkdir_mode=-m$mode
++	else
++	  mkdir_mode=
++	fi
++
++	posix_mkdir=false
++	case $umask in
++	  *[123567][0-7][0-7])
++	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
++	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
++	    ;;
++	  *)
++	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
++	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
++
++	    if (umask $mkdir_umask &&
++		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
++	    then
++	      if test -z "$dir_arg" || {
++		   # Check for POSIX incompatibilities with -m.
++		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
++		   # other-writeable bit of parent directory when it shouldn't.
++		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
++		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
++		   case $ls_ld_tmpdir in
++		     d????-?r-*) different_mode=700;;
++		     d????-?--*) different_mode=755;;
++		     *) false;;
++		   esac &&
++		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
++		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
++		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
++		   }
++		 }
++	      then posix_mkdir=:
++	      fi
++	      rmdir "$tmpdir/d" "$tmpdir"
++	    else
++	      # Remove any dirs left behind by ancient mkdir implementations.
++	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
++	    fi
++	    trap '' 0;;
++	esac;;
++    esac
+ 
+-  # Make sure that the destination directory exists.
++    if
++      $posix_mkdir && (
++	umask $mkdir_umask &&
++	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
++      )
++    then :
++    else
+ 
+-  # Skip lots of stat calls in the usual case.
+-  if test ! -d "$dstdir"; then
+-    defaultIFS='
+-	 '
+-    IFS="${IFS-$defaultIFS}"
++      # The umask is ridiculous, or mkdir does not conform to POSIX,
++      # or it failed possibly due to a race condition.  Create the
++      # directory the slow way, step by step, checking for races as we go.
+ 
+-    oIFS=$IFS
+-    # Some sh's can't handle IFS=/ for some reason.
+-    IFS='%'
+-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+-    shift
+-    IFS=$oIFS
++      case $dstdir in
++	/*) prefix='/';;
++	-*) prefix='./';;
++	*)  prefix='';;
++      esac
+ 
+-    pathcomp=
++      eval "$initialize_posix_glob"
+ 
+-    while test $# -ne 0 ; do
+-      pathcomp=$pathcomp$1
++      oIFS=$IFS
++      IFS=/
++      $posix_glob set -f
++      set fnord $dstdir
+       shift
+-      if test ! -d "$pathcomp"; then
+-        $mkdirprog "$pathcomp"
+-	# mkdir can fail with a `File exist' error in case several
+-	# install-sh are creating the directory concurrently.  This
+-	# is OK.
+-	test -d "$pathcomp" || exit
++      $posix_glob set +f
++      IFS=$oIFS
++
++      prefixes=
++
++      for d
++      do
++	test -z "$d" && continue
++
++	prefix=$prefix$d
++	if test -d "$prefix"; then
++	  prefixes=
++	else
++	  if $posix_mkdir; then
++	    (umask=$mkdir_umask &&
++	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
++	    # Don't fail if two instances are running concurrently.
++	    test -d "$prefix" || exit 1
++	  else
++	    case $prefix in
++	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
++	      *) qprefix=$prefix;;
++	    esac
++	    prefixes="$prefixes '$qprefix'"
++	  fi
++	fi
++	prefix=$prefix/
++      done
++
++      if test -n "$prefixes"; then
++	# Don't fail if two instances are running concurrently.
++	(umask $mkdir_umask &&
++	 eval "\$doit_exec \$mkdirprog $prefixes") ||
++	  test -d "$dstdir" || exit 1
++	obsolete_mkdir_used=true
+       fi
+-      pathcomp=$pathcomp/
+-    done
++    fi
+   fi
+ 
+   if test -n "$dir_arg"; then
+-    $doit $mkdircmd "$dst" \
+-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+-
++    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
++    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
++    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
++      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+   else
+-    dstfile=`basename "$dst"`
+ 
+     # Make a couple of temp file names in the proper directory.
+     dsttmp=$dstdir/_inst.$$_
+@@ -262,10 +448,9 @@ do
+ 
+     # Trap to clean up those temp files at exit.
+     trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+-    trap '(exit $?); exit' 1 2 13 15
+ 
+     # Copy the file name to the temp name.
+-    $doit $cpprog "$src" "$dsttmp" &&
++    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+ 
+     # and set any options; do chmod last to preserve setuid bits.
+     #
+@@ -273,48 +458,59 @@ do
+     # ignore errors from any of these, just make sure not to ignore
+     # errors from the above "$doit $cpprog $src $dsttmp" command.
+     #
+-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+-
+-    # Now rename the file to the real destination.
+-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+-      || {
+-	   # The rename failed, perhaps because mv can't rename something else
+-	   # to itself, or perhaps because mv is so ancient that it does not
+-	   # support -f.
+-
+-	   # Now remove or move aside any old file at destination location.
+-	   # We try this two ways since rm can't unlink itself on some
+-	   # systems and the destination file might be busy for other
+-	   # reasons.  In this case, the final cleanup might fail but the new
+-	   # file should still install successfully.
+-	   {
+-	     if test -f "$dstdir/$dstfile"; then
+-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+-	       || {
+-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+-		 (exit 1); exit 1
+-	       }
+-	     else
+-	       :
+-	     fi
+-	   } &&
+-
+-	   # Now rename the file to the real destination.
+-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+-	 }
+-    }
+-  fi || { (exit 1); exit 1; }
++    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
++    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
++    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
++    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
++
++    # If -C, don't bother to copy if it wouldn't change the file.
++    if $copy_on_change &&
++       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
++       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
++
++       eval "$initialize_posix_glob" &&
++       $posix_glob set -f &&
++       set X $old && old=:$2:$4:$5:$6 &&
++       set X $new && new=:$2:$4:$5:$6 &&
++       $posix_glob set +f &&
++
++       test "$old" = "$new" &&
++       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
++    then
++      rm -f "$dsttmp"
++    else
++      # Rename the file to the real destination.
++      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
++
++      # The rename failed, perhaps because mv can't rename something else
++      # to itself, or perhaps because mv is so ancient that it does not
++      # support -f.
++      {
++	# Now remove or move aside any old file at destination location.
++	# We try this two ways since rm can't unlink itself on some
++	# systems and the destination file might be busy for other
++	# reasons.  In this case, the final cleanup might fail but the new
++	# file should still install successfully.
++	{
++	  test ! -f "$dst" ||
++	  $doit $rmcmd -f "$dst" 2>/dev/null ||
++	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
++	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
++	  } ||
++	  { echo "$0: cannot unlink or rename $dst" >&2
++	    (exit 1); exit 1
++	  }
++	} &&
++
++	# Now rename the file to the real destination.
++	$doit $mvcmd "$dsttmp" "$dst"
++      }
++    fi || exit 1
++
++    trap '' 0
++  fi
+ done
+ 
+-# The final little trick to "correctly" pass the exit status to the exit trap.
+-{
+-  (exit 0); exit 0
+-}
+-
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+ # time-stamp-start: "scriptversion="
+diff --git a/jbig2dec/jbig2.c b/jbig2dec/jbig2.c
+--- a/jbig2dec/jbig2.c
++++ b/jbig2dec/jbig2.c
+@@ -1,27 +1,24 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2002-2005 Artifex Software, Inc.
+-    
++
+     This software is provided AS-IS with no warranty,
+     either express or implied.
+-   
+-    This software is distributed under license and may not 
++
++    This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-   
+-    For information on commercial licensing, go to 
+-    http://www.artifex.com/licensing/ or contact 
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110, 
++
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
+     San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+-        
+-    $Id: jbig2.c 8022 2007-06-05 22:23:38Z giles $
+ */
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+-#endif 
++#endif
+ #include "os_types.h"
+ 
+ #include <stdio.h>
+@@ -31,9 +28,6 @@
+ 
+ #include "jbig2.h"
+ #include "jbig2_priv.h"
+-#include "jbig2_arith.h"
+-#include "jbig2_generic.h"
+-#include "jbig2_symbol_dict.h"
+ 
+ static void *
+ jbig2_default_alloc (Jbig2Allocator *allocator, size_t size)
+@@ -79,7 +73,7 @@ jbig2_realloc (Jbig2Allocator *allocator, void *p, size_t size)
+ }
+ 
+ static int
+-jbig2_default_error(void *data, const char *msg, 
++jbig2_default_error(void *data, const char *msg,
+                     Jbig2Severity severity, int32_t seg_idx)
+ {
+     /* report only fatal errors by default */
+@@ -89,7 +83,7 @@ jbig2_default_error(void *data, const char *msg,
+         fprintf(stderr, "\n");
+         fflush(stderr);
+     }
+-    
++
+     return 0;
+ }
+ 
+@@ -133,7 +127,7 @@ jbig2_ctx_new (Jbig2Allocator *allocator,
+                     JBIG2_SEVERITY_FATAL, -1);
+     return result;
+   }
+-  
++
+   result->allocator = allocator;
+   result->options = options;
+   result->global_ctx = (const Jbig2Ctx *)global_ctx;
+@@ -145,7 +139,7 @@ jbig2_ctx_new (Jbig2Allocator *allocator,
+     JBIG2_FILE_HEADER;
+ 
+   result->buf = NULL;
+-  
++
+   result->n_segments = 0;
+   result->n_segments_max = 16;
+   result->segments = (Jbig2Segment **)jbig2_alloc(allocator, result->n_segments_max * sizeof(Jbig2Segment *));
+@@ -219,7 +213,7 @@ jbig2_data_in (Jbig2Ctx *ctx, const unsigned char *data, size_t size)
+ 	{
+ 	  byte *buf;
+ 	  size_t buf_size = initial_buf_size;
+-	  
++
+ 	  do
+ 	    buf_size <<= 1;
+ 	  while (buf_size < ctx->buf_wr_ix - ctx->buf_rd_ix + size);
+@@ -285,7 +279,7 @@ jbig2_data_in (Jbig2Ctx *ctx, const unsigned char *data, size_t size)
+ 	    }
+ 	  else
+ 	    {
+-	      ctx->state = JBIG2_FILE_RANDOM_HEADERS; 
++	      ctx->state = JBIG2_FILE_RANDOM_HEADERS;
+               jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, -1, "file header indicates random-access organization");
+ 
+             }
+@@ -430,4 +424,3 @@ jbig2_word_stream_buf_free(Jbig2Ctx *ctx, Jbig2WordStream *ws)
+ {
+   jbig2_free(ctx->allocator, ws);
+ }
+-
+diff --git a/jbig2dec/jbig2.h b/jbig2dec/jbig2.h
+--- a/jbig2dec/jbig2.h
++++ b/jbig2dec/jbig2.h
+@@ -1,19 +1,16 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2002-2005 Artifex Software, Inc.
+-    
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
++
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
+     San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+-        
+-    $Id: jbig2.h 8022 2007-06-05 22:23:38Z giles $
+ */
+ 
+ #ifdef __cplusplus
+@@ -70,7 +67,7 @@ Jbig2Image	*jbig2_image_resize(Jbig2Ctx *ctx, Jbig2Image *image,
+ /* errors are returned from the library via a callback. If no callback
+    is provided (a NULL argument is passed ot jbig2_ctx_new) a default
+    handler is used which prints fatal errors to the stderr stream. */
+-   
++
+ /* error callback */
+ typedef int (*Jbig2ErrorCallback) (void *data,
+ 				  const char *msg, Jbig2Severity severity,
+@@ -80,7 +77,7 @@ typedef int (*Jbig2ErrorCallback) (void *data,
+    clients can better control memory usage. If a NULL is passed for
+    this argumennt of jbig2_ctx_new, a default allocator based on malloc()
+    is used. */
+-   
++
+ /* dynamic memory callbacks */
+ struct _Jbig2Allocator {
+   void *(*alloc) (Jbig2Allocator *allocator, size_t size);
+diff --git a/jbig2dec/jbig2_arith.c b/jbig2dec/jbig2_arith.c
+--- a/jbig2dec/jbig2_arith.c
++++ b/jbig2dec/jbig2_arith.c
+@@ -1,22 +1,19 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2001-2005 Artifex Software, Inc.
+-    
++
+     This software is provided AS-IS with no warranty,
+     either express or implied.
+-                                                                                
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: jbig2_arith.c 8022 2007-06-05 22:23:38Z giles $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+ #ifdef HAVE_CONFIG_H
+@@ -385,7 +382,7 @@ main (int argc, char **argv)
+ #ifdef JBIG2_DEBUG_ARITH
+       fprintf(stderr, "%3d: D = %d, ", i, D);
+       jbig2_arith_trace (as, cx);
+-#endif      
++#endif
+     }
+ 
+   jbig2_free(ctx->allocator, as);
+diff --git a/jbig2dec/jbig2_arith.h b/jbig2dec/jbig2_arith.h
+--- a/jbig2dec/jbig2_arith.h
++++ b/jbig2dec/jbig2_arith.h
+@@ -1,19 +1,16 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2001 Artifex Software, Inc.
+-    
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: jbig2_arith.h 8022 2007-06-05 22:23:38Z giles $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+ typedef struct _Jbig2ArithState Jbig2ArithState;
+diff --git a/jbig2dec/jbig2_arith_iaid.c b/jbig2dec/jbig2_arith_iaid.c
+--- a/jbig2dec/jbig2_arith_iaid.c
++++ b/jbig2dec/jbig2_arith_iaid.c
+@@ -5,25 +5,22 @@
+ 
+     This software is provided AS-IS with no warranty,
+     either express or implied.
+-                                                                                
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: jbig2_arith_iaid.c 8022 2007-06-05 22:23:38Z giles $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+ /* Annex A.3 */
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+-#endif 
++#endif
+ #include "os_types.h"
+ 
+ #include <stddef.h>
+diff --git a/jbig2dec/jbig2_arith_iaid.h b/jbig2dec/jbig2_arith_iaid.h
+--- a/jbig2dec/jbig2_arith_iaid.h
++++ b/jbig2dec/jbig2_arith_iaid.h
+@@ -7,13 +7,10 @@
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: jbig2_arith_iaid.h 8022 2007-06-05 22:23:38Z giles $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+ typedef struct _Jbig2ArithIaidCtx Jbig2ArithIaidCtx;
+diff --git a/jbig2dec/jbig2_arith_int.c b/jbig2dec/jbig2_arith_int.c
+--- a/jbig2dec/jbig2_arith_int.c
++++ b/jbig2dec/jbig2_arith_int.c
+@@ -1,29 +1,26 @@
+ /*
+     jbig2dec
+-                                                                                
++
+     Copyright (C) 2001 Artifex Software, Inc.
+-                                                                                
++
+     This software is provided AS-IS with no warranty,
+     either express or implied.
+-                                                                                
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
++
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
+     San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+-                                                                                
+-    $Id: jbig2_arith_int.c 8022 2007-06-05 22:23:38Z giles $
+ */
+ 
+ /* Annex A */
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+-#endif 
++#endif
+ #include "os_types.h"
+ 
+ #include <stddef.h>
+diff --git a/jbig2dec/jbig2_arith_int.h b/jbig2dec/jbig2_arith_int.h
+--- a/jbig2dec/jbig2_arith_int.h
++++ b/jbig2dec/jbig2_arith_int.h
+@@ -7,13 +7,10 @@
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: jbig2_arith_int.h 8022 2007-06-05 22:23:38Z giles $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+ typedef struct _Jbig2ArithIntCtx Jbig2ArithIntCtx;
+diff --git a/jbig2dec/jbig2_generic.c b/jbig2dec/jbig2_generic.c
+--- a/jbig2dec/jbig2_generic.c
++++ b/jbig2dec/jbig2_generic.c
+@@ -1,22 +1,19 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2002-2005 Artifex Software, Inc.
+-    
++
+     This software is provided AS-IS with no warranty,
+     either express or implied.
+-                                                                                
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
++
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
+     San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+-                                                                                
+-    $Id: jbig2_generic.c 8320 2007-10-25 22:14:22Z giles $
+ */
+ 
+ /**
+@@ -25,7 +22,7 @@
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+-#endif 
++#endif
+ #include "os_types.h"
+ 
+ #include <stddef.h>
+@@ -540,7 +537,7 @@ jbig2_decode_generic_region(Jbig2Ctx *ctx,
+   return -1;
+ }
+ 
+-/** 
++/**
+  * Handler for immediate generic region segments
+  */
+ int
+@@ -602,7 +599,7 @@ jbig2_immediate_generic_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+   jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number,
+     "allocated %d x %d image buffer for region decode results",
+         rsi.width, rsi.height);
+-    
++
+   if (params.MMR)
+     {
+       code = jbig2_decode_generic_mmr(ctx, segment, &params,
+@@ -627,10 +624,9 @@ jbig2_immediate_generic_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+       jbig2_free(ctx->allocator, GB_stats);
+     }
+ 
+-  jbig2_page_add_result(ctx, &ctx->pages[ctx->current_page], 
++  jbig2_page_add_result(ctx, &ctx->pages[ctx->current_page],
+ 			image, rsi.x, rsi.y, JBIG2_COMPOSE_OR);
+   jbig2_image_release(ctx, image);
+-  
++
+   return code;
+ }
+-
+diff --git a/jbig2dec/jbig2_generic.h b/jbig2dec/jbig2_generic.h
+--- a/jbig2dec/jbig2_generic.h
++++ b/jbig2dec/jbig2_generic.h
+@@ -1,19 +1,16 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2002-2004 Artifex Software, Inc.
+-    
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
++
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
+     San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+-        
+-    $Id: jbig2_generic.h 8022 2007-06-05 22:23:38Z giles $
+ */
+ 
+ /**
+diff --git a/jbig2dec/jbig2_huffman.c b/jbig2dec/jbig2_huffman.c
+--- a/jbig2dec/jbig2_huffman.c
++++ b/jbig2dec/jbig2_huffman.c
+@@ -1,30 +1,28 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2001-2005 Artifex Software, Inc.
+-    
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
++
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
+     San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+-    
+-    $Id: jbig2_huffman.c 8022 2007-06-05 22:23:38Z giles $
+ */
+ 
+-/* Huffman table decoding procedures 
++/* Huffman table decoding procedures
+     -- See Annex B of the JBIG2 specification */
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+-#endif 
++#endif
+ #include "os_types.h"
+ 
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #ifdef JBIG2_DEBUG
+ #include <stdio.h>
+@@ -63,7 +61,7 @@ jbig2_huffman_new (Jbig2Ctx *ctx, Jbig2WordStream *ws)
+ {
+   Jbig2HuffmanState *result;
+ 
+-  result = (Jbig2HuffmanState *)jbig2_alloc(ctx->allocator,  
++  result = (Jbig2HuffmanState *)jbig2_alloc(ctx->allocator,
+ 	sizeof(Jbig2HuffmanState));
+ 
+   if (result != NULL) {
+@@ -94,7 +92,7 @@ jbig2_huffman_free (Jbig2Ctx *ctx, Jbig2HuffmanState *hs)
+ /** print current huffman state */
+ void jbig2_dump_huffman_state(Jbig2HuffmanState *hs) {
+   fprintf(stderr, "huffman state %08x %08x offset %d.%d\n",
+-	hs->this_word, hs->next_word, hs->offset, hs->offset_bits); 
++	hs->this_word, hs->next_word, hs->offset, hs->offset_bits);
+ }
+ 
+ /** print the binary string we're reading from */
+@@ -121,7 +119,7 @@ jbig2_huffman_skip(Jbig2HuffmanState *hs)
+   if (bits) {
+     bits = 8 - bits;
+     hs->offset_bits += bits;
+-    hs->this_word = (hs->this_word << bits) | 
++    hs->this_word = (hs->this_word << bits) |
+ 	(hs->next_word >> (32 - hs->offset_bits));
+   }
+ 
+@@ -160,7 +158,7 @@ void jbig2_huffman_advance(Jbig2HuffmanState *hs, int offset)
+ /* return the offset of the huffman decode pointer (in bytes)
+  * from the beginning of the WordStream
+  */
+-int 
++int
+ jbig2_huffman_offset(Jbig2HuffmanState *hs)
+ {
+   return hs->offset + (hs->offset_bits >> 3);
+@@ -209,7 +207,7 @@ jbig2_huffman_get (Jbig2HuffmanState *hs,
+   int32_t result;
+ 
+   for (;;)
+-    { 
++    {
+       int log_table_size = table->log_table_size;
+       int PREFLEN;
+ 
+@@ -276,19 +274,20 @@ if (RANGELEN)
+   return result;
+ }
+ 
+-/* TODO: more than 8 bits here is wasteful of memory. We have support 
++/* TODO: more than 8 bits here is wasteful of memory. We have support
+    for sub-trees in jbig2_huffman_get() above, but don't use it here.
+    We should, and then revert to 8 bits */
+ #define LOG_TABLE_SIZE_MAX 16
+ 
+ /** Build an in-memory representation of a Huffman table from the
+  *  set of template params provided by the spec or a table segment
+- */ 
++ */
+ Jbig2HuffmanTable *
+ jbig2_build_huffman_table (Jbig2Ctx *ctx, const Jbig2HuffmanParams *params)
+ {
+-  int LENCOUNT[1 << LOG_TABLE_SIZE_MAX];
++  int *LENCOUNT;
+   int LENMAX = -1;
++  const int lencountsize = 256 * sizeof(*LENCOUNT);
+   const Jbig2HuffmanLine *lines = params->lines;
+   int n_lines = params->n_lines;
+   int i, j;
+@@ -301,6 +300,14 @@ jbig2_build_huffman_table (Jbig2Ctx *ctx, const Jbig2HuffmanParams *params)
+   int CURCODE;
+   int CURTEMP;
+ 
++  LENCOUNT = jbig2_alloc(ctx->allocator, lencountsize);
++  if (LENCOUNT == NULL) {
++    jbig2_error(ctx, JBIG2_SEVERITY_FATAL, -1,
++      "couldn't allocate storage for huffman histogram");
++    return NULL;
++  }
++  memset(LENCOUNT, 0, lencountsize);
++
+   /* B.3, 1. */
+   for (i = 0; i < params->n_lines; i++)
+     {
+@@ -356,6 +363,7 @@ jbig2_build_huffman_table (Jbig2Ctx *ctx, const Jbig2HuffmanParams *params)
+ 		  end_j, max_j);
+ 		jbig2_free(ctx->allocator, result->entries);
+ 		jbig2_free(ctx->allocator, result);
++		jbig2_free(ctx->allocator, LENCOUNT);
+ 		return NULL;
+ 	      }
+ 	      /* todo: build extension tables */
+@@ -390,6 +398,8 @@ jbig2_build_huffman_table (Jbig2Ctx *ctx, const Jbig2HuffmanParams *params)
+ 	}
+     }
+ 
++  jbig2_free(ctx->allocator, LENCOUNT);
++
+   return result;
+ }
+ 
+@@ -436,7 +446,7 @@ main (int argc, char **argv)
+   Jbig2WordStream ws;
+   bool oob;
+   int32_t code;
+-  
++
+   ctx = jbig2_ctx_new(NULL, 0, NULL, NULL, NULL);
+ 
+   tables[0] = NULL;
+@@ -449,22 +459,22 @@ main (int argc, char **argv)
+ 
+   printf("testing jbig2 huffmann decoding...");
+   printf("\t(should be 8 5 (oob) 8)\n");
+-  
++
+   {
+ 	int i;
+ 	int sequence_length = sizeof(test_tabindex);
+-	
++
+ 	for (i = 0; i < sequence_length; i++) {
+ 		code = jbig2_huffman_get (hs, tables[test_tabindex[i]], &oob);
+ 		if (oob) printf("(oob) ");
+ 		else printf("%d ", code);
+ 	}
+   }
+-  
++
+   printf("\n");
+ 
+   jbig2_ctx_free(ctx);
+-  
++
+   return 0;
+ }
+ #endif
+diff --git a/jbig2dec/jbig2_huffman.h b/jbig2dec/jbig2_huffman.h
+--- a/jbig2dec/jbig2_huffman.h
++++ b/jbig2dec/jbig2_huffman.h
+@@ -1,19 +1,16 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2001-2005 Artifex Software, Inc.
+-    
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: jbig2_huffman.h 8022 2007-06-05 22:23:38Z giles $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+ #ifndef JBIG2_HUFFMAN_H
+@@ -66,7 +63,7 @@ jbig2_huffman_skip(Jbig2HuffmanState *hs);
+ 
+ void jbig2_huffman_advance(Jbig2HuffmanState *hs, int offset);
+ 
+-int 
++int
+ jbig2_huffman_offset(Jbig2HuffmanState *hs);
+ 
+ int32_t
+diff --git a/jbig2dec/jbig2_hufftab.h b/jbig2dec/jbig2_hufftab.h
+--- a/jbig2dec/jbig2_hufftab.h
++++ b/jbig2dec/jbig2_hufftab.h
+@@ -1,22 +1,19 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2001-2005 Artifex Software, Inc.
+-    
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
++
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
+     San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+-    
+-    $Id: jbig2_hufftab.h 8022 2007-06-05 22:23:38Z giles $
+ */
+ 
+-/* predefined Huffman table definitions 
++/* predefined Huffman table definitions
+     -- See Annex B of the JBIG2 specification */
+ 
+ #ifndef JBIG2_HUFFTAB_H
+diff --git a/jbig2dec/jbig2_image.c b/jbig2dec/jbig2_image.c
+--- a/jbig2dec/jbig2_image.c
++++ b/jbig2dec/jbig2_image.c
+@@ -1,24 +1,21 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2001-2005 Artifex Software, Inc.
+-    
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: jbig2_image.c 8022 2007-06-05 22:23:38Z giles $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+-#endif 
++#endif
+ #include "os_types.h"
+ 
+ #include <stdio.h>
+@@ -35,14 +32,14 @@ Jbig2Image* jbig2_image_new(Jbig2Ctx *ctx, int width, int height)
+ {
+ 	Jbig2Image	*image;
+ 	int		stride;
+-	
++
+ 	image = (Jbig2Image *)jbig2_alloc(ctx->allocator, sizeof(*image));
+ 	if (image == NULL) {
+ 		jbig2_error(ctx, JBIG2_SEVERITY_FATAL, -1,
+ 			       "could not allocate image structure");
+ 		return NULL;
+ 	}
+-	
++
+ 	stride = ((width - 1) >> 3) + 1; /* generate a byte-aligned stride */
+ 	image->data = (uint8_t *)jbig2_alloc(ctx->allocator, stride*height);
+ 	if (image->data == NULL) {
+@@ -82,7 +79,7 @@ void jbig2_image_free(Jbig2Ctx *ctx, Jbig2Image *image)
+ }
+ 
+ /* resize a Jbig2Image */
+-Jbig2Image *jbig2_image_resize(Jbig2Ctx *ctx, Jbig2Image *image, 
++Jbig2Image *jbig2_image_resize(Jbig2Ctx *ctx, Jbig2Image *image,
+ 				int width, int height)
+ {
+ 	if (width == image->width) {
+@@ -178,7 +175,7 @@ int jbig2_image_compose_unopt(Jbig2Ctx *ctx,
+ }
+ 
+ /* composite one jbig2_image onto another */
+-int jbig2_image_compose(Jbig2Ctx *ctx, Jbig2Image *dst, Jbig2Image *src, 
++int jbig2_image_compose(Jbig2Ctx *ctx, Jbig2Image *dst, Jbig2Image *src,
+ 			int x, int y, Jbig2ComposeOp op)
+ {
+     int i, j;
+@@ -188,7 +185,7 @@ int jbig2_image_compose(Jbig2Ctx *ctx, Jbig2Image *dst, Jbig2Image *src,
+     uint8_t *s, *ss;
+     uint8_t *d, *dd;
+     uint8_t mask, rightmask;
+-    
++
+     if (op != JBIG2_COMPOSE_OR) {
+ 	/* hand off the the general routine */
+ 	return jbig2_image_compose_unopt(ctx, dst, src, x, y, op);
+@@ -200,15 +197,15 @@ int jbig2_image_compose(Jbig2Ctx *ctx, Jbig2Image *dst, Jbig2Image *src,
+     ss = src->data;
+     /* FIXME: this isn't sufficient for the < 0 cases */
+     if (x < 0) { w += x; x = 0; }
+-    if (y < 0) { h += y; y = 0; } 
++    if (y < 0) { h += y; y = 0; }
+     w = (x + w < dst->width) ? w : dst->width - x;
+     h = (y + h < dst->height) ? h : dst->height - y;
+-#ifdef JBIG2_DEBUG    
++#ifdef JBIG2_DEBUG
+     jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, -1,
+-      "composting %dx%d at (%d, %d) afer clipping\n",
++      "composting %dx%d at (%d, %d) after clipping\n",
+         w, h, x, y);
+ #endif
+-    
++
+ #if 0
+     /* special case complete/strip replacement */
+     /* disabled because it's only safe to do when the destination
+@@ -222,8 +219,8 @@ int jbig2_image_compose(Jbig2Ctx *ctx, Jbig2Image *dst, Jbig2Image *src,
+     leftbyte = x >> 3;
+     rightbyte = (x + w - 1) >> 3;
+     shift = x & 7;
+-    
+-    /* general OR case */    
++
++    /* general OR case */
+     s = ss;
+     d = dd = dst->data + y*dst->stride + leftbyte;
+     if (leftbyte == rightbyte) {
+@@ -264,7 +261,7 @@ int jbig2_image_compose(Jbig2Ctx *ctx, Jbig2Image *dst, Jbig2Image *src,
+ 	    s = (ss += src->stride);
+ 	}
+     }
+-            
++
+     return 0;
+ }
+ 
+@@ -290,7 +287,7 @@ int jbig2_image_get_pixel(Jbig2Image *image, int x, int y)
+ 
+   if ((x < 0) || (x >= w)) return 0;
+   if ((y < 0) || (y >= h)) return 0;
+-  
++
+   return ((image->data[byte]>>bit) & 1);
+ }
+ 
+diff --git a/jbig2dec/jbig2_image.h b/jbig2dec/jbig2_image.h
+--- a/jbig2dec/jbig2_image.h
++++ b/jbig2dec/jbig2_image.h
+@@ -1,19 +1,16 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2001-2002 Artifex Software, Inc.
+-    
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: jbig2_image.h 8320 2007-10-25 22:14:22Z giles $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+ 
+diff --git a/jbig2dec/jbig2_image_pbm.c b/jbig2dec/jbig2_image_pbm.c
+--- a/jbig2dec/jbig2_image_pbm.c
++++ b/jbig2dec/jbig2_image_pbm.c
+@@ -1,24 +1,21 @@
+ /*
+     jbig2dec
+-    
+-    Copyright (C) 2002 Artifex Software, Inc.
+-    
++
++    Copyright (C) 2009 Artifex Software, Inc.
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: jbig2_image_pbm.c 8022 2007-06-05 22:23:38Z giles $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+-#endif 
++#endif
+ #include "os_types.h"
+ 
+ #include <stdio.h>
+@@ -33,14 +30,14 @@ int jbig2_image_write_pbm_file(Jbig2Image *image, char *filename)
+ {
+     FILE *out;
+     int	error;
+-    
++
+     if ((out = fopen(filename, "wb")) == NULL) {
+         fprintf(stderr, "unable to open '%s' for writing", filename);
+         return 1;
+     }
+-    
++
+     error = jbig2_image_write_pbm(image, out);
+-    
++
+     fclose(out);
+     return (error);
+ }
+@@ -51,12 +48,12 @@ int jbig2_image_write_pbm(Jbig2Image *image, FILE *out)
+ {
+         /* pbm header */
+         fprintf(out, "P4\n%d %d\n", image->width, image->height);
+-        
++
+         /* pbm format pads to a byte boundary, so we can
+            just write out the whole data buffer
+            NB: this assumes minimal stride for the width */
+         fwrite(image->data, 1, image->height*image->stride, out);
+-        
++
+         /* success */
+ 	return 0;
+ }
+@@ -66,14 +63,16 @@ Jbig2Image *jbig2_image_read_pbm_file(Jbig2Ctx *ctx, char *filename)
+ {
+     FILE *in;
+     Jbig2Image *image;
+-    
++
+     if ((in = fopen(filename, "rb")) == NULL) {
+ 		fprintf(stderr, "unable to open '%s' for reading\n", filename);
+ 		return NULL;
+     }
+-    
++
+     image = jbig2_image_read_pbm(ctx, in);
+-    
++
++    fclose(in);
++
+     return (image);
+ }
+ 
+@@ -85,7 +84,7 @@ Jbig2Image *jbig2_image_read_pbm(Jbig2Ctx *ctx, FILE *in)
+     Jbig2Image *image;
+     int c;
+     char buf[32];
+-    
++
+     /* look for 'P4' magic */
+     while ((c = fgetc(in)) != 'P') {
+         if (feof(in)) return NULL;
+@@ -109,16 +108,25 @@ Jbig2Image *jbig2_image_read_pbm(Jbig2Ctx *ctx, FILE *in)
+             while ((c = fgetc(in)) != '\n');
+             continue;
+         }
++        /* report unexpected eof */
++        if (c == EOF) {
++           fprintf(stderr, "end-of-file parsing pbm header\n");
++           return NULL;
++        }
+         if (isdigit(c)) {
+             buf[i++] = c;
+-            while (isdigit(buf[i++] = fgetc(in))) {
+-                if (feof(in) || i >= 32) {
++            while (isdigit(c = fgetc(in))) {
++                if (i >= 32) {
+                     fprintf(stderr, "pbm parsing error\n");
+                     return NULL;
+                 }
++                buf[i++] = c;
+             }
+             buf[i] = '\0';
+-            sscanf(buf, "%d", &dim[done]);
++            if (sscanf(buf, "%d", &dim[done]) != 1) {
++                fprintf(stderr, "couldn't read pbm image dimensions\n");
++                return NULL;
++            }
+             i = 0;
+             done++;
+         }
+@@ -136,7 +144,7 @@ Jbig2Image *jbig2_image_read_pbm(Jbig2Ctx *ctx, FILE *in)
+         fprintf(stderr, "unexpected end of pbm file.\n");
+         jbig2_image_release(ctx, image);
+         return NULL;
+-    }    
++    }
+     /* success */
+     return image;
+ }
+diff --git a/jbig2dec/jbig2_image_png.c b/jbig2dec/jbig2_image_png.c
+--- a/jbig2dec/jbig2_image_png.c
++++ b/jbig2dec/jbig2_image_png.c
+@@ -1,24 +1,21 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2002 Artifex Software, Inc.
+-    
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: jbig2_image_png.c 8022 2007-06-05 22:23:38Z giles $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+-#endif 
++#endif
+ #include "os_types.h"
+ 
+ #include <stdio.h>
+@@ -55,14 +52,14 @@ int jbig2_image_write_png_file(Jbig2Image *image, char *filename)
+ {
+     FILE *out;
+     int	error;
+-    
++
+     if ((out = fopen(filename, "wb")) == NULL) {
+ 		fprintf(stderr, "unable to open '%s' for writing\n", filename);
+ 		return 1;
+     }
+-    
++
+     error = jbig2_image_write_png(image, out);
+-    
++
+     fclose(out);
+     return (error);
+ }
+@@ -75,14 +72,14 @@ int jbig2_image_write_png(Jbig2Image *image, FILE *out)
+ 	png_structp	png;
+ 	png_infop	info;
+ 	png_bytep	rowpointer;
+-	
++
+ 	png = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+ 		NULL, NULL, NULL);
+ 	if (png == NULL) {
+ 		fprintf(stderr, "unable to create png structure\n");
+ 		return 2;
+ 	}
+-	
++
+ 	info = png_create_info_struct(png);
+ 	if (info == NULL) {
+             fprintf(stderr, "unable to create png info structure\n");
+@@ -104,7 +101,7 @@ int jbig2_image_write_png(Jbig2Image *image, FILE *out)
+ 	/* png_init_io(png, out); */
+         png_set_write_fn(png, (png_voidp)out, jbig2_png_write_data,
+             jbig2_png_flush);
+-        
++
+ 	/* now we fill out the info structure with our format data */
+ 	png_set_IHDR(png, info, image->width, image->height,
+ 		1, PNG_COLOR_TYPE_GRAY, PNG_INTERLACE_NONE,
+@@ -113,17 +110,17 @@ int jbig2_image_write_png(Jbig2Image *image, FILE *out)
+ 
+ 	/* png natively treates 0 as black. This will convert for us */
+ 	png_set_invert_mono(png);
+-	
++
+ 	/* write out each row in turn */
+ 	rowpointer = (png_bytep)image->data;
+ 	for(i = 0; i < image->height; i++) {
+ 		png_write_row(png, rowpointer);
+ 		rowpointer += image->stride;
+ 	}
+-	
++
+ 	/* finish and clean up */
+ 	png_write_end(png, info);
+ 	png_destroy_write_struct(&png, &info);
+-		
++
+ 	return 0;
+ }
+diff --git a/jbig2dec/jbig2_metadata.c b/jbig2dec/jbig2_metadata.c
+--- a/jbig2dec/jbig2_metadata.c
++++ b/jbig2dec/jbig2_metadata.c
+@@ -1,24 +1,21 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2003 Artifex Software, Inc.
+-    
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: jbig2_metadata.c 8022 2007-06-05 22:23:38Z giles $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+-#endif 
++#endif
+ #include "os_types.h"
+ 
+ #include <stdlib.h>
+@@ -32,7 +29,7 @@
+ Jbig2Metadata *jbig2_metadata_new(Jbig2Ctx *ctx, Jbig2Encoding encoding)
+ {
+     Jbig2Metadata *md = jbig2_alloc(ctx->allocator, sizeof(Jbig2Metadata));
+-    
++
+     if (md != NULL) {
+         md->encoding = encoding;
+         md->entries = 0;
+@@ -82,7 +79,7 @@ int jbig2_metadata_add(Jbig2Ctx *ctx, Jbig2Metadata *md,
+                         const char *value, const int value_length)
+ {
+     char **keys, **values;
+-    
++
+     /* grow the array if necessary */
+     if (md->entries == md->max_entries) {
+         md->max_entries >>= 2;
+@@ -96,12 +93,12 @@ int jbig2_metadata_add(Jbig2Ctx *ctx, Jbig2Metadata *md,
+         md->keys = keys;
+         md->values = values;
+     }
+-    
++
+     /* copy the passed key,value pair */
+     md->keys[md->entries] = jbig2_strndup(ctx, key, key_length);
+     md->values[md->entries] = jbig2_strndup(ctx, value, value_length);
+     md->entries++;
+-    
++
+     return 0;
+ }
+ 
+@@ -115,10 +112,10 @@ int jbig2_parse_comment_ascii(Jbig2Ctx *ctx, Jbig2Segment *segment,
+     Jbig2Metadata *comment;
+     char *key, *value;
+     int key_length, value_length;
+-    
++
+     jbig2_error(ctx, JBIG2_SEVERITY_INFO, segment->number,
+         "ASCII comment data");
+-        
++
+     comment = jbig2_metadata_new(ctx, JBIG2_ENCODING_ASCII);
+     if (comment == NULL) {
+         jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number,
+@@ -137,12 +134,12 @@ int jbig2_parse_comment_ascii(Jbig2Ctx *ctx, Jbig2Segment *segment,
+         jbig2_error(ctx, JBIG2_SEVERITY_INFO, segment->number,
+             "'%s'\t'%s'", key, value);
+     }
+-    
++
+     /* TODO: associate with ctx, page, or referred-to segment(s) */
+     segment->result = comment;
+-    
++
+     return 0;
+-    
++
+ too_short:
+     jbig2_metadata_free(ctx, comment);
+     return jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number,
+diff --git a/jbig2dec/jbig2_metadata.h b/jbig2dec/jbig2_metadata.h
+--- a/jbig2dec/jbig2_metadata.h
++++ b/jbig2dec/jbig2_metadata.h
+@@ -1,19 +1,16 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2003 Artifex Software, Inc.
+-    
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: jbig2_metadata.h 8022 2007-06-05 22:23:38Z giles $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+ 
+diff --git a/jbig2dec/jbig2_mmr.c b/jbig2dec/jbig2_mmr.c
+--- a/jbig2dec/jbig2_mmr.c
++++ b/jbig2dec/jbig2_mmr.c
+@@ -1,24 +1,29 @@
+ /*
+-jbig2dec
++    jbig2dec
+ 
+-Copyright (C) 2001-2002 Artifex Software, Inc.
++    Copyright (C) 2001-2002 Artifex Software, Inc.
+ 
+-This program is free software; you can redistribute it and/or modify
+-it under the terms of the GNU General Public License as published by
+-the Free Software Foundation; either version 2 of the License, or
+-(at your option) any later version.
++    This software is provided AS-IS with no warranty,
++    either express or implied.
+ 
+-$Id: jbig2_mmr.c 8022 2007-06-05 22:23:38Z giles $
++    This software is distributed under license and may not
++    be copied, modified or distributed except as expressly
++    authorized under the terms of the license contained in
++    the file LICENSE in this distribution.
++
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+-/*
+-An implementation of MMR decoding. This is based on the implementation
+-in Fitz, which in turn is based on the one in Ghostscript.
++/* An implementation of MMR decoding. This is based on the
++   implementation in Fitz, which in turn is based on the one
++   in Ghostscript.
+ */
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+-#endif 
++#endif
+ #include "os_types.h"
+ 
+ #include <stddef.h>
+diff --git a/jbig2dec/jbig2_mmr.h b/jbig2dec/jbig2_mmr.h
+--- a/jbig2dec/jbig2_mmr.h
++++ b/jbig2dec/jbig2_mmr.h
+@@ -7,13 +7,10 @@
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: jbig2_mmr.h 8022 2007-06-05 22:23:38Z giles $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+ int
+diff --git a/jbig2dec/jbig2_page.c b/jbig2dec/jbig2_page.c
+--- a/jbig2dec/jbig2_page.c
++++ b/jbig2dec/jbig2_page.c
+@@ -1,24 +1,21 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2001-2005 Artifex Software, Inc.
+-    
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: jbig2_page.c 8778 2008-05-26 19:04:05Z giles $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+-#endif 
++#endif
+ #include "os_types.h"
+ 
+ #include <stdlib.h>
+@@ -76,7 +73,7 @@ jbig2_parse_page_info (Jbig2Ctx *ctx, Jbig2Segment *segment, const uint8_t *segm
+         jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number,
+             "unexpected page info segment, marking previous page finished");
+     }
+-        
++
+     /* find a free page */
+     {
+         int index, j;
+@@ -101,17 +98,17 @@ jbig2_parse_page_info (Jbig2Ctx *ctx, Jbig2Segment *segment, const uint8_t *segm
+         page->state = JBIG2_PAGE_NEW;
+         page->number = segment->page_association;
+     }
+-    
++
+     /* FIXME: would be nice if we tried to work around this */
+     if (segment->data_length < 19) {
+         return jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
+             "segment too short");
+     }
+-    
++
+     /* 7.4.8.x */
+     page->width = jbig2_get_int32(segment_data);
+     page->height = jbig2_get_int32(segment_data + 4);
+-    
++
+     page->x_resolution = jbig2_get_int32(segment_data + 8);
+     page->y_resolution = jbig2_get_int32(segment_data + 12);
+     page->flags = segment_data[16];
+@@ -133,12 +130,12 @@ jbig2_parse_page_info (Jbig2Ctx *ctx, Jbig2Segment *segment, const uint8_t *segm
+         page->striped = TRUE;
+     }
+     page->end_row = 0;
+-    
++
+     if (segment->data_length > 19) {
+         jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number,
+             "extra data in segment");
+     }
+-    
++
+     dump_page_info(ctx, segment, page);
+ 
+     /* allocate an approprate page image buffer */
+@@ -160,7 +157,7 @@ jbig2_parse_page_info (Jbig2Ctx *ctx, Jbig2Segment *segment, const uint8_t *segm
+             page->image->width, page->image->height,
+             page->image->stride*page->image->height);
+     }
+-    
++
+     return 0;
+ }
+ 
+@@ -177,13 +174,13 @@ jbig2_parse_end_of_stripe(Jbig2Ctx *ctx, Jbig2Segment *segment, const uint8_t *s
+     if (end_row < page.end_row) {
+ 	jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number,
+ 	    "end of stripe segment with non-positive end row advance"
+-	    "(new end row %d vs current end row %d)", 
++	    " (new end row %d vs current end row %d)",
+ 	    end_row, page.end_row);
+     } else {
+ 	jbig2_error(ctx, JBIG2_SEVERITY_INFO, segment->number,
+ 	    "end of stripe: advancing end row to %d", end_row);
+     }
+-    
++
+     page.end_row = end_row;
+ 
+     return 0;
+@@ -236,12 +233,12 @@ jbig2_parse_end_of_page(Jbig2Ctx *ctx, Jbig2Segment *segment, const uint8_t *seg
+             "end of page marker for page %d doesn't match current page number %d",
+             segment->page_association, page_number);
+     }
+-    
++
+     jbig2_error(ctx, JBIG2_SEVERITY_INFO, segment->number,
+         "end of page %d", page_number);
+ 
+     jbig2_complete_page(ctx);
+-    
++
+ #ifdef OUTPUT_PBM
+     jbig2_image_write_pbm(ctx->pages[ctx->current_page].image, stdout);
+ #endif
+@@ -269,7 +266,7 @@ jbig2_page_add_result(Jbig2Ctx *ctx, Jbig2Page *page, Jbig2Image *image,
+ 	    jbig2_image_resize(ctx, page->image,
+ 		page->image->width, new_height);
+ 	}
+-    }    
++    }
+ 
+     jbig2_image_compose(ctx, page->image, image,
+                         x, y + page->end_row, JBIG2_COMPOSE_OR);
+@@ -302,7 +299,7 @@ Jbig2Image *jbig2_page_out(Jbig2Ctx *ctx)
+             return ctx->pages[index].image;
+         }
+     }
+-    
++
+     /* no pages available */
+     return NULL;
+ }
+@@ -313,7 +310,7 @@ Jbig2Image *jbig2_page_out(Jbig2Ctx *ctx)
+ int jbig2_release_page(Jbig2Ctx *ctx, Jbig2Image *image)
+ {
+     int index;
+-    
++
+     /* find the matching page struct and mark it released */
+     for (index = 0; index < ctx->max_page_index; index++) {
+         if (ctx->pages[index].image == image) {
+@@ -324,7 +321,7 @@ int jbig2_release_page(Jbig2Ctx *ctx, Jbig2Image *image)
+             return 0;
+         }
+     }
+-    
++
+     /* no matching pages */
+     jbig2_error(ctx, JBIG2_SEVERITY_WARNING, -1,
+         "jbig2_release_page called on unknown page");
+diff --git a/jbig2dec/jbig2_priv.h b/jbig2dec/jbig2_priv.h
+--- a/jbig2dec/jbig2_priv.h
++++ b/jbig2dec/jbig2_priv.h
+@@ -1,23 +1,20 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2002 Artifex Software, Inc.
+-    
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
++
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
+     San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+-        
+-    $Id: jbig2_priv.h 8022 2007-06-05 22:23:38Z giles $
+-    
+-    shared library internals
+ */
+ 
++/* library internals */
++
+ typedef uint8_t byte;
+ typedef int bool;
+ 
+@@ -62,7 +59,7 @@ struct _Jbig2Ctx {
+   Jbig2Segment **segments;
+   int n_segments;	/* index of last segment header parsed */
+   int segment_index;    /* index of last segment body parsed */
+-  
++
+   /* list of decoded pages, including the one in progress,
+      currently stored as a contiguous, 0-indexed array. */
+   int current_page;
+@@ -155,7 +152,7 @@ int jbig2_immediate_generic_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+ 			       const uint8_t *segment_data);
+ int jbig2_refinement_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+                                const byte *segment_data);
+-          
++
+ /* The word stream design is a compromise between simplicity and
+    trying to amortize the number of method calls. Each ::get_next_word
+    invocation pulls 4 bytes from the stream, packed big-endian into a
+diff --git a/jbig2dec/jbig2_refinement.c b/jbig2dec/jbig2_refinement.c
+--- a/jbig2dec/jbig2_refinement.c
++++ b/jbig2dec/jbig2_refinement.c
+@@ -1,22 +1,19 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2004 Artifex Software, Inc.
+-    
++
+     This software is provided AS-IS with no warranty,
+     either express or implied.
+-                                                                                
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
++
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
+     San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+-                                                                                
+-    $Id: jbig2_refinement.c 8320 2007-10-25 22:14:22Z giles $
+ */
+ 
+ /**
+@@ -25,7 +22,7 @@
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+-#endif 
++#endif
+ #include "os_types.h"
+ 
+ #include <stddef.h>
+@@ -37,7 +34,6 @@
+ #include "jbig2_priv.h"
+ #include "jbig2_arith.h"
+ #include "jbig2_generic.h"
+-#include "jbig2_mmr.h"
+ #include "jbig2_image.h"
+ 
+ static int
+@@ -72,11 +68,11 @@ jbig2_decode_refinement_template0_unopt(Jbig2Ctx *ctx,
+   for (y = 0; y < GRH; y++) {
+     for (x = 0; x < GRW; x++) {
+       CONTEXT = 0;
+-      CONTEXT |= jbig2_image_get_pixel(image, x - 1, y + 0) << 0; 
+-      CONTEXT |= jbig2_image_get_pixel(image, x + 1, y - 1) << 1; 
+-      CONTEXT |= jbig2_image_get_pixel(image, x + 0, y - 1) << 2; 
+-      CONTEXT |= jbig2_image_get_pixel(image, x + params->grat[0], 
+-	y + params->grat[1]) << 3; 
++      CONTEXT |= jbig2_image_get_pixel(image, x - 1, y + 0) << 0;
++      CONTEXT |= jbig2_image_get_pixel(image, x + 1, y - 1) << 1;
++      CONTEXT |= jbig2_image_get_pixel(image, x + 0, y - 1) << 2;
++      CONTEXT |= jbig2_image_get_pixel(image, x + params->grat[0],
++	y + params->grat[1]) << 3;
+       CONTEXT |= jbig2_image_get_pixel(ref, x-dx+1, y-dy+1) << 4;
+       CONTEXT |= jbig2_image_get_pixel(ref, x-dx+0, y-dy+1) << 5;
+       CONTEXT |= jbig2_image_get_pixel(ref, x-dx-1, y-dy+1) << 6;
+@@ -85,13 +81,13 @@ jbig2_decode_refinement_template0_unopt(Jbig2Ctx *ctx,
+       CONTEXT |= jbig2_image_get_pixel(ref, x-dx-1, y-dy+0) << 9;
+       CONTEXT |= jbig2_image_get_pixel(ref, x-dx+1, y-dy-1) << 10;
+       CONTEXT |= jbig2_image_get_pixel(ref, x-dx+0, y-dy-1) << 11;
+-      CONTEXT |= jbig2_image_get_pixel(ref, x-dx+params->grat[2], 
++      CONTEXT |= jbig2_image_get_pixel(ref, x-dx+params->grat[2],
+ 	y-dy+params->grat[3]) << 12;
+       bit = jbig2_arith_decode(as, &GR_stats[CONTEXT]);
+       jbig2_image_set_pixel(image, x, y, bit);
+     }
+   }
+-#ifdef JBIG2_DEBUG
++#ifdef JBIG2_DEBUG_DUMP
+   {
+     static count = 0;
+     char name[32];
+@@ -127,10 +123,10 @@ jbig2_decode_refinement_template1_unopt(Jbig2Ctx *ctx,
+   for (y = 0; y < GRH; y++) {
+     for (x = 0; x < GRW; x++) {
+       CONTEXT = 0;
+-      CONTEXT |= jbig2_image_get_pixel(image, x - 1, y + 0) << 0; 
+-      CONTEXT |= jbig2_image_get_pixel(image, x + 1, y - 1) << 1; 
+-      CONTEXT |= jbig2_image_get_pixel(image, x + 0, y - 1) << 2; 
+-      CONTEXT |= jbig2_image_get_pixel(image, x - 1, y - 1) << 3; 
++      CONTEXT |= jbig2_image_get_pixel(image, x - 1, y + 0) << 0;
++      CONTEXT |= jbig2_image_get_pixel(image, x + 1, y - 1) << 1;
++      CONTEXT |= jbig2_image_get_pixel(image, x + 0, y - 1) << 2;
++      CONTEXT |= jbig2_image_get_pixel(image, x - 1, y - 1) << 3;
+       CONTEXT |= jbig2_image_get_pixel(ref, x-dx+1, y-dy+1) << 4;
+       CONTEXT |= jbig2_image_get_pixel(ref, x-dx+0, y-dy+1) << 5;
+       CONTEXT |= jbig2_image_get_pixel(ref, x-dx+1, y-dy+0) << 6;
+@@ -142,7 +138,7 @@ jbig2_decode_refinement_template1_unopt(Jbig2Ctx *ctx,
+     }
+   }
+ 
+-#ifdef JBIG2_DEBUG
++#ifdef JBIG2_DEBUG_DUMP
+   {
+     static count = 0;
+     char name[32];
+@@ -197,9 +193,9 @@ jbig2_decode_refinement_template1(Jbig2Ctx *ctx,
+       const int minor_width = GRW - x > 8 ? 8 : GRW - x;
+ 
+       if (y >= 1) {
+-	line_m1 = (line_m1 << 8) | 
++	line_m1 = (line_m1 << 8) |
+ 	  (x + 8 < GRW ? grreg_line[-stride + (x >> 3) + 1] : 0);
+-	refline_m1 = (refline_m1 << 8) | 
++	refline_m1 = (refline_m1 << 8) |
+ 	  (x + 8 < GRW ? grref_line[-refstride + (x >> 3) + 1] << 2 : 0);
+       }
+ 
+@@ -275,7 +271,7 @@ jbig2_decode_refinement_region(Jbig2Ctx *ctx,
+     return jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number,
+         "decode_refinement_region: typical prediction coding NYI");
+   if (params->GRTEMPLATE)
+-    return jbig2_decode_refinement_template1_unopt(ctx, segment, params, 
++    return jbig2_decode_refinement_template1_unopt(ctx, segment, params,
+                                              as, image, GR_stats);
+   else
+     return jbig2_decode_refinement_template0_unopt(ctx, segment, params,
+@@ -294,7 +290,7 @@ jbig2_region_find_referred(Jbig2Ctx *ctx,Jbig2Segment *segment)
+   int index;
+ 
+   for (index = 0; index < nsegments; index++) {
+-    rsegment = jbig2_find_segment(ctx, 
++    rsegment = jbig2_find_segment(ctx,
+       segment->referred_to_segments[index]);
+     if (rsegment == NULL) {
+       jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number,
+@@ -317,7 +313,7 @@ jbig2_region_find_referred(Jbig2Ctx *ctx,Jbig2Segment *segment)
+   return NULL;
+ }
+ 
+-/** 
++/**
+  * Handler for generic refinement region segments
+  */
+ int
+@@ -328,7 +324,7 @@ jbig2_refinement_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+   Jbig2RegionSegmentInfo rsi;
+   int offset = 0;
+   byte seg_flags;
+-  
++
+   /* 7.4.7 */
+   if (segment->data_length < 18)
+     return jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
+@@ -362,7 +358,7 @@ jbig2_refinement_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+     params.grat[2] = segment_data[offset + 2];
+     params.grat[3] = segment_data[offset + 3];
+     jbig2_error(ctx, JBIG2_SEVERITY_INFO, segment->number,
+-                   "grat1: (%d, %d) grat2: (%d, %d)", 
++                   "grat1: (%d, %d) grat2: (%d, %d)",
+                    params.grat[0], params.grat[1],
+                    params.grat[2], params.grat[3]);
+     offset += 4;
+@@ -376,7 +372,7 @@ jbig2_refinement_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+     if (ref == NULL)
+       return jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
+         "could not find reference bitmap!");
+-    /* the reference bitmap is the result of a previous 
++    /* the reference bitmap is the result of a previous
+        intermediate region segment; the reference selection
+        rules say to use the first one available, and not to
+        reuse any intermediate result, so we simply clone it
+@@ -388,7 +384,7 @@ jbig2_refinement_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+       "found reference bitmap in segment %d", ref->number);
+   } else {
+     /* the reference is just (a subset of) the page buffer */
+-    params.reference = jbig2_image_clone(ctx, 
++    params.reference = jbig2_image_clone(ctx,
+       ctx->pages[ctx->current_page].image);
+     /* TODO: subset the image if appropriate */
+   }
+diff --git a/jbig2dec/jbig2_segment.c b/jbig2dec/jbig2_segment.c
+--- a/jbig2dec/jbig2_segment.c
++++ b/jbig2dec/jbig2_segment.c
+@@ -1,24 +1,21 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2002-2005 Artifex Software, Inc.
+-    
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: jbig2_segment.c 8022 2007-06-05 22:23:38Z giles $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+-#endif 
++#endif
+ #include "os_types.h"
+ 
+ #include <stddef.h> /* size_t */
+@@ -75,21 +72,21 @@ jbig2_parse_segment_header (Jbig2Ctx *ctx, uint8_t *buf, size_t buf_size,
+   pa_size = result->flags & 0x40 ? 4 : 1; /* 7.2.6 */
+   if (offset + referred_to_segment_count*referred_to_segment_size + pa_size + 4 > buf_size)
+     {
+-      jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, result->number, 
++      jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, result->number,
+         "jbig2_parse_segment_header() called with insufficient data", -1);
+       jbig2_free (ctx->allocator, result);
+       return NULL;
+     }
+-    
++
+   /* 7.2.5 */
+   if (referred_to_segment_count)
+     {
+       int i;
+ 
+       referred_to_segments = jbig2_alloc(ctx->allocator, referred_to_segment_count * referred_to_segment_size * sizeof(uint32_t));
+-    
++
+       for (i = 0; i < referred_to_segment_count; i++) {
+-        referred_to_segments[i] = 
++        referred_to_segments[i] =
+           (referred_to_segment_size == 1) ? buf[offset] :
+           (referred_to_segment_size == 2) ? jbig2_get_int16(buf+offset) :
+             jbig2_get_int32(buf + offset);
+@@ -104,7 +101,7 @@ jbig2_parse_segment_header (Jbig2Ctx *ctx, uint8_t *buf, size_t buf_size,
+     {
+       result->referred_to_segments = NULL;
+     }
+-  
++
+   /* 7.2.6 */
+   if (result->flags & 0x40) {
+ 	result->page_association = jbig2_get_int32(buf + offset);
+@@ -115,7 +112,7 @@ jbig2_parse_segment_header (Jbig2Ctx *ctx, uint8_t *buf, size_t buf_size,
+   jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, result->number,
+   	"segment %d is associated with page %d",
+   	result->number, result->page_association);
+-  	
++
+   /* 7.2.7 */
+   result->data_length = jbig2_get_int32(buf + offset);
+   *p_header_size = offset + 4;
+@@ -165,12 +162,12 @@ jbig2_find_segment(Jbig2Ctx *ctx, uint32_t number)
+     for (index = index_max; index >= 0; index--)
+         if (ctx->segments[index]->number == number)
+             return (ctx->segments[index]);
+-        
++
+     if (global_ctx)
+ 	for (index = global_ctx->segment_index - 1; index >= 0; index--)
+ 	    if (global_ctx->segments[index]->number == number)
+ 		return (global_ctx->segments[index]);
+-    
++
+     /* didn't find a match */
+     return NULL;
+ }
+@@ -197,7 +194,7 @@ int jbig2_parse_extension_segment(Jbig2Ctx *ctx, Jbig2Segment *segment,
+     bool reserved, dependent, necessary;
+ 
+     type = jbig2_get_int32(segment_data);
+-    
++
+     reserved = type & 0x20000000;
+     dependent = type & 0x40000000;
+     necessary = type & 0x80000000;
+@@ -206,7 +203,7 @@ int jbig2_parse_extension_segment(Jbig2Ctx *ctx, Jbig2Segment *segment,
+         jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number,
+             "extension segment is marked 'necessary' but not 'reservered' contrary to spec");
+     }
+-    
++
+     switch (type) {
+         case 0x20000000: return jbig2_parse_comment_ascii(ctx, segment, segment_data);
+         case 0x20000002: return jbig2_parse_comment_unicode(ctx, segment, segment_data);
+@@ -219,7 +216,7 @@ int jbig2_parse_extension_segment(Jbig2Ctx *ctx, Jbig2Segment *segment,
+                     "unhandled extension segment");
+             }
+     }
+-    
++
+     return 0;
+ }
+ 
+diff --git a/jbig2dec/jbig2_symbol_dict.c b/jbig2dec/jbig2_symbol_dict.c
+--- a/jbig2dec/jbig2_symbol_dict.c
++++ b/jbig2dec/jbig2_symbol_dict.c
+@@ -1,26 +1,23 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2001-2005 Artifex Software, Inc.
+-    
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: jbig2_symbol_dict.c 8433 2007-12-11 08:29:58Z ken $
+-    
+-    symbol dictionary segment decode and support
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
++/* symbol dictionary segment decode and support */
++
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+-#endif 
++#endif
+ #include "os_types.h"
+ 
+ #include <stddef.h>
+@@ -70,12 +67,12 @@ jbig2_dump_symbol_dict(Jbig2Ctx *ctx, Jbig2Segment *segment)
+     Jbig2SymbolDict *dict = (Jbig2SymbolDict *)segment->result;
+     int index;
+     char filename[24];
+-    
++
+     if (dict == NULL) return;
+     jbig2_error(ctx, JBIG2_SEVERITY_INFO, segment->number,
+         "dumping symbol dict as %d individual png files\n", dict->n_symbols);
+     for (index = 0; index < dict->n_symbols; index++) {
+-        snprintf(filename, sizeof(filename), "symbol_%02d-%04d.png", 
++        snprintf(filename, sizeof(filename), "symbol_%02d-%04d.png",
+ 		segment->number, index);
+ 	jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number,
+ 	  "dumping symbol %d/%d as '%s'", index, dict->n_symbols, filename);
+@@ -93,7 +90,7 @@ Jbig2SymbolDict *
+ jbig2_sd_new(Jbig2Ctx *ctx, int n_symbols)
+ {
+    Jbig2SymbolDict *new = NULL;
+-   
++
+    new = (Jbig2SymbolDict *)jbig2_alloc(ctx->allocator,
+    				sizeof(Jbig2SymbolDict));
+    if (new != NULL) {
+@@ -110,7 +107,7 @@ jbig2_sd_new(Jbig2Ctx *ctx, int n_symbols)
+      jbig2_free(ctx->allocator, new);
+      return NULL;
+    }
+-   
++
+    return new;
+ }
+ 
+@@ -119,7 +116,7 @@ void
+ jbig2_sd_release(Jbig2Ctx *ctx, Jbig2SymbolDict *dict)
+ {
+    int i;
+-   
++
+    if (dict == NULL) return;
+    for (i = 0; i < dict->n_symbols; i++)
+      if (dict->glyphs[i]) jbig2_image_release(ctx, dict->glyphs[i]);
+@@ -142,12 +139,12 @@ jbig2_sd_count_referred(Jbig2Ctx *ctx, Jbig2Segment *segment)
+     int index;
+     Jbig2Segment *rsegment;
+     int n_dicts = 0;
+- 
++
+     for (index = 0; index < segment->referred_to_segment_count; index++) {
+         rsegment = jbig2_find_segment(ctx, segment->referred_to_segments[index]);
+         if (rsegment && ((rsegment->flags & 63) == 0)) n_dicts++;
+     }
+-                                                                                
++
+     return (n_dicts);
+ }
+ 
+@@ -160,7 +157,7 @@ jbig2_sd_list_referred(Jbig2Ctx *ctx, Jbig2Segment *segment)
+     Jbig2SymbolDict **dicts;
+     int n_dicts = jbig2_sd_count_referred(ctx, segment);
+     int dindex = 0;
+-                                                     
++
+     dicts = jbig2_alloc(ctx->allocator, sizeof(Jbig2SymbolDict *) * n_dicts);
+     for (index = 0; index < segment->referred_to_segment_count; index++) {
+         rsegment = jbig2_find_segment(ctx, segment->referred_to_segments[index]);
+@@ -169,25 +166,25 @@ jbig2_sd_list_referred(Jbig2Ctx *ctx, Jbig2Segment *segment)
+             dicts[dindex++] = (Jbig2SymbolDict *)rsegment->result;
+         }
+     }
+-                                                                                
++
+     if (dindex != n_dicts) {
+         /* should never happen */
+         jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
+             "counted %d symbol dictionaries but build a list with %d.\n",
+             n_dicts, dindex);
+     }
+-                                                                                
++
+     return (dicts);
+ }
+ 
+-/* generate a new symbol dictionary by concatenating a list of 
++/* generate a new symbol dictionary by concatenating a list of
+    existing dictionaries */
+ Jbig2SymbolDict *
+ jbig2_sd_cat(Jbig2Ctx *ctx, int n_dicts, Jbig2SymbolDict **dicts)
+ {
+   int i,j,k, symbols;
+   Jbig2SymbolDict *new = NULL;
+-  
++
+   /* count the imported symbols and allocate a new array */
+   symbols = 0;
+   for(i = 0; i < n_dicts; i++)
+@@ -201,7 +198,7 @@ jbig2_sd_cat(Jbig2Ctx *ctx, int n_dicts, Jbig2SymbolDict **dicts)
+       for (j = 0; j < dicts[i]->n_symbols; j++)
+         new->glyphs[k++] = jbig2_image_clone(ctx, dicts[i]->glyphs[j]);
+   }
+-  
++
+   return new;
+ }
+ 
+@@ -311,7 +308,7 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+ #ifdef JBIG2_DEBUG
+       jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number,
+         "HCHEIGHT = %d", HCHEIGHT);
+-#endif        
++#endif
+       jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number,
+         "decoding height class %d with %d syms decoded", HCHEIGHT, NSYMSDECODED);
+ 
+@@ -374,7 +371,7 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+ 		  code = jbig2_decode_generic_region(ctx, segment, &region_params,
+ 						     as, image, GB_stats);
+ 		  /* todo: handle errors */
+-                  
++
+                   SDNEWSYMS->glyphs[NSYMSDECODED] = image;
+ 
+ 	      } else {
+@@ -399,7 +396,7 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+ 		      Jbig2Image *image;
+ 		      int i;
+ 
+-		      if (tparams == NULL) 
++		      if (tparams == NULL)
+ 		      {
+ 			  /* First time through, we need to initialise the */
+ 			  /* various tables for Huffman or adaptive encoding */
+@@ -438,7 +435,7 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+ 			      tparams->IADS = jbig2_arith_int_ctx_new(ctx);
+ 			      tparams->IAIT = jbig2_arith_int_ctx_new(ctx);
+ 			      /* Table 31 */
+-			      for (SBSYMCODELEN = 0; (1 << SBSYMCODELEN) < 
++			      for (SBSYMCODELEN = 0; (1 << SBSYMCODELEN) <
+ 				  (int)(params->SDNUMINSYMS + params->SDNUMNEWSYMS); SBSYMCODELEN++);
+ 			      tparams->IAID = jbig2_arith_iaid_ctx_new(ctx, SBSYMCODELEN);
+ 			      tparams->IARI = jbig2_arith_int_ctx_new(ctx);
+@@ -485,7 +482,7 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+ 		      }
+ 
+ 		      /* multiple symbols are handled as a text region */
+-		      jbig2_decode_text_region(ctx, segment, tparams, (const Jbig2SymbolDict * const *)refagg_dicts, 
++		      jbig2_decode_text_region(ctx, segment, tparams, (const Jbig2SymbolDict * const *)refagg_dicts,
+ 			  n_refagg_dicts, image, data, size, GR_stats, as, (Jbig2WordStream *)NULL);
+ 
+ 		      SDNEWSYMS->glyphs[NSYMSDECODED] = image;
+@@ -514,7 +511,7 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+ 			  "refinement references unknown symbol %d", ID);
+ 			return NULL;
+ 		      }
+-   
++
+ 		      jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number,
+ 			"symbol is a refinement of id %d with the refinement applied at (%d,%d)",
+ 			ID, RDX, RDY);
+@@ -523,14 +520,14 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+ 
+ 		      /* Table 18 */
+ 		      rparams.GRTEMPLATE = params->SDRTEMPLATE;
+-		      rparams.reference = (ID < ninsyms) ? 
++		      rparams.reference = (ID < ninsyms) ?
+ 					params->SDINSYMS->glyphs[ID] :
+ 					SDNEWSYMS->glyphs[ID-ninsyms];
+ 		      rparams.DX = RDX;
+ 		      rparams.DY = RDY;
+ 		      rparams.TPGRON = 0;
+ 		      memcpy(rparams.grat, params->sdrat, 4);
+-		      jbig2_decode_refinement_region(ctx, segment, 
++		      jbig2_decode_refinement_region(ctx, segment,
+ 		          &rparams, as, image, GR_stats);
+ 
+ 		      SDNEWSYMS->glyphs[NSYMSDECODED] = image;
+@@ -542,7 +539,7 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+ 		  {
+ 		    char name[64];
+ 		    FILE *out;
+-		    snprintf(name, 64, "sd.%04d.%04d.pbm", 
++		    snprintf(name, 64, "sd.%04d.%04d.pbm",
+ 		             segment->number, NSYMSDECODED);
+ 		    out = fopen(name, "wb");
+                     jbig2_image_write_pbm(SDNEWSYMS->glyphs[NSYMSDECODED], out);
+@@ -558,7 +555,7 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+ 	  if (params->SDHUFF && !params->SDREFAGG) {
+ 	    SDNEWSYMWIDTHS[NSYMSDECODED] = SYMWIDTH;
+ 	  }
+-	
++
+ 	  jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number,
+             "decoded symbol %d of %d (%dx%d)",
+ 		NSYMSDECODED, params->SDNUMNEWSYMS,
+@@ -597,7 +594,7 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+ 	if (BMSIZE == 0) {
+ 	  /* if BMSIZE == 0 bitmap is uncompressed */
+ 	  const byte *src = data + jbig2_huffman_offset(hs);
+-	  const int stride = (image->width >> 3) + 
++	  const int stride = (image->width >> 3) +
+ 		((image->width & 7) ? 1 : 0);
+ 	  byte *dst = image->data;
+ 
+@@ -638,17 +635,17 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+ 	for (j = HCFIRSTSYM; j < NSYMSDECODED; j++) {
+ 	  Jbig2Image *glyph;
+ 	  glyph = jbig2_image_new(ctx, SDNEWSYMWIDTHS[j], HCHEIGHT);
+-	  jbig2_image_compose(ctx, glyph, image, 
++	  jbig2_image_compose(ctx, glyph, image,
+ 		-x, 0, JBIG2_COMPOSE_REPLACE);
+ 	  x += SDNEWSYMWIDTHS[j];
+-	  SDNEWSYMS->glyphs[j] = glyph; 
++	  SDNEWSYMS->glyphs[j] = glyph;
+ 	}
+ 	jbig2_image_release(ctx, image);
+       }
+ 
+   } /* end of symbol decode loop */
+ 
+-  if (tparams != NULL) 
++  if (tparams != NULL)
+   {
+       if (!params->SDHUFF)
+       {
+@@ -680,7 +677,7 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+   }
+ 
+   jbig2_free(ctx->allocator, GB_stats);
+-  
++
+   /* 6.5.10 */
+   SDEXSYMS = jbig2_sd_new(ctx, params->SDNUMEXSYMS);
+   {
+@@ -688,7 +685,7 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+     int j = 0;
+     int k, m, exflag = 0;
+     int32_t exrunlength;
+-    
++
+     if (params->SDINSYMS != NULL)
+       m = params->SDINSYMS->n_symbols;
+     else
+@@ -699,9 +696,18 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+         exrunlength = params->SDNUMEXSYMS;
+       else
+         code = jbig2_arith_int_decode(IAEX, as, &exrunlength);
++      if (exrunlength > params->SDNUMEXSYMS - j) {
++        jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
++          "runlength too large in export symbol table (%d > %d - %d)\n",
++          exrunlength, params->SDNUMEXSYMS, j);
++        jbig2_sd_release(ctx, SDEXSYMS);
++        /* skip to the cleanup code and return SDEXSYMS = NULL */
++        SDEXSYMS = NULL;
++        break;
++      }
+       for(k = 0; k < exrunlength; k++)
+         if (exflag) {
+-          SDEXSYMS->glyphs[j++] = (i < m) ? 
++          SDEXSYMS->glyphs[j++] = (i < m) ?
+             jbig2_image_clone(ctx, params->SDINSYMS->glyphs[i]) :
+             jbig2_image_clone(ctx, SDNEWSYMS->glyphs[i-m]);
+           i++;
+@@ -709,9 +715,9 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+         exflag = !exflag;
+     }
+   }
+-  
++
+   jbig2_sd_release(ctx, SDNEWSYMS);
+-  
++
+   if (!params->SDHUFF) {
+       jbig2_arith_int_ctx_free(ctx, IADH);
+       jbig2_arith_int_ctx_free(ctx, IADW);
+@@ -722,7 +728,7 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+         jbig2_arith_int_ctx_free(ctx, IARDX);
+         jbig2_arith_int_ctx_free(ctx, IARDY);
+       }
+-      jbig2_free(ctx->allocator, as);  
++      jbig2_free(ctx->allocator, as);
+   } else {
+       if (params->SDREFAGG) {
+ 	jbig2_free(ctx->allocator, SDNEWSYMWIDTHS);
+@@ -732,7 +738,7 @@ jbig2_decode_symbol_dict(Jbig2Ctx *ctx,
+   }
+ 
+   jbig2_word_stream_buf_free(ctx, ws);
+-  
++
+   return SDEXSYMS;
+ }
+ 
+@@ -747,7 +753,7 @@ jbig2_symbol_dictionary(Jbig2Ctx *ctx, Jbig2Segment *segment,
+   int offset;
+   Jbig2ArithCx *GB_stats = NULL;
+   Jbig2ArithCx *GR_stats = NULL;
+-  
++
+   if (segment->data_length < 10)
+     goto too_short;
+ 
+@@ -766,11 +772,11 @@ jbig2_symbol_dictionary(Jbig2Ctx *ctx, Jbig2Segment *segment,
+   if (params.SDHUFF) {
+     switch ((flags & 0x000c) >> 2) {
+       case 0: /* Table B.4 */
+-	params.SDHUFFDH = jbig2_build_huffman_table(ctx, 
++	params.SDHUFFDH = jbig2_build_huffman_table(ctx,
+ 		                       &jbig2_huffman_params_D);
+ 	break;
+       case 1: /* Table B.5 */
+-	params.SDHUFFDH = jbig2_build_huffman_table(ctx, 
++	params.SDHUFFDH = jbig2_build_huffman_table(ctx,
+ 		                       &jbig2_huffman_params_E);
+ 	break;
+       case 3: /* Custom table from referred segment */
+@@ -785,11 +791,11 @@ jbig2_symbol_dictionary(Jbig2Ctx *ctx, Jbig2Segment *segment,
+     }
+     switch ((flags & 0x0030) >> 4) {
+       case 0: /* Table B.2 */
+-	params.SDHUFFDW = jbig2_build_huffman_table(ctx, 
++	params.SDHUFFDW = jbig2_build_huffman_table(ctx,
+ 		                       &jbig2_huffman_params_B);
+ 	break;
+       case 1: /* Table B.3 */
+-	params.SDHUFFDW = jbig2_build_huffman_table(ctx, 
++	params.SDHUFFDW = jbig2_build_huffman_table(ctx,
+ 		                       &jbig2_huffman_params_C);
+ 	break;
+       case 3: /* Custom table from referred segment */
+@@ -811,7 +817,7 @@ jbig2_symbol_dictionary(Jbig2Ctx *ctx, Jbig2Segment *segment,
+ 	params.SDHUFFBMSIZE = jbig2_build_huffman_table(ctx,
+ 					&jbig2_huffman_params_A);
+     }
+-    if (flags & 0x0080) { 
++    if (flags & 0x0080) {
+         /* Custom table from referred segment */
+ 	return jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
+ 	    "symbol dictionary uses custom REFAGG huffman table (NYI)");
+@@ -833,7 +839,7 @@ jbig2_symbol_dictionary(Jbig2Ctx *ctx, Jbig2Segment *segment,
+       jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number,
+ 		  "SDHUFF is zero, but contrary to spec SDHUFFDW is not.");
+     }
+-  } 
++  }
+ 
+   if (flags & 0x0080) {
+       jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number,
+@@ -853,7 +859,7 @@ jbig2_symbol_dictionary(Jbig2Ctx *ctx, Jbig2Segment *segment,
+       offset += 4;
+   } else {
+       /* sdrat is meaningless if SDRTEMPLATE is 1, but set a value
+-         to avoid confusion if anybody looks */ 
++         to avoid confusion if anybody looks */
+       memset(params.sdrat, 0, 4);
+   }
+ 
+@@ -874,8 +880,8 @@ jbig2_symbol_dictionary(Jbig2Ctx *ctx, Jbig2Segment *segment,
+   {
+     int n_dicts = jbig2_sd_count_referred(ctx, segment);
+     Jbig2SymbolDict **dicts = NULL;
+-  
+-    params.SDINSYMS = NULL;	
++
++    params.SDINSYMS = NULL;
+     if (n_dicts > 0) {
+       dicts = jbig2_sd_list_referred(ctx, segment);
+       params.SDINSYMS = jbig2_sd_cat(ctx, n_dicts, dicts);
+@@ -886,7 +892,7 @@ jbig2_symbol_dictionary(Jbig2Ctx *ctx, Jbig2Segment *segment,
+      params.SDNUMINSYMS = 0;
+     }
+   }
+-  
++
+   /* 7.4.2.2 (4) */
+   if (!params.SDHUFF) {
+       int stats_size = params.SDTEMPLATE == 0 ? 65536 :
+diff --git a/jbig2dec/jbig2_symbol_dict.h b/jbig2dec/jbig2_symbol_dict.h
+--- a/jbig2dec/jbig2_symbol_dict.h
++++ b/jbig2dec/jbig2_symbol_dict.h
+@@ -1,22 +1,19 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2001-2002 Artifex Software, Inc.
+-    
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: jbig2_symbol_dict.h 8022 2007-06-05 22:23:38Z giles $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
++*/
+ 
+-    symbol dictionary header
+- */
++/* symbol dictionary header */
+ 
+ /* the results of decoding a symbol dictionary */
+ typedef struct {
+@@ -47,12 +44,12 @@ Jbig2SymbolDict *
+ jbig2_sd_cat(Jbig2Ctx *ctx, int n_dicts,
+ 			Jbig2SymbolDict **dicts);
+ 
+-/* count the number of dictionary segments referred 
++/* count the number of dictionary segments referred
+    to by the given segment */
+ int
+ jbig2_sd_count_referred(Jbig2Ctx *ctx, Jbig2Segment *segment);
+ 
+-/* return an array of pointers to symbol dictionaries referred 
++/* return an array of pointers to symbol dictionaries referred
+    to by a segment */
+ Jbig2SymbolDict **
+ jbig2_sd_list_referred(Jbig2Ctx *ctx, Jbig2Segment *segment);
+diff --git a/jbig2dec/jbig2_text.c b/jbig2dec/jbig2_text.c
+--- a/jbig2dec/jbig2_text.c
++++ b/jbig2dec/jbig2_text.c
+@@ -1,24 +1,21 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2002-2008 Artifex Software, Inc.
+-    
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: jbig2_text.c 8723 2008-05-09 14:00:44Z giles $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+-#endif 
++#endif
+ #include "os_types.h"
+ 
+ #include <stddef.h>
+@@ -79,14 +76,14 @@ jbig2_decode_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+     Jbig2HuffmanTable *SBSYMCODES = NULL;
+     int code = 0;
+     int RI;
+-    
++
+     SBNUMSYMS = 0;
+     for (index = 0; index < n_dicts; index++) {
+         SBNUMSYMS += dicts[index]->n_symbols;
+     }
+     jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number,
+         "symbol list contains %d glyphs in %d dictionaries", SBNUMSYMS, n_dicts);
+-    
++
+     if (params->SBHUFF) {
+ 	Jbig2HuffmanTable *runcodes;
+ 	Jbig2HuffmanParams runcodeparams;
+@@ -141,14 +138,14 @@ jbig2_decode_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+ 	    len = code;
+ 	    range = 1;
+ 	  } else {
+-	    if (index < 1) {
+-	      jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
+-		"error decoding symbol id table: run length with no antecedent!");
+-	      /* todo: memory cleanup */
+-	      return -1;
+-	    }
+ 	    if (code == 32) {
+ 	      len = symcodelengths[index-1].PREFLEN;
++	      if (index < 1) {
++		jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
++	 	  "error decoding symbol id table: run length with no antecedent!");
++	        /* todo: memory cleanup */
++	        return -1;
++	      }
+ 	    } else {
+ 	      len = 0; /* code == 33 or 34 */
+ 	    }
+@@ -165,8 +162,8 @@ jbig2_decode_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+ 	    range = SBNUMSYMS - index;
+ 	  }
+ 	  for (r = 0; r < range; r++) {
+-	    symcodelengths[index+r].PREFLEN = len; 
+-	    symcodelengths[index+r].RANGELEN = 0; 
++	    symcodelengths[index+r].PREFLEN = len;
++	    symcodelengths[index+r].RANGELEN = 0;
+ 	    symcodelengths[index+r].RANGELOW = index + r;
+ 	  }
+ 	  index += r;
+@@ -198,7 +195,7 @@ jbig2_decode_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+ 
+     /* 6.4.5 (1) */
+     jbig2_image_clear(ctx, image, params->SBDEFPIXEL);
+-    
++
+     /* 6.4.6 */
+     if (params->SBHUFF) {
+         STRIPT = jbig2_huffman_get(hs, params->SBHUFFDT, &code);
+@@ -210,7 +207,7 @@ jbig2_decode_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+     STRIPT *= -(params->SBSTRIPS);
+     FIRSTS = 0;
+     NINSTANCES = 0;
+-    
++
+     /* 6.4.5 (3) */
+     while (NINSTANCES < params->SBNUMINSTANCES) {
+         /* (3b) */
+@@ -221,7 +218,7 @@ jbig2_decode_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+         }
+         DT *= params->SBSTRIPS;
+         STRIPT += DT;
+-       
++
+ 	first_symbol = TRUE;
+ 	/* 6.4.5 (3c) - decode symbols in strip */
+ 	for (;;) {
+@@ -293,7 +290,7 @@ jbig2_decode_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+ 		Jbig2RefinementRegionParams rparams;
+ 		Jbig2Image *IBO;
+ 		int32_t RDW, RDH, RDX, RDY;
+-		Jbig2Image *image;
++		Jbig2Image *refimage;
+ 		int BMSIZE = 0;
+ 
+ 		/* 6.4.11 (1, 2, 3, 4) */
+@@ -313,8 +310,8 @@ jbig2_decode_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+ 
+ 		/* 6.4.11 (6) */
+ 		IBO = IB;
+-		image = jbig2_image_new(ctx, IBO->width + RDW,
+-					     IBO->height + RDH);
++		refimage = jbig2_image_new(ctx, IBO->width + RDW,
++						IBO->height + RDH);
+ 
+ 		/* Table 12 */
+ 		rparams.GRTEMPLATE = params->SBRTEMPLATE;
+@@ -324,8 +321,8 @@ jbig2_decode_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+ 		rparams.TPGRON = 0;
+ 		memcpy(rparams.grat, params->sbrat, 4);
+ 		jbig2_decode_refinement_region(ctx, segment,
+-		    &rparams, as, image, GR_stats);
+-		IB = image;
++		    &rparams, as, refimage, GR_stats);
++		IB = refimage;
+ 
+ 		jbig2_image_release(ctx, IBO);
+ 
+@@ -335,17 +332,17 @@ jbig2_decode_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+ 		}
+ 
+ 	    }
+-        
++
+ 	    /* (3c.vi) */
+ 	    if ((!params->TRANSPOSED) && (params->REFCORNER > 1)) {
+ 		CURS += IB->width - 1;
+ 	    } else if ((params->TRANSPOSED) && !(params->REFCORNER & 1)) {
+ 		CURS += IB->height - 1;
+ 	    }
+-        
++
+ 	    /* (3c.vii) */
+ 	    S = CURS;
+-        
++
+ 	    /* (3c.viii) */
+ 	    if (!params->TRANSPOSED) {
+ 		switch (params->REFCORNER) {  /* FIXME: double check offsets */
+@@ -362,23 +359,23 @@ jbig2_decode_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+ 		case JBIG2_CORNER_BOTTOMRIGHT: y = S - IB->width + 1; x = T - IB->height + 1; break;
+ 		}
+ 	    }
+-        
++
+ 	    /* (3c.ix) */
+ #ifdef JBIG2_DEBUG
+ 	    jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number,
+-			"composing glyph id %d: %dx%d @ (%d,%d) symbol %d/%d", 
++			"composing glyph id %d: %dx%d @ (%d,%d) symbol %d/%d",
+ 			ID, IB->width, IB->height, x, y, NINSTANCES + 1,
+ 			params->SBNUMINSTANCES);
+ #endif
+ 	    jbig2_image_compose(ctx, image, IB, x, y, params->SBCOMBOP);
+-        
++
+ 	    /* (3c.x) */
+ 	    if ((!params->TRANSPOSED) && (params->REFCORNER < 2)) {
+ 		CURS += IB->width -1 ;
+ 	    } else if ((params->TRANSPOSED) && (params->REFCORNER & 1)) {
+ 		CURS += IB->height - 1;
+ 	    }
+-        
++
+ 	    /* (3c.xi) */
+ 	    NINSTANCES++;
+ 
+@@ -390,8 +387,8 @@ jbig2_decode_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
+ 
+     if (params->SBHUFF) {
+       jbig2_release_huffman_table(ctx, SBSYMCODES);
+-    } 
+-    
++    }
++
+     return 0;
+ }
+ 
+@@ -411,22 +408,22 @@ jbig2_parse_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment, const byte *segmen
+     uint16_t huffman_flags = 0;
+     Jbig2ArithCx *GR_stats = NULL;
+     int code = 0;
+-    Jbig2WordStream *ws = NULL; 
+-    Jbig2ArithState *as = NULL; 
+-    
++    Jbig2WordStream *ws = NULL;
++    Jbig2ArithState *as = NULL;
++
+     /* 7.4.1 */
+     if (segment->data_length < 17)
+         goto too_short;
+     jbig2_get_region_segment_info(&region_info, segment_data);
+     offset += 17;
+-    
++
+     /* 7.4.3.1.1 */
+     flags = jbig2_get_int16(segment_data + offset);
+     offset += 2;
+ 
+     jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number,
+ 	"text region header flags 0x%04x", flags);
+-    
++
+     params.SBHUFF = flags & 0x0001;
+     params.SBREFINE = flags & 0x0002;
+     params.LOGSBSTRIPS = (flags & 0x000c) >> 2;
+@@ -450,7 +447,7 @@ jbig2_parse_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment, const byte *segmen
+         /* 7.4.3.1.2 */
+         huffman_flags = jbig2_get_int16(segment_data + offset);
+         offset += 2;
+-        
++
+         if (huffman_flags & 0x8000)
+             jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number,
+                 "reserved bit 15 of text region huffman flags is not zero");
+@@ -465,16 +462,19 @@ jbig2_parse_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment, const byte *segmen
+             params.sbrat[2] = segment_data[offset + 2];
+             params.sbrat[3] = segment_data[offset + 3];
+             offset += 4;
++	  } else {
++	    /* zero these for the sake of later debug messages */
++	    memset(params.sbrat, 0, sizeof(params.sbrat));
+ 	  }
+       }
+-    
++
+     /* 7.4.3.1.4 */
+     params.SBNUMINSTANCES = jbig2_get_int32(segment_data + offset);
+     offset += 4;
+-    
++
+     if (params.SBHUFF) {
+         /* 7.4.3.1.5 - Symbol ID Huffman table */
+-	/* ...this is handled in the segment body decoder */	
++	/* ...this is handled in the segment body decoder */
+ 
+         /* 7.4.3.1.6 - Other Huffman table selection */
+ 	switch (huffman_flags & 0x0003) {
+@@ -626,12 +626,12 @@ jbig2_parse_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment, const byte *segmen
+ 		"text region uses custom RSIZE huffman table (NYI)");
+ 	    break;
+ 	}
+-	
++
+         if (huffman_flags & 0x8000) {
+ 	  jbig2_error(ctx, JBIG2_SEVERITY_WARNING, segment->number,
+  	    "text region huffman flags bit 15 is set, contrary to spec");
+ 	}
+-        
++
+         /* 7.4.3.1.7 */
+         /* For convenience this is done in the body decoder routine */
+     }
+@@ -640,7 +640,7 @@ jbig2_parse_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment, const byte *segmen
+         "text region: %d x %d @ (%d,%d) %d symbols",
+         region_info.width, region_info.height,
+         region_info.x, region_info.y, params.SBNUMINSTANCES);
+-    
++
+     /* 7.4.3.2 (2) - compose the list of symbol dictionaries */
+     n_dicts = jbig2_sd_count_referred(ctx, segment);
+     if (n_dicts != 0) {
+@@ -656,7 +656,7 @@ jbig2_parse_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment, const byte *segmen
+     } else {
+ 	int index;
+ 	if (dicts[0] == NULL) {
+-	    return jbig2_error(ctx, JBIG2_SEVERITY_WARNING, 
++	    return jbig2_error(ctx, JBIG2_SEVERITY_WARNING,
+ 			segment->number,
+                         "unable to find first referenced symbol dictionary!");
+ 	}
+@@ -745,17 +745,17 @@ jbig2_parse_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment, const byte *segmen
+         segment->result = image;
+     } else {
+         /* otherwise composite onto the page */
+-        jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number, 
++        jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number,
+             "composing %dx%d decoded text region onto page at (%d, %d)",
+             region_info.width, region_info.height, region_info.x, region_info.y);
+ 	jbig2_page_add_result(ctx, &ctx->pages[ctx->current_page], image,
+ 			      region_info.x, region_info.y, region_info.op);
+         jbig2_image_release(ctx, image);
+     }
+-    
+-    /* success */            
++
++    /* success */
+     return 0;
+-    
++
+     too_short:
+         return jbig2_error(ctx, JBIG2_SEVERITY_FATAL, segment->number,
+                     "Segment too short");
+diff --git a/jbig2dec/jbig2_text.h b/jbig2dec/jbig2_text.h
+--- a/jbig2dec/jbig2_text.h
++++ b/jbig2dec/jbig2_text.h
+@@ -1,76 +1,73 @@
+-/*

+-    jbig2dec

+-    

+-    Copyright (C) 2002-2004 Artifex Software, Inc.

+-    

+-    This software is distributed under license and may not

+-    be copied, modified or distributed except as expressly

+-    authorized under the terms of the license contained in

+-    the file LICENSE in this distribution.

+-                                                                                

+-    For information on commercial licensing, go to

+-    http://www.artifex.com/licensing/ or contact

+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,

+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.

+-        

+-    $Id: jbig2_text.h 8022 2007-06-05 22:23:38Z giles $

+-*/

+-

+-/**

+- * Headers for Text region handling

+- **/

+-

+-typedef enum {

+-    JBIG2_CORNER_BOTTOMLEFT = 0,

+-    JBIG2_CORNER_TOPLEFT = 1,

+-    JBIG2_CORNER_BOTTOMRIGHT = 2,

+-    JBIG2_CORNER_TOPRIGHT = 3

+-} Jbig2RefCorner;

+-

+-typedef struct {

+-    bool SBHUFF;

+-    bool SBREFINE;

+-    bool SBDEFPIXEL;

+-    Jbig2ComposeOp SBCOMBOP;

+-    bool TRANSPOSED;

+-    Jbig2RefCorner REFCORNER;

+-    int SBDSOFFSET;

+-    /* int SBW; */

+-    /* int SBH; */

+-    uint32_t SBNUMINSTANCES;

+-    int LOGSBSTRIPS;

+-    int SBSTRIPS;

+-    /* int SBNUMSYMS; */

+-    /* SBSYMCODES */

+-    /* SBSYMCODELEN */

+-    /* SBSYMS */

+-    Jbig2HuffmanTable *SBHUFFFS;

+-    Jbig2HuffmanTable *SBHUFFDS;

+-    Jbig2HuffmanTable *SBHUFFDT;

+-    Jbig2HuffmanTable *SBHUFFRDW;

+-    Jbig2HuffmanTable *SBHUFFRDH;

+-    Jbig2HuffmanTable *SBHUFFRDX;

+-    Jbig2HuffmanTable *SBHUFFRDY;

+-    Jbig2HuffmanTable *SBHUFFRSIZE;

+-    Jbig2ArithIntCtx *IADT;

+-    Jbig2ArithIntCtx *IAFS;

+-    Jbig2ArithIntCtx *IADS;

+-    Jbig2ArithIntCtx *IAIT;

+-    Jbig2ArithIaidCtx *IAID;

+-    Jbig2ArithIntCtx *IARI;

+-    Jbig2ArithIntCtx *IARDW;

+-    Jbig2ArithIntCtx *IARDH;

+-    Jbig2ArithIntCtx *IARDX;

+-    Jbig2ArithIntCtx *IARDY;

+-    bool SBRTEMPLATE;

+-    int8_t sbrat[4];

+-} Jbig2TextRegionParams;

+-

+-int

+-jbig2_decode_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment,

+-                             const Jbig2TextRegionParams *params,

+-                             const Jbig2SymbolDict * const *dicts, const int n_dicts,

+-                             Jbig2Image *image,

+-                             const byte *data, const size_t size,

+-			     Jbig2ArithCx *GR_stats,

+-			     Jbig2ArithState *as, Jbig2WordStream *ws);

++/*
++    jbig2dec
++
++    Copyright (C) 2002-2004 Artifex Software, Inc.
++
++    This software is distributed under license and may not
++    be copied, modified or distributed except as expressly
++    authorized under the terms of the license contained in
++    the file LICENSE in this distribution.
++
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
++*/
++
++/**
++ * Headers for Text region handling
++ **/
++
++typedef enum {
++    JBIG2_CORNER_BOTTOMLEFT = 0,
++    JBIG2_CORNER_TOPLEFT = 1,
++    JBIG2_CORNER_BOTTOMRIGHT = 2,
++    JBIG2_CORNER_TOPRIGHT = 3
++} Jbig2RefCorner;
++
++typedef struct {
++    bool SBHUFF;
++    bool SBREFINE;
++    bool SBDEFPIXEL;
++    Jbig2ComposeOp SBCOMBOP;
++    bool TRANSPOSED;
++    Jbig2RefCorner REFCORNER;
++    int SBDSOFFSET;
++    /* int SBW; */
++    /* int SBH; */
++    uint32_t SBNUMINSTANCES;
++    int LOGSBSTRIPS;
++    int SBSTRIPS;
++    /* int SBNUMSYMS; */
++    /* SBSYMCODES */
++    /* SBSYMCODELEN */
++    /* SBSYMS */
++    Jbig2HuffmanTable *SBHUFFFS;
++    Jbig2HuffmanTable *SBHUFFDS;
++    Jbig2HuffmanTable *SBHUFFDT;
++    Jbig2HuffmanTable *SBHUFFRDW;
++    Jbig2HuffmanTable *SBHUFFRDH;
++    Jbig2HuffmanTable *SBHUFFRDX;
++    Jbig2HuffmanTable *SBHUFFRDY;
++    Jbig2HuffmanTable *SBHUFFRSIZE;
++    Jbig2ArithIntCtx *IADT;
++    Jbig2ArithIntCtx *IAFS;
++    Jbig2ArithIntCtx *IADS;
++    Jbig2ArithIntCtx *IAIT;
++    Jbig2ArithIaidCtx *IAID;
++    Jbig2ArithIntCtx *IARI;
++    Jbig2ArithIntCtx *IARDW;
++    Jbig2ArithIntCtx *IARDH;
++    Jbig2ArithIntCtx *IARDX;
++    Jbig2ArithIntCtx *IARDY;
++    bool SBRTEMPLATE;
++    int8_t sbrat[4];
++} Jbig2TextRegionParams;
++
++int
++jbig2_decode_text_region(Jbig2Ctx *ctx, Jbig2Segment *segment,
++                             const Jbig2TextRegionParams *params,
++                             const Jbig2SymbolDict * const *dicts, const int n_dicts,
++                             Jbig2Image *image,
++                             const byte *data, const size_t size,
++			     Jbig2ArithCx *GR_stats,
++			     Jbig2ArithState *as, Jbig2WordStream *ws);
+diff --git a/jbig2dec/jbig2dec.c b/jbig2dec/jbig2dec.c
+--- a/jbig2dec/jbig2dec.c
++++ b/jbig2dec/jbig2dec.c
+@@ -1,25 +1,29 @@
+ /*
+     jbig2dec
+-    
+-    Copyright (C) 2001-2003 Artifex Software, Inc.
+-    
++
++    Copyright (C) 2001-2009 Artifex Software, Inc.
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: jbig2dec.c 8022 2007-06-05 22:23:38Z giles $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+ 
++#ifndef PACKAGE
++#define PACKAGE "jbig2dec"
++#endif
++#ifndef VERSION
++#define VERSION "unknown-version"
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stddef.h>
+@@ -86,7 +90,7 @@ hash_print(jbig2dec_params_t *params, FILE *out)
+     unsigned char md[SHA1_DIGEST_SIZE];
+     char digest[2*SHA1_DIGEST_SIZE + 1];
+     int i;
+-    
++
+     SHA1_Final(params->hash_ctx, md);
+     for (i = 0; i < SHA1_DIGEST_SIZE; i++) {
+         snprintf(&(digest[2*i]), 3, "%02x", md[i]);
+@@ -114,7 +118,7 @@ set_output_format(jbig2dec_params_t *params, const char *format)
+ #endif
+     /* default to pbm */
+     params->output_format=jbig2dec_format_pbm;
+-    
++
+     return 0;
+ }
+ 
+@@ -223,7 +227,7 @@ print_usage (void)
+  #endif
+     "\n"
+   );
+-  
++
+   return 1;
+ }
+ 
+@@ -234,7 +238,7 @@ error_callback(void *error_callback_data, const char *buf, Jbig2Severity severit
+     const jbig2dec_params_t *params = error_callback_data;
+     char *type;
+     char segment[22];
+-    
++
+     switch (severity) {
+         case JBIG2_SEVERITY_DEBUG:
+             if (params->verbose < 3) return 0;
+@@ -250,7 +254,7 @@ error_callback(void *error_callback_data, const char *buf, Jbig2Severity severit
+     }
+     if (seg_idx == -1) segment[0] = '\0';
+     else snprintf(segment, sizeof(segment), "(segment 0x%02x)", seg_idx);
+-    
++
+     fprintf(stderr, "jbig2dec %s %s %s\n", type, buf, segment);
+ 
+     return 0;
+@@ -262,15 +266,15 @@ make_output_filename(const char *input_filename, const char *extension)
+     char *output_filename;
+     const char *c, *e;
+     int len;
+-    
++
+     if (extension == NULL) {
+         fprintf(stderr, "make_output_filename called with no extension!\n");
+         exit (1);
+     }
+-    
++
+     if (input_filename == NULL)
+       c = "out";
+-    else {  
++    else {
+       /* strip any leading path */
+       c = strrchr(input_filename, '/'); /* *nix */
+       if (c == NULL)
+@@ -284,24 +288,24 @@ make_output_filename(const char *input_filename, const char *extension)
+     /* make sure we haven't just stripped the last character */
+     if (*c == '\0')
+       c = "out";
+-        
++
+     /* strip the extension */
+     len = strlen(c);
+     e = strrchr(c, '.');
+     if (e != NULL)
+       len -= strlen(e);
+-    
++
+     /* allocate enough space for the base + ext */
+     output_filename = malloc(len + strlen(extension) + 1);
+     if (output_filename == NULL) {
+         fprintf(stderr, "couldn't allocate memory for output_filename\n");
+         exit (1);
+     }
+-    
++
+     strncpy(output_filename, c, len);
+     strncpy(output_filename + len, extension, strlen(extension));
+     *(output_filename + len + strlen(extension)) = '\0';
+-    
++
+     /* return the new string */
+     return (output_filename);
+ }
+@@ -343,7 +347,7 @@ write_page_image(jbig2dec_params_t *params, Jbig2Image *image)
+               return 1;
+           }
+         }
+-        
++
+   return 0;
+ }
+ 
+@@ -351,17 +355,17 @@ static int
+ write_document_hash(jbig2dec_params_t *params)
+ {
+     FILE *out;
+-    
++
+     if (!strncmp(params->output_file, "-", 2)) {
+         out = stderr;
+     } else {
+         out = stdout;
+     }
+-    
++
+     fprintf(out, "Hash of decoded document: ");
+     hash_print(params, out);
+     fprintf(out, "\n");
+-    
++
+     return 0;
+ }
+ 
+@@ -373,18 +377,18 @@ main (int argc, char **argv)
+   uint8_t buf[4096];
+   jbig2dec_params_t params;
+   int filearg;
+-  
++
+   /* set defaults */
+   params.mode = render;
+   params.verbose = 1;
+   params.hash = 0;
+   params.output_file = NULL;
+   params.output_format = jbig2dec_format_none;
+-  
++
+   filearg = parse_options(argc, argv, &params);
+ 
+   if (params.hash) hash_init(&params);
+-  
++
+   switch (params.mode) {
+     case usage:
+         print_usage();
+@@ -394,7 +398,7 @@ main (int argc, char **argv)
+         fprintf(stderr, "Sorry, segment dump not yet implemented\n");
+         break;
+     case render:
+-    
++
+   if ((argc - filearg) == 1)
+   /* only one argument--open as a jbig2 file */
+     {
+@@ -430,7 +434,7 @@ main (int argc, char **argv)
+   else
+   /* any other number of arguments */
+     return print_usage();
+-    
++
+   ctx = jbig2_ctx_new(NULL, f_page != NULL ? JBIG2_OPTIONS_EMBEDDED : 0,
+ 		      NULL,
+ 		      error_callback, &params);
+@@ -469,7 +473,7 @@ main (int argc, char **argv)
+     /* work around broken CVision embedded streams */
+     if (f_page != NULL)
+       jbig2_complete_page(ctx);
+-    
++
+     if (params.output_file == NULL)
+       {
+ #ifdef HAVE_LIBPNG
+@@ -494,14 +498,14 @@ main (int argc, char **argv)
+     }
+     if (params.hash) write_document_hash(&params);
+   }
+-  
++
+   jbig2_ctx_free(ctx);
+ 
+   } /* end params.mode switch */
+ 
+   if (params.output_file) free(params.output_file);
+   if (params.hash) hash_free(&params);
+-  
++
+   /* fin */
+   return 0;
+ }
+diff --git a/jbig2dec/memcmp.c b/jbig2dec/memcmp.c
+--- a/jbig2dec/memcmp.c
++++ b/jbig2dec/memcmp.c
+@@ -1,19 +1,16 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2001-2005 Artifex Software, Inc.
+-    
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
+-    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ 
+-    $Id: memcmp.c 8022 2007-06-05 22:23:38Z giles $
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
++    San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+ */
+ 
+ #ifdef HAVE_CONFIG_H
+diff --git a/jbig2dec/missing b/jbig2dec/missing
+--- a/jbig2dec/missing
++++ b/jbig2dec/missing
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Common stub for a few missing GNU programs while installing.
+ 
+-scriptversion=2005-02-08.22
++scriptversion=2006-05-10.23
+ 
+-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+ #   Free Software Foundation, Inc.
+ # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+ 
+@@ -19,8 +19,8 @@ scriptversion=2005-02-08.22
+ 
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+ 
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -33,6 +33,8 @@ if test $# -eq 0; then
+ fi
+ 
+ run=:
++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
++sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+ 
+ # In the cases where this matters, `missing' is being run in the
+ # srcdir already.
+@@ -44,7 +46,7 @@ fi
+ 
+ msg="missing on your system"
+ 
+-case "$1" in
++case $1 in
+ --run)
+   # Try to run requested program, and just exit if it succeeds.
+   run=
+@@ -77,6 +79,7 @@ Supported PROGRAM values:
+   aclocal      touch file \`aclocal.m4'
+   autoconf     touch file \`configure'
+   autoheader   touch file \`config.h.in'
++  autom4te     touch the output file, or create a stub one
+   automake     touch all \`Makefile.in' files
+   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
+   flex         create \`lex.yy.c', if possible, from existing .c
+@@ -106,7 +109,7 @@ esac
+ # Now exit if we have it, but it failed.  Also exit now if we
+ # don't have it and --version was passed (most likely to detect
+ # the program).
+-case "$1" in
++case $1 in
+   lex|yacc)
+     # Not GNU programs, they don't have --version.
+     ;;
+@@ -135,7 +138,7 @@ esac
+ 
+ # If it does not exist, or fails to run (possibly an outdated version),
+ # try to emulate it.
+-case "$1" in
++case $1 in
+   aclocal*)
+     echo 1>&2 "\
+ WARNING: \`$1' is $msg.  You should only need it if
+@@ -164,7 +167,7 @@ WARNING: \`$1' is $msg.  You should only need it if
+     test -z "$files" && files="config.h"
+     touch_files=
+     for f in $files; do
+-      case "$f" in
++      case $f in
+       *:*) touch_files="$touch_files "`echo "$f" |
+ 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+       *) touch_files="$touch_files $f.in";;
+@@ -192,8 +195,8 @@ WARNING: \`$1' is needed, but is $msg.
+          You can get \`$1' as part of \`Autoconf' from any GNU
+          archive site."
+ 
+-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
++    file=`echo "$*" | sed -n "$sed_output"`
++    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+     if test -f "$file"; then
+ 	touch $file
+     else
+@@ -214,25 +217,25 @@ WARNING: \`$1' $msg.  You should only need it if
+          in order for those modifications to take effect.  You can get
+          \`Bison' from any GNU archive site."
+     rm -f y.tab.c y.tab.h
+-    if [ $# -ne 1 ]; then
++    if test $# -ne 1; then
+         eval LASTARG="\${$#}"
+-	case "$LASTARG" in
++	case $LASTARG in
+ 	*.y)
+ 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+-	    if [ -f "$SRCFILE" ]; then
++	    if test -f "$SRCFILE"; then
+ 	         cp "$SRCFILE" y.tab.c
+ 	    fi
+ 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+-	    if [ -f "$SRCFILE" ]; then
++	    if test -f "$SRCFILE"; then
+ 	         cp "$SRCFILE" y.tab.h
+ 	    fi
+ 	  ;;
+ 	esac
+     fi
+-    if [ ! -f y.tab.h ]; then
++    if test ! -f y.tab.h; then
+ 	echo >y.tab.h
+     fi
+-    if [ ! -f y.tab.c ]; then
++    if test ! -f y.tab.c; then
+ 	echo 'main() { return 0; }' >y.tab.c
+     fi
+     ;;
+@@ -244,18 +247,18 @@ WARNING: \`$1' is $msg.  You should only need it if
+          in order for those modifications to take effect.  You can get
+          \`Flex' from any GNU archive site."
+     rm -f lex.yy.c
+-    if [ $# -ne 1 ]; then
++    if test $# -ne 1; then
+         eval LASTARG="\${$#}"
+-	case "$LASTARG" in
++	case $LASTARG in
+ 	*.l)
+ 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+-	    if [ -f "$SRCFILE" ]; then
++	    if test -f "$SRCFILE"; then
+ 	         cp "$SRCFILE" lex.yy.c
+ 	    fi
+ 	  ;;
+ 	esac
+     fi
+-    if [ ! -f lex.yy.c ]; then
++    if test ! -f lex.yy.c; then
+ 	echo 'main() { return 0; }' >lex.yy.c
+     fi
+     ;;
+@@ -267,11 +270,9 @@ WARNING: \`$1' is $msg.  You should only need it if
+ 	 \`Help2man' package in order for those modifications to take
+ 	 effect.  You can get \`Help2man' from any GNU archive site."
+ 
+-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+-    if test -z "$file"; then
+-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+-    fi
+-    if [ -f "$file" ]; then
++    file=`echo "$*" | sed -n "$sed_output"`
++    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++    if test -f "$file"; then
+ 	touch $file
+     else
+ 	test -z "$file" || exec >$file
+@@ -289,14 +290,23 @@ WARNING: \`$1' is $msg.  You should only need it if
+          DU, IRIX).  You might want to install the \`Texinfo' package or
+          the \`GNU make' package.  Grab either from any GNU archive site."
+     # The file to touch is that specified with -o ...
+-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
++    file=`echo "$*" | sed -n "$sed_output"`
++    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+     if test -z "$file"; then
+       # ... or it is the one specified with @setfilename ...
+       infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
++      file=`sed -n '
++	/^@setfilename/{
++	  s/.* \([^ ]*\) *$/\1/
++	  p
++	  q
++	}' $infile`
+       # ... or it is derived from the source name (dir/f.texi becomes f.info)
+       test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+     fi
++    # If the file does not exist, the user really needs makeinfo;
++    # let's fail without touching anything.
++    test -f $file || exit 1
+     touch $file
+     ;;
+ 
+@@ -314,13 +324,13 @@ WARNING: \`$1' is $msg.  You should only need it if
+     fi
+     firstarg="$1"
+     if shift; then
+-	case "$firstarg" in
++	case $firstarg in
+ 	*o*)
+ 	    firstarg=`echo "$firstarg" | sed s/o//`
+ 	    tar "$firstarg" "$@" && exit 0
+ 	    ;;
+ 	esac
+-	case "$firstarg" in
++	case $firstarg in
+ 	*h*)
+ 	    firstarg=`echo "$firstarg" | sed s/h//`
+ 	    tar "$firstarg" "$@" && exit 0
+diff --git a/jbig2dec/os_types.h b/jbig2dec/os_types.h
+--- a/jbig2dec/os_types.h
++++ b/jbig2dec/os_types.h
+@@ -1,19 +1,16 @@
+ /*
+     jbig2dec
+-    
++
+     Copyright (C) 2003 Artifex Software, Inc.
+-    
++
+     This software is distributed under license and may not
+     be copied, modified or distributed except as expressly
+     authorized under the terms of the license contained in
+     the file LICENSE in this distribution.
+-                                                                                
+-    For information on commercial licensing, go to
+-    http://www.artifex.com/licensing/ or contact
+-    Artifex Software, Inc.,  101 Lucas Valley Road #110,
++
++    For further licensing information refer to http://artifex.com/ or
++    contact Artifex Software, Inc., 7 Mt. Lassen Drive - Suite A-134,
+     San Rafael, CA  94903, U.S.A., +1(415)492-9861.
+-        
+-    $Id: os_types.h 8037 2007-06-10 01:51:33Z alexcher $
+ */
+ 
+ /*
+@@ -41,7 +38,7 @@
+ #endif
+ #elif defined(HAVE_CONFIG_H)
+ # include "config_types.h"
+-#elif defined(_WIN32) || defined(__WIN32__) 
++#elif defined(_WIN32) || defined(__WIN32__)
+ # include "config_win32.h"
+ #endif
+ 
+diff --git a/jbig2dec/sha1.c b/jbig2dec/sha1.c
+--- a/jbig2dec/sha1.c
++++ b/jbig2dec/sha1.c
+@@ -4,7 +4,7 @@ By Steve Reid <sreid@sea-to-sky.net>
+ 100% Public Domain
+ 
+ -----------------
+-Modified 7/98 
++Modified 7/98
+ By James H. Brown <jbrown@burgoyne.com>
+ Still 100% Public Domain
+ 
+@@ -26,7 +26,7 @@ Since the file IO in main() reads 16K at a time, any file 8K or larger would
+ be guaranteed to generate the wrong hash (e.g. Test Vector #3, a million
+ "a"s).
+ 
+-I also changed the declaration of variables i & j in SHA1Update to 
++I also changed the declaration of variables i & j in SHA1Update to
+ unsigned long from unsigned int for the same reason.
+ 
+ These changes should make no difference to any 32 bit implementations since
+@@ -53,7 +53,7 @@ Still 100% public domain
+ Modified 4/01
+ By Saul Kravitz <Saul.Kravitz@celera.com>
+ Still 100% PD
+-Modified to run on Compaq Alpha hardware.  
++Modified to run on Compaq Alpha hardware.
+ 
+ -----------------
+ Modified 07/2002
+@@ -116,7 +116,7 @@ void SHA1_Transform(uint32_t state[5], const uint8_t buffer[64]);
+ void SHAPrintContext(SHA1_CTX *context, char *msg){
+   printf("%s (%d,%d) %x %x %x %x %x\n",
+ 	 msg,
+-	 context->count[0], context->count[1], 
++	 context->count[0], context->count[1],
+ 	 context->state[0],
+ 	 context->state[1],
+ 	 context->state[2],
+@@ -245,7 +245,7 @@ void SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE])
+         digest[i] = (uint8_t)
+          ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
+     }
+-    
++
+     /* Wipe variables */
+     i = 0;
+     memset(context->buffer, 0, 64);
+@@ -257,7 +257,7 @@ void SHA1_Final(SHA1_CTX* context, uint8_t digest[SHA1_DIGEST_SIZE])
+     SHA1_Transform(context->state, context->buffer);
+ #endif
+ }
+-  
++
+ /*************************************************************/
+ 
+ #if 0
+@@ -282,7 +282,7 @@ FILE* file;
+             fputs("Unable to open file.", stderr);
+             return(-1);
+         }
+-    } 
++    }
+     SHA1_Init(&context);
+     while (!feof(file)) {  /* note: what if ferror(file) */
+         i = fread(buffer, 1, 16384, file);
+@@ -313,13 +313,13 @@ static char *test_results[] = {
+     "A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D",
+     "84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1",
+     "34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F"};
+-    
++
+ 
+ void digest_to_hex(const uint8_t digest[SHA1_DIGEST_SIZE], char *output)
+ {
+     int i,j;
+     char *c = output;
+-    
++
+     for (i = 0; i < SHA1_DIGEST_SIZE/4; i++) {
+         for (j = 0; j < 4; j++) {
+             sprintf(c,"%02X", digest[i*4+j]);
+@@ -330,7 +330,7 @@ void digest_to_hex(const uint8_t digest[SHA1_DIGEST_SIZE], char *output)
+     }
+     *(c - 1) = '\0';
+ }
+-    
++
+ int main(int argc, char** argv)
+ {
+     int k;
+@@ -339,8 +339,8 @@ int main(int argc, char** argv)
+     char output[80];
+ 
+     fprintf(stdout, "verifying SHA-1 implementation... ");
+-    
+-    for (k = 0; k < 2; k++){ 
++
++    for (k = 0; k < 2; k++){
+         SHA1_Init(&context);
+         SHA1_Update(&context, (uint8_t*)test_data[k], strlen(test_data[k]));
+         SHA1_Final(&context, digest);
+@@ -352,7 +352,7 @@ int main(int argc, char** argv)
+             fprintf(stderr,"\t%s returned\n", output);
+             fprintf(stderr,"\t%s is correct\n", test_results[k]);
+             return (1);
+-        }    
++        }
+     }
+     /* million 'a' vector we feed separately */
+     SHA1_Init(&context);
+diff --git a/jbig2dec/test_jbig2dec.py b/jbig2dec/test_jbig2dec.py
+--- a/jbig2dec/test_jbig2dec.py
++++ b/jbig2dec/test_jbig2dec.py
+@@ -1,12 +1,60 @@
+ #! /usr/bin/env python
+ 
+ # this is the testtest script for jbig2dec
+-# $Id: test_jbig2dec.py 6300 2005-12-28 19:56:24Z giles $
+ 
+ import os, re
+-import unittest
++import sys, time
+ 
+-class KnownFileHash(unittest.TestCase):
++class SelfTest:
++  'generic class for self tests'
++  def __init__(self):
++    self.result = 'unrun'
++    self.msg = ''
++  def shortDescription(self):
++    'returns a short name for the test'
++    return "generic self test"
++  def runTest(self):
++    'call this to execute the test'
++    pass
++  def fail(self, msg=None):
++    self.result = 'FAIL'
++    self.msg = msg
++  def failIf(self, check, msg=None):
++    if check: self.fail(msg)
++  def assertEqual(self, a, b, msg=None):
++    if a != b: self.fail(msg)
++
++class SelfTestSuite:
++  'generic class for running a collection of SelfTest instances'
++  def __init__(self, stream=sys.stderr):
++    self.stream = stream
++    self.tests = []
++    self.fails = []
++    self.xfails = []
++    self.errors = []
++  def addTest(self, test):
++    self.tests.append(test)
++  def run(self):
++    starttime = time.time()
++    for test in self.tests:
++      self.stream.write("%s ... " % test.shortDescription())
++      test.result = 'ok'
++      test.runTest()
++      if test.result != 'ok':
++        self.fails.append(test)
++      self.stream.write("%s\n" % test.result)
++    stoptime = time.time()
++    self.stream.write('-'*72 + '\n')
++    self.stream.write('ran %d tests in %.3f seconds\n\n' % 
++	(len(self.tests), stoptime - starttime))
++    if len(self.fails):
++      self.stream.write('FAILED %d of %d tests\n' % 
++	(len(self.fails),len(self.tests)))
++    else:
++      self.stream.write('PASSED all %d tests\n' % len(self.tests))
++
++class KnownFileHash(SelfTest):
++  'self test to check for correct decode of known test files'
+ 
+   # hashes of known test inputs
+   known_042_DECODED = "ebfdf6e2fc5ff3ee2271c2fa19de0e52712046e8"
+@@ -101,10 +149,10 @@ class KnownFileHash(unittest.TestCase):
+                         "ff373f070f5f405b732c53ffffff087eff22ff5b") )
+ 
+   def __init__(self, file, file_hash, decode_hash):
++    SelfTest.__init__(self)
+     self.file = file
+     self.file_hash = file_hash
+     self.decode_hash = decode_hash
+-    unittest.TestCase.__init__(self)
+ 
+   def shortDescription(self):
+     return "Checking '%s' for correct decoded document hash" % self.file
+@@ -126,7 +174,7 @@ class KnownFileHash(unittest.TestCase):
+         return
+     self.fail('document hash was not found in the output')
+ 
+-suite = unittest.TestSuite()
++suite = SelfTestSuite()
+ for filename, file_hash, decode_hash in KnownFileHash.known_hashes:
+   # only add tests for files we can find
+   if not os.access(filename, os.R_OK): continue
+@@ -135,8 +183,5 @@ for filename, file_hash, decode_hash in KnownFileHash.known_hashes:
+ 
+ # run the defined tests if we're called as a script
+ if __name__ == "__main__":
+-    import sys
+-    verbosity = 2
+-    runner = unittest.TextTestRunner(verbosity=verbosity)
+-    result = runner.run(suite)
+-    sys.exit(not result.wasSuccessful())
++    result = suite.run()
++    sys.exit(not result)
diff --git a/recipes/gs/gs/1001_install_cjk_examples.patch b/recipes/gs/gs/1001_install_cjk_examples.patch
new file mode 100644
index 0000000000..16de1c84d4
--- /dev/null
+++ b/recipes/gs/gs/1001_install_cjk_examples.patch
@@ -0,0 +1,18 @@
+Description: Install CJK example files
+Author: Jonas Smedegaard <dr@jones.dk>
+diff -ruN a/base/unixinst.mak b/base/unixinst.mak
+--- a/base/unixinst.mak
++++ b/base/unixinst.mak
+@@ -169,6 +169,12 @@
+ ridt91.eps ;\
+ 	do $(INSTALL_DATA) $(PSEXDIR)/$$f $(DESTDIR)$(exdir) ;\
+ 	done
++	-mkdir -p $(DESTDIR)$(exdir)/cjk
++	for f in \
++all_ac1.ps all_aj1.ps all_ak1.ps gscjk_ac.ps gscjk_aj.ps iso2022.ps \
++all_ag1.ps all_aj2.ps article9.ps gscjk_ag.ps gscjk_ak.ps iso2022v.ps ;\
++	do $(INSTALL_DATA) $(PSEXDIR)/cjk/$$f $(DESTDIR)$(exdir)/cjk ;\
++	done
+ 
+ install-shared: $(GS_SHARED_OBJS)
+ 	-mkdir -p $(DESTDIR)$(gssharedir)
diff --git a/recipes/gs/gs/1002_ps2pdf_man_fix.patch b/recipes/gs/gs/1002_ps2pdf_man_fix.patch
new file mode 100644
index 0000000000..0314d040ac
--- /dev/null
+++ b/recipes/gs/gs/1002_ps2pdf_man_fix.patch
@@ -0,0 +1,126 @@
+Description: Document ps2pdf14 in ps2pdf manpage
+Author: Jonas Smedegaard <dr@jones.dk>
+--- a/man/ps2pdf.1
++++ b/man/ps2pdf.1
+@@ -1,17 +1,21 @@
+ .\" $Id: ps2pdf.1 9434 2009-02-03 17:03:41Z giles $
+-.TH PS2PDF 1 "3 February 2009" 8.64 Ghostscript \" -*- nroff -*-
++.TH PS2PDF 1 "7 February 2009" 8.64 Ghostscript \" -*- nroff -*-
+ .SH NAME
+ ps2pdf \- Convert PostScript to PDF using ghostscript
+ .br
+ ps2pdf12 \- Convert PostScript to PDF\ 1.2 (Acrobat\ 3-and-later compatible) using ghostscript
+ .br
+ ps2pdf13 \- Convert PostScript to PDF\ 1.3 (Acrobat\ 4-and-later compatible) using ghostscript
++.br
++ps2pdf14 \- Convert PostScript to PDF\ 1.4 (Acrobat\ 5-and-later compatible) using ghostscript
+ .SH SYNOPSIS
+ \fBps2pdf\fR  [options...] {input.[e]ps|-} [output.pdf|-]
+ .br
+ \fBps2pdf12\fR  [options...] {input.[e]ps|-} [output.pdf|-]
+ .br
+ \fBps2pdf13\fR  [options...] {input.[e]ps|-} [output.pdf|-]
++.br
++\fBps2pdf14\fR  [options...] {input.[e]ps|-} [output.pdf|-]
+ .SH DESCRIPTION
+ The
+ .B ps2pdf
+@@ -32,13 +36,17 @@
+ .B ps2pdf13
+ will always produce PDF 1.3 output (Acrobat 4-and-later compatible).
+ .IP -
++.B ps2pdf14
++will always produce PDF 1.4 output (Acrobat 5-and-later compatible).
++.IP -
+ .B ps2pdf
+ per se currently produces PDF 1.4 output.
+ However, this may change in the future. If you care about
+ the compatibility level of the output, use
+-.B ps2pdf12
++.BR ps2pdf12 ,
++.B ps2pdf13
+ or
+-.BR ps2pdf13 ,
++.BR ps2pdf14 ,
+ or use the
+ .B \-dCompatibility=1.x
+ switch in the command line.
+--- a/man/de/ps2pdf.1
++++ b/man/de/ps2pdf.1
+@@ -1,54 +1,63 @@
+ .\" $Id: ps2pdf.1 9322 2009-01-04 20:15:19Z till $
+-.\" Using encoding of the German (de_DE) translation: ISO-8859-1
++.\" Using encoding of the German (de_DE) translation: UTF-8
+ .\" Translation by Tobias Burnus <burnus@gmx.de> and Thomas Hoffmann
+ .\" revised for version 7.06 by Wolfram Quester <wolfi@mittelerde.physik.uni-kostanz.de> 
+-.TH PS2PDF 1 "8.Juli 2002" 7.21 Ghostscript \" -*- nroff -*-
++.\" revised for version 8.64 and recoded to UTF-8 by Jonas Smedegaard <dr@jones.dk>
++.TH PS2PDF 1 "7.März 2009" 8.64 Ghostscript \" -*- nroff -*-
+ .SH NAME
+ ps2pdf \- konvertiert PostScript nach PDF mittels ghostscript
+ .br
+-ps2pdf12 \- konvertiert PostScript nach PDF\ 1.2 (kompatibel zu Acrobat\ 3 und später) mittels ghostscript
++ps2pdf12 \- konvertiert PostScript nach PDF\ 1.2 (kompatibel zu Acrobat\ 3 und später) mittels ghostscript
+ .br
+-ps2pdf13 \- konvertiert PostScript nach PDF\ 1.3 (kompatibel zu Acrobat\ 4 und später) mittels ghostscript
++ps2pdf13 \- konvertiert PostScript nach PDF\ 1.3 (kompatibel zu Acrobat\ 4 und später) mittels ghostscript
++.br
++ps2pdf14 \- konvertiert PostScript nach PDF\ 1.4 (kompatibel zu Acrobat\ 5 und später) mittels ghostscript
+ .SH SYNTAX
+ \fBps2pdf\fR  [Optionen...] {Eingabe.[e]ps|-} [Ausgabe.pdf|-]
+ .br
+ \fBps2pdf12\fR  [Optionen...] {Eingabe.[e]ps|-} [Ausgabe.pdf|-]
+ .br
+ \fBps2pdf13\fR  [Optionen...] {Eingabe.[e]ps|-} [Ausgabe.pdf|-]
++.br
++\fBps2pdf14\fR  [Optionen...] {Eingabe.[e]ps|-} [Ausgabe.pdf|-]
+ .SH BESCHREIBUNG
+-Außer in der Benutzerschnittstelle sind die
++Außer in der Benutzerschnittstelle sind die
+ .B ps2pdf\-Skripte
+-nahezu in allen Funktionen äquivalent zu Adobe Acrobat Distiller: Sie konvertieren 
++nahezu in allen Funktionen äquivalent zu Adobe Acrobat Distiller: Sie konvertieren 
+ PostScript-Dateien in das Portable Document Format (PDF).
+ 
+ .PP
+ Die drei Skripte unterscheiden sich wie folgt:
+ .IP -
+ .B ps2pdf12
+-produziert immer PDF-1.2-Dateien (kompatibel zu Acrobat 3 und später).
++produziert immer PDF-1.2-Dateien (kompatibel zu Acrobat 3 und später).
+ .IP -
+ .B ps2pdf13
+-produziert immer PDF-1.3-Dateien (kompatibel zu Acrobat 4 und später).
++produziert immer PDF-1.3-Dateien (kompatibel zu Acrobat 4 und später).
++.IP -
++.B ps2pdf14
++produziert immer PDF-1.4-Dateien (kompatibel zu Acrobat 5 und später).
+ .IP -
+ .B ps2pdf
+-selbst produziert standardgemäß PDF-1.2-Dateien (kompatibel zu Acrobat 3 und später); In späteren Versionen kann sich das jedoch ändern. Falls Sie eine bestimmte PDF-Version benötigen, sollten Sie
++selbst produziert standardgemäß PDF-1.4-Dateien (kompatibel zu Acrobat 5 und später); In späteren Versionen kann sich das jedoch ändern. Falls Sie eine bestimmte PDF-Version benötigen, sollten Sie
+ .B ps2pdf12,
+-.BR ps2pdf13 
++.B ps2pdf13,
++.BR ps2pdf14 
+ oder den
+ .B \-dCompatibility=1.x
+ Schalter in der Kommandozeile benutzen.
+ .PP
+ Die Konvertierung mittels
+ .BR ps2pdf
+-unterliegt einigen Beschränkungen. Ausführlichere Informationen dazu stehen in der HTML-Dokumentation.
++unterliegt einigen Beschränkungen. Ausführlichere Informationen dazu stehen in der HTML-Dokumentation.
+ .SH OPTIONEN
+-Für ps2pdf gelten die gleichen Optionen wie für gs(1).
++Für ps2pdf gelten die gleichen Optionen wie für gs(1).
+ .SH SIEHE AUCH
+ gs(1), ps2pdfwr(1),
+ .br
+ Ps2pdf.htm in der Ghostscript-Dokumentation
+ .SH VERSION
+-Dieses Dokument wurde zuletzt für Ghostscript Version 7.21 durchgesehen.
++Dieses Dokument wurde zuletzt für Ghostscript Version 8.64 durchgesehen.
+ .SH AUTOR
+ Artifex Software, Inc. sind die
+ Hauptautoren von Ghostscript.
diff --git a/recipes/gs/gs/1003_fix_autoconf_create_from_infiles.patch b/recipes/gs/gs/1003_fix_autoconf_create_from_infiles.patch
new file mode 100644
index 0000000000..2f9d898d9e
--- /dev/null
+++ b/recipes/gs/gs/1003_fix_autoconf_create_from_infiles.patch
@@ -0,0 +1,14 @@
+Description: Use newer autoconf syntax to declare autogenerated files
+Author: Jonas Smedegaard <dr@jones.dk>
+diff --git a/base/configure.ac b/base/configure.ac
+--- a/base/configure.ac
++++ b/base/configure.ac
+@@ -1077,6 +1077,7 @@ dnl --------------------------------------------------
+ 
+ AC_SUBST(OPT_CFLAGS)
+ AC_SUBST(GCFLAGS)
+-AC_OUTPUT(Makefile cups/pstopxl cups/pstoraster)
++AC_CONFIG_FILES([Makefile cups/pstopxl cups/pstoraster])
++AC_OUTPUT
+ 
+ chmod +x cups/pstopxl cups/pstoraster
diff --git a/recipes/gs/gs/1004_CVE-2009-0792_CVE-2009-0584_CVE-2009-0583.patch b/recipes/gs/gs/1004_CVE-2009-0792_CVE-2009-0584_CVE-2009-0583.patch
new file mode 100644
index 0000000000..79231fb3ec
--- /dev/null
+++ b/recipes/gs/gs/1004_CVE-2009-0792_CVE-2009-0584_CVE-2009-0583.patch
@@ -0,0 +1,1154 @@
+Description: fixing various integer overflows
+Author: Nico Golde <nion@debian.org>
+diff -urNad ghostscript-8.64~dfsg~/icclib/icc.c ghostscript-8.64~dfsg/icclib/icc.c
+--- ghostscript-8.64~dfsg~/icclib/icc.c	2008-05-09 06:12:01.000000000 +0200
++++ ghostscript-8.64~dfsg/icclib/icc.c	2009-04-22 01:44:37.000000000 +0200
+@@ -152,6 +152,8 @@
+  *      Various bug fixes and enhancements.
+  */
+ 
++#include <limits.h>
++#include <stdint.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -313,8 +315,11 @@
+ 	icmFileMem *p = (icmFileMem *)pp;
+ 	size_t len;
+ 
++	if (count > 0 && size > SIZE_MAX / count)
++		return 0;
++
+ 	len = size * count;
+-	if ((p->cur + len) >= p->end) {		/* Too much */
++	if (len > (p->end - p->cur)) { /* Too much */
+ 		if (size > 0)
+ 			count = (p->end - p->cur)/size;
+ 		else
+@@ -1634,6 +1639,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmUInt8Array_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -1698,7 +1705,7 @@
+ 	if (p->size != p->_size) {
+ 		if (p->data != NULL)
+ 			icp->al->free(icp->al, p->data);
+-		if ((p->data = (unsigned int *) icp->al->malloc(icp->al, p->size * sizeof(unsigned int))) == NULL) {
++		if ((p->data = (unsigned int *) icp->al->calloc(icp->al, p->size, sizeof(unsigned int))) == NULL) {
+ 			sprintf(icp->err,"icmUInt8Array_alloc: malloc() of icmUInt8Array data failed");
+ 			return icp->errc = 2;
+ 		}
+@@ -1749,6 +1756,10 @@
+ 	icmUInt16Array *p = (icmUInt16Array *)pp;
+ 	unsigned int len = 0;
+ 	len += 8;			/* 8 bytes for tag and padding */
++	if (p->size > (UINT_MAX - len) / 2) {
++		p->icp->errc = 1;
++		return (unsigned int) -1;
++	}
+ 	len += p->size * 2;	/* 2 bytes for each UInt16 */
+ 	return len;
+ }
+@@ -1821,6 +1832,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmUInt16Array_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -1885,7 +1898,7 @@
+ 	if (p->size != p->_size) {
+ 		if (p->data != NULL)
+ 			icp->al->free(icp->al, p->data);
+-		if ((p->data = (unsigned int *) icp->al->malloc(icp->al, p->size * sizeof(unsigned int))) == NULL) {
++		if ((p->data = (unsigned int *) icp->al->calloc(icp->al, p->size, sizeof(unsigned int))) == NULL) {
+ 			sprintf(icp->err,"icmUInt16Array_alloc: malloc() of icmUInt16Array data failed");
+ 			return icp->errc = 2;
+ 		}
+@@ -1936,6 +1949,10 @@
+ 	icmUInt32Array *p = (icmUInt32Array *)pp;
+ 	unsigned int len = 0;
+ 	len += 8;			/* 8 bytes for tag and padding */
++	if (p->size > (UINT_MAX - len) / 4) {
++		p->icp->errc = 1;
++		return (unsigned int) -1;
++	}
+ 	len += p->size * 4;	/* 4 bytes for each UInt32 */
+ 	return len;
+ }
+@@ -2008,6 +2025,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmUInt32Array_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -2072,7 +2091,7 @@
+ 	if (p->size != p->_size) {
+ 		if (p->data != NULL)
+ 			icp->al->free(icp->al, p->data);
+-		if ((p->data = (unsigned int *) icp->al->malloc(icp->al, p->size * sizeof(unsigned int))) == NULL) {
++		if ((p->data = (unsigned int *) icp->al->calloc(icp->al, p->size, sizeof(unsigned int))) == NULL) {
+ 			sprintf(icp->err,"icmUInt32Array_alloc: malloc() of icmUInt32Array data failed");
+ 			return icp->errc = 2;
+ 		}
+@@ -2123,6 +2142,10 @@
+ 	icmUInt64Array *p = (icmUInt64Array *)pp;
+ 	unsigned int len = 0;
+ 	len += 8;			/* 8 bytes for tag and padding */
++	if (p->size > (UINT_MAX - len) / 8) {
++		p->icp->errc = 1;
++		return (unsigned int) -1;
++	}
+ 	len += p->size * 8;	/* 8 bytes for each UInt64 */
+ 	return len;
+ }
+@@ -2195,6 +2218,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmUInt64Array_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -2259,7 +2284,7 @@
+ 	if (p->size != p->_size) {
+ 		if (p->data != NULL)
+ 			icp->al->free(icp->al, p->data);
+-		if ((p->data = (icmUint64 *) icp->al->malloc(icp->al, p->size * sizeof(icmUint64))) == NULL) {
++		if ((p->data = (icmUint64 *) icp->al->calloc(icp->al, p->size, sizeof(icmUint64))) == NULL) {
+ 			sprintf(icp->err,"icmUInt64Array_alloc: malloc() of icmUInt64Array data failed");
+ 			return icp->errc = 2;
+ 		}
+@@ -2310,6 +2335,10 @@
+ 	icmU16Fixed16Array *p = (icmU16Fixed16Array *)pp;
+ 	unsigned int len = 0;
+ 	len += 8;			/* 8 bytes for tag and padding */
++	if (p->size > (UINT_MAX - len) / 4) {
++		p->icp->errc = 1;
++		return (unsigned int) -1;
++	}
+ 	len += p->size * 4;	/* 4 byte for each U16Fixed16 */
+ 	return len;
+ }
+@@ -2382,6 +2411,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmU16Fixed16Array_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -2446,7 +2477,7 @@
+ 	if (p->size != p->_size) {
+ 		if (p->data != NULL)
+ 			icp->al->free(icp->al, p->data);
+-		if ((p->data = (double *) icp->al->malloc(icp->al, p->size * sizeof(double))) == NULL) {
++		if ((p->data = (double *) icp->al->calloc(icp->al, p->size, sizeof(double))) == NULL) {
+ 			sprintf(icp->err,"icmU16Fixed16Array_alloc: malloc() of icmU16Fixed16Array data failed");
+ 			return icp->errc = 2;
+ 		}
+@@ -2497,6 +2528,10 @@
+ 	icmS15Fixed16Array *p = (icmS15Fixed16Array *)pp;
+ 	unsigned int len = 0;
+ 	len += 8;			/* 8 bytes for tag and padding */
++	if (p->size > (UINT_MAX - len) / 4) {
++		p->icp->errc = 1;
++		return (unsigned int) - 1;
++	}
+ 	len += p->size * 4;	/* 4 byte for each S15Fixed16 */
+ 	return len;
+ }
+@@ -2569,6 +2604,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmS15Fixed16Array_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -2633,7 +2670,7 @@
+ 	if (p->size != p->_size) {
+ 		if (p->data != NULL)
+ 			icp->al->free(icp->al, p->data);
+-		if ((p->data = (double *) icp->al->malloc(icp->al, p->size * sizeof(double))) == NULL) {
++		if ((p->data = (double *) icp->al->calloc(icp->al, p->size, sizeof(double))) == NULL) {
+ 			sprintf(icp->err,"icmS15Fixed16Array_alloc: malloc() of icmS15Fixed16Array data failed");
+ 			return icp->errc = 2;
+ 		}
+@@ -2726,6 +2763,10 @@
+ 	icmXYZArray *p = (icmXYZArray *)pp;
+ 	unsigned int len = 0;
+ 	len += 8;				/* 8 bytes for tag and padding */
++	if (p->size > (UINT_MAX - len) / 12) {
++		p->icp->errc = 1;
++		return (unsigned int) - 1;
++	}
+ 	len += p->size * 12;	/* 12 bytes for each XYZ */
+ 	return len;
+ }
+@@ -2798,6 +2839,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmXYZArray_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -2865,7 +2908,7 @@
+ 	if (p->size != p->_size) {
+ 		if (p->data != NULL)
+ 			icp->al->free(icp->al, p->data);
+-		if ((p->data = (icmXYZNumber *) icp->al->malloc(icp->al, p->size * sizeof(icmXYZNumber))) == NULL) {
++		if ((p->data = (icmXYZNumber *) icp->al->calloc(icp->al, p->size, sizeof(icmXYZNumber))) == NULL) {
+ 			sprintf(icp->err,"icmXYZArray_alloc: malloc() of icmXYZArray data failed");
+ 			return icp->errc = 2;
+ 		}
+@@ -2939,7 +2982,7 @@
+ 			rv |= 1;
+ 		}
+ 		ix = (int)floor(val);		/* Coordinate */
+-		if (ix > (p->size-2))
++		if (ix < 0 || ix > (p->size-2))
+ 			ix = (p->size-2);
+ 		w = val - (double)ix;		/* weight */
+ 		val = p->data[ix];
+@@ -2961,6 +3004,11 @@
+ ) {
+ 	int i;
+ 
++	if (size > INT_MAX - 2)
++		/* Although rt->size is unsigned long, the rt data
++		 * structure uses int data types to store indices. */
++		return 2;
++
+ 	rt->size = size;		/* Stash pointers to these away */
+ 	rt->data = data;
+ 	
+@@ -2979,7 +3027,7 @@
+ 	rt->qscale = (double)rt->rsize/(rt->rmax - rt->rmin);	/* Scale factor to quantize to */
+ 	
+ 	/* Initialize the reverse lookup structures, and get overall min/max */
+-	if ((rt->rlists = (int **) icp->al->calloc(icp->al, 1, rt->rsize * sizeof(int *))) == NULL) {
++	if ((rt->rlists = (int **) icp->al->calloc(icp->al, rt->rsize, sizeof(int *))) == NULL) {
+ 		return 2;
+ 	}
+ 
+@@ -2992,6 +3040,15 @@
+ 			int t;
+ 			t = s; s = e; e = t;
+ 		}
++		/* s and e should both be in the range [0,rt->rsize]
++		 * now, but let's not rely on floating point
++		 * calculations -- double-check. */
++		if (s < 0)
++			s = 0;
++		if (e < 0)
++			e = 0;
++		if (s >= rt->rsize)
++			s = rt->rsize-1;
+ 		if (e >= rt->rsize)
+ 			e = rt->rsize-1;
+ 
+@@ -3001,7 +3058,7 @@
+ 			int nf;			/* Next free slot */
+ 			if (rt->rlists[j] == NULL) {	/* No allocation */
+ 				as = 5;						/* Start with space for 5 */
+-				if ((rt->rlists[j] = (int *) icp->al->malloc(icp->al, sizeof(int) * as)) == NULL) {
++				if ((rt->rlists[j] = (int *) icp->al->calloc(icp->al, sizeof(int), as)) == NULL) {
+ 					return 2;
+ 				}
+ 				rt->rlists[j][0] = as;
+@@ -3010,6 +3067,9 @@
+ 				as = rt->rlists[j][0];	/* Allocate space for this list */
+ 				nf = rt->rlists[j][1];	/* Next free location in list */
+ 				if (nf >= as) {			/* need to expand space */
++					if (as > INT_MAX / 2 / sizeof (int))
++						return 2;
++
+ 					as *= 2;
+ 					rt->rlists[j] = (int *) icp->al->realloc(icp->al,rt->rlists[j], sizeof(int) * as);
+ 					if (rt->rlists[j] == NULL) {
+@@ -3061,7 +3121,7 @@
+ 		val = rsize_1;
+ 	ix = (int)floor(val);		/* Coordinate */
+ 
+-	if (ix > (rt->size-2))
++	if (ix < 0 || ix > (rt->size-2))
+ 		ix = (rt->size-2);
+ 	if (rt->rlists[ix] != NULL)  {		/* There is a list of fwd candidates */
+ 		/* For each candidate forward range */
+@@ -3088,6 +3148,7 @@
+ 	/* We have failed to find an exact value, so return the nearest value */
+ 	/* (This is slow !) */
+ 	val = fabs(ival - rt->data[0]);
++	/* rt->size is known to be < INT_MAX */
+ 	for (k = 0, i = 1; i < rt->size; i++) {
+ 		double er;
+ 		er = fabs(ival - rt->data[i]);
+@@ -3141,6 +3202,10 @@
+ 	icmCurve *p = (icmCurve *)pp;
+ 	unsigned int len = 0;
+ 	len += 12;			/* 12 bytes for tag, padding and count */
++	if (p->size > (UINT_MAX - len) / 2) {
++		p->icp->errc = 1;
++		return (unsigned int) - 1;
++	}
+ 	len += p->size * 2;	/* 2 bytes for each UInt16 */
+ 	return len;
+ }
+@@ -3238,6 +3303,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmCurve_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -3347,7 +3414,7 @@
+ 	if (p->size != p->_size) {
+ 		if (p->data != NULL)
+ 			icp->al->free(icp->al, p->data);
+-		if ((p->data = (double *) icp->al->malloc(icp->al, p->size * sizeof(double))) == NULL) {
++		if ((p->data = (double *) icp->al->calloc(icp->al, p->size, sizeof(double))) == NULL) {
+ 			sprintf(icp->err,"icmCurve_alloc: malloc() of icmCurve data failed");
+ 			return icp->errc = 2;
+ 		}
+@@ -3493,6 +3560,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmData_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -3620,7 +3689,7 @@
+ 	if (p->size != p->_size) {
+ 		if (p->data != NULL)
+ 			icp->al->free(icp->al, p->data);
+-		if ((p->data = (unsigned char *) icp->al->malloc(icp->al, p->size * sizeof(unsigned char))) == NULL) {
++		if ((p->data = (unsigned char *) icp->al->calloc(icp->al, p->size, sizeof(unsigned char))) == NULL) {
+ 			sprintf(icp->err,"icmData_alloc: malloc() of icmData data failed");
+ 			return icp->errc = 2;
+ 		}
+@@ -3745,6 +3814,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmText_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -3834,7 +3905,7 @@
+ 	if (p->size != p->_size) {
+ 		if (p->data != NULL)
+ 			icp->al->free(icp->al, p->data);
+-		if ((p->data = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
++		if ((p->data = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
+ 			sprintf(icp->err,"icmText_alloc: malloc() of icmText data failed");
+ 			return icp->errc = 2;
+ 		}
+@@ -4038,6 +4109,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmDateTimeNumber_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -4128,11 +4201,15 @@
+ /* icmLut object */
+ 
+ /* Utility function - raise one integer to an integer power */
+-static unsigned int uipow(unsigned int a, unsigned int b) {
++static int uipow(unsigned int a, unsigned int b, unsigned int *ret) {
+ 	unsigned int rv = 1;
+-	for (; b > 0; b--)
++	for (; b > 0; b--) {
++		if (a > 0 && rv > UINT_MAX / a)
++			return 1;
+ 		rv *= a;
+-	return rv;
++	}
++	*ret = rv;
++	return 0;
+ }
+ 
+ /* - - - - - - - - - - - - - - - - */
+@@ -4242,7 +4319,7 @@
+ 			rv |= 1;
+ 		}
+ 		ix = (int)floor(val);		/* Grid coordinate */
+-		if (ix > (p->inputEnt-2))
++		if (ix < 0 || ix > (p->inputEnt-2))
+ 			ix = (p->inputEnt-2);
+ 		w = val - (double)ix;		/* weight */
+ 		val = table[ix];
+@@ -4268,7 +4345,7 @@
+ 	if (p->inputChan <= 8) {
+ 		gw = GW;				/* Use stack allocation */
+ 	} else {
+-		if ((gw = (double *) icp->al->malloc(icp->al, (1 << p->inputChan) * sizeof(double))) == NULL) {
++		if ((gw = (double *) icp->al->calloc(icp->al, (1 << p->inputChan), sizeof(double))) == NULL) {
+ 			sprintf(icp->err,"icmLut_lookup_clut: malloc() failed");
+ 			return icp->errc = 2;
+ 		}
+@@ -4301,7 +4378,7 @@
+ 				rv |= 1;
+ 			}
+ 			x = (int)floor(val);		/* Grid coordinate */
+-			if (x > clutPoints_2)
++			if (x < 0 || x > clutPoints_2)
+ 				x = clutPoints_2;
+ 			co[e] = val - (double)x;	/* 1.0 - weight */
+ 			gp += x * p->dinc[e];		/* Add index offset for base of cube */
+@@ -4374,7 +4451,7 @@
+ 				rv |= 1;
+ 			}
+ 			x = (int)floor(val);		/* Grid coordinate */
+-			if (x > clutPoints_2)
++			if (x < 0 || x > clutPoints_2)
+ 				x = clutPoints_2;
+ 			co[e] = val - (double)x;	/* 1.0 - weight */
+ 			gp += x * p->dinc[e];		/* Add index offset for base of cube */
+@@ -4447,7 +4524,7 @@
+ 			rv |= 1;
+ 		}
+ 		ix = (int)floor(val);		/* Grid coordinate */
+-		if (ix > (p->outputEnt-2))
++		if (ix < 0 || ix > (p->outputEnt-2))
+ 			ix = (p->outputEnt-2);
+ 		w = val - (double)ix;		/* weight */
+ 		val = table[ix];
+@@ -4819,19 +4896,50 @@
+ ) {
+ 	icmLut *p = (icmLut *)pp;
+ 	unsigned int len = 0;
++	unsigned int pw;
+ 
+ 	if (p->ttype == icSigLut8Type) {
+ 		len += 48;			/* tag and header */
++		if (p->inputChan > 0 &&
++		    p->inputEnt > (UINT_MAX - len) / p->inputChan / 1)
++			goto overflow;
++
+ 		len += 1 * (p->inputChan * p->inputEnt);
+-		len += 1 * (p->outputChan * uipow(p->clutPoints,p->inputChan));
++		if (uipow(p->clutPoints,p->inputChan, &pw) ||
++		    (p->outputChan > 0 &&
++		     pw > (UINT_MAX - len) / p->outputChan / 1))
++			goto overflow;
++
++		len += 1 * (p->outputChan * pw);
++		if (p->outputChan > 0 &&
++		    p->outputEnt > (UINT_MAX - len) / p->outputChan / 1)
++			goto overflow;
++
+ 		len += 1 * (p->outputChan * p->outputEnt);
+ 	} else {
+ 		len += 52;			/* tag and header */
++		if (p->inputChan > 0 &&
++		    p->inputEnt > (UINT_MAX - len) / p->inputChan / 2)
++			goto overflow;
++
+ 		len += 2 * (p->inputChan * p->inputEnt);
+-		len += 2 * (p->outputChan * uipow(p->clutPoints,p->inputChan));
++		if (uipow(p->clutPoints,p->inputChan, &pw) ||
++		    (p->outputChan > 0 &&
++		     pw > (UINT_MAX - len) / p->outputChan / 2))
++			goto overflow;
++
++		len += 2 * (p->outputChan * pw);
++		if (p->outputChan > 0 &&
++		    p->outputEnt > (UINT_MAX - len) / p->outputChan / 2)
++			goto overflow;
++
+ 		len += 2 * (p->outputChan * p->outputEnt);
+ 	}
+ 	return len;
++
++  overflow:
++	p->icp->errc = 1;
++	return (unsigned int) -1;
+ }
+ 
+ /* read the object, return 0 on success, error code on fail */
+@@ -4844,6 +4952,7 @@
+ 	icc *icp = p->icp;
+ 	int rv = 0;
+ 	unsigned long i, j, g, size;
++	unsigned int pw;
+ 	char *bp, *buf;
+ 
+ 	if (len < 4) {
+@@ -4904,6 +5013,11 @@
+ 		return icp->errc = 1;
+ 	}
+ 
++	if (p->clutPoints > 100) {
++		sprintf(icp->err,"icmLut_read: too many clutPoints");
++		return icp->errc = 1;
++	}
++
+ 	/* Read 3x3 transform matrix */
+ 	for (j = 0; j < 3; j++) {		/* Rows */
+ 		for (i = 0; i < 3; i++) {	/* Columns */
+@@ -4921,13 +5035,18 @@
+ 		bp = buf+52;
+ 	}
+ 
+-	if (len < icmLut_get_size((icmBase *)p)) {
++	if (len < icmLut_get_size((icmBase *)p) || icp->errc) {
+ 		sprintf(icp->err,"icmLut_read: Tag too small for contents");
+ 		icp->al->free(icp->al, buf);
+ 		return icp->errc = 1;
+ 	}
+ 
+ 	/* Read the input tables */
++	if (p->inputEnt > 0 && p->inputChan > UINT_MAX / p->inputEnt) {
++		sprintf(icp->err,"icmLut_read: overflow");
++		icp->al->free(icp->al, buf);
++		return icp->errc = 1;
++	}
+ 	size = (p->inputChan * p->inputEnt);
+ 	if ((rv = p->allocate((icmBase *)p)) != 0) {
+ 		icp->al->free(icp->al, buf);
+@@ -4942,7 +5061,14 @@
+ 	}
+ 
+ 	/* Read the clut table */
+-	size = (p->outputChan * uipow(p->clutPoints,p->inputChan));
++	if (uipow(p->clutPoints,p->inputChan,&pw) ||
++	    (p->outputChan > 0 &&
++	     pw > UINT_MAX / p->outputChan)) {
++		sprintf(icp->err,"icmLut_read: overflow");
++		icp->al->free(icp->al, buf);
++		return icp->errc = 1;
++	}
++	size = (p->outputChan * pw);
+ 	if ((rv = p->allocate((icmBase *)p)) != 0) {
+ 		icp->al->free(icp->al, buf);
+ 		return rv;
+@@ -4956,6 +5082,11 @@
+ 	}
+ 
+ 	/* Read the output tables */
++	if (p->outputChan > 0 && p->outputEnt > UINT_MAX / p->outputChan) {
++		sprintf(icp->err,"icmLut_read: overflow");
++		icp->al->free(icp->al, buf);
++		return icp->errc = 1;
++	}
+ 	size = (p->outputChan * p->outputEnt);
+ 	if ((rv = p->allocate((icmBase *)p)) != 0) {
+ 		icp->al->free(icp->al, buf);
+@@ -4995,12 +5126,14 @@
+ 	icmLut *p = (icmLut *)pp;
+ 	icc *icp = p->icp;
+ 	unsigned long i,j;
+-	unsigned int len, size;
++	unsigned int len, size, pw;
+ 	char *bp, *buf;		/* Buffer to write from */
+ 	int rv = 0;
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmLut_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -5066,6 +5199,11 @@
+ 	}
+ 
+ 	/* Write the input tables */
++	if (p->inputEnt > 0 && p->inputChan > UINT_MAX / p->inputEnt) {
++		sprintf(icp->err,"icmLut_write: overflow");
++		icp->al->free(icp->al, buf);
++		return icp->errc = 1;
++	}
+ 	size = (p->inputChan * p->inputEnt);
+ 	if (p->ttype == icSigLut8Type) {
+ 		for (i = 0; i < size; i++, bp += 1) {
+@@ -5086,7 +5224,14 @@
+ 	}
+ 
+ 	/* Write the clut table */
+-	size = (p->outputChan * uipow(p->clutPoints,p->inputChan));
++	if (uipow(p->clutPoints,p->inputChan,&pw) ||
++	    (p->outputChan > 0 &&
++	     pw > UINT_MAX / p->outputChan)) {
++		sprintf(icp->err,"icmLut_write: overflow");
++		icp->al->free(icp->al, buf);
++		return icp->errc = 1;
++	}
++	size = (p->outputChan * pw);
+ 	if (p->ttype == icSigLut8Type) {
+ 		for (i = 0; i < size; i++, bp += 1) {
+ 			if ((rv = write_DCS8Number(p->clutTable[i], bp)) != 0) {
+@@ -5106,6 +5251,11 @@
+ 	}
+ 
+ 	/* Write the output tables */
++	if (p->outputChan > 0 && p->outputEnt > UINT_MAX / p->outputChan) {
++		sprintf(icp->err,"icmLut_write: overflow");
++		icp->al->free(icp->al, buf);
++		return icp->errc = 1;
++	}
+ 	size = (p->outputChan * p->outputEnt);
+ 	if (p->ttype == icSigLut8Type) {
+ 		for (i = 0; i < size; i++, bp += 1) {
+@@ -5177,7 +5327,14 @@
+ 		if (p->inputChan > MAX_CHAN) {
+ 			fprintf(op,"  !!Can't dump > %d input channel CLUT table!!\n",MAX_CHAN);
+ 		} else {
+-			size = (p->outputChan * uipow(p->clutPoints,p->inputChan));
++			unsigned int pw;
++			if (uipow(p->clutPoints,p->inputChan,&pw) ||
++			    (p->outputChan > 0 &&
++			     pw > UINT_MAX / p->outputChan)) {
++				fprintf(op,"Would overflow.\n");
++				return;
++			}
++			size = (p->outputChan * pw);
+ 			for (j = 0; j < p->inputChan; j++)
+ 				ii[j] = 0;
+ 			for (i = 0; i < size;) {
+@@ -5216,7 +5373,7 @@
+ static int icmLut_allocate(
+ 	icmBase *pp
+ ) {
+-	unsigned int i, j, g, size;
++	unsigned int i, j, g, size, pw;
+ 	icmLut *p = (icmLut *)pp;
+ 	icc *icp = p->icp;
+ 
+@@ -5231,6 +5388,10 @@
+ 		return icp->errc = 1;
+ 	}
+ 
++	if (p->inputEnt > 0 && p->inputChan > UINT_MAX / p->inputEnt) {
++		sprintf(icp->err,"icmLut_alloc: too many entries");
++		return icp->errc = 1;
++	}
+ 	size = (p->inputChan * p->inputEnt);
+ 	if (size != p->inputTable_size) {
+ 		if (p->inputTable != NULL)
+@@ -5241,7 +5402,13 @@
+ 		}
+ 		p->inputTable_size = size;
+ 	}
+-	size = (p->outputChan * uipow(p->clutPoints,p->inputChan));
++	if (uipow(p->clutPoints,p->inputChan,&pw) ||
++	    (p->outputChan > 0 &&
++	     pw > UINT_MAX / p->outputChan)) {
++		sprintf(icp->err,"icmLut_alloc: overflow");
++		return icp->errc = 1;
++	}
++	size = (p->outputChan * pw);
+ 	if (size != p->clutTable_size) {
+ 		if (p->clutTable != NULL)
+ 			icp->al->free(icp->al, p->clutTable);
+@@ -5251,6 +5418,10 @@
+ 		}
+ 		p->clutTable_size = size;
+ 	}
++	if (p->outputChan > 0 && p->outputEnt > UINT_MAX / p->outputChan) {
++		sprintf(icp->err,"icmLut_alloc: overflow");
++		return icp->errc = 1;
++	}
+ 	size = (p->outputChan * p->outputEnt);
+ 	if (size != p->outputTable_size) {
+ 		if (p->outputTable != NULL)
+@@ -5441,6 +5612,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmMeasurement_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -5712,13 +5885,20 @@
+ 			len += p->nDeviceCoords * 1;	/* bytes for each named color */
+ 		}
+ 	} else {	/* Named Color 2 */
++		unsigned int col;
+ 		len += 8;			/* 8 bytes for tag and padding */
+ 		len += 4;			/* 4 for vendor specific flags */
+ 		len += 4;			/* 4 for count of named colors */
+ 		len += 4;			/* 4 for number of device coords */
+ 		len += 32;			/* 32 for prefix of color names */
+ 		len += 32;			/* 32 for suffix of color names */
+-		len += p->count * (32 + 6 + p->nDeviceCoords * 2);	/* bytes for each named color */
++		col = 32 + 6 + p->nDeviceCoords * 2;
++		if (p->nDeviceCoords > (UINT_MAX - (32 + 6)) / 2 ||
++		    (p->count > 0 && col > (UINT_MAX - len) / p->count)) {
++			p->icp->errc = 1;
++			return (unsigned int) -1;
++		}
++		len += p->count * col;	/* bytes for each named color */
+ 	}
+ 	return len;
+ }
+@@ -5882,6 +6062,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmNamedColor_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -6109,9 +6291,22 @@
+ ) {
+ 	icmTextDescription *p = (icmTextDescription *)pp;
+ 	unsigned int len = 0;
++	if (p->size > UINT_MAX - (8 + 4 + 8)) {
++		p->icp->errc = 1;
++		return (unsigned int) -1;
++	}
+ 	len += 8;			/* 8 bytes for tag and padding */
+ 	len += 4 + p->size;	/* Ascii string length + ascii string */
+-	len += 8 + 2 * p->ucSize;	/* Unicode language code + length + string */
++	len += 8;               /* Unicode language code + length */
++	if (p->ucSize > (UINT_MAX - len) / 2) {
++		p->icp->errc = 1;
++		return (unsigned int) -1;
++	}
++	len += 2 * p->ucSize;    /* Unicode string */
++	if (len > (UINT_MAX - (3 + 67))) {
++		p->icp->errc = 1;
++		return (unsigned int) -1;
++	}
+ 	len += 3 + 67;		/* ScriptCode code, length string */
+ 	return len;
+ }
+@@ -6294,6 +6489,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmTextDescription_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -6535,7 +6732,7 @@
+ 	if (p->size != p->_size) {
+ 		if (p->desc != NULL)
+ 			icp->al->free(icp->al, p->desc);
+-		if ((p->desc = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
++		if ((p->desc = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
+ 			sprintf(icp->err,"icmTextDescription_alloc: malloc() of Ascii description failed");
+ 			return icp->errc = 2;
+ 		}
+@@ -6544,7 +6741,7 @@
+ 	if (p->ucSize != p->uc_size) {
+ 		if (p->ucDesc != NULL)
+ 			icp->al->free(icp->al, p->ucDesc);
+-		if ((p->ucDesc = (ORD16 *) icp->al->malloc(icp->al, p->ucSize * sizeof(ORD16))) == NULL) {
++		if ((p->ucDesc = (ORD16 *) icp->al->calloc(icp->al, p->ucSize, sizeof(ORD16))) == NULL) {
+ 			sprintf(icp->err,"icmTextDescription_alloc: malloc() of Unicode description failed");
+ 			return icp->errc = 2;
+ 		}
+@@ -6820,6 +7017,12 @@
+ 	bp += 8;	/* Skip padding */
+ 
+ 	p->count = read_UInt32Number(bp);	/* Number of sequence descriptions */
++	if (p->count > 1000) {
++		sprintf(icp->err,"icmProfileSequenceDesc_read: too many sequence descriptions");
++		icp->al->free(icp->al, buf);
++		return icp->errc = 1;
++	}
++
+ 	bp += 4;
+ 
+ 	/* Read all the sequence descriptions */
+@@ -6852,6 +7055,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmProfileSequenceDesc_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -6922,7 +7127,7 @@
+ 	if (p->count != p->_count) {
+ 		if (p->data != NULL)
+ 			icp->al->free(icp->al, p->data);
+-		if ((p->data = (icmDescStruct *) icp->al->malloc(icp->al, p->count * sizeof(icmDescStruct))) == NULL) {
++		if ((p->data = (icmDescStruct *) icp->al->calloc(icp->al, p->count, sizeof(icmDescStruct))) == NULL) {
+ 			sprintf(icp->err,"icmProfileSequenceDesc_allocate Allocation of DescStruct array failed");
+ 			return icp->errc = 2;
+ 		}
+@@ -7041,6 +7246,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmSignature_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -7156,6 +7363,10 @@
+ 	icmScreening *p = (icmScreening *)pp;
+ 	unsigned int len = 0;
+ 	len += 16;				/* 16 bytes for tag, padding, flag & channeles */
++	if (p->channels > (UINT_MAX - len) / 12) {
++		p->icp->errc = 1;
++		return (unsigned int) -1;
++	}
+ 	len += p->channels * 12;	/* 12 bytes for each channel */
+ 	return len;
+ }
+@@ -7235,6 +7446,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmScreening_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -7315,7 +7528,7 @@
+ 	if (p->channels != p->_channels) {
+ 		if (p->data != NULL)
+ 			icp->al->free(icp->al, p->data);
+-		if ((p->data = (icmScreeningData *) icp->al->malloc(icp->al, p->channels * sizeof(icmScreeningData))) == NULL) {
++		if ((p->data = (icmScreeningData *) icp->al->calloc(icp->al, p->channels, sizeof(icmScreeningData))) == NULL) {
+ 			sprintf(icp->err,"icmScreening_alloc: malloc() of icmScreening data failed");
+ 			return icp->errc = 2;
+ 		}
+@@ -7366,10 +7579,20 @@
+ 	icmUcrBg *p = (icmUcrBg *)pp;
+ 	unsigned int len = 0;
+ 	len += 8;			/* 8 bytes for tag and padding */
++	if (p->UCRcount > (UINT_MAX - len - 4) / 2)
++		goto overflow;
++
+ 	len += 4 + p->UCRcount * 2;	/* Undercolor Removal */
++	if (p->BGcount > (UINT_MAX - len - 4 - p->size) / 2)
++		goto overflow;
++
+ 	len += 4 + p->BGcount * 2;	/* Black Generation */
+ 	len += p->size;				/* Description string */
+ 	return len;
++
++ overflow:
++	p->icp->errc = 1;
++	return (unsigned int) -1;
+ }
+ 
+ /* read the object, return 0 on success, error code on fail */
+@@ -7498,6 +7721,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmUcrBg_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -7663,7 +7888,7 @@
+ 	if (p->UCRcount != p->UCR_count) {
+ 		if (p->UCRcurve != NULL)
+ 			icp->al->free(icp->al, p->UCRcurve);
+-		if ((p->UCRcurve = (double *) icp->al->malloc(icp->al, p->UCRcount * sizeof(double))) == NULL) {
++		if ((p->UCRcurve = (double *) icp->al->calloc(icp->al, p->UCRcount, sizeof(double))) == NULL) {
+ 			sprintf(icp->err,"icmUcrBg_allocate: malloc() of UCR curve data failed");
+ 			return icp->errc = 2;
+ 		}
+@@ -7672,7 +7897,7 @@
+ 	if (p->BGcount != p->BG_count) {
+ 		if (p->BGcurve != NULL)
+ 			icp->al->free(icp->al, p->BGcurve);
+-		if ((p->BGcurve = (double *) icp->al->malloc(icp->al, p->BGcount * sizeof(double))) == NULL) {
++		if ((p->BGcurve = (double *) icp->al->calloc(icp->al, p->BGcount, sizeof(double))) == NULL) {
+ 			sprintf(icp->err,"icmUcrBg_allocate: malloc() of BG curve data failed");
+ 			return icp->errc = 2;
+ 		}
+@@ -7681,7 +7906,7 @@
+ 	if (p->size != p->_size) {
+ 		if (p->string != NULL)
+ 			icp->al->free(icp->al, p->string);
+-		if ((p->string = (char *) icp->al->malloc(icp->al, p->size * sizeof(char))) == NULL) {
++		if ((p->string = (char *) icp->al->calloc(icp->al, p->size, sizeof(char))) == NULL) {
+ 			sprintf(icp->err,"icmUcrBg_allocate: malloc() of string data failed");
+ 			return icp->errc = 2;
+ 		}
+@@ -7743,6 +7968,15 @@
+ 		len += 2;       /* 2 bytes for channels */
+ 		len += 2;       /* 2 for entry count */
+ 		len += 2;       /* 2 for entry size */
++		if (p->u.table.entryCount > 0 &&
++		    p->u.table.entrySize > 0 &&
++		    p->u.table.channels >
++		    (UINT_MAX - len) /
++		    p->u.table.entryCount /
++		    p->u.table.entrySize) {
++			p->icp->errc = 1;
++			return (unsigned int) -1;
++		}
+ 		len += ( p->u.table.channels *     /* compute table size */
+ 				 p->u.table.entryCount *
+ 				 p->u.table.entrySize );
+@@ -7762,10 +7996,11 @@
+ ) {
+ 	icmVideoCardGamma *p = (icmVideoCardGamma *)pp;
+ 	icc *icp = p->icp;
+-	int rv, c;
++	int rv;
+ 	char *bp, *buf;
+ 	unsigned char *pchar;
+ 	unsigned short *pshort;
++	unsigned long c;
+ 
+ 	if (len < 18) {
+ 		sprintf(icp->err,"icmVideoCardGamma_read: Tag too small to be legal");
+@@ -7803,6 +8038,16 @@
+ 		p->u.table.channels   = read_UInt16Number(bp+12);
+ 		p->u.table.entryCount = read_UInt16Number(bp+14);
+ 		p->u.table.entrySize  = read_UInt16Number(bp+16);
++		if (p->u.table.entrySize > 65530 || p->u.table.entrySize == 0) {
++			sprintf(icp->err,"icmVideoCardGamma_read: Too many entries (or none)");
++			return icp->errc = 1;
++		}
++		if (p->u.table.entryCount > 0 && p->u.table.entrySize > 0 &&
++		    p->u.table.channels >
++		    UINT_MAX / p->u.table.entryCount / p->u.table.entrySize) {
++			sprintf(icp->err,"icmVideoCardGamma_read: Overflow reading tag");
++			return icp->errc = 1;
++		}
+ 		if (len-18 < p->u.table.channels*p->u.table.entryCount*p->u.table.entrySize) {
+ 			sprintf(icp->err,"icmVideoCardGamma_read: Tag too small to be legal");
+ 			return icp->errc = 1;
+@@ -7871,6 +8116,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmViewingConditions_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -8049,7 +8296,7 @@
+ ) {
+ 	icmVideoCardGamma *p = (icmVideoCardGamma *)pp;
+ 	icc *icp = p->icp;
+-	int size;
++	unsigned int size;
+ 
+ 	/* note: allocation is only relevant for table type
+ 	 * and in that case the channels, entryCount, and entrySize
+@@ -8059,6 +8306,11 @@
+ 	if (p->tagType == icmVideoCardGammaTableType) {
+ 		if (p->u.table.data != NULL)
+ 			icp->al->free(icp->al, p->u.table.data);
++		if (p->u.table.entryCount > 0 &&
++		    p->u.table.channels > UINT_MAX / p->u.table.entryCount) {
++			sprintf(icp->err,"icmVideoCardGamma_alloc: table too large");
++			return icp->errc = 1;
++		}
+ 		size = (p->u.table.channels *
+ 				p->u.table.entryCount);
+ 		switch (p->u.table.entrySize) {
+@@ -8066,6 +8318,10 @@
+ 			size *= sizeof(unsigned char);
+ 			break;
+ 		case 2:
++			if (size > UINT_MAX / sizeof(unsigned short)) {
++				sprintf(icp->err,"icmVideoCardGamma_alloc: table too large");
++				return icp->errc = 1;
++			}
+ 			size *= sizeof(unsigned short);
+ 			break;
+ 		default:
+@@ -8201,6 +8457,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmViewingConditions_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -8433,6 +8691,8 @@
+ 
+ 	/* Allocate a file write buffer */
+ 	len = p->get_size((icmBase *)p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->malloc(icp->al, len)) == NULL) {
+ 		sprintf(icp->err,"icmCrdInfo_write malloc() failed");
+ 		return icp->errc = 2;
+@@ -8585,7 +8845,7 @@
+ 	if (p->ppsize != p->_ppsize) {
+ 		if (p->ppname != NULL)
+ 			icp->al->free(icp->al, p->ppname);
+-		if ((p->ppname = (char *) icp->al->malloc(icp->al, p->ppsize * sizeof(char))) == NULL) {
++		if ((p->ppname = (char *) icp->al->calloc(icp->al, p->ppsize, sizeof(char))) == NULL) {
+ 			sprintf(icp->err,"icmCrdInfo_alloc: malloc() of string data failed");
+ 			return icp->errc = 2;
+ 		}
+@@ -8595,7 +8855,7 @@
+ 		if (p->crdsize[t] != p->_crdsize[t]) {
+ 			if (p->crdname[t] != NULL)
+ 				icp->al->free(icp->al, p->crdname[t]);
+-			if ((p->crdname[t] = (char *) icp->al->malloc(icp->al, p->crdsize[t] * sizeof(char))) == NULL) {
++			if ((p->crdname[t] = (char *) icp->al->calloc(icp->al, p->crdsize[t], sizeof(char))) == NULL) {
+ 				sprintf(icp->err,"icmCrdInfo_alloc: malloc() of CRD%d name string failed",t);
+ 				return icp->errc = 2;
+ 			}
+@@ -8736,6 +8996,8 @@
+ 	int rv = 0;
+ 
+ 	len = p->get_size(p);
++	if (icp->errc)
++		return icp->errc;
+ 	if ((buf = (char *) icp->al->calloc(icp->al,1,len)) == NULL) {			/* Zero it - some CMS are fussy */
+ 		sprintf(icp->err,"icmHeader_write calloc() failed");
+ 		return icp->errc = 2;
+@@ -9245,13 +9507,23 @@
+ 	}
+ 
+ 	p->count = read_UInt32Number(tcbuf);		/* Tag count */
++	if (p->count > 100) {
++		sprintf(p->err,"icc_read: too many table tags");
++		return p->errc = 1;
++	}
+ 	if (p->count > 0) {
+ 		char *bp, *buf;
+-		if ((p->data = (icmTag *) p->al->malloc(p->al, p->count * sizeof(icmTag))) == NULL) {
++		if ((p->data = (icmTag *) p->al->calloc(p->al, p->count, sizeof(icmTag))) == NULL) {
+ 			sprintf(p->err,"icc_read: Tag table malloc() failed");
+ 			return p->errc = 2;
+ 		}
+ 	
++		if (p->count > (UINT_MAX - 4) / 12) {
++			sprintf(p->err,"icc_read: overflow");
++			p->al->free(p->al, p->data);
++			p->data = NULL;
++			return p->errc = 1;
++		}
+ 		len = 4 + p->count * 12;
+ 		if ((buf = (char *) p->al->malloc(p->al, len)) == NULL) {
+ 			sprintf(p->err,"icc_read: Tag table read buffer malloc() failed");
+@@ -9281,6 +9553,14 @@
+ 	    	    return p->errc = 1;
+ 	    	}
+ 	    	p->data[i].size = read_UInt32Number(bp + 8);	
++			if (p->data[i].offset + p->data[i].size >
++			    p->header->size) {
++				sprintf(p->err,"icc_read: tag out of bounds");
++				p->al->free(p->al, p->data);
++				p->data = NULL;
++				p->al->free(p->al, buf);
++				return p->errc = 1;
++			}
+ 			if (   p->fp->seek(p->fp, of + p->data[i].offset) != 0
+ 			    || p->fp->read(p->fp, tcbuf, 1, 4) != 4) {
+ 				sprintf(p->err,"icc_read: fseek() or fread() failed on tag headers");
+@@ -9321,8 +9601,14 @@
+ 	}
+ 
+ 	size += p->header->get_size(p->header);
++	if (p->errc)
++		return (unsigned int) -1;
+ 
+ 	size = DO_ALIGN(size);
++	if (size == 0 || p->count > (UINT_MAX - 4 - size) / 12) {
++		p->errc = 1;
++		return (unsigned int) -1;
++	}
+ 	size += 4 + p->count * 12;	/* Tag table length */
+ 	
+ 	/* Reset touched flag for each tag type */
+@@ -9337,8 +9623,13 @@
+ 	/* Get size for each tag type, skipping links */
+ 	for (i = 0; i < p->count; i++) {
+ 		if (p->data[i].objp->touched == 0) { /* Not alllowed for previously */
++			unsigned int obj_size;
+ 			size = DO_ALIGN(size);
+-			size += p->data[i].objp->get_size(p->data[i].objp);
++			obj_size = p->data[i].objp->get_size(p->data[i].objp);
++			if (size == 0 || p->errc ||
++			    obj_size > UINT_MAX - size)
++				return (unsigned int) -1;
++			size += obj_size;
+ 			p->data[i].objp->touched = 1;	/* Don't account for this again */
+ 		}
+ 	}
+@@ -9373,9 +9664,19 @@
+ 	}
+ 
+ 	size += p->header->get_size(p->header);
++	if (p->errc)
++		return p->errc;
+ 
++	if (p->count > (UINT_MAX - 4) / 12) {
++		sprintf(p->err,"icc_write: too many tags");
++		return p->errc = 1;
++	}
+ 	len = 4 + p->count * 12;	/* Tag table length */
+ 	size = DO_ALIGN(size);
++	if (size == 0 || size > UINT_MAX - len) {
++		sprintf(p->err,"icc_write: overflow writing tag table");
++		return p->errc = 1;
++	}
+ 	size += len;
+ 	
+ 	/* Allocate memory buffer for tag table */
+@@ -9406,6 +9707,12 @@
+ 			size = DO_ALIGN(size);
+ 			p->data[i].offset = size;			/* Profile relative target */
+ 			p->data[i].size = p->data[i].objp->get_size(p->data[i].objp);
++			if (size == 0 ||
++			    p->errc || p->data[i].size > UINT_MAX - size) {
++				sprintf(p->err,"icc_write: internal error - overflow?");
++				p->al->free(p->al, buf);
++				return p->errc;
++			}
+ 			size += p->data[i].size;
+ 			p->data[i].objp->touched = 1;	/* Allocated space for it */
+ 		} else { /* must be linked - copy allocation */
+@@ -9529,6 +9836,11 @@
+ 	}
+ 
+ 	/* Make space in tag table for new tag item */
++	if (p->count > (UINT_MAX / sizeof(icmTag)) - 1) {
++		sprintf(p->err,"icc_add_tag: overflow");
++		p->errc = 1;
++		return NULL;
++	}
+ 	if (p->data == NULL)
+ 		tp = p->al->malloc(p->al, (p->count+1) * sizeof(icmTag));
+ 	else
+@@ -9612,6 +9924,11 @@
+ 	}
+ 
+ 	/* Make space in tag table for new tag item */
++	if (p->count > (UINT_MAX / sizeof(icmTag)) - 1) {
++		sprintf(p->err,"icc_link_tag: overflow");
++		p->errc = 1;
++		return NULL;
++	}
+ 	if (p->data == NULL)
+ 		tp = p->al->malloc(p->al, (p->count+1) * sizeof(icmTag));
+ 	else
diff --git a/recipes/gs/gs/1006_system-jasper.patch b/recipes/gs/gs/1006_system-jasper.patch
new file mode 100644
index 0000000000..f547ef5a4f
--- /dev/null
+++ b/recipes/gs/gs/1006_system-jasper.patch
@@ -0,0 +1,28 @@
+Description: Avoid calling routine not available in official libjasper
+Author: Tim Waugh <twaugh@redhat.com>
+diff -up ghostscript-8.64/base/sjpx.c.system-jasper ghostscript-8.64/base/sjpx.c
+--- ghostscript-8.64/base/sjpx.c.system-jasper	2008-08-21 00:22:49.000000000 +0100
++++ ghostscript-8.64/base/sjpx.c	2009-02-04 11:35:56.000000000 +0000
+@@ -34,14 +34,6 @@ static void s_jpxd_set_defaults(stream_s
+ private_st_jpxd_state(); /* creates a gc object for our state,
+ 			    defined in sjpx.h */
+ 
+-/* error reporting callback for the jpx library */
+-static void
+-s_jpx_jas_error_cb(jas_error_t err, char *msg)
+-{
+-  dprintf2("jasper (code %d) %s", (int)err, msg);
+-}
+-
+-
+ /* initialize the steam.
+    this involves allocating the stream and image structures, and
+    initializing the decoder.
+@@ -59,7 +51,6 @@ s_jpxd_init(stream_state * ss)
+     }
+ 
+     status = jas_init();
+-    jas_set_error_cb(s_jpx_jas_error_cb);
+ #ifdef JPX_DEBUG
+     /* raise the error reporting threshold from the default (0) */
+     jas_setdbglevel(1);
diff --git a/recipes/gs/gs/1007_fix_pphs_script_not_lib.patch b/recipes/gs/gs/1007_fix_pphs_script_not_lib.patch
new file mode 100644
index 0000000000..3b962d057f
--- /dev/null
+++ b/recipes/gs/gs/1007_fix_pphs_script_not_lib.patch
@@ -0,0 +1,22 @@
+Description: Install pphs as a user script, not a library
+Author: Jonas Smedegaard <dr@jones.dk>
+--- a/base/unixinst.mak	2009-05-24 18:40:45.000000000 +0200
++++ b/base/unixinst.mak	2009-05-24 18:43:02.000000000 +0200
+@@ -39,7 +39,7 @@
+ 	$(SH) -c 'for f in \
+ gsbj gsdj gsdj500 gslj gslp gsnd \
+ bdftops dumphint dvipdf eps2eps font2c \
+-pdf2dsc pdf2ps pdfopt pf2afm pfbtopfa printafm \
++pdf2dsc pdf2ps pdfopt pf2afm pfbtopfa pphs printafm \
+ ps2ascii ps2epsi ps2pdf ps2pdf12 ps2pdf13 ps2pdf14 ps2pdfwr ps2ps ps2ps2 \
+ wftopfa fixmswrd.pl lprsetup.sh pj-gs.sh pv.sh sysvlp.sh unix-lpr.sh ;\
+ 	do if ( test -f $(PSLIBDIR)/$$f ); then \
+@@ -72,7 +72,7 @@
+ jispaper.ps landscap.ps level1.ps lines.ps markhint.ps markpath.ps \
+ mkcidfm.ps opdfread.ps PDFA_def.ps PDFX_def.ps \
+ packfile.ps pcharstr.ps pf2afm.ps pfbtopfa.ps ppath.ps \
+-pphs pphs.ps \
++pphs.ps \
+ prfont.ps printafm.ps \
+ ps2ai.ps ps2ascii.ps ps2epsi.ps quit.ps rollconv.ps \
+ showchar.ps showpage.ps stcinfo.ps stcolor.ps stocht.ps \
diff --git a/recipes/gs/gs/2001_docdir_fix_for_debian.patch b/recipes/gs/gs/2001_docdir_fix_for_debian.patch
new file mode 100644
index 0000000000..24e93ef325
--- /dev/null
+++ b/recipes/gs/gs/2001_docdir_fix_for_debian.patch
@@ -0,0 +1,16 @@
+Description: Set docdir appropriately for Debian
+Author: Masayuki Hatta <mhatta@debian.org>
+diff -urN a/base/Makefile.in b/base/Makefile.in
+--- a/base/Makefile.in
++++ b/base/Makefile.in
+@@ -71,8 +71,8 @@
+ gssharedir = @libdir@/ghostscript/$(GS_DOT_VERSION)
+ gsincludedir = @includedir@/ghostscript/
+ 
+-docdir=$(gsdatadir)/doc
+-exdir=$(gsdatadir)/examples
++docdir=$(prefix)/share/doc/ghostscript
++exdir=$(prefix)/share/doc/ghostscript/examples
+ GS_DOCDIR=$(docdir)
+ 
+ # Define install location for 'cups' device/filter support
diff --git a/recipes/gs/gs/2002_gs_man_fix_debian.patch b/recipes/gs/gs/2002_gs_man_fix_debian.patch
new file mode 100644
index 0000000000..c9d6f8393b
--- /dev/null
+++ b/recipes/gs/gs/2002_gs_man_fix_debian.patch
@@ -0,0 +1,40 @@
+Description: Fixes for gs.1 (Debian specific path adjustments)
+Author: Masayuki Hatta <mhatta@debian.org>
+diff -urN a/man/gs.1 b/man/gs.1
+--- a/man/gs.1
++++ b/man/gs.1
+@@ -295,18 +295,18 @@
+ are typically based in \fBC:\\GS\fR, but may be elsewhere, especially if
+ you install Ghostscript with \fBGSview\fR.  Run "\fBgs -h\fR" to find the
+ location of Ghostscript documentation on your system, from which you can
+-get more details.
++get more details. On a Debian system they are in \fB/usr\fR.
+ .TP
+-.B /usr/local/share/ghostscript/#.##/*
++.B /usr/share/gs-gpl/#.##/*/*
+ Startup files, utilities, and basic font definitions
+ .TP
+-.B /usr/local/share/ghostscript/fonts/*
+-More font definitions
++.B /usr/share/fonts/type1/gsfonts/*
++More font definitions from the gsfonts package
+ .TP
+-.B /usr/local/share/ghostscript/#.##/examples/*
++.B /usr/share/doc/gs-gpl/examples/*
+ Ghostscript demonstration files
+ .TP
+-.B /usr/local/share/ghostscript/#.##/doc/*
++.B /usr/share/doc/gs-gpl/*
+ Diverse document files
+ .SH "INITIALIZATION FILES"
+ When looking for the initialization files "gs_*.ps", the files related to
+@@ -330,7 +330,8 @@
+ Ghostscript makefile when the executable was built.  When \fBgs\fR is built
+ on Unix, \fBGS_LIB_DEFAULT\fR is usually
+ "/usr/local/share/ghostscript/#.##:/usr/local/share/ghostscript/fonts"
+-where "#.##" represents the Ghostscript version number.
++where "#.##" represents the Ghostscript version number. They are
++"/usr/share/gs-gpl/#.## on a Debian system".
+ .PP
+ Each of these (\fBGS_LIB_DEFAULT\fR, \fBGS_LIB\fR, and \fB\-I\fR parameter)
+ may be either a single directory or a list of directories separated by
diff --git a/recipes/gs/gs_8.64.bb b/recipes/gs/gs_8.64.bb
new file mode 100644
index 0000000000..37f0af1b42
--- /dev/null
+++ b/recipes/gs/gs_8.64.bb
@@ -0,0 +1,54 @@
+DESCRIPTION = "An interpreter of the Postscript language"
+LICENSE = "GPL"
+SECTION = "console/utils"
+HOMEPAGE = "http://www.gnu.org/software/ghostscript/ghostscript.html"
+DEPENDS = "jpeg zlib fontconfig cups"
+PR = "r2"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/g/ghostscript/ghostscript_${PV}~dfsg.orig.tar.gz \
+           file://0001_svn_snapshot.patch;patch=1 \
+           file://0002_svn_snapshot_jbig2dec.patch;patch=1 \
+           file://1001_install_cjk_examples.patch;patch=1 \
+           file://1002_ps2pdf_man_fix.patch;patch=1 \
+           file://1003_fix_autoconf_create_from_infiles.patch;patch=1 \
+           file://1004_CVE-2009-0792_CVE-2009-0584_CVE-2009-0583.patch;patch=1 \
+           file://1006_system-jasper.patch;patch=1 \
+           file://1007_fix_pphs_script_not_lib.patch;patch=1 \
+           file://2001_docdir_fix_for_debian.patch;patch=1 \
+           file://2002_gs_man_fix_debian.patch;patch=1 \
+           "
+
+S = "${WORKDIR}/ghostscript-${PV}~dfsg"
+
+inherit autotools
+
+EXTRA_OECONF = "--without-x --with-jasper --with-zlib=${STAGING_DIR_HOST}${layout_prefix}"
+
+PACKAGES += "cups-gs"
+
+do_configure() {
+	# hack script to allow for cross compiling
+	sed 's,&& ./configure$,& --host=\$host --build=\$build --target=\$target,g' -i configure
+ 
+	gnu-configize
+	oe_runconf
+}
+
+do_stage () {
+	install -d ${STAGING_INCDIR}/ghostscript
+	install -m 755 ${S}/psi/*.h ${STAGING_INCDIR}/ghostscript/
+	oe_libinstall -so -C sobin libgs ${STAGING_LIBDIR}
+}
+
+do_compile_append () {
+        oe_runmake so
+}
+
+do_install_append () {
+        oe_runmake 'DESTDIR=${D}' soinstall
+}
+
+FILES_${PN} += "${datadir}/ghostscript"
+FILES_cups-gs = "${libdir}/cups/filter/* ${datadir}/cups ${sysconfdir}/cups"
+
+RDEPENDS_cups-gs += "gs"
diff --git a/recipes/gtk-webcore/files/wscript-fix.patch b/recipes/gtk-webcore/files/wscript-fix.patch
new file mode 100644
index 0000000000..58a0cbff46
--- /dev/null
+++ b/recipes/gtk-webcore/files/wscript-fix.patch
@@ -0,0 +1,14 @@
+Index: git/wscript
+===================================================================
+--- git.orig/wscript
++++ git/wscript
+@@ -62,8 +62,7 @@ def rc_file(self, node):
+     rctask.set_inputs (node)
+     rctask.set_outputs (node.change_ext ('.rc.o'))
+     self.compiled_tasks.append (rctask)
+-Task.simple_task_type ('winrc', '${WINRC} -o${TGT} ${SRC}', color='BLUE',
+-    before='cc cxx', shell=False)
++    Task.simple_task_type ('winrc', '${WINRC} -o${TGT} ${SRC}', color='BLUE', before='cc cxx', shell=False)
+ 
+ def configure (conf):
+     def option_checkfatal (option, desc):
diff --git a/recipes/gtk-webcore/midori_git.bb b/recipes/gtk-webcore/midori_git.bb
index aa5a213f78..decc81c365 100644
--- a/recipes/gtk-webcore/midori_git.bb
+++ b/recipes/gtk-webcore/midori_git.bb
@@ -3,11 +3,12 @@ require midori.inc
 DEPENDS += "python-native python-docutils-native"
 
 # increment PR every time SRCREV is updated!
-PR = "r1"
+PR = "r2"
 PV = "0.1.7+${PR}+gitr${SRCREV}"
 
 SRC_URI = "git://git.xfce.org/kalikiana/midori;protocol=git \
-           file://waf"
+           file://waf \
+           file://wscript-fix.patch;patch=1"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/linux/linux-2.6.29/stamp9g20evb/defconfig b/recipes/linux/linux-2.6.29/stamp9g20evb/defconfig
new file mode 100644
index 0000000000..f8203a3b94
--- /dev/null
+++ b/recipes/linux/linux-2.6.29/stamp9g20evb/defconfig
@@ -0,0 +1,1277 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.29
+# Thu Jun 11 09:47:54 2009
+#
+CONFIG_ARM=y
+CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_GENERIC_GPIO=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_MMU=y
+# CONFIG_NO_IOPORT is not set
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_HARDIRQS_SW_RESEND=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_ARCH_HAS_ILOG2_U32 is not set
+# CONFIG_ARCH_HAS_ILOG2_U64 is not set
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
+CONFIG_VECTORS_BASE=0xffff0000
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+
+#
+# RCU Subsystem
+#
+CONFIG_CLASSIC_RCU=y
+# CONFIG_TREE_RCU is not set
+# CONFIG_PREEMPT_RCU is not set
+# CONFIG_TREE_RCU_TRACE is not set
+# CONFIG_PREEMPT_RCU_TRACE is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_GROUP_SCHED is not set
+# CONFIG_CGROUPS is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+CONFIG_NAMESPACES=y
+# CONFIG_UTS_NS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+# CONFIG_NET_NS is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_ANON_INODES=y
+# CONFIG_EMBEDDED is not set
+CONFIG_UID16=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_COMPAT_BRK=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_FREEZER=y
+
+#
+# System Type
+#
+# CONFIG_ARCH_AAEC2000 is not set
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_REALVIEW is not set
+# CONFIG_ARCH_VERSATILE is not set
+CONFIG_ARCH_AT91=y
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_EP93XX is not set
+# CONFIG_ARCH_FOOTBRIDGE is not set
+# CONFIG_ARCH_NETX is not set
+# CONFIG_ARCH_H720X is not set
+# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_IOP13XX is not set
+# CONFIG_ARCH_IOP32X is not set
+# CONFIG_ARCH_IOP33X is not set
+# CONFIG_ARCH_IXP23XX is not set
+# CONFIG_ARCH_IXP2000 is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_KIRKWOOD is not set
+# CONFIG_ARCH_KS8695 is not set
+# CONFIG_ARCH_NS9XXX is not set
+# CONFIG_ARCH_LOKI is not set
+# CONFIG_ARCH_MV78XX0 is not set
+# CONFIG_ARCH_MXC is not set
+# CONFIG_ARCH_ORION5X is not set
+# CONFIG_ARCH_PNX4008 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_S3C64XX is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_DAVINCI is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_MSM is not set
+# CONFIG_ARCH_W90X900 is not set
+
+#
+# Atmel AT91 System-on-Chip
+#
+# CONFIG_ARCH_AT91RM9200 is not set
+# CONFIG_ARCH_AT91SAM9260 is not set
+# CONFIG_ARCH_AT91SAM9261 is not set
+# CONFIG_ARCH_AT91SAM9263 is not set
+# CONFIG_ARCH_AT91SAM9RL is not set
+CONFIG_ARCH_AT91SAM9G20=y
+# CONFIG_ARCH_AT91CAP9 is not set
+# CONFIG_ARCH_AT91X40 is not set
+CONFIG_AT91_PMC_UNIT=y
+
+#
+# AT91SAM9G20 Board Type
+#
+# CONFIG_MACH_AT91SAM9G20EK is not set
+CONFIG_MACH_STAMP9G20=y
+CONFIG_MACH_STAMP9G20_EVB=y
+
+#
+# AT91 Board Options
+#
+
+#
+# AT91 Feature Selections
+#
+CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
+CONFIG_AT91_SLOW_CLOCK=y
+CONFIG_AT91_TIMER_HZ=100
+CONFIG_AT91_EARLY_DBGU=y
+# CONFIG_AT91_EARLY_USART0 is not set
+# CONFIG_AT91_EARLY_USART1 is not set
+# CONFIG_AT91_EARLY_USART2 is not set
+# CONFIG_AT91_EARLY_USART3 is not set
+# CONFIG_AT91_EARLY_USART4 is not set
+# CONFIG_AT91_EARLY_USART5 is not set
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_ARM926T=y
+CONFIG_CPU_32v5=y
+CONFIG_CPU_ABRT_EV5TJ=y
+CONFIG_CPU_PABRT_NOIFAR=y
+CONFIG_CPU_CACHE_VIVT=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WBI=y
+CONFIG_CPU_CP15=y
+CONFIG_CPU_CP15_MMU=y
+
+#
+# Processor Features
+#
+CONFIG_ARM_THUMB=y
+# CONFIG_CPU_ICACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
+# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
+# CONFIG_OUTER_CACHE is not set
+
+#
+# Bus support
+#
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCCARD is not set
+
+#
+# Kernel Features
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_PAGE_OFFSET=0xC0000000
+CONFIG_PREEMPT=y
+CONFIG_HZ=100
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+CONFIG_ARCH_FLATMEM_HAS_HOLES=y
+# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
+# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4096
+# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=0
+CONFIG_VIRT_TO_BUS=y
+CONFIG_UNEVICTABLE_LRU=y
+# CONFIG_LEDS is not set
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Boot options
+#
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
+# CONFIG_XIP_KERNEL is not set
+# CONFIG_KEXEC is not set
+
+#
+# CPU Power Management
+#
+# CONFIG_CPU_IDLE is not set
+
+#
+# Floating point emulation
+#
+
+#
+# At least one emulation must be selected
+#
+# CONFIG_VFP is not set
+
+#
+# Userspace binary formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+CONFIG_HAVE_AOUT=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_APM_EMULATION is not set
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_COMPAT_NET_DEV_OPS=y
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_NET_DSA is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_DCB is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+# CONFIG_PHONET is not set
+# CONFIG_WIRELESS is not set
+# CONFIG_WIMAX is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_TESTS is not set
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_AFS_PARTS is not set
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+# CONFIG_MTD_NAND_ECC_SMC is not set
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+# CONFIG_MTD_NAND_GPIO is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+CONFIG_MTD_NAND_ATMEL=y
+# CONFIG_MTD_NAND_ATMEL_ECC_HW is not set
+CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y
+# CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_ALAUDA is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# LPDDR flash memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_ATMEL_TCLIB is not set
+# CONFIG_ATMEL_SSC is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+# CONFIG_EEPROM_93CX6 is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+# CONFIG_SCSI_LOWLEVEL is not set
+# CONFIG_SCSI_DH is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_NATIONAL_PHY is not set
+# CONFIG_STE10XP is not set
+# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_MII is not set
+CONFIG_MACB=y
+# CONFIG_AX88796 is not set
+# CONFIG_SMC91X is not set
+# CONFIG_DM9000 is not set
+# CONFIG_SMC911X is not set
+# CONFIG_SMSC911X is not set
+# CONFIG_DNET is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
+# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
+# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
+# CONFIG_B44 is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=320
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_DEVKMEM is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_ATMEL=y
+CONFIG_SERIAL_ATMEL_CONSOLE=y
+CONFIG_SERIAL_ATMEL_PDC=y
+# CONFIG_SERIAL_ATMEL_TTYAT is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+CONFIG_W1=y
+
+#
+# 1-wire Bus Masters
+#
+# CONFIG_W1_MASTER_DS2490 is not set
+# CONFIG_W1_MASTER_DS1WM is not set
+CONFIG_W1_MASTER_GPIO=y
+
+#
+# 1-wire Slaves
+#
+# CONFIG_W1_SLAVE_THERM is not set
+# CONFIG_W1_SLAVE_SMEM is not set
+CONFIG_W1_SLAVE_DS2431=y
+# CONFIG_W1_SLAVE_DS2433 is not set
+# CONFIG_W1_SLAVE_DS2760 is not set
+# CONFIG_W1_SLAVE_BQ27000 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
+
+#
+# Sonics Silicon Backplane
+#
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_TMIO is not set
+# CONFIG_MFD_T7L66XB is not set
+# CONFIG_MFD_TC6387XB is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
+# CONFIG_DAB is not set
+
+#
+# Graphics support
+#
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_SOUND is not set
+# CONFIG_HID_SUPPORT is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICE_CLASS is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_MON is not set
+# CONFIG_USB_WUSB is not set
+# CONFIG_USB_WUSB_CBAF is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+# CONFIG_USB_OXU210HP_HCD is not set
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+# CONFIG_USB_HWA_HCD is not set
+# CONFIG_USB_MUSB_HDRC is not set
+# CONFIG_USB_GADGET_MUSB_HDRC is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_WDM is not set
+# CONFIG_USB_TMC is not set
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
+#
+
+#
+# see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_SEVSEG is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_VST is not set
+CONFIG_USB_GADGET=y
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_SELECTED=y
+CONFIG_USB_GADGET_AT91=y
+CONFIG_USB_AT91=y
+# CONFIG_USB_GADGET_ATMEL_USBA is not set
+# CONFIG_USB_GADGET_FSL_USB2 is not set
+# CONFIG_USB_GADGET_LH7A40X is not set
+# CONFIG_USB_GADGET_OMAP is not set
+# CONFIG_USB_GADGET_PXA25X is not set
+# CONFIG_USB_GADGET_PXA27X is not set
+# CONFIG_USB_GADGET_S3C2410 is not set
+# CONFIG_USB_GADGET_IMX is not set
+# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_GADGET_AMD5536UDC is not set
+# CONFIG_USB_GADGET_FSL_QE is not set
+# CONFIG_USB_GADGET_CI13XXX is not set
+# CONFIG_USB_GADGET_NET2280 is not set
+# CONFIG_USB_GADGET_GOKU is not set
+# CONFIG_USB_GADGET_DUMMY_HCD is not set
+# CONFIG_USB_GADGET_DUALSPEED is not set
+CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_MIDI_GADGET is not set
+# CONFIG_USB_G_PRINTER is not set
+# CONFIG_USB_CDC_COMPOSITE is not set
+
+#
+# OTG and related infrastructure
+#
+# CONFIG_USB_GPIO_VBUS is not set
+CONFIG_MMC=y
+# CONFIG_MMC_DEBUG is not set
+# CONFIG_MMC_UNSAFE_RESUME is not set
+
+#
+# MMC/SD/SDIO Card Drivers
+#
+CONFIG_MMC_BLOCK=y
+# CONFIG_MMC_BLOCK_BOUNCE is not set
+# CONFIG_SDIO_UART is not set
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_SDHCI is not set
+CONFIG_MMC_AT91=y
+# CONFIG_MEMSTICK is not set
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_GPIO=y
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1286 is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T35 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_BQ4802 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_AT91SAM9=y
+CONFIG_RTC_DRV_AT91SAM9_RTT=0
+CONFIG_RTC_DRV_AT91SAM9_GPBR=0
+# CONFIG_DMADEVICES is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_UIO is not set
+# CONFIG_STAGING is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_FS_XATTR is not set
+# CONFIG_EXT4_FS is not set
+CONFIG_JBD=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+CONFIG_FILE_LOCKING=y
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_BTRFS_FS is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+CONFIG_JFFS2_SUMMARY=y
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_SQUASHFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFSD is not set
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_REGISTER_V4 is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+CONFIG_NLS_CODEPAGE_850=y
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+CONFIG_NLS_ISO8859_15=y
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+# CONFIG_DLM is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_RCU_CPU_STALL_DETECTOR is not set
+# CONFIG_LATENCYTOP is not set
+# CONFIG_SYSCTL_SYSCALL_CHECK is not set
+CONFIG_HAVE_FUNCTION_TRACER=y
+
+#
+# Tracers
+#
+# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_DEBUG_USER is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITYFS is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_FIPS is not set
+# CONFIG_CRYPTO_MANAGER is not set
+# CONFIG_CRYPTO_MANAGER2 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_LZO is not set
+
+#
+# Random Number Generation
+#
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_HW is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_FIND_LAST_BIT=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
diff --git a/recipes/linux/linux-2.6.29/stamp9g20evb/stamp9g20.patch b/recipes/linux/linux-2.6.29/stamp9g20evb/stamp9g20.patch
new file mode 100644
index 0000000000..3d44c695f6
--- /dev/null
+++ b/recipes/linux/linux-2.6.29/stamp9g20evb/stamp9g20.patch
@@ -0,0 +1,1594 @@
+diff --git a/arch/arm/configs/stamp9g20evb_defconfig b/arch/arm/configs/stamp9g20evb_defconfig
+new file mode 100644
+index 0000000..f8203a3
+--- /dev/null
++++ b/arch/arm/configs/stamp9g20evb_defconfig
+@@ -0,0 +1,1277 @@
++#
++# Automatically generated make config: don't edit
++# Linux kernel version: 2.6.29
++# Thu Jun 11 09:47:54 2009
++#
++CONFIG_ARM=y
++CONFIG_SYS_SUPPORTS_APM_EMULATION=y
++CONFIG_GENERIC_GPIO=y
++CONFIG_GENERIC_TIME=y
++CONFIG_GENERIC_CLOCKEVENTS=y
++CONFIG_MMU=y
++# CONFIG_NO_IOPORT is not set
++CONFIG_GENERIC_HARDIRQS=y
++CONFIG_STACKTRACE_SUPPORT=y
++CONFIG_HAVE_LATENCYTOP_SUPPORT=y
++CONFIG_LOCKDEP_SUPPORT=y
++CONFIG_TRACE_IRQFLAGS_SUPPORT=y
++CONFIG_HARDIRQS_SW_RESEND=y
++CONFIG_GENERIC_IRQ_PROBE=y
++CONFIG_RWSEM_GENERIC_SPINLOCK=y
++# CONFIG_ARCH_HAS_ILOG2_U32 is not set
++# CONFIG_ARCH_HAS_ILOG2_U64 is not set
++CONFIG_GENERIC_HWEIGHT=y
++CONFIG_GENERIC_CALIBRATE_DELAY=y
++CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
++CONFIG_VECTORS_BASE=0xffff0000
++CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
++
++#
++# General setup
++#
++CONFIG_EXPERIMENTAL=y
++CONFIG_BROKEN_ON_SMP=y
++CONFIG_LOCK_KERNEL=y
++CONFIG_INIT_ENV_ARG_LIMIT=32
++CONFIG_LOCALVERSION=""
++# CONFIG_LOCALVERSION_AUTO is not set
++# CONFIG_SWAP is not set
++CONFIG_SYSVIPC=y
++CONFIG_SYSVIPC_SYSCTL=y
++# CONFIG_POSIX_MQUEUE is not set
++# CONFIG_BSD_PROCESS_ACCT is not set
++# CONFIG_TASKSTATS is not set
++# CONFIG_AUDIT is not set
++
++#
++# RCU Subsystem
++#
++CONFIG_CLASSIC_RCU=y
++# CONFIG_TREE_RCU is not set
++# CONFIG_PREEMPT_RCU is not set
++# CONFIG_TREE_RCU_TRACE is not set
++# CONFIG_PREEMPT_RCU_TRACE is not set
++# CONFIG_IKCONFIG is not set
++CONFIG_LOG_BUF_SHIFT=14
++# CONFIG_GROUP_SCHED is not set
++# CONFIG_CGROUPS is not set
++CONFIG_SYSFS_DEPRECATED=y
++CONFIG_SYSFS_DEPRECATED_V2=y
++# CONFIG_RELAY is not set
++CONFIG_NAMESPACES=y
++# CONFIG_UTS_NS is not set
++# CONFIG_IPC_NS is not set
++# CONFIG_USER_NS is not set
++# CONFIG_PID_NS is not set
++# CONFIG_NET_NS is not set
++CONFIG_BLK_DEV_INITRD=y
++CONFIG_INITRAMFS_SOURCE=""
++CONFIG_CC_OPTIMIZE_FOR_SIZE=y
++CONFIG_SYSCTL=y
++CONFIG_ANON_INODES=y
++# CONFIG_EMBEDDED is not set
++CONFIG_UID16=y
++CONFIG_SYSCTL_SYSCALL=y
++CONFIG_KALLSYMS=y
++# CONFIG_KALLSYMS_EXTRA_PASS is not set
++CONFIG_HOTPLUG=y
++CONFIG_PRINTK=y
++CONFIG_BUG=y
++CONFIG_ELF_CORE=y
++CONFIG_BASE_FULL=y
++CONFIG_FUTEX=y
++CONFIG_EPOLL=y
++CONFIG_SIGNALFD=y
++CONFIG_TIMERFD=y
++CONFIG_EVENTFD=y
++CONFIG_SHMEM=y
++CONFIG_AIO=y
++CONFIG_VM_EVENT_COUNTERS=y
++CONFIG_COMPAT_BRK=y
++CONFIG_SLAB=y
++# CONFIG_SLUB is not set
++# CONFIG_SLOB is not set
++# CONFIG_PROFILING is not set
++CONFIG_HAVE_OPROFILE=y
++# CONFIG_KPROBES is not set
++CONFIG_HAVE_KPROBES=y
++CONFIG_HAVE_KRETPROBES=y
++CONFIG_HAVE_CLK=y
++CONFIG_HAVE_GENERIC_DMA_COHERENT=y
++CONFIG_SLABINFO=y
++CONFIG_RT_MUTEXES=y
++CONFIG_BASE_SMALL=0
++CONFIG_MODULES=y
++# CONFIG_MODULE_FORCE_LOAD is not set
++CONFIG_MODULE_UNLOAD=y
++# CONFIG_MODULE_FORCE_UNLOAD is not set
++# CONFIG_MODVERSIONS is not set
++# CONFIG_MODULE_SRCVERSION_ALL is not set
++CONFIG_BLOCK=y
++# CONFIG_LBD is not set
++# CONFIG_BLK_DEV_IO_TRACE is not set
++# CONFIG_BLK_DEV_BSG is not set
++# CONFIG_BLK_DEV_INTEGRITY is not set
++
++#
++# IO Schedulers
++#
++CONFIG_IOSCHED_NOOP=y
++CONFIG_IOSCHED_AS=y
++# CONFIG_IOSCHED_DEADLINE is not set
++# CONFIG_IOSCHED_CFQ is not set
++CONFIG_DEFAULT_AS=y
++# CONFIG_DEFAULT_DEADLINE is not set
++# CONFIG_DEFAULT_CFQ is not set
++# CONFIG_DEFAULT_NOOP is not set
++CONFIG_DEFAULT_IOSCHED="anticipatory"
++CONFIG_FREEZER=y
++
++#
++# System Type
++#
++# CONFIG_ARCH_AAEC2000 is not set
++# CONFIG_ARCH_INTEGRATOR is not set
++# CONFIG_ARCH_REALVIEW is not set
++# CONFIG_ARCH_VERSATILE is not set
++CONFIG_ARCH_AT91=y
++# CONFIG_ARCH_CLPS711X is not set
++# CONFIG_ARCH_EBSA110 is not set
++# CONFIG_ARCH_EP93XX is not set
++# CONFIG_ARCH_FOOTBRIDGE is not set
++# CONFIG_ARCH_NETX is not set
++# CONFIG_ARCH_H720X is not set
++# CONFIG_ARCH_IMX is not set
++# CONFIG_ARCH_IOP13XX is not set
++# CONFIG_ARCH_IOP32X is not set
++# CONFIG_ARCH_IOP33X is not set
++# CONFIG_ARCH_IXP23XX is not set
++# CONFIG_ARCH_IXP2000 is not set
++# CONFIG_ARCH_IXP4XX is not set
++# CONFIG_ARCH_L7200 is not set
++# CONFIG_ARCH_KIRKWOOD is not set
++# CONFIG_ARCH_KS8695 is not set
++# CONFIG_ARCH_NS9XXX is not set
++# CONFIG_ARCH_LOKI is not set
++# CONFIG_ARCH_MV78XX0 is not set
++# CONFIG_ARCH_MXC is not set
++# CONFIG_ARCH_ORION5X is not set
++# CONFIG_ARCH_PNX4008 is not set
++# CONFIG_ARCH_PXA is not set
++# CONFIG_ARCH_RPC is not set
++# CONFIG_ARCH_SA1100 is not set
++# CONFIG_ARCH_S3C2410 is not set
++# CONFIG_ARCH_S3C64XX is not set
++# CONFIG_ARCH_SHARK is not set
++# CONFIG_ARCH_LH7A40X is not set
++# CONFIG_ARCH_DAVINCI is not set
++# CONFIG_ARCH_OMAP is not set
++# CONFIG_ARCH_MSM is not set
++# CONFIG_ARCH_W90X900 is not set
++
++#
++# Atmel AT91 System-on-Chip
++#
++# CONFIG_ARCH_AT91RM9200 is not set
++# CONFIG_ARCH_AT91SAM9260 is not set
++# CONFIG_ARCH_AT91SAM9261 is not set
++# CONFIG_ARCH_AT91SAM9263 is not set
++# CONFIG_ARCH_AT91SAM9RL is not set
++CONFIG_ARCH_AT91SAM9G20=y
++# CONFIG_ARCH_AT91CAP9 is not set
++# CONFIG_ARCH_AT91X40 is not set
++CONFIG_AT91_PMC_UNIT=y
++
++#
++# AT91SAM9G20 Board Type
++#
++# CONFIG_MACH_AT91SAM9G20EK is not set
++CONFIG_MACH_STAMP9G20=y
++CONFIG_MACH_STAMP9G20_EVB=y
++
++#
++# AT91 Board Options
++#
++
++#
++# AT91 Feature Selections
++#
++CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
++CONFIG_AT91_SLOW_CLOCK=y
++CONFIG_AT91_TIMER_HZ=100
++CONFIG_AT91_EARLY_DBGU=y
++# CONFIG_AT91_EARLY_USART0 is not set
++# CONFIG_AT91_EARLY_USART1 is not set
++# CONFIG_AT91_EARLY_USART2 is not set
++# CONFIG_AT91_EARLY_USART3 is not set
++# CONFIG_AT91_EARLY_USART4 is not set
++# CONFIG_AT91_EARLY_USART5 is not set
++
++#
++# Processor Type
++#
++CONFIG_CPU_32=y
++CONFIG_CPU_ARM926T=y
++CONFIG_CPU_32v5=y
++CONFIG_CPU_ABRT_EV5TJ=y
++CONFIG_CPU_PABRT_NOIFAR=y
++CONFIG_CPU_CACHE_VIVT=y
++CONFIG_CPU_COPY_V4WB=y
++CONFIG_CPU_TLB_V4WBI=y
++CONFIG_CPU_CP15=y
++CONFIG_CPU_CP15_MMU=y
++
++#
++# Processor Features
++#
++CONFIG_ARM_THUMB=y
++# CONFIG_CPU_ICACHE_DISABLE is not set
++# CONFIG_CPU_DCACHE_DISABLE is not set
++# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
++# CONFIG_CPU_CACHE_ROUND_ROBIN is not set
++# CONFIG_OUTER_CACHE is not set
++
++#
++# Bus support
++#
++# CONFIG_PCI_SYSCALL is not set
++# CONFIG_ARCH_SUPPORTS_MSI is not set
++# CONFIG_PCCARD is not set
++
++#
++# Kernel Features
++#
++CONFIG_TICK_ONESHOT=y
++CONFIG_NO_HZ=y
++CONFIG_HIGH_RES_TIMERS=y
++CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
++CONFIG_VMSPLIT_3G=y
++# CONFIG_VMSPLIT_2G is not set
++# CONFIG_VMSPLIT_1G is not set
++CONFIG_PAGE_OFFSET=0xC0000000
++CONFIG_PREEMPT=y
++CONFIG_HZ=100
++CONFIG_AEABI=y
++# CONFIG_OABI_COMPAT is not set
++CONFIG_ARCH_FLATMEM_HAS_HOLES=y
++# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
++# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
++CONFIG_SELECT_MEMORY_MODEL=y
++CONFIG_FLATMEM_MANUAL=y
++# CONFIG_DISCONTIGMEM_MANUAL is not set
++# CONFIG_SPARSEMEM_MANUAL is not set
++CONFIG_FLATMEM=y
++CONFIG_FLAT_NODE_MEM_MAP=y
++CONFIG_PAGEFLAGS_EXTENDED=y
++CONFIG_SPLIT_PTLOCK_CPUS=4096
++# CONFIG_PHYS_ADDR_T_64BIT is not set
++CONFIG_ZONE_DMA_FLAG=0
++CONFIG_VIRT_TO_BUS=y
++CONFIG_UNEVICTABLE_LRU=y
++# CONFIG_LEDS is not set
++CONFIG_ALIGNMENT_TRAP=y
++
++#
++# Boot options
++#
++CONFIG_ZBOOT_ROM_TEXT=0x0
++CONFIG_ZBOOT_ROM_BSS=0x0
++CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
++# CONFIG_XIP_KERNEL is not set
++# CONFIG_KEXEC is not set
++
++#
++# CPU Power Management
++#
++# CONFIG_CPU_IDLE is not set
++
++#
++# Floating point emulation
++#
++
++#
++# At least one emulation must be selected
++#
++# CONFIG_VFP is not set
++
++#
++# Userspace binary formats
++#
++CONFIG_BINFMT_ELF=y
++# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
++CONFIG_HAVE_AOUT=y
++# CONFIG_BINFMT_AOUT is not set
++# CONFIG_BINFMT_MISC is not set
++
++#
++# Power management options
++#
++CONFIG_PM=y
++# CONFIG_PM_DEBUG is not set
++CONFIG_PM_SLEEP=y
++CONFIG_SUSPEND=y
++CONFIG_SUSPEND_FREEZER=y
++# CONFIG_APM_EMULATION is not set
++CONFIG_ARCH_SUSPEND_POSSIBLE=y
++CONFIG_NET=y
++
++#
++# Networking options
++#
++CONFIG_COMPAT_NET_DEV_OPS=y
++CONFIG_PACKET=y
++# CONFIG_PACKET_MMAP is not set
++CONFIG_UNIX=y
++# CONFIG_NET_KEY is not set
++CONFIG_INET=y
++# CONFIG_IP_MULTICAST is not set
++# CONFIG_IP_ADVANCED_ROUTER is not set
++CONFIG_IP_FIB_HASH=y
++# CONFIG_IP_PNP is not set
++# CONFIG_NET_IPIP is not set
++# CONFIG_NET_IPGRE is not set
++# CONFIG_ARPD is not set
++# CONFIG_SYN_COOKIES is not set
++# CONFIG_INET_AH is not set
++# CONFIG_INET_ESP is not set
++# CONFIG_INET_IPCOMP is not set
++# CONFIG_INET_XFRM_TUNNEL is not set
++# CONFIG_INET_TUNNEL is not set
++# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
++# CONFIG_INET_XFRM_MODE_TUNNEL is not set
++# CONFIG_INET_XFRM_MODE_BEET is not set
++# CONFIG_INET_LRO is not set
++CONFIG_INET_DIAG=y
++CONFIG_INET_TCP_DIAG=y
++# CONFIG_TCP_CONG_ADVANCED is not set
++CONFIG_TCP_CONG_CUBIC=y
++CONFIG_DEFAULT_TCP_CONG="cubic"
++# CONFIG_TCP_MD5SIG is not set
++# CONFIG_IPV6 is not set
++# CONFIG_NETWORK_SECMARK is not set
++# CONFIG_NETFILTER is not set
++# CONFIG_IP_DCCP is not set
++# CONFIG_IP_SCTP is not set
++# CONFIG_TIPC is not set
++# CONFIG_ATM is not set
++# CONFIG_BRIDGE is not set
++# CONFIG_NET_DSA is not set
++# CONFIG_VLAN_8021Q is not set
++# CONFIG_DECNET is not set
++# CONFIG_LLC2 is not set
++# CONFIG_IPX is not set
++# CONFIG_ATALK is not set
++# CONFIG_X25 is not set
++# CONFIG_LAPB is not set
++# CONFIG_ECONET is not set
++# CONFIG_WAN_ROUTER is not set
++# CONFIG_NET_SCHED is not set
++# CONFIG_DCB is not set
++
++#
++# Network testing
++#
++# CONFIG_NET_PKTGEN is not set
++# CONFIG_HAMRADIO is not set
++# CONFIG_CAN is not set
++# CONFIG_IRDA is not set
++# CONFIG_BT is not set
++# CONFIG_AF_RXRPC is not set
++# CONFIG_PHONET is not set
++# CONFIG_WIRELESS is not set
++# CONFIG_WIMAX is not set
++# CONFIG_RFKILL is not set
++# CONFIG_NET_9P is not set
++
++#
++# Device Drivers
++#
++
++#
++# Generic Driver Options
++#
++CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
++CONFIG_STANDALONE=y
++CONFIG_PREVENT_FIRMWARE_BUILD=y
++CONFIG_FW_LOADER=y
++CONFIG_FIRMWARE_IN_KERNEL=y
++CONFIG_EXTRA_FIRMWARE=""
++# CONFIG_SYS_HYPERVISOR is not set
++# CONFIG_CONNECTOR is not set
++CONFIG_MTD=y
++# CONFIG_MTD_DEBUG is not set
++CONFIG_MTD_CONCAT=y
++CONFIG_MTD_PARTITIONS=y
++# CONFIG_MTD_TESTS is not set
++# CONFIG_MTD_REDBOOT_PARTS is not set
++CONFIG_MTD_CMDLINE_PARTS=y
++# CONFIG_MTD_AFS_PARTS is not set
++# CONFIG_MTD_AR7_PARTS is not set
++
++#
++# User Modules And Translation Layers
++#
++CONFIG_MTD_CHAR=y
++CONFIG_MTD_BLKDEVS=y
++CONFIG_MTD_BLOCK=y
++# CONFIG_FTL is not set
++# CONFIG_NFTL is not set
++# CONFIG_INFTL is not set
++# CONFIG_RFD_FTL is not set
++# CONFIG_SSFDC is not set
++# CONFIG_MTD_OOPS is not set
++
++#
++# RAM/ROM/Flash chip drivers
++#
++# CONFIG_MTD_CFI is not set
++# CONFIG_MTD_JEDECPROBE is not set
++CONFIG_MTD_MAP_BANK_WIDTH_1=y
++CONFIG_MTD_MAP_BANK_WIDTH_2=y
++CONFIG_MTD_MAP_BANK_WIDTH_4=y
++# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
++# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
++# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
++CONFIG_MTD_CFI_I1=y
++CONFIG_MTD_CFI_I2=y
++# CONFIG_MTD_CFI_I4 is not set
++# CONFIG_MTD_CFI_I8 is not set
++# CONFIG_MTD_RAM is not set
++# CONFIG_MTD_ROM is not set
++# CONFIG_MTD_ABSENT is not set
++
++#
++# Mapping drivers for chip access
++#
++# CONFIG_MTD_COMPLEX_MAPPINGS is not set
++# CONFIG_MTD_PLATRAM is not set
++
++#
++# Self-contained MTD device drivers
++#
++# CONFIG_MTD_SLRAM is not set
++# CONFIG_MTD_PHRAM is not set
++# CONFIG_MTD_MTDRAM is not set
++# CONFIG_MTD_BLOCK2MTD is not set
++
++#
++# Disk-On-Chip Device Drivers
++#
++# CONFIG_MTD_DOC2000 is not set
++# CONFIG_MTD_DOC2001 is not set
++# CONFIG_MTD_DOC2001PLUS is not set
++CONFIG_MTD_NAND=y
++# CONFIG_MTD_NAND_VERIFY_WRITE is not set
++# CONFIG_MTD_NAND_ECC_SMC is not set
++# CONFIG_MTD_NAND_MUSEUM_IDS is not set
++# CONFIG_MTD_NAND_GPIO is not set
++CONFIG_MTD_NAND_IDS=y
++# CONFIG_MTD_NAND_DISKONCHIP is not set
++CONFIG_MTD_NAND_ATMEL=y
++# CONFIG_MTD_NAND_ATMEL_ECC_HW is not set
++CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y
++# CONFIG_MTD_NAND_ATMEL_ECC_NONE is not set
++# CONFIG_MTD_NAND_NANDSIM is not set
++# CONFIG_MTD_NAND_PLATFORM is not set
++# CONFIG_MTD_ALAUDA is not set
++# CONFIG_MTD_ONENAND is not set
++
++#
++# LPDDR flash memory drivers
++#
++# CONFIG_MTD_LPDDR is not set
++
++#
++# UBI - Unsorted block images
++#
++# CONFIG_MTD_UBI is not set
++# CONFIG_PARPORT is not set
++CONFIG_BLK_DEV=y
++# CONFIG_BLK_DEV_COW_COMMON is not set
++CONFIG_BLK_DEV_LOOP=y
++# CONFIG_BLK_DEV_CRYPTOLOOP is not set
++# CONFIG_BLK_DEV_NBD is not set
++# CONFIG_BLK_DEV_UB is not set
++CONFIG_BLK_DEV_RAM=y
++CONFIG_BLK_DEV_RAM_COUNT=16
++CONFIG_BLK_DEV_RAM_SIZE=4096
++# CONFIG_BLK_DEV_XIP is not set
++# CONFIG_CDROM_PKTCDVD is not set
++# CONFIG_ATA_OVER_ETH is not set
++CONFIG_MISC_DEVICES=y
++# CONFIG_ATMEL_TCLIB is not set
++# CONFIG_ATMEL_SSC is not set
++# CONFIG_ENCLOSURE_SERVICES is not set
++# CONFIG_C2PORT is not set
++
++#
++# EEPROM support
++#
++# CONFIG_EEPROM_93CX6 is not set
++CONFIG_HAVE_IDE=y
++# CONFIG_IDE is not set
++
++#
++# SCSI device support
++#
++# CONFIG_RAID_ATTRS is not set
++CONFIG_SCSI=y
++CONFIG_SCSI_DMA=y
++# CONFIG_SCSI_TGT is not set
++# CONFIG_SCSI_NETLINK is not set
++CONFIG_SCSI_PROC_FS=y
++
++#
++# SCSI support type (disk, tape, CD-ROM)
++#
++CONFIG_BLK_DEV_SD=y
++# CONFIG_CHR_DEV_ST is not set
++# CONFIG_CHR_DEV_OSST is not set
++# CONFIG_BLK_DEV_SR is not set
++# CONFIG_CHR_DEV_SG is not set
++# CONFIG_CHR_DEV_SCH is not set
++
++#
++# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
++#
++CONFIG_SCSI_MULTI_LUN=y
++# CONFIG_SCSI_CONSTANTS is not set
++# CONFIG_SCSI_LOGGING is not set
++# CONFIG_SCSI_SCAN_ASYNC is not set
++CONFIG_SCSI_WAIT_SCAN=m
++
++#
++# SCSI Transports
++#
++# CONFIG_SCSI_SPI_ATTRS is not set
++# CONFIG_SCSI_FC_ATTRS is not set
++# CONFIG_SCSI_ISCSI_ATTRS is not set
++# CONFIG_SCSI_SAS_LIBSAS is not set
++# CONFIG_SCSI_SRP_ATTRS is not set
++# CONFIG_SCSI_LOWLEVEL is not set
++# CONFIG_SCSI_DH is not set
++# CONFIG_ATA is not set
++# CONFIG_MD is not set
++CONFIG_NETDEVICES=y
++# CONFIG_DUMMY is not set
++# CONFIG_BONDING is not set
++# CONFIG_MACVLAN is not set
++# CONFIG_EQUALIZER is not set
++# CONFIG_TUN is not set
++# CONFIG_VETH is not set
++CONFIG_PHYLIB=y
++
++#
++# MII PHY device drivers
++#
++# CONFIG_MARVELL_PHY is not set
++# CONFIG_DAVICOM_PHY is not set
++# CONFIG_QSEMI_PHY is not set
++# CONFIG_LXT_PHY is not set
++# CONFIG_CICADA_PHY is not set
++# CONFIG_VITESSE_PHY is not set
++# CONFIG_SMSC_PHY is not set
++# CONFIG_BROADCOM_PHY is not set
++# CONFIG_ICPLUS_PHY is not set
++# CONFIG_REALTEK_PHY is not set
++# CONFIG_NATIONAL_PHY is not set
++# CONFIG_STE10XP is not set
++# CONFIG_LSI_ET1011C_PHY is not set
++# CONFIG_FIXED_PHY is not set
++# CONFIG_MDIO_BITBANG is not set
++CONFIG_NET_ETHERNET=y
++# CONFIG_MII is not set
++CONFIG_MACB=y
++# CONFIG_AX88796 is not set
++# CONFIG_SMC91X is not set
++# CONFIG_DM9000 is not set
++# CONFIG_SMC911X is not set
++# CONFIG_SMSC911X is not set
++# CONFIG_DNET is not set
++# CONFIG_IBM_NEW_EMAC_ZMII is not set
++# CONFIG_IBM_NEW_EMAC_RGMII is not set
++# CONFIG_IBM_NEW_EMAC_TAH is not set
++# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
++# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
++# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
++# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
++# CONFIG_B44 is not set
++# CONFIG_NETDEV_1000 is not set
++# CONFIG_NETDEV_10000 is not set
++
++#
++# Wireless LAN
++#
++# CONFIG_WLAN_PRE80211 is not set
++# CONFIG_WLAN_80211 is not set
++# CONFIG_IWLWIFI_LEDS is not set
++
++#
++# Enable WiMAX (Networking options) to see the WiMAX drivers
++#
++
++#
++# USB Network Adapters
++#
++# CONFIG_USB_CATC is not set
++# CONFIG_USB_KAWETH is not set
++# CONFIG_USB_PEGASUS is not set
++# CONFIG_USB_RTL8150 is not set
++# CONFIG_USB_USBNET is not set
++# CONFIG_WAN is not set
++# CONFIG_PPP is not set
++# CONFIG_SLIP is not set
++# CONFIG_NETCONSOLE is not set
++# CONFIG_NETPOLL is not set
++# CONFIG_NET_POLL_CONTROLLER is not set
++# CONFIG_ISDN is not set
++
++#
++# Input device support
++#
++CONFIG_INPUT=y
++# CONFIG_INPUT_FF_MEMLESS is not set
++# CONFIG_INPUT_POLLDEV is not set
++
++#
++# Userland interfaces
++#
++CONFIG_INPUT_MOUSEDEV=y
++# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
++CONFIG_INPUT_MOUSEDEV_SCREEN_X=320
++CONFIG_INPUT_MOUSEDEV_SCREEN_Y=240
++# CONFIG_INPUT_JOYDEV is not set
++# CONFIG_INPUT_EVDEV is not set
++# CONFIG_INPUT_EVBUG is not set
++
++#
++# Input Device Drivers
++#
++# CONFIG_INPUT_KEYBOARD is not set
++# CONFIG_INPUT_MOUSE is not set
++# CONFIG_INPUT_JOYSTICK is not set
++# CONFIG_INPUT_TABLET is not set
++# CONFIG_INPUT_TOUCHSCREEN is not set
++# CONFIG_INPUT_MISC is not set
++
++#
++# Hardware I/O ports
++#
++# CONFIG_SERIO is not set
++# CONFIG_GAMEPORT is not set
++
++#
++# Character devices
++#
++CONFIG_VT=y
++CONFIG_CONSOLE_TRANSLATIONS=y
++CONFIG_VT_CONSOLE=y
++CONFIG_HW_CONSOLE=y
++# CONFIG_VT_HW_CONSOLE_BINDING is not set
++# CONFIG_DEVKMEM is not set
++# CONFIG_SERIAL_NONSTANDARD is not set
++
++#
++# Serial drivers
++#
++# CONFIG_SERIAL_8250 is not set
++
++#
++# Non-8250 serial port support
++#
++CONFIG_SERIAL_ATMEL=y
++CONFIG_SERIAL_ATMEL_CONSOLE=y
++CONFIG_SERIAL_ATMEL_PDC=y
++# CONFIG_SERIAL_ATMEL_TTYAT is not set
++CONFIG_SERIAL_CORE=y
++CONFIG_SERIAL_CORE_CONSOLE=y
++CONFIG_UNIX98_PTYS=y
++# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
++# CONFIG_LEGACY_PTYS is not set
++# CONFIG_IPMI_HANDLER is not set
++# CONFIG_HW_RANDOM is not set
++# CONFIG_R3964 is not set
++# CONFIG_RAW_DRIVER is not set
++# CONFIG_TCG_TPM is not set
++# CONFIG_I2C is not set
++# CONFIG_SPI is not set
++CONFIG_W1=y
++
++#
++# 1-wire Bus Masters
++#
++# CONFIG_W1_MASTER_DS2490 is not set
++# CONFIG_W1_MASTER_DS1WM is not set
++CONFIG_W1_MASTER_GPIO=y
++
++#
++# 1-wire Slaves
++#
++# CONFIG_W1_SLAVE_THERM is not set
++# CONFIG_W1_SLAVE_SMEM is not set
++CONFIG_W1_SLAVE_DS2431=y
++# CONFIG_W1_SLAVE_DS2433 is not set
++# CONFIG_W1_SLAVE_DS2760 is not set
++# CONFIG_W1_SLAVE_BQ27000 is not set
++# CONFIG_POWER_SUPPLY is not set
++# CONFIG_HWMON is not set
++# CONFIG_THERMAL is not set
++# CONFIG_THERMAL_HWMON is not set
++# CONFIG_WATCHDOG is not set
++CONFIG_SSB_POSSIBLE=y
++
++#
++# Sonics Silicon Backplane
++#
++# CONFIG_SSB is not set
++
++#
++# Multifunction device drivers
++#
++# CONFIG_MFD_CORE is not set
++# CONFIG_MFD_SM501 is not set
++# CONFIG_HTC_PASIC3 is not set
++# CONFIG_MFD_TMIO is not set
++# CONFIG_MFD_T7L66XB is not set
++# CONFIG_MFD_TC6387XB is not set
++
++#
++# Multimedia devices
++#
++
++#
++# Multimedia core support
++#
++# CONFIG_VIDEO_DEV is not set
++# CONFIG_DVB_CORE is not set
++# CONFIG_VIDEO_MEDIA is not set
++
++#
++# Multimedia drivers
++#
++# CONFIG_DAB is not set
++
++#
++# Graphics support
++#
++# CONFIG_VGASTATE is not set
++# CONFIG_VIDEO_OUTPUT_CONTROL is not set
++# CONFIG_FB is not set
++# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
++
++#
++# Display device support
++#
++# CONFIG_DISPLAY_SUPPORT is not set
++
++#
++# Console display driver support
++#
++# CONFIG_VGA_CONSOLE is not set
++CONFIG_DUMMY_CONSOLE=y
++# CONFIG_SOUND is not set
++# CONFIG_HID_SUPPORT is not set
++CONFIG_USB_SUPPORT=y
++CONFIG_USB_ARCH_HAS_HCD=y
++CONFIG_USB_ARCH_HAS_OHCI=y
++# CONFIG_USB_ARCH_HAS_EHCI is not set
++CONFIG_USB=y
++# CONFIG_USB_DEBUG is not set
++# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
++
++#
++# Miscellaneous USB options
++#
++CONFIG_USB_DEVICEFS=y
++# CONFIG_USB_DEVICE_CLASS is not set
++# CONFIG_USB_DYNAMIC_MINORS is not set
++# CONFIG_USB_SUSPEND is not set
++# CONFIG_USB_OTG is not set
++# CONFIG_USB_MON is not set
++# CONFIG_USB_WUSB is not set
++# CONFIG_USB_WUSB_CBAF is not set
++
++#
++# USB Host Controller Drivers
++#
++# CONFIG_USB_C67X00_HCD is not set
++# CONFIG_USB_OXU210HP_HCD is not set
++# CONFIG_USB_ISP116X_HCD is not set
++CONFIG_USB_OHCI_HCD=y
++# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
++# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
++CONFIG_USB_OHCI_LITTLE_ENDIAN=y
++# CONFIG_USB_SL811_HCD is not set
++# CONFIG_USB_R8A66597_HCD is not set
++# CONFIG_USB_HWA_HCD is not set
++# CONFIG_USB_MUSB_HDRC is not set
++# CONFIG_USB_GADGET_MUSB_HDRC is not set
++
++#
++# USB Device Class drivers
++#
++# CONFIG_USB_ACM is not set
++# CONFIG_USB_PRINTER is not set
++# CONFIG_USB_WDM is not set
++# CONFIG_USB_TMC is not set
++
++#
++# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
++#
++
++#
++# see USB_STORAGE Help for more information
++#
++CONFIG_USB_STORAGE=y
++# CONFIG_USB_STORAGE_DEBUG is not set
++# CONFIG_USB_STORAGE_DATAFAB is not set
++# CONFIG_USB_STORAGE_FREECOM is not set
++# CONFIG_USB_STORAGE_ISD200 is not set
++# CONFIG_USB_STORAGE_USBAT is not set
++# CONFIG_USB_STORAGE_SDDR09 is not set
++# CONFIG_USB_STORAGE_SDDR55 is not set
++# CONFIG_USB_STORAGE_JUMPSHOT is not set
++# CONFIG_USB_STORAGE_ALAUDA is not set
++# CONFIG_USB_STORAGE_ONETOUCH is not set
++# CONFIG_USB_STORAGE_KARMA is not set
++# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
++# CONFIG_USB_LIBUSUAL is not set
++
++#
++# USB Imaging devices
++#
++# CONFIG_USB_MDC800 is not set
++# CONFIG_USB_MICROTEK is not set
++
++#
++# USB port drivers
++#
++# CONFIG_USB_SERIAL is not set
++
++#
++# USB Miscellaneous drivers
++#
++# CONFIG_USB_EMI62 is not set
++# CONFIG_USB_EMI26 is not set
++# CONFIG_USB_ADUTUX is not set
++# CONFIG_USB_SEVSEG is not set
++# CONFIG_USB_RIO500 is not set
++# CONFIG_USB_LEGOTOWER is not set
++# CONFIG_USB_LCD is not set
++# CONFIG_USB_BERRY_CHARGE is not set
++# CONFIG_USB_LED is not set
++# CONFIG_USB_CYPRESS_CY7C63 is not set
++# CONFIG_USB_CYTHERM is not set
++# CONFIG_USB_PHIDGET is not set
++# CONFIG_USB_IDMOUSE is not set
++# CONFIG_USB_FTDI_ELAN is not set
++# CONFIG_USB_APPLEDISPLAY is not set
++# CONFIG_USB_LD is not set
++# CONFIG_USB_TRANCEVIBRATOR is not set
++# CONFIG_USB_IOWARRIOR is not set
++# CONFIG_USB_TEST is not set
++# CONFIG_USB_ISIGHTFW is not set
++# CONFIG_USB_VST is not set
++CONFIG_USB_GADGET=y
++# CONFIG_USB_GADGET_DEBUG_FILES is not set
++CONFIG_USB_GADGET_VBUS_DRAW=2
++CONFIG_USB_GADGET_SELECTED=y
++CONFIG_USB_GADGET_AT91=y
++CONFIG_USB_AT91=y
++# CONFIG_USB_GADGET_ATMEL_USBA is not set
++# CONFIG_USB_GADGET_FSL_USB2 is not set
++# CONFIG_USB_GADGET_LH7A40X is not set
++# CONFIG_USB_GADGET_OMAP is not set
++# CONFIG_USB_GADGET_PXA25X is not set
++# CONFIG_USB_GADGET_PXA27X is not set
++# CONFIG_USB_GADGET_S3C2410 is not set
++# CONFIG_USB_GADGET_IMX is not set
++# CONFIG_USB_GADGET_M66592 is not set
++# CONFIG_USB_GADGET_AMD5536UDC is not set
++# CONFIG_USB_GADGET_FSL_QE is not set
++# CONFIG_USB_GADGET_CI13XXX is not set
++# CONFIG_USB_GADGET_NET2280 is not set
++# CONFIG_USB_GADGET_GOKU is not set
++# CONFIG_USB_GADGET_DUMMY_HCD is not set
++# CONFIG_USB_GADGET_DUALSPEED is not set
++CONFIG_USB_ZERO=m
++CONFIG_USB_ETH=m
++CONFIG_USB_ETH_RNDIS=y
++CONFIG_USB_GADGETFS=m
++CONFIG_USB_FILE_STORAGE=m
++# CONFIG_USB_FILE_STORAGE_TEST is not set
++CONFIG_USB_G_SERIAL=m
++# CONFIG_USB_MIDI_GADGET is not set
++# CONFIG_USB_G_PRINTER is not set
++# CONFIG_USB_CDC_COMPOSITE is not set
++
++#
++# OTG and related infrastructure
++#
++# CONFIG_USB_GPIO_VBUS is not set
++CONFIG_MMC=y
++# CONFIG_MMC_DEBUG is not set
++# CONFIG_MMC_UNSAFE_RESUME is not set
++
++#
++# MMC/SD/SDIO Card Drivers
++#
++CONFIG_MMC_BLOCK=y
++# CONFIG_MMC_BLOCK_BOUNCE is not set
++# CONFIG_SDIO_UART is not set
++# CONFIG_MMC_TEST is not set
++
++#
++# MMC/SD/SDIO Host Controller Drivers
++#
++# CONFIG_MMC_SDHCI is not set
++CONFIG_MMC_AT91=y
++# CONFIG_MEMSTICK is not set
++# CONFIG_ACCESSIBILITY is not set
++CONFIG_NEW_LEDS=y
++CONFIG_LEDS_CLASS=y
++
++#
++# LED drivers
++#
++CONFIG_LEDS_GPIO=y
++
++#
++# LED Triggers
++#
++CONFIG_LEDS_TRIGGERS=y
++CONFIG_LEDS_TRIGGER_TIMER=y
++CONFIG_LEDS_TRIGGER_HEARTBEAT=y
++# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
++CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
++CONFIG_RTC_LIB=y
++CONFIG_RTC_CLASS=y
++CONFIG_RTC_HCTOSYS=y
++CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
++# CONFIG_RTC_DEBUG is not set
++
++#
++# RTC interfaces
++#
++CONFIG_RTC_INTF_SYSFS=y
++CONFIG_RTC_INTF_PROC=y
++CONFIG_RTC_INTF_DEV=y
++# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
++# CONFIG_RTC_DRV_TEST is not set
++
++#
++# SPI RTC drivers
++#
++
++#
++# Platform RTC drivers
++#
++# CONFIG_RTC_DRV_CMOS is not set
++# CONFIG_RTC_DRV_DS1286 is not set
++# CONFIG_RTC_DRV_DS1511 is not set
++# CONFIG_RTC_DRV_DS1553 is not set
++# CONFIG_RTC_DRV_DS1742 is not set
++# CONFIG_RTC_DRV_STK17TA8 is not set
++# CONFIG_RTC_DRV_M48T86 is not set
++# CONFIG_RTC_DRV_M48T35 is not set
++# CONFIG_RTC_DRV_M48T59 is not set
++# CONFIG_RTC_DRV_BQ4802 is not set
++# CONFIG_RTC_DRV_V3020 is not set
++
++#
++# on-CPU RTC drivers
++#
++CONFIG_RTC_DRV_AT91SAM9=y
++CONFIG_RTC_DRV_AT91SAM9_RTT=0
++CONFIG_RTC_DRV_AT91SAM9_GPBR=0
++# CONFIG_DMADEVICES is not set
++# CONFIG_REGULATOR is not set
++# CONFIG_UIO is not set
++# CONFIG_STAGING is not set
++
++#
++# File systems
++#
++CONFIG_EXT2_FS=y
++# CONFIG_EXT2_FS_XATTR is not set
++# CONFIG_EXT2_FS_XIP is not set
++CONFIG_EXT3_FS=y
++# CONFIG_EXT3_FS_XATTR is not set
++# CONFIG_EXT4_FS is not set
++CONFIG_JBD=y
++# CONFIG_REISERFS_FS is not set
++# CONFIG_JFS_FS is not set
++# CONFIG_FS_POSIX_ACL is not set
++CONFIG_FILE_LOCKING=y
++# CONFIG_XFS_FS is not set
++# CONFIG_OCFS2_FS is not set
++# CONFIG_BTRFS_FS is not set
++CONFIG_DNOTIFY=y
++CONFIG_INOTIFY=y
++CONFIG_INOTIFY_USER=y
++# CONFIG_QUOTA is not set
++# CONFIG_AUTOFS_FS is not set
++# CONFIG_AUTOFS4_FS is not set
++# CONFIG_FUSE_FS is not set
++
++#
++# CD-ROM/DVD Filesystems
++#
++# CONFIG_ISO9660_FS is not set
++# CONFIG_UDF_FS is not set
++
++#
++# DOS/FAT/NT Filesystems
++#
++CONFIG_FAT_FS=y
++CONFIG_MSDOS_FS=y
++CONFIG_VFAT_FS=y
++CONFIG_FAT_DEFAULT_CODEPAGE=437
++CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
++# CONFIG_NTFS_FS is not set
++
++#
++# Pseudo filesystems
++#
++CONFIG_PROC_FS=y
++CONFIG_PROC_SYSCTL=y
++CONFIG_PROC_PAGE_MONITOR=y
++CONFIG_SYSFS=y
++CONFIG_TMPFS=y
++# CONFIG_TMPFS_POSIX_ACL is not set
++# CONFIG_HUGETLB_PAGE is not set
++# CONFIG_CONFIGFS_FS is not set
++CONFIG_MISC_FILESYSTEMS=y
++# CONFIG_ADFS_FS is not set
++# CONFIG_AFFS_FS is not set
++# CONFIG_HFS_FS is not set
++# CONFIG_HFSPLUS_FS is not set
++# CONFIG_BEFS_FS is not set
++# CONFIG_BFS_FS is not set
++# CONFIG_EFS_FS is not set
++CONFIG_JFFS2_FS=y
++CONFIG_JFFS2_FS_DEBUG=0
++CONFIG_JFFS2_FS_WRITEBUFFER=y
++# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
++CONFIG_JFFS2_SUMMARY=y
++# CONFIG_JFFS2_FS_XATTR is not set
++# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
++CONFIG_JFFS2_ZLIB=y
++# CONFIG_JFFS2_LZO is not set
++CONFIG_JFFS2_RTIME=y
++# CONFIG_JFFS2_RUBIN is not set
++# CONFIG_CRAMFS is not set
++# CONFIG_SQUASHFS is not set
++# CONFIG_VXFS_FS is not set
++# CONFIG_MINIX_FS is not set
++# CONFIG_OMFS_FS is not set
++# CONFIG_HPFS_FS is not set
++# CONFIG_QNX4FS_FS is not set
++# CONFIG_ROMFS_FS is not set
++# CONFIG_SYSV_FS is not set
++# CONFIG_UFS_FS is not set
++CONFIG_NETWORK_FILESYSTEMS=y
++CONFIG_NFS_FS=y
++CONFIG_NFS_V3=y
++# CONFIG_NFS_V3_ACL is not set
++# CONFIG_NFS_V4 is not set
++# CONFIG_NFSD is not set
++CONFIG_LOCKD=y
++CONFIG_LOCKD_V4=y
++CONFIG_NFS_COMMON=y
++CONFIG_SUNRPC=y
++# CONFIG_SUNRPC_REGISTER_V4 is not set
++# CONFIG_RPCSEC_GSS_KRB5 is not set
++# CONFIG_RPCSEC_GSS_SPKM3 is not set
++# CONFIG_SMB_FS is not set
++# CONFIG_CIFS is not set
++# CONFIG_NCP_FS is not set
++# CONFIG_CODA_FS is not set
++# CONFIG_AFS_FS is not set
++
++#
++# Partition Types
++#
++# CONFIG_PARTITION_ADVANCED is not set
++CONFIG_MSDOS_PARTITION=y
++CONFIG_NLS=y
++CONFIG_NLS_DEFAULT="iso8859-1"
++CONFIG_NLS_CODEPAGE_437=y
++# CONFIG_NLS_CODEPAGE_737 is not set
++# CONFIG_NLS_CODEPAGE_775 is not set
++CONFIG_NLS_CODEPAGE_850=y
++# CONFIG_NLS_CODEPAGE_852 is not set
++# CONFIG_NLS_CODEPAGE_855 is not set
++# CONFIG_NLS_CODEPAGE_857 is not set
++# CONFIG_NLS_CODEPAGE_860 is not set
++# CONFIG_NLS_CODEPAGE_861 is not set
++# CONFIG_NLS_CODEPAGE_862 is not set
++# CONFIG_NLS_CODEPAGE_863 is not set
++# CONFIG_NLS_CODEPAGE_864 is not set
++# CONFIG_NLS_CODEPAGE_865 is not set
++# CONFIG_NLS_CODEPAGE_866 is not set
++# CONFIG_NLS_CODEPAGE_869 is not set
++# CONFIG_NLS_CODEPAGE_936 is not set
++# CONFIG_NLS_CODEPAGE_950 is not set
++# CONFIG_NLS_CODEPAGE_932 is not set
++# CONFIG_NLS_CODEPAGE_949 is not set
++# CONFIG_NLS_CODEPAGE_874 is not set
++# CONFIG_NLS_ISO8859_8 is not set
++# CONFIG_NLS_CODEPAGE_1250 is not set
++# CONFIG_NLS_CODEPAGE_1251 is not set
++# CONFIG_NLS_ASCII is not set
++CONFIG_NLS_ISO8859_1=y
++# CONFIG_NLS_ISO8859_2 is not set
++# CONFIG_NLS_ISO8859_3 is not set
++# CONFIG_NLS_ISO8859_4 is not set
++# CONFIG_NLS_ISO8859_5 is not set
++# CONFIG_NLS_ISO8859_6 is not set
++# CONFIG_NLS_ISO8859_7 is not set
++# CONFIG_NLS_ISO8859_9 is not set
++# CONFIG_NLS_ISO8859_13 is not set
++# CONFIG_NLS_ISO8859_14 is not set
++CONFIG_NLS_ISO8859_15=y
++# CONFIG_NLS_KOI8_R is not set
++# CONFIG_NLS_KOI8_U is not set
++CONFIG_NLS_UTF8=y
++# CONFIG_DLM is not set
++
++#
++# Kernel hacking
++#
++# CONFIG_PRINTK_TIME is not set
++# CONFIG_ENABLE_WARN_DEPRECATED is not set
++CONFIG_ENABLE_MUST_CHECK=y
++CONFIG_FRAME_WARN=1024
++# CONFIG_MAGIC_SYSRQ is not set
++# CONFIG_UNUSED_SYMBOLS is not set
++# CONFIG_DEBUG_FS is not set
++# CONFIG_HEADERS_CHECK is not set
++# CONFIG_DEBUG_KERNEL is not set
++CONFIG_DEBUG_BUGVERBOSE=y
++CONFIG_DEBUG_MEMORY_INIT=y
++CONFIG_FRAME_POINTER=y
++# CONFIG_RCU_CPU_STALL_DETECTOR is not set
++# CONFIG_LATENCYTOP is not set
++# CONFIG_SYSCTL_SYSCALL_CHECK is not set
++CONFIG_HAVE_FUNCTION_TRACER=y
++
++#
++# Tracers
++#
++# CONFIG_DYNAMIC_PRINTK_DEBUG is not set
++# CONFIG_SAMPLES is not set
++CONFIG_HAVE_ARCH_KGDB=y
++# CONFIG_DEBUG_USER is not set
++
++#
++# Security options
++#
++# CONFIG_KEYS is not set
++# CONFIG_SECURITY is not set
++# CONFIG_SECURITYFS is not set
++# CONFIG_SECURITY_FILE_CAPABILITIES is not set
++CONFIG_CRYPTO=y
++
++#
++# Crypto core or helper
++#
++# CONFIG_CRYPTO_FIPS is not set
++# CONFIG_CRYPTO_MANAGER is not set
++# CONFIG_CRYPTO_MANAGER2 is not set
++# CONFIG_CRYPTO_GF128MUL is not set
++# CONFIG_CRYPTO_NULL is not set
++# CONFIG_CRYPTO_CRYPTD is not set
++# CONFIG_CRYPTO_AUTHENC is not set
++# CONFIG_CRYPTO_TEST is not set
++
++#
++# Authenticated Encryption with Associated Data
++#
++# CONFIG_CRYPTO_CCM is not set
++# CONFIG_CRYPTO_GCM is not set
++# CONFIG_CRYPTO_SEQIV is not set
++
++#
++# Block modes
++#
++# CONFIG_CRYPTO_CBC is not set
++# CONFIG_CRYPTO_CTR is not set
++# CONFIG_CRYPTO_CTS is not set
++# CONFIG_CRYPTO_ECB is not set
++# CONFIG_CRYPTO_LRW is not set
++# CONFIG_CRYPTO_PCBC is not set
++# CONFIG_CRYPTO_XTS is not set
++
++#
++# Hash modes
++#
++# CONFIG_CRYPTO_HMAC is not set
++# CONFIG_CRYPTO_XCBC is not set
++
++#
++# Digest
++#
++# CONFIG_CRYPTO_CRC32C is not set
++# CONFIG_CRYPTO_MD4 is not set
++# CONFIG_CRYPTO_MD5 is not set
++# CONFIG_CRYPTO_MICHAEL_MIC is not set
++# CONFIG_CRYPTO_RMD128 is not set
++# CONFIG_CRYPTO_RMD160 is not set
++# CONFIG_CRYPTO_RMD256 is not set
++# CONFIG_CRYPTO_RMD320 is not set
++# CONFIG_CRYPTO_SHA1 is not set
++# CONFIG_CRYPTO_SHA256 is not set
++# CONFIG_CRYPTO_SHA512 is not set
++# CONFIG_CRYPTO_TGR192 is not set
++# CONFIG_CRYPTO_WP512 is not set
++
++#
++# Ciphers
++#
++# CONFIG_CRYPTO_AES is not set
++# CONFIG_CRYPTO_ANUBIS is not set
++# CONFIG_CRYPTO_ARC4 is not set
++# CONFIG_CRYPTO_BLOWFISH is not set
++# CONFIG_CRYPTO_CAMELLIA is not set
++# CONFIG_CRYPTO_CAST5 is not set
++# CONFIG_CRYPTO_CAST6 is not set
++# CONFIG_CRYPTO_DES is not set
++# CONFIG_CRYPTO_FCRYPT is not set
++# CONFIG_CRYPTO_KHAZAD is not set
++# CONFIG_CRYPTO_SALSA20 is not set
++# CONFIG_CRYPTO_SEED is not set
++# CONFIG_CRYPTO_SERPENT is not set
++# CONFIG_CRYPTO_TEA is not set
++# CONFIG_CRYPTO_TWOFISH is not set
++
++#
++# Compression
++#
++# CONFIG_CRYPTO_DEFLATE is not set
++# CONFIG_CRYPTO_LZO is not set
++
++#
++# Random Number Generation
++#
++# CONFIG_CRYPTO_ANSI_CPRNG is not set
++# CONFIG_CRYPTO_HW is not set
++
++#
++# Library routines
++#
++CONFIG_BITREVERSE=y
++CONFIG_GENERIC_FIND_LAST_BIT=y
++# CONFIG_CRC_CCITT is not set
++# CONFIG_CRC16 is not set
++# CONFIG_CRC_T10DIF is not set
++# CONFIG_CRC_ITU_T is not set
++CONFIG_CRC32=y
++# CONFIG_CRC7 is not set
++# CONFIG_LIBCRC32C is not set
++CONFIG_ZLIB_INFLATE=y
++CONFIG_ZLIB_DEFLATE=y
++CONFIG_PLIST=y
++CONFIG_HAS_IOMEM=y
++CONFIG_HAS_IOPORT=y
++CONFIG_HAS_DMA=y
+diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
+index 323b47f..ed0017b 100644
+--- a/arch/arm/mach-at91/Kconfig
++++ b/arch/arm/mach-at91/Kconfig
+@@ -276,6 +276,17 @@ config MACH_AT91SAM9G20EK
+ 	help
+ 	  Select this if you are using Atmel's AT91SAM9G20-EK Evaluation Kit.
+ 
++config MACH_STAMP9G20
++	bool "taskit Stamp9G20 CPU module"
++	depends on ARCH_AT91SAM9G20
++	help
++	  Select this if you are using taskit's Stamp9G20 CPU module.
++
++config MACH_STAMP9G20_EVB
++	bool "Stamp9G20 EVB"
++	depends on MACH_STAMP9G20
++	help
++	  Select this if you are using taskit's Stamp9G20 Evaluation Board.
+ endif
+ 
+ # ----------------------------------------------------------
+diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
+index c69ff23..36060dc 100644
+--- a/arch/arm/mach-at91/Makefile
++++ b/arch/arm/mach-at91/Makefile
+@@ -54,6 +54,8 @@ obj-$(CONFIG_MACH_AT91SAM9RLEK)	+= board-sam9rlek.o
+ 
+ # AT91SAM9G20 board-specific support
+ obj-$(CONFIG_MACH_AT91SAM9G20EK) += board-sam9g20ek.o
++obj-$(CONFIG_MACH_STAMP9G20)     += board-stamp9g20.o
++obj-$(CONFIG_MACH_STAMP9G20_EVB) += stamp9g20-evb.o
+ 
+ # AT91CAP9 board-specific support
+ obj-$(CONFIG_MACH_AT91CAP9ADK)	+= board-cap9adk.o
+diff --git a/arch/arm/mach-at91/board-stamp9g20.c b/arch/arm/mach-at91/board-stamp9g20.c
+new file mode 100644
+index 0000000..c39b926
+--- /dev/null
++++ b/arch/arm/mach-at91/board-stamp9g20.c
+@@ -0,0 +1,153 @@
++/*
++ *  Copyright (C) 2009 taskit GmbH
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++
++#include <linux/mm.h>
++#include <linux/platform_device.h>
++#include <linux/w1-gpio.h>
++
++#include <asm/mach-types.h>
++#include <asm/mach/arch.h>
++
++#include <mach/board.h>
++#include <mach/gpio.h>
++#include <mach/at91sam9_smc.h>
++
++#include "sam9_smc.h"
++#include "generic.h"
++
++
++static void __init stamp9g20_map_io(void)
++{
++	/* Initialize processor: 18.432 MHz crystal */
++	at91sam9260_initialize(18432000);
++
++	/* DGBU on ttyS0. (Rx & Tx only) */
++	at91_register_uart(0, 0, 0);
++
++	/* set serial console to ttyS0 (ie, DBGU) */
++	at91_set_serial_console(0);
++}
++
++static void __init stamp9g20_init_irq(void)
++{
++	at91sam9260_init_interrupts(NULL);
++}
++
++
++/*
++ * NAND flash
++ */
++
++/* det_pin is not connected */
++static struct atmel_nand_data __initdata stamp9g20_nand_data = {
++	.ale		= 21,
++	.cle		= 22,
++	.rdy_pin	= AT91_PIN_PC13,
++	.enable_pin	= AT91_PIN_PC14,
++	.bus_width_16	= 0,
++};
++
++static struct sam9_smc_config __initdata stamp9g20_nand_smc_config = {
++	.ncs_read_setup		= 0,
++	.nrd_setup		= 2,
++	.ncs_write_setup	= 0,
++	.nwe_setup		= 2,
++
++	.ncs_read_pulse		= 4,
++	.nrd_pulse		= 4,
++	.ncs_write_pulse	= 4,
++	.nwe_pulse		= 4,
++
++	.read_cycle		= 7,
++	.write_cycle		= 7,
++
++	.mode			= AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_DBW_8,
++	.tdf_cycles		= 3,
++};
++
++static void __init stamp9g20_add_device_nand(void)
++{
++	/* configure chip-select 3 (NAND) */
++	sam9_smc_configure(3, &stamp9g20_nand_smc_config);
++
++	at91_add_device_nand(&stamp9g20_nand_data);
++}
++
++
++/*
++ * MCI (SD/MMC)
++ * det_pin, wp_pin and vcc_pin are not connected
++ */
++static struct at91_mmc_data __initdata stamp9g20_mmc_data = {
++	.slot_b		= 0,
++	.wire4		= 1,
++};
++
++
++/*
++ * Dallas 1-Wire
++ */
++static struct w1_gpio_platform_data stamp9g20_w1_gpio_pdata = {
++	.pin		= AT91_PIN_PA29,
++	.is_open_drain	= 1,
++};
++
++static struct platform_device stamp9g20_w1_device = {
++	.name			= "w1-gpio",
++	.id			= -1,
++	.dev.platform_data	= &stamp9g20_w1_gpio_pdata,
++};
++
++void stamp9g20_add_w1(void)
++{
++	at91_set_GPIO_periph(stamp9g20_w1_gpio_pdata.pin, 1);
++	at91_set_multi_drive(stamp9g20_w1_gpio_pdata.pin, 1);
++	platform_device_register(&stamp9g20_w1_device);
++}
++
++
++void stamp9g20_evb_init(void);
++
++static void __init stamp9g20_board_init(void)
++{
++	/* NAND */
++	stamp9g20_add_device_nand();
++	/* MMC */
++	at91_add_device_mmc(0, &stamp9g20_mmc_data);
++	/* W1 */
++	stamp9g20_add_w1();
++
++#ifdef CONFIG_MACH_STAMP9G20_EVB
++	stamp9g20_evb_init();
++#endif
++
++	/* Serial */
++	at91_add_device_serial();
++}
++
++
++MACHINE_START(STAMP9G20, "tastit Stamp9G20")
++	/* Maintainer: taskit GmbH */
++	.phys_io	= AT91_BASE_SYS,
++	.io_pg_offst	= (AT91_VA_BASE_SYS >> 18) & 0xfffc,
++	.boot_params	= AT91_SDRAM_BASE + 0x100,
++	.timer		= &at91sam926x_timer,
++	.map_io		= stamp9g20_map_io,
++	.init_irq	= stamp9g20_init_irq,
++	.init_machine	= stamp9g20_board_init,
++MACHINE_END
+diff --git a/arch/arm/mach-at91/stamp9g20-evb.c b/arch/arm/mach-at91/stamp9g20-evb.c
+new file mode 100644
+index 0000000..dc1e8ab
+--- /dev/null
++++ b/arch/arm/mach-at91/stamp9g20-evb.c
+@@ -0,0 +1,111 @@
++/*
++ *  Copyright (C) 2009 taskit GmbH
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ */
++#include <linux/types.h>
++#include <linux/init.h>
++#include <linux/mm.h>
++#include <linux/module.h>
++#include <linux/platform_device.h>
++#include <linux/spi/spi.h>
++#include <linux/spi/at73c213.h>
++#include <linux/clk.h>
++
++#include <mach/hardware.h>
++#include <asm/setup.h>
++#include <asm/mach-types.h>
++#include <asm/irq.h>
++
++#include <asm/mach/arch.h>
++#include <asm/mach/map.h>
++#include <asm/mach/irq.h>
++
++#include <mach/board.h>
++#include <mach/gpio.h>
++#include <mach/at91sam9_smc.h>
++
++#include "sam9_smc.h"
++#include "generic.h"
++
++#include <mach/board.h>
++#include <mach/gpio.h>
++
++/*
++ * USB Host port
++ */
++static struct at91_usbh_data __initdata stamp9g20_usbh_data = {
++	.ports		= 2,
++};
++
++
++/*
++ * USB Device port
++ */
++static struct at91_udc_data __initdata stamp9g20_udc_data = {
++	.vbus_pin	= AT91_PIN_PA22,
++	.pullup_pin	= 0,		/* pull-up driven by UDC */
++};
++
++
++/*
++ * MACB Ethernet device
++ */
++static struct at91_eth_data __initdata stamp9g20_macb_data = {
++	.phy_irq_pin	= AT91_PIN_PA28,
++	.is_rmii	= 1,
++};
++
++
++/*
++ * LEDs
++ */
++static struct gpio_led ek_leds[] = {
++	{
++		.name                   = "D8:red",
++		.gpio                   = AT91_PIN_PB18,
++		.active_low             = 1,
++		.default_trigger        = "none",
++	},{
++		.name                   = "D9:yellow",
++		.gpio                   = AT91_PIN_PB19,
++		.active_low             = 1,
++		.default_trigger        = "none",
++	},{
++		.name                   = "D10:green",
++		.gpio                   = AT91_PIN_PB20,
++		.active_low             = 1,
++		.default_trigger        = "heartbeat",
++	}
++};
++
++void __init stamp9g20_evb_init(void)
++{
++	/* USART0 on ttyS1. (Rx, Tx, CTS, RTS, DTR, DSR, DCD, RI) */
++	at91_register_uart(AT91SAM9260_ID_US0, 1, ATMEL_UART_CTS | ATMEL_UART_RTS
++	                                        | ATMEL_UART_DTR | ATMEL_UART_DSR
++	                                        | ATMEL_UART_DCD | ATMEL_UART_RI);
++	/* USB Host */
++	at91_add_device_usbh(&stamp9g20_usbh_data);
++	/* USB Device */
++	at91_add_device_udc(&stamp9g20_udc_data);
++	/* Ethernet */
++	at91_add_device_eth(&stamp9g20_macb_data);
++	/* LEDs */
++	at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
++	/* I2C */
++	at91_add_device_i2c(NULL, 0);
++}
++
diff --git a/recipes/linux/linux_2.6.29.bb b/recipes/linux/linux_2.6.29.bb
index f1733ea197..275baf97ea 100644
--- a/recipes/linux/linux_2.6.29.bb
+++ b/recipes/linux/linux_2.6.29.bb
@@ -1,6 +1,6 @@
 require linux.inc
 
-PR = "r7"
+PR = "r8"
 
 S = "${WORKDIR}/linux-2.6.29"
 
@@ -16,6 +16,7 @@ DEFAULT_PREFERENCE_ep93xx = "1"
 DEFAULT_PREFERENCE_cm-x270 = "1"
 DEFAULT_PREFERENCE_at2440evb = "1"
 DEFAULT_PREFERENCE_tqm8540 = "1"
+DEFAULT_PREFERENCE_stamp9g20evb = "1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.29.tar.bz2 \
            file://defconfig"
@@ -66,5 +67,9 @@ SRC_URI_append_cm-x270 = "\
 	file://0003-cm-x2xx.c-add-support-for-sharp-VGA-display-panel.patch;patch=1 \
 	"	
 
+SRC_URI_append_stamp9g20evb = " \
+    file://stamp9g20.patch;patch=1 \
+    "
+
 CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),0x230000(root),-(config);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd4 rootfstype=jffs2"
 
diff --git a/recipes/webkit/webkit-gtk/GNUmakefile.am b/recipes/webkit/webkit-gtk/GNUmakefile.am
index c87ee49c14..c80d6493fa 100644
--- a/recipes/webkit/webkit-gtk/GNUmakefile.am
+++ b/recipes/webkit/webkit-gtk/GNUmakefile.am
@@ -84,6 +84,7 @@ corekit_cflags += \
 	-fno-strict-aliasing \
 	$(COVERAGE_CFLAGS) \
 	$(ENCHANT_CFLAGS) \
+	$(GAIL_CFLAGS) \
 	$(GEOCLUE_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GNOMEKEYRING_CFLAGS) \
@@ -243,6 +244,7 @@ libwebkit_1_0_la_LIBADD = \
 	$(COVERAGE_LDFLAGS) \
 	$(ENCHANT_LIBS) \
 	$(FREETYPE_LIBS) \
+	$(GAIL_LIBS) \
 	$(GEOCLUE_LIBS) \
 	$(GLIB_LIBS) \
 	$(GNOMEKEYRING_LIBS) \
@@ -524,11 +526,14 @@ webkit_tests_ldflags = \
 	-no-fast-install
 
 TEST_PROGS += Programs/unittests/testhttpbackend \
+	Programs/unittests/testloading \
+	Programs/unittests/testnetworkrequest \
 	Programs/unittests/testwebframe \
 	Programs/unittests/testwebbackforwardlist \
 	Programs/unittests/testwebhistoryitem \
 	Programs/unittests/testdownload \
-	Programs/unittests/testatk
+	Programs/unittests/testatk \
+	Programs/unittests/testwebsettings
 
 # Add additional tests here
 Programs_unittests_testhttpbackend_SOURCES = WebKit/gtk/tests/testhttpbackend.c
@@ -536,6 +541,16 @@ Programs_unittests_testhttpbackend_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testhttpbackend_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testhttpbackend_LDFLAGS = $(webkit_tests_ldflags)
 
+Programs_unittests_testloading_SOURCES = WebKit/gtk/tests/testloading.c
+Programs_unittests_testloading_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testloading_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testloading_LDFLAGS = $(webkit_tests_ldflags)
+
+Programs_unittests_testnetworkrequest_SOURCES = WebKit/gtk/tests/testnetworkrequest.c
+Programs_unittests_testnetworkrequest_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testnetworkrequest_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testnetworkrequest_LDFLAGS = $(webkit_tests_ldflags)
+
 Programs_unittests_testwebframe_SOURCES = WebKit/gtk/tests/testwebframe.c
 Programs_unittests_testwebframe_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testwebframe_LDADD = $(webkit_tests_ldadd)
@@ -561,6 +576,11 @@ Programs_unittests_testatk_CFLAGS = $(webkit_tests_cflags)
 Programs_unittests_testatk_LDADD = $(webkit_tests_ldadd)
 Programs_unittests_testatk_LDFLAGS = $(webkit_tests_ldflags)
 
+Programs_unittests_testwebsettings_SOURCES = WebKit/gtk/tests/testwebsettings.c
+Programs_unittests_testwebsettings_CFLAGS = $(webkit_tests_cflags)
+Programs_unittests_testwebsettings_LDADD = $(webkit_tests_ldadd)
+Programs_unittests_testwebsettings_LDFLAGS = $(webkit_tests_ldflags)
+
 # Autogenerated sources
 BUILT_SOURCES := \
 	$(javascriptcore_built_sources) \
diff --git a/recipes/webkit/webkit-gtk/WebKit.pri b/recipes/webkit/webkit-gtk/WebKit.pri
index a869906288..73288abc0f 100644
--- a/recipes/webkit/webkit-gtk/WebKit.pri
+++ b/recipes/webkit/webkit-gtk/WebKit.pri
@@ -2,21 +2,37 @@
 
 
 isEmpty(OUTPUT_DIR) {
-    CONFIG(release):OUTPUT_DIR=$$PWD/WebKitBuild/Release
-    CONFIG(debug):OUTPUT_DIR=$$PWD/WebKitBuild/Debug
+    CONFIG(debug, debug|release) {
+        OUTPUT_DIR=$$PWD/WebKitBuild/Debug
+    } else { # Release
+        OUTPUT_DIR=$$PWD/WebKitBuild/Release
+    }
 }
 
 DEFINES += BUILDING_QT__=1
 building-libs {
     win32-msvc*: INCLUDEPATH += $$PWD/JavaScriptCore/os-win32
 } else {
-    QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
-    LIBS += -lQtWebKit
+    CONFIG(QTDIR_build) {
+        QT += webkit
+    } else {
+        QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
+        mac:!static:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework) {
+            LIBS += -framework QtWebKit
+            QMAKE_FRAMEWORKPATH = $$OUTPUT_DIR/lib $$QMAKE_FRAMEWORKPATH
+        } else {
+            win32-*|wince* {
+                LIBS += -lQtWebKit$${QT_MAJOR_VERSION}
+            } else {
+                LIBS += -lQtWebKit
+            }
+        }
+    }
     DEPENDPATH += $$PWD/WebKit/qt/Api
 }
 
 DEFINES += USE_SYSTEM_MALLOC
-CONFIG(release) {
+CONFIG(release, debug|release) {
     DEFINES += NDEBUG
 }
 
@@ -34,6 +50,8 @@ INCLUDEPATH += $$PWD/WebKit/qt/Api
 defineTest(addExtraCompiler) {
     CONFIG(QTDIR_build) {
         outputRule = $$eval($${1}.output)
+        outVariable = $$eval($${1}.variable_out)
+        !isEqual(outVariable,GENERATED_SOURCES):return(true)
 
         input = $$eval($${1}.input)
         input = $$eval($$input)
diff --git a/recipes/webkit/webkit-gtk/WebKit.pro b/recipes/webkit/webkit-gtk/WebKit.pro
index 035f73aa3f..bb2ae976b7 100644
--- a/recipes/webkit/webkit-gtk/WebKit.pro
+++ b/recipes/webkit/webkit-gtk/WebKit.pro
@@ -2,11 +2,12 @@ TEMPLATE = subdirs
 CONFIG += ordered
 
 SUBDIRS += \
-        JavaScriptCore \
         WebCore \
-        JavaScriptCore/kjs/jsc.pro \
+        JavaScriptCore/jsc.pro \
         WebKit/qt/QtLauncher \
         WebKit/qt/tests
 
-!win32-*: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
+!win32:!symbian: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro \
+                            WebKitTools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
 
+include(WebKit/qt/docs/docs.pri)
diff --git a/recipes/webkit/webkit-gtk/acinclude.m4 b/recipes/webkit/webkit-gtk/acinclude.m4
deleted file mode 100644
index e69de29bb2..0000000000
--- a/recipes/webkit/webkit-gtk/acinclude.m4
+++ /dev/null
diff --git a/recipes/webkit/webkit-gtk/configure.ac b/recipes/webkit/webkit-gtk/configure.ac
index 19ce1eb553..4793e68b24 100644
--- a/recipes/webkit/webkit-gtk/configure.ac
+++ b/recipes/webkit/webkit-gtk/configure.ac
@@ -2,7 +2,14 @@ AC_PREREQ(2.59)
 
 m4_define([webkit_major_version], [1])
 m4_define([webkit_minor_version], [1])
-m4_define([webkit_micro_version], [8])
+m4_define([webkit_micro_version], [11])
+
+# This is the version we'll be using as part of our User-Agent string
+# e.g., AppleWebKit/$(webkit_user_agent_version) ...
+#
+# Sourced from WebCore/Configurations/Version.xcconfig
+m4_define([webkit_user_agent_major_version], [531])
+m4_define([webkit_user_agent_minor_version], [2])
 
 AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/])
 
@@ -16,15 +23,19 @@ AC_CANONICAL_HOST
 WEBKIT_MAJOR_VERSION=webkit_major_version
 WEBKIT_MINOR_VERSION=webkit_minor_version
 WEBKIT_MICRO_VERSION=webkit_micro_version
+WEBKIT_USER_AGENT_MAJOR_VERSION=webkit_user_agent_major_version
+WEBKIT_USER_AGENT_MINOR_VERSION=webkit_user_agent_minor_version
 AC_SUBST(WEBKIT_MAJOR_VERSION)
 AC_SUBST(WEBKIT_MINOR_VERSION)
 AC_SUBST(WEBKIT_MICRO_VERSION)
+AC_SUBST(WEBKIT_USER_AGENT_MAJOR_VERSION)
+AC_SUBST(WEBKIT_USER_AGENT_MINOR_VERSION)
 
 AC_CONFIG_SRCDIR([WebCore/config.h])
 
 dnl # Libtool library version, not to confuse with API version
 dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html#Libtool-versioning
-LIBWEBKITGTK_VERSION=8:0:6
+LIBWEBKITGTK_VERSION=10:0:8
 AC_SUBST([LIBWEBKITGTK_VERSION])
 
 AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar])
@@ -176,6 +187,7 @@ if test "$with_hildon" = "yes"; then
 fi
 
 # minimum base dependencies
+LIBSOUP_REQUIRED_VERSION=2.27.4
 CAIRO_REQUIRED_VERSION=1.2
 FONTCONFIG_REQUIRED_VERSION=2.4
 FREETYPE2_REQUIRED_VERSION=9.0
@@ -186,12 +198,12 @@ PANGO_REQUIRED_VERSION=1.0
 GTK_REQUIRED_VERSION=2.10
 
 # optional modules
-LIBSOUP_REQUIRED_VERSION=2.25.91
 LIBXSLT_REQUIRED_VERSION=1.1.7
 SQLITE_REQUIRED_VERSION=3.0
 GSTREAMER_REQUIRED_VERSION=0.10
 GNOME_KEYRING_REQUIRED_VERSION=2.26.0
 ENCHANT_REQUIRED_VERSION=0.22
+GAIL_REQUIRED_VERSION=1.8
 
 # Available modules
 #
@@ -220,6 +232,10 @@ PKG_CHECK_MODULES(ENCHANT, enchant >= $ENCHANT_REQUIRED_VERSION)
 AC_SUBST(ENCHANT_CFLAGS)
 AC_SUBST(ENCHANT_LIBS)
 
+PKG_CHECK_MODULES(GAIL, gail >= $GAIL_REQUIRED_VERSION)
+AC_SUBST(GAIL_CFLAGS)
+AC_SUBST(GAIL_LIBS)
+
 # check for target-specific dependencies
 if test "$with_target" = "directfb"; then
    PKG_CHECK_MODULES(CAIRO, cairo-directfb >= $CAIRO_REQUIRED_VERSION)
@@ -293,8 +309,8 @@ AC_MSG_RESULT([$enable_3D_transforms])
 AC_MSG_CHECKING([whether to enable HTML5 Channel Messaging support])
 AC_ARG_ENABLE(channel_messaging,
               AC_HELP_STRING([--enable-channel-messaging],
-                             [enable HTML5 channel messaging support [default=no]]),
-              [],[enable_channel_messaging="no"])
+                             [enable HTML5 channel messaging support [default=yes]]),
+              [],[enable_channel_messaging="yes"])
 AC_MSG_RESULT([$enable_channel_messaging])
 
 # check whether to enable JavaScript debugger/profiler support
@@ -393,13 +409,21 @@ AC_ARG_ENABLE(wml,
               [],[enable_wml="no"])
 AC_MSG_RESULT([$enable_wml])
 
+# check whether to enable SharedWorkers support
+AC_MSG_CHECKING([whether to enable SharedWorkers support])
+AC_ARG_ENABLE(shared_workers,
+              AC_HELP_STRING([--enable-shared-workers],
+                             [enable support for SharedWorkers [default=no]]),
+              [],[enable_shared_workers="no"])
+AC_MSG_RESULT([$enable_shared_workers])
+
 # check whether to enable Web Workers support
 AC_MSG_CHECKING([whether to enable Web Workers support])
-AC_ARG_ENABLE(web_workers,
-              AC_HELP_STRING([--enable-web-workers],
+AC_ARG_ENABLE(workers,
+              AC_HELP_STRING([--enable-workers],
                              [enable support for Web Workers [default=yes]]),
-              [],[enable_web_workers="yes"])
-AC_MSG_RESULT([$enable_web_workers])
+              [],[enable_workers="yes"])
+AC_MSG_RESULT([$enable_workers])
 
 # turn off svg features if --disable-svg is requested
 if test "$enable_svg" = "no"; then
@@ -407,7 +431,7 @@ if test "$enable_svg" = "no"; then
    enable_svg_fonts=no
    enable_svg_foreign_object=no
    enable_svg_as_image=no
-   enable_svg_use_element=no
+   enable_svg_use=no
 fi
 
 # check whether to enable support for SVG animation
@@ -452,18 +476,18 @@ AC_MSG_RESULT([$enable_svg_as_image])
 
 # check whether to enable SVG USE element support
 AC_MSG_CHECKING([whether to enable support for SVG use element])
-AC_ARG_ENABLE(svg_use_element,
-              AC_HELP_STRING([--enable-svg-use-element],
+AC_ARG_ENABLE(svg_use,
+              AC_HELP_STRING([--enable-svg-use],
                              [enable SVG use element support (experimental) [default=yes]]),
-              [],[enable_svg_use_element="yes"])
-AC_MSG_RESULT([$enable_svg_use_element])
+              [],[enable_svg_use="yes"])
+AC_MSG_RESULT([$enable_svg_use])
 
 # check for SVG features, enabling SVG if necessary
 if test "$enable_svg_animation" = "yes" || \
    test "$enable_svg_fonts" = "yes" || \
    test "$enable_svg_foreign_object" = "yes" || \
    test "$enable_svg_as_image" = "yes" || \
-   test "$enable_svg_use_element" = "yes"; then
+   test "$enable_svg_use" = "yes"; then
    svg_flags=yes
    if test "$enable_svg" = "no"; then
        AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support])
@@ -494,10 +518,6 @@ AC_ARG_ENABLE([jit],
               [],[enable_jit="yes"])
 if test "$enable_jit" = "yes"; then
     case "$host_cpu" in
-        arm)
-            AC_DEFINE([ENABLE_JIT_OPTIMIZE_CALL], [1], [Define to enable optimizing calls])
-            AC_DEFINE([ENABLE_JIT_OPTIMIZE_METHOD_CALLS], [1], [Define to enable optimizing method calls])
-		;;
         i*86|x86_64)
             AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT])
             AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR])
@@ -674,11 +694,12 @@ AM_CONDITIONAL([ENABLE_SVG_ANIMATION],[test "$enable_svg_animation" = "yes"])
 AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"])
 AM_CONDITIONAL([ENABLE_SVG_FOREIGN_OBJECT],[test "$enable_svg_foreign_object" = "yes"])
 AM_CONDITIONAL([ENABLE_SVG_AS_IMAGE],[test "$enable_svg_as_image" = "yes"])
-AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use_element" = "yes"])
+AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use" = "yes"])
 AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"])
 AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"])
 AM_CONDITIONAL([ENABLE_WML],[test "$enable_wml" = "yes"])
-AM_CONDITIONAL([ENABLE_WORKERS],[test "$enable_web_workers" = "yes"])
+AM_CONDITIONAL([ENABLE_WORKERS],[test "$enable_workers" = "yes"])
+AM_CONDITIONAL([ENABLE_SHARED_WORKERS],[test "$enable_shared_workers" = "yes"])
 AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"])
 AM_CONDITIONAL([HTML_FLAGS],[test "$html_flags" = "yes"])
 
@@ -717,14 +738,15 @@ Features:
  HTML5 client-side database storage support               : $enable_database
  HTML5 video element support                              : $enable_video
  Icon database support                                    : $enable_icon_database
+ SharedWorkers support                                    : $enable_shared_workers
  SVG support                                              : $enable_svg
  SVG animation support                                    : $enable_svg_animation
  SVG fonts support                                        : $enable_svg_fonts
  SVG foreign object support                               : $enable_svg_foreign_object
  SVG as image support                                     : $enable_svg_as_image
- SVG use element support                                  : $enable_svg_use_element
+ SVG use element support                                  : $enable_svg_use
  WML support                                              : $enable_wml
- Web Workers support                                      : $enable_web_workers
+ Web Workers support                                      : $enable_workers
  XPATH support                                            : $enable_xpath
  XSLT support                                             : $enable_xslt
 GTK+ configuration:
diff --git a/recipes/webkit/webkit-gtk/symbols.filter b/recipes/webkit/webkit-gtk/symbols.filter
deleted file mode 100644
index f5af6bac90..0000000000
--- a/recipes/webkit/webkit-gtk/symbols.filter
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-local:
-_ZSt*;
-_ZNSt*;
-};
diff --git a/recipes/webkit/webkit-gtk/unicode-fixes.diff b/recipes/webkit/webkit-gtk/unicode-fixes.diff
deleted file mode 100644
index 03dbc0f3d1..0000000000
--- a/recipes/webkit/webkit-gtk/unicode-fixes.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: wtf/unicode/glib/UnicodeMacrosFromICU.h
-===================================================================
---- a/JavaScriptCore/wtf/unicode/glib/UnicodeMacrosFromICU.h	(revision 44458)
-+++ b/JavaScriptCore/wtf/unicode/glib/UnicodeMacrosFromICU.h	(working copy)
-@@ -41,6 +41,17 @@
- #define U16_IS_SURROGATE(c) U_IS_SURROGATE(c)
- #define U16_IS_SURROGATE_LEAD(c) (((c)&0x400)==0)
- 
-+#define U16_PREV(s, start, i, c) { \
-+    (c)=(s)[--(i)]; \
-+    if(U16_IS_TRAIL(c)) { \
-+        uint16_t __c2; \
-+        if((i)>(start) && U16_IS_LEAD(__c2=(s)[(i)-1])) { \
-+            --(i); \
-+            (c)=U16_GET_SUPPLEMENTARY(__c2, (c)); \
-+        } \
-+    } \
-+}
-+
- #define U16_NEXT(s, i, length, c) { \
-     (c)=(s)[(i)++]; \
-     if(U16_IS_LEAD(c)) { \
diff --git a/recipes/webkit/webkit-gtk/update-webkit.sh b/recipes/webkit/webkit-gtk/update-webkit.sh
index e4cc3ebefa..723c45a4fb 100644
--- a/recipes/webkit/webkit-gtk/update-webkit.sh
+++ b/recipes/webkit/webkit-gtk/update-webkit.sh
@@ -3,6 +3,6 @@
 
 export rev=$1
 
-for i in acinclude.m4 autogen.sh configure.ac GNUmakefile.am Makefile Makefile.shared  ; do
+for i in autogen.sh configure.ac GNUmakefile.am Makefile Makefile.shared  ; do
 	wget "http://trac.webkit.org/browser/trunk/$i?rev=$rev&format=raw" -O $i
 done
diff --git a/recipes/webkit/webkit-gtk_svn.bb b/recipes/webkit/webkit-gtk_svn.bb
index f36671c494..fcf7ccfa97 100644
--- a/recipes/webkit/webkit-gtk_svn.bb
+++ b/recipes/webkit/webkit-gtk_svn.bb
@@ -3,7 +3,7 @@ DEPENDS = "enchant gtk-doc-native gtk-doc gnome-keyring libsoup-2.4 curl icu lib
 
 SRCREV_FORMAT = "webcore-rwebkit"
 
-PV = "1.1.7+svnr${SRCREV}"
+PV = "1.1.11+svnr${SRCREV}"
 
 SRC_URI = "\
   svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \
@@ -17,10 +17,8 @@ SRC_URI = "\
   file://Makefile.shared \
   file://autogen.sh \
   file://configure.ac \
-  file://symbols.filter \
   file://GNUmakefile.am \
   file://gtk-doc.make \
-  file://unicode-fixes.diff;patch=1;maxrev=44459 \
  "
 
 S = "${WORKDIR}/"
@@ -57,7 +55,7 @@ do_compile_prepend() {
             ${BUILD_CXX} dftables.cpp -o dftables -I. -I../wtf
         fi
         cp dftables ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/
-        cp dftables ${S}/Programs/        
+        cp dftables ${S}/Programs/
 	cd ${S}
 }