[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Updated format spec

[<hug...@li...>]

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/f10f5be9e4b9
changeset: 4925:f10f5be9e4b9
user:      tmodes
date:       Wed Feb 02 17:50:52 2011 +0100
description:
Updated format spec

diffstat:

 doc/nona.txt |  13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r ac32a2c98e4b -r f10f5be9e4b9 doc/nona.txt
--- a/doc/nona.txt	Mon Jan 31 23:24:15 2011 +0000
+++ b/doc/nona.txt	Wed Feb 02 17:50:52 2011 +0100
@@ -6,7 +6,7 @@
 # Based on the PTStitcher documentation
 #
 #
-# Only lines starting with 'p','o', i', or 'm' are read, 
+# Only lines starting with 'p','o', i', 'm' or 'k' are read, 
 # so you can add comments and info as you like by using 
 # other line starting characters.  
 
@@ -51,7 +51,7 @@
 #              n"JPEG q95"
 #                  q - jpeg quality
 #                  
-# E1           exposure value for final panorama
+# E12.3        exposure value for final panorama
 # R1           stitching mode: 0: normal LDR mode, 1: HDR mode
 # T"UINT8"     bitdepth of output images, possible values are
 #               UINT8  -  8 bit unsigned
@@ -63,7 +63,7 @@
 #                    will be rendered. Images that do not contain pixels in this area
 #                    are not rendered/created.
 #
-
+m w1000 h600 f0 v360 E12.3
 
 # The 'i' lines describe input images (nona also accepts 'o' line image descriptions)
 #
@@ -139,10 +139,13 @@
 #                       Selection can be outside image dimension.
 #                       The selection will be circular for circular fisheye images, and
 #                       rectangular for all other projection formats
+#
+# j0           stack number
+#
 # nName        file name of the input image.
 
-o f2 r0   p0    y0     v183    a0 b-0.1 c0  S100,600,100,800 n"photo1.jpg"
-o f2 r0   p0    y180   v183    a0 b-0.1 c0  S100,600,100,800 n"photo1.jpg"
+i f2 r0   p0    y0     v183    a0 b-0.1 c0  S100,600,100,800 n"photo1.jpg"
+i f2 r0   p0    y180   v183    a0 b-0.1 c0  S100,600,100,800 n"photo1.jpg"
 
 
 # 'm'-line options