Activate advanced globbing styles in response files.
Update documentation accordingly.
1.1 --- a/VERSION Mon Nov 09 11:10:46 2009 +0100
1.2 +++ b/VERSION Mon Nov 09 14:14:33 2009 +0100
1.3 @@ -1,1 +1,1 @@
1.4 -4.0-e29281594440
1.5 +4.0-f2f608b8ddb4
2.1 --- a/doc/Makefile.am Mon Nov 09 11:10:46 2009 +0100
2.2 +++ b/doc/Makefile.am Mon Nov 09 14:14:33 2009 +0100
2.3 @@ -54,8 +54,10 @@
2.4 *.fig.bak \
2.5 *.msg
2.6
2.7 -# created by configure(1)
2.8 -DISTCLEANFILES = texinfo.tex
2.9 +# created by configure(1) or LaTeX
2.10 +DISTCLEANFILES = texinfo.tex \
2.11 + enblend.sc enblend.scs \
2.12 + enfuse.sc enfuse.scs
2.13
2.14 MAINTAINERCLEANFILES = enblend.info enfuse.info
2.15
3.1 --- a/doc/enblend.info Mon Nov 09 11:10:46 2009 +0100
3.2 +++ b/doc/enblend.info Mon Nov 09 14:14:33 2009 +0100
3.3 @@ -8,6 +8,7 @@
3.4 3.1 Response Files
3.5 3.1.1 Response File Format
3.6 3.1.2 Syntactic Comments
3.7 + 3.1.3 Globbing Algorithms
3.8 3.2 Common Options
3.9 3.3 Extended Options
3.10 3.4 Mask Generation Options
3.11 @@ -23,6 +24,7 @@
3.12 Appendix B Authors
3.13 Appendix C GNU Free Documentation License
3.14 Program Index
3.15 +Syntactic-Comment Index
3.16 Option Index
3.17 General Index
3.18
3.19 @@ -102,7 +104,7 @@
3.20 *note Figure:photographic-workflow:: shows where Enblend and Enfuse sit
3.21 in this tool chain.
3.22
3.23 - Figure 2.1: Photographic workflow with Enblend and Enfuse.
3.24 +Figure 2.1: Photographic workflow with Enblend and Enfuse.
3.25
3.26 Take Images
3.27 Take _multiple_ images to form a panorama, an exposure series, a
3.28 @@ -194,10 +196,11 @@
3.29 Introduce response file names with an at-character (`@').
3.30
3.31 Enblend and Enfuse process the list INPUT strictly from left to
3.32 -right, expanding response files in depth-first order. The following
3.33 +right, expanding response files in depth-first order. (Multi-layer
3.34 +files are processed from first layer to the last.) The following
3.35 examples only show Enblend, but Enfuse works exactly the same.
3.36
3.37 -Solely literal filenames.
3.38 +Solely image filenames.
3.39 Example:
3.40 enblend image-1.tif image-2.tif image-3.tif
3.41
3.42 @@ -259,14 +262,7 @@
3.43 file itself, not relative to the current-working directory of the
3.44 application.
3.45
3.46 -The above grammar might unpleasantly surprise the user in the some ways:
3.47 -
3.48 -Literal filenames
3.49 - Inside a response file all filenames are treated as literals. No
3.50 - filename globbing or filename expansion is performed. This is, for
3.51 - example, the line
3.52 - img_*.tif
3.53 - stands for exactly one file, called `img_*.tif'.
3.54 +The above grammar might unpleasantly surprise the user in the some ways.
3.55
3.56 Whitespace trimmed at both line ends
3.57 For convenience, whitespace at the beginning and at the end of each
3.58 @@ -282,22 +278,22 @@
3.59 img-0.33ev.tif # "middle" EV
3.60 img-1.33ev.tif
3.61 img+0.67ev.tif
3.62 - only the first line contains a comment, whereas the second lines
3.63 + only the first line contains a comment, whereas the second line
3.64 includes none. Rather, it refers to a file called
3.65 `img-0.33ev.tif # "middle" EV'.
3.66
3.67 Image filenames cannot start with `@'
3.68 - An at-sign always introduces a response file, even if the
3.69 + An at-sign invariably introduces a response file, even if the
3.70 filename's extension hints towards an image.
3.71
3.72 If Enblend or Enfuse do not recognize a response file, they will skip
3.73 the file and issue a warning. To force a file being recognized as a
3.74 -response file add one of the following syntactic comments (see below)
3.75 -to the _first_ line of the file.
3.76 -
3.77 - # response-file: true
3.78 - # enblend-response-file: true
3.79 - # enfuse-response-file: true
3.80 +response file add one of the following syntactic comments to the
3.81 +_first_ line of the file.
3.82 +
3.83 + response-file: true
3.84 + enblend-response-file: true
3.85 + enfuse-response-file: true
3.86
3.87 Finally, here is an example of a valid response file.
3.88 # 4\pi panorama!
3.89 @@ -318,7 +314,9 @@
3.90
3.91 Comments that follow the format described in *note
3.92 Table:response-file-syntactic-comment:: are treated as instructions how
3.93 -to interpret the rest of the response file.
3.94 +to interpret the rest of the response file. A syntactic comment is
3.95 +effective immediately and its effect persists to the end of the
3.96 +response file, unless another syntactic comment undoes it.
3.97
3.98 SYNTACTIC-COMMENT ::= SPACE* `#' SPACE* KEY SPACE* `:' SPACE*
3.99 VALUE
3.100 @@ -331,6 +329,62 @@
3.101
3.102 Unknown syntactic comments are silently ignored.
3.103
3.104 +3.1.3 Globbing Algorithms
3.105 +-------------------------
3.106 +
3.107 +The three equivalent syntactic keys
3.108 + * `glob',
3.109 +
3.110 + * `globbing', or
3.111 +
3.112 + * `filename-globbing'
3.113 + control the algorithm that Enblend or Enfuse use to glob filenames in
3.114 +response files.
3.115 +
3.116 + All versions of Enblend and Enfuse support at least two algorithms:
3.117 +`literal', which is the default, and `wildcard'. See *note
3.118 +Table:globbing-algorithms:: for a list of all possible globbing
3.119 +algorithms. To find out about the algorithms in your version of
3.120 +Enblend or Enfuse team up the options `--version' and `--verbose'.
3.121 +
3.122 +`literal'
3.123 + Do not glob. Interpret all filenames in response files as
3.124 + literals. This is the default.
3.125 +
3.126 + Please keep in mind that whitespace at both ends of a line in a
3.127 + response file _always_ gets discarded.
3.128 +
3.129 +`wildcard'
3.130 + Glob using the wildcard characters `?', `*', `[', and `]'.
3.131 +
3.132 + The W*N32 implementation only globs the filename part of a path,
3.133 + whereas all other implementations perform wildcard expansion in
3.134 + _all_ path components. Also see glob(7)
3.135 + (http://www.kernel.org/doc/man-pages/online/pages/man7/glob.7.html).
3.136 +
3.137 +`none'
3.138 + Alias for `literal'.
3.139 +
3.140 +`shell'
3.141 + The `shell' globbing algorithm works as `literal' does. In
3.142 + addition, it interprets the wildcard characters `{', `}', and `~'.
3.143 + This makes the expansion process behave more like common UN*X
3.144 + shells.
3.145 +
3.146 +`sh'
3.147 + Alias for `shell'.
3.148 +
3.149 +Table 3.3: Globbing algorithms for the use in response files
3.150 +
3.151 + Example:
3.152 + # Horizontal panorama
3.153 + # 15 images
3.154 +
3.155 + # filename-globbing: wildcard
3.156 +
3.157 + image_000[0-9].tif
3.158 + image_001[0-4].tif
3.159 +
3.160 3.2 Common Options
3.161 ==================
3.162
3.163 @@ -750,7 +804,7 @@
3.164 algorithm, fill vector
3.165 contours.
3.166
3.167 - Table 3.3: Various options that control the generation of masks.
3.168 + Table 3.4: Various options that control the generation of masks.
3.169 All mask computations are based on the Nearest-Feature
3.170 Transformation (NFT) of the overlap region.
3.171
3.172 @@ -772,7 +826,7 @@
3.173 seam line, which can be slow. Use this option, for example, if
3.174 you have very narrow overlap regions.
3.175
3.176 - Also see *note Table 3.3: Table:mask-generation.
3.177 + Also see *note Table 3.4: Table:mask-generation.
3.178
3.179 `--load-masks[=IMAGE-TEMPLATE]'
3.180 Instead of generating masks, use those in IMAGE-TEMPLATE. The
3.181 @@ -787,7 +841,7 @@
3.182
3.183 If Enblend uses a coarse mask (`--coarse-mask') or Enblend
3.184 optimizes (`--optimize') a mask it vectorizes the initial seam
3.185 - line before performing further operations. See *note Table 3.3:
3.186 + line before performing further operations. See *note Table 3.4:
3.187 Table:mask-generation. for the precise conditions. DISTANCE tells
3.188 Enblend how long to make each of the line segments called vectors
3.189 here.
3.190 @@ -831,13 +885,13 @@
3.191 Enblend version 2.5, namely the result of a Nearest-Feature
3.192 Transform (NFT).(1)
3.193
3.194 - Also see *note Table 3.3: Table:mask-generation.
3.195 + Also see *note Table 3.4: Table:mask-generation.
3.196
3.197 `--optimize'
3.198 Use a two-strategy approach to route the seam line around
3.199 mismatches in the overlap region. This is the default. *note
3.200 Table:optimizer-strategies:: explains these strategies; also see
3.201 - *note Table 3.3: Table:mask-generation.
3.202 + *note Table 3.4: Table:mask-generation.
3.203
3.204 Stragegy 1: Simulated Annealing
3.205 Tune with option `--anneal' = TAU : DELTA-E-MAX : DELTA-E-MIN
3.206 @@ -853,7 +907,7 @@
3.207 (http://en.wikipedia.org/wiki/Dijkstra_algorithm)
3.208
3.209
3.210 - Table 3.4: Enblend's two strategies to optimize the seam lines
3.211 + Table 3.5: Enblend's two strategies to optimize the seam lines
3.212 between images.
3.213
3.214 `--optimizer-weights=DISTANCE-WEIGHT[:MISMATCH-WEIGHT]'
3.215 @@ -983,7 +1037,7 @@
3.216 bright yellow
3.217 Final seam line
3.218
3.219 - Table 3.5: Colors used in seam-line visualization images.
3.220 + Table 3.6: Colors used in seam-line visualization images.
3.221
3.222
3.223 `%%'
3.224 @@ -1057,7 +1111,7 @@
3.225 `%E'
3.226 Is replaced with the extension of the output file.
3.227
3.228 -Table 3.6: Special characters to control the generation of mask
3.229 +Table 3.7: Special characters to control the generation of mask
3.230 filenames.
3.231
3.232 ---------- Footnotes ----------
3.233 @@ -1901,258 +1955,284 @@
3.234 Program Index
3.235 *************
3.236
3.237 -ale: See 6. (line 1250)
3.238 -align_image_stack (Hugin): See 6. (line 1257)
3.239 -cinepaint <1>: See 6. (line 1269)
3.240 -cinepaint: See 3.3. (line 635)
3.241 -convert (ImageMagick): See 6. (line 1280)
3.242 -dcraw <1>: See 6. (line 1240)
3.243 -dcraw: See 2. (line 105)
3.244 -display (ImageMagick): See 6. (line 1280)
3.245 -exiftool: See 6. (line 1308)
3.246 -exrdisplay (OpenEXR): See 6. (line 1286)
3.247 -fulla (Hugin): See 6. (line 1257)
3.248 -gimp <1>: See 6. (line 1276)
3.249 -gimp <2>: See 3.3. (line 635)
3.250 -gimp: See 2. (line 105)
3.251 -gm (GraphicsMagick): See 6. (line 1280)
3.252 -hugin <1>: See 6. (line 1254)
3.253 -hugin <2>: See 3.3. (line 626)
3.254 -hugin <3>: See 2. (line 105)
3.255 -hugin: See 1. (line 59)
3.256 -identify (ImageMagick) <1>: See 6. (line 1280)
3.257 -identify (ImageMagick): See 4.1. (line 1089)
3.258 -montage (ImageMagick): See 6. (line 1280)
3.259 -nona (Hugin) <1>: See 6. (line 1257)
3.260 -nona (Hugin): See 3.3. (line 626)
3.261 -PanoTools <1>: See 2. (line 105)
3.262 -PanoTools: See 1. (line 59)
3.263 -pfshdrcalibrate (PFScalibration): See 6. (line 1289)
3.264 -pfsin (PFSTools): See 6. (line 1289)
3.265 -pfsout (PFSTools): See 6. (line 1289)
3.266 -pfstmo_* (PFStmo): See 6. (line 1289)
3.267 -pfsview (PFSTools): See 6. (line 1289)
3.268 -PTmender (PanoTools): See 6. (line 1262)
3.269 -PTOptimizer (PanoTools): See 6. (line 1262)
3.270 -tifficc (LittleCMS): See 6. (line 1312)
3.271 -tiffinfo (libtiff) <1>: See 6. (line 1304)
3.272 -tiffinfo (libtiff): See 4.1. (line 1089)
3.273 -ufraw <1>: See 6. (line 1243)
3.274 -ufraw: See 2. (line 105)
3.275 -ufraw-batch: See 6. (line 1243)
3.276 +ale: See 6. (line 1304)
3.277 +align_image_stack (Hugin): See 6. (line 1311)
3.278 +cinepaint <1>: See 6. (line 1323)
3.279 +cinepaint: See 3.3. (line 689)
3.280 +convert (ImageMagick): See 6. (line 1334)
3.281 +dcraw <1>: See 6. (line 1294)
3.282 +dcraw: See 2. (line 107)
3.283 +display (ImageMagick): See 6. (line 1334)
3.284 +exiftool: See 6. (line 1362)
3.285 +exrdisplay (OpenEXR): See 6. (line 1340)
3.286 +fulla (Hugin): See 6. (line 1311)
3.287 +gimp <1>: See 6. (line 1330)
3.288 +gimp <2>: See 3.3. (line 689)
3.289 +gimp: See 2. (line 107)
3.290 +gm (GraphicsMagick): See 6. (line 1334)
3.291 +hugin <1>: See 6. (line 1308)
3.292 +hugin <2>: See 3.3. (line 680)
3.293 +hugin <3>: See 2. (line 107)
3.294 +hugin: See 1. (line 61)
3.295 +identify (ImageMagick) <1>: See 6. (line 1334)
3.296 +identify (ImageMagick): See 4.1. (line 1143)
3.297 +montage (ImageMagick): See 6. (line 1334)
3.298 +nona (Hugin) <1>: See 6. (line 1311)
3.299 +nona (Hugin): See 3.3. (line 680)
3.300 +PanoTools <1>: See 2. (line 107)
3.301 +PanoTools: See 1. (line 61)
3.302 +pfshdrcalibrate (PFScalibration): See 6. (line 1343)
3.303 +pfsin (PFSTools): See 6. (line 1343)
3.304 +pfsout (PFSTools): See 6. (line 1343)
3.305 +pfstmo_* (PFStmo): See 6. (line 1343)
3.306 +pfsview (PFSTools): See 6. (line 1343)
3.307 +PTmender (PanoTools): See 6. (line 1316)
3.308 +PTOptimizer (PanoTools): See 6. (line 1316)
3.309 +tifficc (LittleCMS): See 6. (line 1366)
3.310 +tiffinfo (libtiff) <1>: See 6. (line 1358)
3.311 +tiffinfo (libtiff): See 4.1. (line 1143)
3.312 +ufraw <1>: See 6. (line 1297)
3.313 +ufraw: See 2. (line 107)
3.314 +ufraw-batch: See 6. (line 1297)
3.315 +Syntactic-Comment Index
3.316 +***********************
3.317 +
3.318 +enblend-response-file: See 3.1.1. (line 295)
3.319 +enfuse-response-file: See 3.1.1. (line 296)
3.320 +filename-globbing: See 3.1.3. (line 340)
3.321 +glob: See 3.1.3. (line 336)
3.322 +globbing: See 3.1.3. (line 338)
3.323 +response-file: See 3.1.1. (line 294)
3.324 Option Index
3.325 ************
3.326
3.327 ---anneal: See 3.4. (line 672)
3.328 ---coarse-mask: See 3.4. (line 718)
3.329 ---compression: See 3.2. (line 348)
3.330 ---depth: See 3.3. (line 546)
3.331 ---dijkstra: See 3.4. (line 758)
3.332 ---fine-mask: See 3.4. (line 771)
3.333 ---gpu: See 3.3. (line 643)
3.334 ---help: See 3.2. (line 384)
3.335 ---load-masks: See 3.4. (line 778)
3.336 ---mask-vectorize: See 3.4. (line 784)
3.337 ---no-optimize: See 3.4. (line 829)
3.338 ---optimize: See 3.4. (line 837)
3.339 ---optimizer-weights: See 3.4. (line 860)
3.340 ---output: See 3.2. (line 417)
3.341 ---save-masks: See 3.4. (line 887)
3.342 ---smooth-difference: See 3.4. (line 915)
3.343 ---verbose: See 3.2. (line 424)
3.344 ---version: See 3.2. (line 459)
3.345 ---visualize: See 3.4. (line 933)
3.346 ---wrap: See 3.2. (line 466)
3.347 --a: See 3.2. (line 340)
3.348 --b <1>: See 5. (line 1163)
3.349 --b: See 3.3. (line 524)
3.350 --c: See 3.3. (line 535)
3.351 --d: See 3.3. (line 546)
3.352 --f: See 3.3. (line 623)
3.353 --g: See 3.3. (line 631)
3.354 --h: See 3.2. (line 384)
3.355 --l: See 3.2. (line 387)
3.356 --m <1>: See 5. (line 1163)
3.357 --m: See 3.3. (line 655)
3.358 --o: See 3.2. (line 417)
3.359 --V: See 3.2. (line 459)
3.360 --v: See 3.2. (line 424)
3.361 --w: See 3.2. (line 466)
3.362 --x: See 3.2. (line 503)
3.363 +--anneal: See 3.4. (line 726)
3.364 +--coarse-mask: See 3.4. (line 772)
3.365 +--compression: See 3.2. (line 402)
3.366 +--depth: See 3.3. (line 600)
3.367 +--dijkstra: See 3.4. (line 812)
3.368 +--fine-mask: See 3.4. (line 825)
3.369 +--gpu: See 3.3. (line 697)
3.370 +--help: See 3.2. (line 438)
3.371 +--load-masks: See 3.4. (line 832)
3.372 +--mask-vectorize: See 3.4. (line 838)
3.373 +--no-optimize: See 3.4. (line 883)
3.374 +--optimize: See 3.4. (line 891)
3.375 +--optimizer-weights: See 3.4. (line 914)
3.376 +--output: See 3.2. (line 471)
3.377 +--save-masks: See 3.4. (line 941)
3.378 +--smooth-difference: See 3.4. (line 969)
3.379 +--verbose: See 3.2. (line 478)
3.380 +--version: See 3.2. (line 513)
3.381 +--visualize: See 3.4. (line 987)
3.382 +--wrap: See 3.2. (line 520)
3.383 +-a: See 3.2. (line 394)
3.384 +-b <1>: See 5. (line 1217)
3.385 +-b: See 3.3. (line 578)
3.386 +-c: See 3.3. (line 589)
3.387 +-d: See 3.3. (line 600)
3.388 +-f: See 3.3. (line 677)
3.389 +-g: See 3.3. (line 685)
3.390 +-h: See 3.2. (line 438)
3.391 +-l: See 3.2. (line 441)
3.392 +-m <1>: See 5. (line 1217)
3.393 +-m: See 3.3. (line 709)
3.394 +-o: See 3.2. (line 471)
3.395 +-V: See 3.2. (line 513)
3.396 +-v: See 3.2. (line 478)
3.397 +-w: See 3.2. (line 520)
3.398 +-x: See 3.2. (line 557)
3.399 General Index
3.400 *************
3.401
3.402 -360o panoramas: See 3.2. (line 466)
3.403 -a.tif: See 3.2. (line 419)
3.404 -affine transformation: See 2. (line 142)
3.405 -alpha channel <1>: See 2. (line 163)
3.406 -alpha channel: See 1. (line 52)
3.407 -alpha channel, associated: See 3.3. (line 631)
3.408 -anneal parameters: See 3.4. (line 672)
3.409 +# (response file comment): See 3.1.1. (line 245)
3.410 +360o panoramas: See 3.2. (line 520)
3.411 +@ (response file prefix): See 3.1. (line 195)
3.412 +a.tif: See 3.2. (line 473)
3.413 +affine transformation: See 2. (line 144)
3.414 +algorithms, globbing: See 3.1.3. (line 335)
3.415 +alpha channel <1>: See 2. (line 165)
3.416 +alpha channel: See 1. (line 54)
3.417 +alpha channel, associated: See 3.3. (line 685)
3.418 +anneal parameters: See 3.4. (line 726)
3.419 authors, list of: See Appendix B.
3.420 - (line 1467)
3.421 -binary mask: See 4. (line 1073)
3.422 -bits per channel: See 3.3. (line 546)
3.423 -blur difference image: See 3.4. (line 915)
3.424 + (line 1521)
3.425 +binary mask: See 4. (line 1127)
3.426 +bits per channel: See 3.3. (line 600)
3.427 +blur difference image: See 3.4. (line 969)
3.428 bug reports: See Appendix A.
3.429 - (line 1320)
3.430 -Burt-Adelson multiresolution spline: See 1. (line 40)
3.431 -channel width: See 3.3. (line 546)
3.432 -channel, alpha: See 1. (line 52)
3.433 -CIECAM02: See 3.3. (line 535)
3.434 -coarse mask: See 3.4. (line 718)
3.435 -color appearance model: See 3.3. (line 535)
3.436 -color space, sRGB: See 3.3. (line 537)
3.437 -colors, visualization image: See 3.4. (line 986)
3.438 -compression: See 3.2. (line 348)
3.439 -compression, deflate: See 3.2. (line 363)
3.440 -compression, JPEG: See 3.2. (line 354)
3.441 -compression, LZW: See 3.2. (line 369)
3.442 -compression, packbits: See 3.2. (line 373)
3.443 -conversion, raw: See 2. (line 129)
3.444 -default output filename: See 3.2. (line 419)
3.445 -deflate compression: See 3.2. (line 363)
3.446 -DIJKSTRA radius: See 3.4. (line 758)
3.447 -double precision float, IEEE754: See 3.3. (line 598)
3.448 -feathering, detrimental effect of: See 1. (line 59)
3.449 -filename, literal: See 3. (line 186)
3.450 -fine mask: See 3.4. (line 771)
3.451 -format of response file: See 3.1.1. (line 242)
3.452 + (line 1374)
3.453 +Burt-Adelson multiresolution spline: See 1. (line 42)
3.454 +channel width: See 3.3. (line 600)
3.455 +channel, alpha: See 1. (line 54)
3.456 +CIECAM02: See 3.3. (line 589)
3.457 +coarse mask: See 3.4. (line 772)
3.458 +color appearance model: See 3.3. (line 589)
3.459 +color space, sRGB: See 3.3. (line 591)
3.460 +colors, visualization image: See 3.4. (line 1040)
3.461 +compression: See 3.2. (line 402)
3.462 +compression, deflate: See 3.2. (line 417)
3.463 +compression, JPEG: See 3.2. (line 408)
3.464 +compression, LZW: See 3.2. (line 423)
3.465 +compression, packbits: See 3.2. (line 427)
3.466 +conversion, raw: See 2. (line 131)
3.467 +default output filename: See 3.2. (line 473)
3.468 +deflate compression: See 3.2. (line 417)
3.469 +DIJKSTRA radius: See 3.4. (line 812)
3.470 +double precision float, IEEE754: See 3.3. (line 652)
3.471 +feathering, detrimental effect of: See 1. (line 61)
3.472 +filename, literal: See 3. (line 188)
3.473 +fine mask: See 3.4. (line 825)
3.474 +format of response file: See 3.1.1. (line 245)
3.475 free documentation license (FDL): See Appendix C.
3.476 - (line 1506)
3.477 + (line 1560)
3.478 general index:
3.479 - See ``General Index''. (line 1985)
3.480 + See ``General Index''. (line 2048)
3.481 +glob(7): See 3.1.3. (line 358)
3.482 +globbing algorithm literal: See 3.1.3. (line 344)
3.483 +globbing algorithm none: See 3.1.3. (line 366)
3.484 +globbing algorithm sh: See 3.1.3. (line 375)
3.485 +globbing algorithm shell: See 3.1.3. (line 369)
3.486 +globbing algorithm wildcard: See 3.1.3. (line 344)
3.487 +globbing algorithms: See 3.1.3. (line 335)
3.488 GNU free documentation license: See Appendix C.
3.489 - (line 1506)
3.490 -GPU (Graphics Processing Unit): See 3.3. (line 643)
3.491 -grammar, response file: See 3.1.1. (line 256)
3.492 -grammar, syntactic comment: See 3.1.2. (line 329)
3.493 -graphics processing unit: See 3.3. (line 643)
3.494 -half precision float, OpenEXR: See 3.3. (line 613)
3.495 -helpful programs: See 6. (line 1236)
3.496 -Hugin: See A.2. (line 1410)
3.497 -ICC profile: See 3.3. (line 537)
3.498 -IEEE754 double precision float: See 3.3. (line 598)
3.499 -IEEE754 single precision float: See 3.3. (line 589)
3.500 -image cache: See 5. (line 1166)
3.501 -image cache, block size: See 3.3. (line 524)
3.502 -image cache, cache size: See 3.3. (line 655)
3.503 -image cache, location: See 5. (line 1177)
3.504 -image colors, visualization: See 3.4. (line 986)
3.505 -image, multi-layer: See 1. (line 73)
3.506 -image, visualization: See 3.4. (line 951)
3.507 + (line 1560)
3.508 +GPU (Graphics Processing Unit): See 3.3. (line 697)
3.509 +grammar, response file: See 3.1.1. (line 259)
3.510 +grammar, syntactic comment: See 3.1.2. (line 327)
3.511 +graphics processing unit: See 3.3. (line 697)
3.512 +half precision float, OpenEXR: See 3.3. (line 667)
3.513 +helpful programs: See 6. (line 1290)
3.514 +Hugin: See A.2. (line 1464)
3.515 +ICC profile: See 3.3. (line 591)
3.516 +IEEE754 double precision float: See 3.3. (line 652)
3.517 +IEEE754 single precision float: See 3.3. (line 643)
3.518 +image cache: See 5. (line 1220)
3.519 +image cache, block size: See 3.3. (line 578)
3.520 +image cache, cache size: See 3.3. (line 709)
3.521 +image cache, location: See 5. (line 1231)
3.522 +image colors, visualization: See 3.4. (line 1040)
3.523 +image, multi-layer: See 1. (line 75)
3.524 +image, visualization: See 3.4. (line 1005)
3.525 index, general:
3.526 - See ``General Index''. (line 1985)
3.527 + See ``General Index''. (line 2048)
3.528 index, option:
3.529 - See ``Option Index''. (line 1946)
3.530 + See ``Option Index''. (line 2009)
3.531 index, program:
3.532 - See ``Program Index''. (line 1904)
3.533 -input mask: See 4.1. (line 1085)
3.534 -invocation: See 3. (line 182)
3.535 -JPEG compression: See 3.2. (line 354)
3.536 -KImageFuser: See A.2. (line 1410)
3.537 -lens distortion, correction of: See 2. (line 142)
3.538 -levels, pyramid: See 3.2. (line 387)
3.539 -LibJPEG: See 6. (line 1293)
3.540 -LibPNG: See 6. (line 1296)
3.541 -LibTiff: See 6. (line 1300)
3.542 -literal filename: See 3. (line 186)
3.543 -load mask: See 3.4. (line 778)
3.544 -loops in seam line: See 3.4. (line 814)
3.545 -LZW compression: See 3.2. (line 369)
3.546 -mask template character, %: See 3.4. (line 990)
3.547 -mask template character, B: See 3.4. (line 1039)
3.548 -mask template character, b: See 3.4. (line 1033)
3.549 -mask template character, D: See 3.4. (line 1030)
3.550 -mask template character, d: See 3.4. (line 1024)
3.551 -mask template character, E: See 3.4. (line 1058)
3.552 -mask template character, e: See 3.4. (line 1052)
3.553 -mask template character, F: See 3.4. (line 1048)
3.554 -mask template character, f: See 3.4. (line 1042)
3.555 -mask template character, i: See 3.4. (line 993)
3.556 -mask template character, n: See 3.4. (line 1008)
3.557 -mask template character, P: See 3.4. (line 1021)
3.558 -mask template character, p: See 3.4. (line 1013)
3.559 -mask template characters, table of: See 3.4. (line 989)
3.560 -mask, binary: See 4. (line 1073)
3.561 -mask, coarse: See 3.4. (line 718)
3.562 -mask, fine: See 3.4. (line 771)
3.563 -mask, generation: See 3.4. (line 753)
3.564 -mask, input files: See 4.1. (line 1085)
3.565 -mask, load: See 3.4. (line 778)
3.566 -mask, optimization visualization: See 3.4. (line 933)
3.567 -mask, save: See 3.4. (line 887)
3.568 -mask, vectorization distance: See 3.4. (line 784)
3.569 -mask, weight: See 4. (line 1073)
3.570 -masks, understanding: See 4. (line 1073)
3.571 -memory, tuning usage of: See 5. (line 1163)
3.572 -multi-directory TIFF: See 1. (line 73)
3.573 -multi-layer image: See 1. (line 73)
3.574 -nearest-feature transform (NFT): See 3.4. (line 753)
3.575 + See ``Program Index''. (line 1958)
3.576 +index, syntactic-comment:
3.577 + See ``Syntactic-Comment Index''. (line 2000)
3.578 +input mask: See 4.1. (line 1139)
3.579 +invocation: See 3. (line 184)
3.580 +JPEG compression: See 3.2. (line 408)
3.581 +KImageFuser: See A.2. (line 1464)
3.582 +lens distortion, correction of: See 2. (line 144)
3.583 +levels, pyramid: See 3.2. (line 441)
3.584 +LibJPEG: See 6. (line 1347)
3.585 +LibPNG: See 6. (line 1350)
3.586 +LibTiff: See 6. (line 1354)
3.587 +literal filename: See 3. (line 188)
3.588 +load mask: See 3.4. (line 832)
3.589 +loops in seam line: See 3.4. (line 868)
3.590 +LZW compression: See 3.2. (line 423)
3.591 +mask template character, %: See 3.4. (line 1044)
3.592 +mask template character, B: See 3.4. (line 1093)
3.593 +mask template character, b: See 3.4. (line 1087)
3.594 +mask template character, D: See 3.4. (line 1084)
3.595 +mask template character, d: See 3.4. (line 1078)
3.596 +mask template character, E: See 3.4. (line 1112)
3.597 +mask template character, e: See 3.4. (line 1106)
3.598 +mask template character, F: See 3.4. (line 1102)
3.599 +mask template character, f: See 3.4. (line 1096)
3.600 +mask template character, i: See 3.4. (line 1047)
3.601 +mask template character, n: See 3.4. (line 1062)
3.602 +mask template character, P: See 3.4. (line 1075)
3.603 +mask template character, p: See 3.4. (line 1067)
3.604 +mask template characters, table of: See 3.4. (line 1043)
3.605 +mask, binary: See 4. (line 1127)
3.606 +mask, coarse: See 3.4. (line 772)
3.607 +mask, fine: See 3.4. (line 825)
3.608 +mask, generation: See 3.4. (line 807)
3.609 +mask, input files: See 4.1. (line 1139)
3.610 +mask, load: See 3.4. (line 832)
3.611 +mask, optimization visualization: See 3.4. (line 987)
3.612 +mask, save: See 3.4. (line 941)
3.613 +mask, vectorization distance: See 3.4. (line 838)
3.614 +mask, weight: See 4. (line 1127)
3.615 +masks, understanding: See 4. (line 1127)
3.616 +memory, tuning usage of: See 5. (line 1217)
3.617 +multi-directory TIFF: See 1. (line 75)
3.618 +multi-layer image: See 1. (line 75)
3.619 +nearest-feature transform (NFT): See 3.4. (line 807)
3.620 Octave: See Appendix A.
3.621 - (line 1320)
3.622 -OpenEXR, data format: See 3.3. (line 609)
3.623 -OpenEXR, half precision float: See 3.3. (line 613)
3.624 -optimize seam: See 3.4. (line 829)
3.625 -optimize strategy: See 3.4. (line 842)
3.626 -optimize, anneal parameters: See 3.4. (line 672)
3.627 -optimizer weights: See 3.4. (line 860)
3.628 -optimizer, simulated annealing: See 3.4. (line 672)
3.629 + (line 1374)
3.630 +OpenEXR, data format: See 3.3. (line 663)
3.631 +OpenEXR, half precision float: See 3.3. (line 667)
3.632 +optimize seam: See 3.4. (line 883)
3.633 +optimize strategy: See 3.4. (line 896)
3.634 +optimize, anneal parameters: See 3.4. (line 726)
3.635 +optimizer weights: See 3.4. (line 914)
3.636 +optimizer, simulated annealing: See 3.4. (line 726)
3.637 option index:
3.638 - See ``Option Index''. (line 1946)
3.639 -options, common: See 3.2. (line 337)
3.640 -options, extended: See 3.3. (line 520)
3.641 -options, mask generation: See 3.4. (line 669)
3.642 -output file compression: See 3.2. (line 348)
3.643 -output filename, default: See 3.2. (line 419)
3.644 -output image, set size of: See 3.3. (line 623)
3.645 -overview: See 1. (line 40)
3.646 -packbits compression: See 3.2. (line 373)
3.647 -parallax error: See 2. (line 152)
3.648 -photometric alignment: See 2. (line 144)
3.649 + See ``Option Index''. (line 2009)
3.650 +options, common: See 3.2. (line 391)
3.651 +options, extended: See 3.3. (line 574)
3.652 +options, mask generation: See 3.4. (line 723)
3.653 +order, of processing: See 3.1. (line 198)
3.654 +output file compression: See 3.2. (line 402)
3.655 +output filename, default: See 3.2. (line 473)
3.656 +output image, set size of: See 3.3. (line 677)
3.657 +overview: See 1. (line 42)
3.658 +packbits compression: See 3.2. (line 427)
3.659 +parallax error: See 2. (line 154)
3.660 +photometric alignment: See 2. (line 146)
3.661 problem reports: See Appendix A.
3.662 - (line 1323)
3.663 -profile, ICC: See 3.3. (line 537)
3.664 + (line 1377)
3.665 +processing order: See 3.1. (line 198)
3.666 +profile, ICC: See 3.3. (line 591)
3.667 program index:
3.668 - See ``Program Index''. (line 1904)
3.669 -programs, helpful additional: See 6. (line 1236)
3.670 -pyramid levels: See 3.2. (line 387)
3.671 -radius, DIJKSTRA: See 3.4. (line 758)
3.672 -raw conversion: See 2. (line 129)
3.673 -response file <1>: See 3.1. (line 193)
3.674 -response file: See 3. (line 186)
3.675 -response file, force recognition of: See 3.1.1. (line 293)
3.676 -response file, format: See 3.1.1. (line 242)
3.677 -response file, grammar: See 3.1.1. (line 256)
3.678 -response file, syntactic comment: See 3.1.2. (line 319)
3.679 -save mask: See 3.4. (line 887)
3.680 -seam line, loops: See 3.4. (line 814)
3.681 -seam optimization: See 3.4. (line 829)
3.682 -simulated annealing optimizer: See 3.4. (line 672)
3.683 -single precision float, IEEE754: See 3.3. (line 589)
3.684 -smooth difference image: See 3.4. (line 915)
3.685 + See ``Program Index''. (line 1958)
3.686 +programs, helpful additional: See 6. (line 1290)
3.687 +pyramid levels: See 3.2. (line 441)
3.688 +radius, DIJKSTRA: See 3.4. (line 812)
3.689 +raw conversion: See 2. (line 131)
3.690 +response file <1>: See 3.1. (line 195)
3.691 +response file: See 3. (line 188)
3.692 +response file, comment (#): See 3.1.1. (line 245)
3.693 +response file, force recognition of: See 3.1.1. (line 289)
3.694 +response file, format: See 3.1.1. (line 245)
3.695 +response file, grammar: See 3.1.1. (line 259)
3.696 +response file, syntactic comment: See 3.1.2. (line 315)
3.697 +save mask: See 3.4. (line 941)
3.698 +seam line, loops: See 3.4. (line 868)
3.699 +seam optimization: See 3.4. (line 883)
3.700 +simulated annealing optimizer: See 3.4. (line 726)
3.701 +single precision float, IEEE754: See 3.3. (line 643)
3.702 +smooth difference image: See 3.4. (line 969)
3.703 SourceForge <1>: See Appendix A.
3.704 - (line 1326)
3.705 -SourceForge: See 1. (line 79)
3.706 + (line 1380)
3.707 +SourceForge: See 1. (line 81)
3.708 SourceForge, tracker: See Appendix A.
3.709 - (line 1326)
3.710 -sRGB color space: See 3.3. (line 537)
3.711 -syntactic comment, grammar: See 3.1.2. (line 329)
3.712 -syntactic comment, response file: See 3.1.2. (line 319)
3.713 -TIFF, multi-directory: See 1. (line 73)
3.714 -tiffcopy: See 1. (line 73)
3.715 -tiffsplit: See 1. (line 73)
3.716 -TMPDIR: See 5. (line 1177)
3.717 + (line 1380)
3.718 +sRGB color space: See 3.3. (line 591)
3.719 +syntactic comment, grammar: See 3.1.2. (line 327)
3.720 +syntactic comment, response file: See 3.1.2. (line 315)
3.721 +syntactic-comment index:
3.722 + See ``Syntactic-Comment Index''. (line 2000)
3.723 +TIFF, multi-directory: See 1. (line 75)
3.724 +tiffcopy: See 1. (line 75)
3.725 +tiffsplit: See 1. (line 75)
3.726 +TMPDIR: See 5. (line 1231)
3.727 tracker, SourceForge: See Appendix A.
3.728 - (line 1326)
3.729 -transformation, affine: See 2. (line 142)
3.730 -understanding masks: See 4. (line 1073)
3.731 -visualization image: See 3.4. (line 951)
3.732 -visualization image colors: See 3.4. (line 986)
3.733 -visualization of mask optimization: See 3.4. (line 933)
3.734 -weight mask: See 4. (line 1073)
3.735 -weights, optimizer: See 3.4. (line 860)
3.736 -workflow: See 2. (line 94)
3.737 -workflow with Enblend: See 2. (line 105)
3.738 -workflow with Enfuse: See 2. (line 105)
3.739 -wrap around: See 3.2. (line 466)
3.740 + (line 1380)
3.741 +transformation, affine: See 2. (line 144)
3.742 +understanding masks: See 4. (line 1127)
3.743 +visualization image: See 3.4. (line 1005)
3.744 +visualization image colors: See 3.4. (line 1040)
3.745 +visualization of mask optimization: See 3.4. (line 987)
3.746 +weight mask: See 4. (line 1127)
3.747 +weights, optimizer: See 3.4. (line 914)
3.748 +workflow: See 2. (line 96)
3.749 +workflow with Enblend: See 2. (line 107)
3.750 +workflow with Enfuse: See 2. (line 107)
3.751 +wrap around: See 3.2. (line 520)
4.1 --- a/doc/enblend.texi Mon Nov 09 11:10:46 2009 +0100
4.2 +++ b/doc/enblend.texi Mon Nov 09 14:14:33 2009 +0100
4.3 @@ -17,6 +17,8 @@
4.4 @set default-image-cache-cachesize 1024@dmn{MB}
4.5 @set default-image-cache-blocksize 2048@dmn{KB}
4.6
4.7 +@c Define a new index for syntactic comments.
4.8 +@defcodeindex sc
4.9 @c Define a new index for options.
4.10 @defcodeindex op
4.11 @c %**end of header
4.12 @@ -124,6 +126,7 @@
4.13 * Authors:: Major Contributors
4.14 * FDL:: @acronym{GNU} Free Documentation License
4.15 * Program Index:: Names of programs referenced
4.16 +* Syntactic-Comment Index:: Keys of syntactic comments
4.17 * Option Index:: Index of all options
4.18 * General Index:: Topic index
4.19 @end menu
4.20 @@ -1549,6 +1552,14 @@
4.21 @printindex pg
4.22
4.23
4.24 +@node Syntactic-Comment Index
4.25 +@unnumbered Syntactic-Comment Index
4.26 +@cindex syntactic-comment index
4.27 +@cindex index, syntactic-comment
4.28 +
4.29 +@printindex sc
4.30 +
4.31 +
4.32 @node Option Index
4.33 @unnumbered Option Index
4.34 @cindex option index
5.1 --- a/doc/enfuse.info Mon Nov 09 11:10:46 2009 +0100
5.2 +++ b/doc/enfuse.info Mon Nov 09 14:14:33 2009 +0100
5.3 @@ -16,6 +16,7 @@
5.4 List of Tables
5.5 List of Figures
5.6 Program Index
5.7 +Syntactic-Comment Index
5.8 Option Index
5.9 General Index
5.10
5.11 @@ -30,6 +31,7 @@
5.12 3.1 Response Files
5.13 3.1.1 Response File Format
5.14 3.1.2 Syntactic Comments
5.15 + 3.1.3 Globbing Algorithms
5.16 3.2 Common Options
5.17 3.3 Extended Options
5.18 3.4 Fusion Options
5.19 @@ -83,6 +85,7 @@
5.20 List of Tables
5.21 List of Figures
5.22 Program Index
5.23 +Syntactic-Comment Index
5.24 Option Index
5.25 General Index
5.26
5.27 @@ -203,7 +206,7 @@
5.28 *note Figure:photographic-workflow:: shows where Enblend and Enfuse sit
5.29 in this tool chain.
5.30
5.31 - Figure 2.1: Photographic workflow with Enblend and Enfuse.
5.32 +Figure 2.1: Photographic workflow with Enblend and Enfuse.
5.33
5.34 Take Images
5.35 Take _multiple_ images to form a panorama, an exposure series, a
5.36 @@ -295,10 +298,11 @@
5.37 Introduce response file names with an at-character (`@').
5.38
5.39 Enblend and Enfuse process the list INPUT strictly from left to
5.40 -right, expanding response files in depth-first order. The following
5.41 +right, expanding response files in depth-first order. (Multi-layer
5.42 +files are processed from first layer to the last.) The following
5.43 examples only show Enblend, but Enfuse works exactly the same.
5.44
5.45 -Solely literal filenames.
5.46 +Solely image filenames.
5.47 Example:
5.48 enblend image-1.tif image-2.tif image-3.tif
5.49
5.50 @@ -360,14 +364,7 @@
5.51 file itself, not relative to the current-working directory of the
5.52 application.
5.53
5.54 -The above grammar might unpleasantly surprise the user in the some ways:
5.55 -
5.56 -Literal filenames
5.57 - Inside a response file all filenames are treated as literals. No
5.58 - filename globbing or filename expansion is performed. This is, for
5.59 - example, the line
5.60 - img_*.tif
5.61 - stands for exactly one file, called `img_*.tif'.
5.62 +The above grammar might unpleasantly surprise the user in the some ways.
5.63
5.64 Whitespace trimmed at both line ends
5.65 For convenience, whitespace at the beginning and at the end of each
5.66 @@ -383,22 +380,22 @@
5.67 img-0.33ev.tif # "middle" EV
5.68 img-1.33ev.tif
5.69 img+0.67ev.tif
5.70 - only the first line contains a comment, whereas the second lines
5.71 + only the first line contains a comment, whereas the second line
5.72 includes none. Rather, it refers to a file called
5.73 `img-0.33ev.tif # "middle" EV'.
5.74
5.75 Image filenames cannot start with `@'
5.76 - An at-sign always introduces a response file, even if the
5.77 + An at-sign invariably introduces a response file, even if the
5.78 filename's extension hints towards an image.
5.79
5.80 If Enblend or Enfuse do not recognize a response file, they will skip
5.81 the file and issue a warning. To force a file being recognized as a
5.82 -response file add one of the following syntactic comments (see below)
5.83 -to the _first_ line of the file.
5.84 -
5.85 - # response-file: true
5.86 - # enblend-response-file: true
5.87 - # enfuse-response-file: true
5.88 +response file add one of the following syntactic comments to the
5.89 +_first_ line of the file.
5.90 +
5.91 + response-file: true
5.92 + enblend-response-file: true
5.93 + enfuse-response-file: true
5.94
5.95 Finally, here is an example of a valid response file.
5.96 # 4\pi panorama!
5.97 @@ -419,7 +416,9 @@
5.98
5.99 Comments that follow the format described in *note
5.100 Table:response-file-syntactic-comment:: are treated as instructions how
5.101 -to interpret the rest of the response file.
5.102 +to interpret the rest of the response file. A syntactic comment is
5.103 +effective immediately and its effect persists to the end of the
5.104 +response file, unless another syntactic comment undoes it.
5.105
5.106 SYNTACTIC-COMMENT ::= SPACE* `#' SPACE* KEY SPACE* `:' SPACE*
5.107 VALUE
5.108 @@ -432,6 +431,62 @@
5.109
5.110 Unknown syntactic comments are silently ignored.
5.111
5.112 +3.1.3 Globbing Algorithms
5.113 +-------------------------
5.114 +
5.115 +The three equivalent syntactic keys
5.116 + * `glob',
5.117 +
5.118 + * `globbing', or
5.119 +
5.120 + * `filename-globbing'
5.121 + control the algorithm that Enblend or Enfuse use to glob filenames in
5.122 +response files.
5.123 +
5.124 + All versions of Enblend and Enfuse support at least two algorithms:
5.125 +`literal', which is the default, and `wildcard'. See *note
5.126 +Table:globbing-algorithms:: for a list of all possible globbing
5.127 +algorithms. To find out about the algorithms in your version of
5.128 +Enblend or Enfuse team up the options `--version' and `--verbose'.
5.129 +
5.130 +`literal'
5.131 + Do not glob. Interpret all filenames in response files as
5.132 + literals. This is the default.
5.133 +
5.134 + Please keep in mind that whitespace at both ends of a line in a
5.135 + response file _always_ gets discarded.
5.136 +
5.137 +`wildcard'
5.138 + Glob using the wildcard characters `?', `*', `[', and `]'.
5.139 +
5.140 + The W*N32 implementation only globs the filename part of a path,
5.141 + whereas all other implementations perform wildcard expansion in
5.142 + _all_ path components. Also see glob(7)
5.143 + (http://www.kernel.org/doc/man-pages/online/pages/man7/glob.7.html).
5.144 +
5.145 +`none'
5.146 + Alias for `literal'.
5.147 +
5.148 +`shell'
5.149 + The `shell' globbing algorithm works as `literal' does. In
5.150 + addition, it interprets the wildcard characters `{', `}', and `~'.
5.151 + This makes the expansion process behave more like common UN*X
5.152 + shells.
5.153 +
5.154 +`sh'
5.155 + Alias for `shell'.
5.156 +
5.157 +Table 3.3: Globbing algorithms for the use in response files
5.158 +
5.159 + Example:
5.160 + # Horizontal panorama
5.161 + # 15 images
5.162 +
5.163 + # filename-globbing: wildcard
5.164 +
5.165 + image_000[0-9].tif
5.166 + image_001[0-4].tif
5.167 +
5.168 3.2 Common Options
5.169 ==================
5.170
5.171 @@ -864,42 +919,6 @@
5.172 image (for example 255 or 65535). *note Figure:entropy-cutoff::
5.173 shows an example.
5.174
5.175 -
5.176 - +-----------+------------+-----------+------------+-----------+
5.177 - + + + + + +
5.178 - | : : : : |
5.179 - 1 ++......................................................####***
5.180 - | : : : : #**** |
5.181 - | : : : : *** |
5.182 - | : : : : *** |
5.183 - | : : : **** |
5.184 - 0.8 ++..............................................***..........++
5.185 - | : : : **** : |
5.186 - | : : : *** : |
5.187 - | : : : *** : |
5.188 - | : : :**** : |
5.189 - 0.6 ++..................................***......................++
5.190 - | : : ****: : |
5.191 - | : : *** : : |
5.192 - | : : *** : : |
5.193 - | : :**** : : |
5.194 - 0.4 ++......................***..................................++
5.195 - | : ****: : : |
5.196 - | : *** : : : |
5.197 - | : *** : : : |
5.198 - | : **** : : : |
5.199 - 0.2 ++..........***..............................................++
5.200 - | **** : : : |
5.201 - | *** : : : : |
5.202 - | *** : : : : |
5.203 - | **** : : : : |
5.204 - 0 ***#.................................................Y.******++
5.205 - | : EntropyCutoff(Y, Lower, Upper) ###### |
5.206 - + + + + + +
5.207 - +-----------+------------+-----------+------------+-----------+
5.208 - 0 0.2 0.4 0.6 0.8 1
5.209 - Y
5.210 -
5.211 Figure 3.1: Linear lightness Y in comparison with an
5.212 entropy-cutoff function for LOWER-CUTOFF = 5% and UPPER-CUTOFF =
5.213 90% which are rather extreme values.
5.214 @@ -1121,7 +1140,7 @@
5.215 `%E'
5.216 Is replaced with the extension of the output file.
5.217
5.218 -Table 3.3: Special characters to control the generation of mask
5.219 +Table 3.4: Special characters to control the generation of mask
5.220 filenames.
5.221
5.222 3.6 Option Delimiters
5.223 @@ -1273,42 +1292,6 @@
5.224 defaults to 0.5 and Sigma defaults to 0.2. *note Figure:gaussian::
5.225 shows a Gaussian.
5.226
5.227 -
5.228 - 1 ++----------+------------+---*****---+------------+----------++
5.229 - + + + * * + Gaussian(Y) ****** +
5.230 - | ** ** |
5.231 - | ** ** |
5.232 - | * * |
5.233 - | * * |
5.234 - 0.8 ++ * * ++
5.235 - | * * |
5.236 - | * * |
5.237 - | * * |
5.238 - | * * |
5.239 - | * * |
5.240 - 0.6 ++ * * ++
5.241 - | * * |
5.242 - | * * |
5.243 - | * * |
5.244 - | * * |
5.245 - | ** ** |
5.246 - | * * |
5.247 - 0.4 ++ * * ++
5.248 - | * * |
5.249 - | * * |
5.250 - | ** ** |
5.251 - | * * |
5.252 - | ** ** |
5.253 - 0.2 ++ ** ** ++
5.254 - | ** ** |
5.255 - | * * |
5.256 - | ** ** |
5.257 - |*** ***|
5.258 - * + + + + *
5.259 - 0 ++----------+------------+-----------+------------+----------++
5.260 - 0 0.2 0.4 0.6 0.8 1
5.261 - Y
5.262 -
5.263 Figure 4.1: Gaussian function with the parameters MU = 0.5 and SIGMA =
5.264 0.2.
5.265
5.266 @@ -1402,7 +1385,7 @@
5.267 *note Figure:local-analysis-window:: shows two windows with different
5.268 sizes.
5.269
5.270 - Figure 4.2: Examples of local analysis windows for the sizes 3 and 5.
5.271 +Figure 4.2: Examples of local analysis windows for the sizes 3 and 5.
5.272 "C" marks the center where the pixel gets the weight. "N" are
5.273 neighboring pixels, which all contribute equally to the weight.
5.274
5.275 @@ -1491,42 +1474,6 @@
5.276 origin, which is why we can easily plot it in *note
5.277 Figure:laplacian-of-gaussian::, setting R = sqrt(x^2 + y^2).
5.278
5.279 -
5.280 - 1 ++--------------+---------------+---------------+--------------++
5.281 - + + ***** + +
5.282 - | : **** : ******* : |
5.283 - | : ** : *******: |
5.284 - 0 ++.....................**.......................*****************
5.285 - | : ** : : |
5.286 - | : * : : |
5.287 - | : ** : : |
5.288 - | : * : : |
5.289 - -1 ++...............**............................................++
5.290 - | :* : : |
5.291 - | * : : |
5.292 - | * : : |
5.293 - -2 ++.............*...............................................++
5.294 - | * : : : |
5.295 - | ** : : : |
5.296 - | * : : : |
5.297 - | * : : : |
5.298 - -3 ++.........*...................................................++
5.299 - | * : : : |
5.300 - | * : : : |
5.301 - | ** : : : |
5.302 - -4 ++......*......................................................++
5.303 - | * : : : |
5.304 - | * : : : |
5.305 - | * : : : |
5.306 - | ** : : : |
5.307 - -5 ***............................................................++
5.308 - | : : : |
5.309 - | : LaplacianOfGaussian(R, 0.5) ****** |
5.310 - + + + + +
5.311 - -6 ++--------------+---------------+---------------+--------------++
5.312 - 0 0.5 1 1.5 2
5.313 - R
5.314 -
5.315 Figure 4.3: Laplacian-of-Gaussian function for sigma = 0.5.
5.316
5.317 See also HIPR2: Laplacian of Gaussian
5.318 @@ -1635,42 +1582,6 @@
5.319 lim(p * log_a(1 / p), p -> 0) = 0.
5.320 *note Figure:entropy:: shows an entropy function.
5.321
5.322 -
5.323 - 1 ++----------+------------+-*********-+------------+----------++
5.324 - + + **** **** Entropy(p) ****** +
5.325 - | *** *** |
5.326 - | *** *** |
5.327 - | ** ** |
5.328 - | ** ** |
5.329 - 0.8 ++ ** ** ++
5.330 - | * * |
5.331 - | * * |
5.332 - | * * |
5.333 - | * * |
5.334 - | * * |
5.335 - 0.6 ++ * * ++
5.336 - | * * |
5.337 - | * * |
5.338 - | * * |
5.339 - | * * |
5.340 - | * * |
5.341 - | * * |
5.342 - 0.4 ++ * * ++
5.343 - | * * |
5.344 - | * * |
5.345 - | * * |
5.346 - | * * |
5.347 - | * * |
5.348 - 0.2 ++* *++
5.349 - | * *|
5.350 - |* *|
5.351 - |* *|
5.352 - | |
5.353 - + + + + + +
5.354 - 0 ++----------+------------+-----------+------------+----------++
5.355 - 0 0.2 0.4 0.6 0.8 1
5.356 - p
5.357 -
5.358 Figure 4.4: Entropy function H for an experiment with exactly two
5.359 outcomes.
5.360
5.361 @@ -2256,73 +2167,9 @@
5.362 Images *note Figure:sharp-edge:: and *note Figure:smooth-edge:: show
5.363 plots of the matrices `sharp_edge' and `smooth_edge'.
5.364
5.365 -
5.366 -
5.367 -
5.368 -
5.369 - sharp_edge ******
5.370 - 250 $$$$$$
5.371 - 200 %%%%%%
5.372 - 150 @@@@@@
5.373 - ### 100 &&&&&&
5.374 - ### # 50 ======
5.375 - ### #
5.376 - # ## #
5.377 - 300 ++ ### # #
5.378 - 250 |+ ## # #
5.379 - | ##### # #
5.380 - 200 |+ # # # # # #####
5.381 - | # # # # ## ########
5.382 - 100 |+ ## # ##*# ########### ############
5.383 - | # # -#* # ## ######## ## |
5.384 - 50 |+ ## ## -%%@** ###### ## ##### |
5.385 - | ## ## -@%%@@&&**## ######## ## |
5.386 - 0 ##### -#=&&&======####. ## ####---- |
5.387 - | ####+==&@@@@%%@@&** ########. ##.+ ---- 4
5.388 - | --- ==&@@ .%%$$%@@&* ## #####.... --+
5.389 - | -- ++=&&@ .%% %%@@& ==*###.. ##.. ..+ 3
5.390 - +--- =&.@%%%%@@&===.. #####..... ---
5.391 - 0 + -----=&&&& ======.... .| .. 2
5.392 - 1 ==&&@@@@&& = ......|. ---
5.393 - 2 --@-&-= +.. | ..- 1
5.394 - 3----- |+--
5.395 - 4- 0
5.396 -
5.397 Figure 7.1: 3D plot augmented by contour plot of the matrix
5.398 `sharp_edge'.
5.399
5.400 -
5.401 -
5.402 -
5.403 -
5.404 - smooth_edge ******
5.405 - 250 $$$$$$
5.406 - 200 %%%%%%
5.407 - 150 @@@@@@
5.408 - 100 &&&&&&
5.409 - 50 ======
5.410 - ########
5.411 - ######## ## |
5.412 - 300 ++ ######## ######### |
5.413 - 250 |+ ####### ######### ## |
5.414 - | ## ######## ######## |
5.415 - 200 |+ ######## ######## ## |
5.416 - | #### ######## ######### |
5.417 - 100 |+ ########################## |
5.418 - | ######### ######### | |
5.419 - 50 |+ ## ######### -==-----| |
5.420 - |######### ---+.. ==.+ &&-------- |
5.421 - 0 ## --- .===.... && |.+@@@ ---%%--- |
5.422 - | --++... ==. &&&....@@@ .%% -$$ 4
5.423 - | --- ===....&&& ..@@| ...%%%.. $$-+
5.424 - | -- ++.. ====. && .....@@. | %% ..$ 3
5.425 - +--- ==.......&& .. @@ .|.%%... $$-
5.426 - 0 + ---=-- &&......@@ .%% .$ 2
5.427 - 1 ---&&- +.. @@ ...%%%|. $$-
5.428 - 2 ---@@- +%% | ..$ 1
5.429 - 3--%-- |+$$
5.430 - 4- 0
5.431 -
5.432 Figure 7.2: 3D plot augmented by contour plot of the matrix
5.433 `smooth_edge'.
5.434
5.435 @@ -2443,7 +2290,7 @@
5.436 Figure *note Figure:focus-stacking-decision-tree:: helps the user to
5.437 arrive at a well-fused focus stack with as few steps as possible.
5.438
5.439 - Figure 7.3: Focus stacking decision tree.
5.440 +Figure 7.3: Focus stacking decision tree.
5.441
5.442 Always start with the default, contrast weighting with a local
5.443 contrast window. Only if seams appear as described in *note Advanced
5.444 @@ -3168,7 +3015,8 @@
5.445 Table 1.1: Weighting criteria See 1.
5.446 Table 3.1: Grammar of response files See 3.1.1.
5.447 Table 3.2: Grammar of syntactic comments See 3.1.2.
5.448 -Table 3.3: Mask template characters See 3.5.
5.449 +Table 3.3: Globbing algorithms See 3.1.3.
5.450 +Table 3.4: Mask template characters See 3.5.
5.451 Table 6.1: Suggested cache-size settings See 6.
5.452
5.453 List of Figures
5.454 @@ -3187,343 +3035,369 @@
5.455 Program Index
5.456 *************
5.457
5.458 -ale: See 8. (line 2514)
5.459 -align_image_stack (Hugin): See 8. (line 2521)
5.460 -cinepaint <1>: See 8. (line 2533)
5.461 -cinepaint: See 3.3. (line 725)
5.462 -convert (ImageMagick): See 8. (line 2544)
5.463 -dcraw <1>: See 8. (line 2504)
5.464 -dcraw: See 2. (line 206)
5.465 -display (ImageMagick): See 8. (line 2544)
5.466 -exiftool: See 8. (line 2572)
5.467 -exrdisplay (OpenEXR): See 8. (line 2550)
5.468 -fulla (Hugin): See 8. (line 2521)
5.469 -gimp <1>: See 8. (line 2540)
5.470 -gimp <2>: See 3.3. (line 725)
5.471 -gimp: See 2. (line 206)
5.472 -gm (GraphicsMagick): See 8. (line 2544)
5.473 -hugin <1>: See 8. (line 2518)
5.474 -hugin <2>: See 7.1. (line 1894)
5.475 -hugin <3>: See 3.3. (line 716)
5.476 -hugin: See 2. (line 206)
5.477 -identify (ImageMagick) <1>: See 8. (line 2544)
5.478 -identify (ImageMagick): See 5.1. (line 1733)
5.479 -montage (ImageMagick): See 8. (line 2544)
5.480 -nona (Hugin) <1>: See 8. (line 2521)
5.481 -nona (Hugin): See 3.3. (line 716)
5.482 -PanoTools: See 2. (line 206)
5.483 -pfshdrcalibrate (PFScalibration): See 8. (line 2553)
5.484 -pfsin (PFSTools): See 8. (line 2553)
5.485 -pfsout (PFSTools): See 8. (line 2553)
5.486 -pfstmo_* (PFStmo): See 8. (line 2553)
5.487 -pfsview (PFSTools): See 8. (line 2553)
5.488 -PTmender (PanoTools): See 8. (line 2526)
5.489 -PTOptimizer (PanoTools): See 8. (line 2526)
5.490 -tifficc (LittleCMS): See 8. (line 2576)
5.491 -tiffinfo (libtiff) <1>: See 8. (line 2568)
5.492 -tiffinfo (libtiff): See 5.1. (line 1733)
5.493 -ufraw <1>: See 8. (line 2507)
5.494 -ufraw: See 2. (line 206)
5.495 -ufraw-batch: See 8. (line 2507)
5.496 +ale: See 8. (line 2361)
5.497 +align_image_stack (Hugin): See 8. (line 2368)
5.498 +cinepaint <1>: See 8. (line 2380)
5.499 +cinepaint: See 3.3. (line 780)
5.500 +convert (ImageMagick): See 8. (line 2391)
5.501 +dcraw <1>: See 8. (line 2351)
5.502 +dcraw: See 2. (line 209)
5.503 +display (ImageMagick): See 8. (line 2391)
5.504 +exiftool: See 8. (line 2419)
5.505 +exrdisplay (OpenEXR): See 8. (line 2397)
5.506 +fulla (Hugin): See 8. (line 2368)
5.507 +gimp <1>: See 8. (line 2387)
5.508 +gimp <2>: See 3.3. (line 780)
5.509 +gimp: See 2. (line 209)
5.510 +gm (GraphicsMagick): See 8. (line 2391)
5.511 +hugin <1>: See 8. (line 2365)
5.512 +hugin <2>: See 7.1. (line 1805)
5.513 +hugin <3>: See 3.3. (line 771)
5.514 +hugin: See 2. (line 209)
5.515 +identify (ImageMagick) <1>: See 8. (line 2391)
5.516 +identify (ImageMagick): See 5.1. (line 1644)
5.517 +montage (ImageMagick): See 8. (line 2391)
5.518 +nona (Hugin) <1>: See 8. (line 2368)
5.519 +nona (Hugin): See 3.3. (line 771)
5.520 +PanoTools: See 2. (line 209)
5.521 +pfshdrcalibrate (PFScalibration): See 8. (line 2400)
5.522 +pfsin (PFSTools): See 8. (line 2400)
5.523 +pfsout (PFSTools): See 8. (line 2400)
5.524 +pfstmo_* (PFStmo): See 8. (line 2400)
5.525 +pfsview (PFSTools): See 8. (line 2400)
5.526 +PTmender (PanoTools): See 8. (line 2373)
5.527 +PTOptimizer (PanoTools): See 8. (line 2373)
5.528 +tifficc (LittleCMS): See 8. (line 2423)
5.529 +tiffinfo (libtiff) <1>: See 8. (line 2415)
5.530 +tiffinfo (libtiff): See 5.1. (line 1644)
5.531 +ufraw <1>: See 8. (line 2354)
5.532 +ufraw: See 2. (line 209)
5.533 +ufraw-batch: See 8. (line 2354)
5.534 +Syntactic-Comment Index
5.535 +***********************
5.536 +
5.537 +enblend-response-file: See 3.1.1. (line 397)
5.538 +enfuse-response-file: See 3.1.1. (line 398)
5.539 +filename-globbing: See 3.1.3. (line 442)
5.540 +glob: See 3.1.3. (line 438)
5.541 +globbing: See 3.1.3. (line 440)
5.542 +response-file: See 3.1.1. (line 396)
5.543 Option Index
5.544 ************
5.545
5.546 ---compression: See 3.2. (line 441)
5.547 ---contrast-edge-scale: See 3.5. (line 830)
5.548 ---contrast-min-curvature: See 3.5. (line 1003)
5.549 ---contrast-weight: See 3.4. (line 751)
5.550 ---contrast-window-size: See 3.5. (line 810)
5.551 ---ContrastWindowSize (deprecated): See 3.5. (line 810)
5.552 ---depth: See 3.3. (line 636)
5.553 ---EdgeScale (deprecated): See 3.5. (line 830)
5.554 ---entropy-cutoff: See 3.5. (line 851)
5.555 ---entropy-weight: See 3.4. (line 758)
5.556 ---entropy-window-size: See 3.5. (line 916)
5.557 ---EntropyCutoff (deprecated): See 3.5. (line 851)
5.558 ---EntropyWindowSize (deprecated): See 3.5. (line 916)
5.559 ---exposure-mu: See 3.4. (line 774)
5.560 ---exposure-sigma: See 3.4. (line 784)
5.561 ---exposure-weight: See 3.4. (line 766)
5.562 ---gray-projector: See 3.5. (line 932)
5.563 ---GrayProjector (deprecated): See 3.5. (line 932)
5.564 ---hard-mask <1>: See 7.6.6. (line 2482)
5.565 ---hard-mask <2>: See 4.1.2. (line 1230)
5.566 ---hard-mask: See 3.5. (line 989)
5.567 ---HardMask (deprecated): See 3.5. (line 989)
5.568 ---help: See 3.2. (line 478)
5.569 ---MinCurvature (deprecated): See 3.5. (line 1003)
5.570 ---output: See 3.2. (line 511)
5.571 ---saturation-weight: See 3.4. (line 795)
5.572 ---save-masks: See 3.5. (line 1021)
5.573 ---SaveMasks (deprecated): See 3.5. (line 1021)
5.574 ---soft-mask: See 3.5. (line 1049)
5.575 ---SoftMask (deprecated): See 3.5. (line 1049)
5.576 ---verbose: See 3.2. (line 518)
5.577 ---version: See 3.2. (line 553)
5.578 ---wContrast (deprecated): See 3.4. (line 751)
5.579 ---wEntropy (deprecated): See 3.4. (line 758)
5.580 ---wExposureMu (deprecated): See 3.4. (line 766)
5.581 ---wExposureSigma (deprecated): See 3.4. (line 784)
5.582 ---wrap: See 3.2. (line 560)
5.583 ---wSaturation (deprecated): See 3.4. (line 795)
5.584 --b <1>: See 6. (line 1807)
5.585 --b: See 3.3. (line 614)
5.586 --c: See 3.3. (line 625)
5.587 --d: See 3.3. (line 636)
5.588 --f: See 3.3. (line 713)
5.589 --g: See 3.3. (line 721)
5.590 --h: See 3.2. (line 478)
5.591 --l: See 3.2. (line 481)
5.592 --m <1>: See 6. (line 1807)
5.593 --m: See 3.3. (line 733)
5.594 --o: See 3.2. (line 511)
5.595 --V: See 3.2. (line 553)
5.596 --v: See 3.2. (line 518)
5.597 --w: See 3.2. (line 560)
5.598 +--compression: See 3.2. (line 496)
5.599 +--contrast-edge-scale: See 3.5. (line 885)
5.600 +--contrast-min-curvature: See 3.5. (line 1022)
5.601 +--contrast-weight: See 3.4. (line 806)
5.602 +--contrast-window-size: See 3.5. (line 865)
5.603 +--ContrastWindowSize (deprecated): See 3.5. (line 865)
5.604 +--depth: See 3.3. (line 691)
5.605 +--EdgeScale (deprecated): See 3.5. (line 885)
5.606 +--entropy-cutoff: See 3.5. (line 906)
5.607 +--entropy-weight: See 3.4. (line 813)
5.608 +--entropy-window-size: See 3.5. (line 935)
5.609 +--EntropyCutoff (deprecated): See 3.5. (line 906)
5.610 +--EntropyWindowSize (deprecated): See 3.5. (line 935)
5.611 +--exposure-mu: See 3.4. (line 829)
5.612 +--exposure-sigma: See 3.4. (line 839)
5.613 +--exposure-weight: See 3.4. (line 821)
5.614 +--gray-projector: See 3.5. (line 951)
5.615 +--GrayProjector (deprecated): See 3.5. (line 951)
5.616 +--hard-mask <1>: See 7.6.6. (line 2329)
5.617 +--hard-mask <2>: See 4.1.2. (line 1249)
5.618 +--hard-mask: See 3.5. (line 1008)
5.619 +--HardMask (deprecated): See 3.5. (line 1008)
5.620 +--help: See 3.2. (line 533)
5.621 +--MinCurvature (deprecated): See 3.5. (line 1022)
5.622 +--output: See 3.2. (line 566)
5.623 +--saturation-weight: See 3.4. (line 850)
5.624 +--save-masks: See 3.5. (line 1040)
5.625 +--SaveMasks (deprecated): See 3.5. (line 1040)
5.626 +--soft-mask: See 3.5. (line 1068)
5.627 +--SoftMask (deprecated): See 3.5. (line 1068)
5.628 +--verbose: See 3.2. (line 573)
5.629 +--version: See 3.2. (line 608)
5.630 +--wContrast (deprecated): See 3.4. (line 806)
5.631 +--wEntropy (deprecated): See 3.4. (line 813)
5.632 +--wExposureMu (deprecated): See 3.4. (line 821)
5.633 +--wExposureSigma (deprecated): See 3.4. (line 839)
5.634 +--wrap: See 3.2. (line 615)
5.635 +--wSaturation (deprecated): See 3.4. (line 850)
5.636 +-b <1>: See 6. (line 1718)
5.637 +-b: See 3.3. (line 669)
5.638 +-c: See 3.3. (line 680)
5.639 +-d: See 3.3. (line 691)
5.640 +-f: See 3.3. (line 768)
5.641 +-g: See 3.3. (line 776)
5.642 +-h: See 3.2. (line 533)
5.643 +-l: See 3.2. (line 536)
5.644 +-m <1>: See 6. (line 1718)
5.645 +-m: See 3.3. (line 788)
5.646 +-o: See 3.2. (line 566)
5.647 +-V: See 3.2. (line 608)
5.648 +-v: See 3.2. (line 573)
5.649 +-w: See 3.2. (line 615)
5.650 General Index
5.651 *************
5.652
5.653 -360o panoramas: See 3.2. (line 560)
5.654 -a.tif: See 3.2. (line 513)
5.655 -advanced focus stacking: See 7.6.5. (line 2229)
5.656 +# (response file comment): See 3.1.1. (line 347)
5.657 +360o panoramas: See 3.2. (line 615)
5.658 +@ (response file prefix): See 3.1. (line 297)
5.659 +a.tif: See 3.2. (line 568)
5.660 +advanced focus stacking: See 7.6.5. (line 2140)
5.661 advanced focus stacking, recognizing faint edges:See 7.6.5.4.
5.662 - (line 2387)
5.663 -advanced focus stacking, suppressing noise: See 7.6.5.4. (line 2387)
5.664 -affine transformation: See 2. (line 243)
5.665 -alpha channel <1>: See 2. (line 264)
5.666 -alpha channel: See 1. (line 158)
5.667 -alpha channel, associated: See 3.3. (line 721)
5.668 -aperture, sweet spot: See 7.6.1. (line 2138)
5.669 -applications of enfuse: See 7. (line 1880)
5.670 + (line 2234)
5.671 +advanced focus stacking, suppressing noise: See 7.6.5.4. (line 2234)
5.672 +affine transformation: See 2. (line 246)
5.673 +algorithms, globbing: See 3.1.3. (line 437)
5.674 +alpha channel <1>: See 2. (line 267)
5.675 +alpha channel: See 1. (line 161)
5.676 +alpha channel, associated: See 3.3. (line 776)
5.677 +aperture, sweet spot: See 7.6.1. (line 2049)
5.678 +applications of enfuse: See 7. (line 1791)
5.679 authors, list of: See Appendix B.
5.680 - (line 2731)
5.681 -average, disabling: See 4.1.2. (line 1230)
5.682 -average, weighted: See 4.1.1. (line 1218)
5.683 -basic focus stacking: See 7.6.4. (line 2201)
5.684 -binary mask: See 5. (line 1717)
5.685 -bits per channel: See 3.3. (line 636)
5.686 -blending exposures: See 7.3.2. (line 2056)
5.687 + (line 2578)
5.688 +average, disabling: See 4.1.2. (line 1249)
5.689 +average, weighted: See 4.1.1. (line 1237)
5.690 +basic focus stacking: See 7.6.4. (line 2112)
5.691 +binary mask: See 5. (line 1628)
5.692 +bits per channel: See 3.3. (line 691)
5.693 +blending exposures: See 7.3.2. (line 1967)
5.694 bug reports: See Appendix A.
5.695 - (line 2584)
5.696 -Burt-Adelson multiresolution spline: See 1. (line 115)
5.697 -channel width: See 3.3. (line 636)
5.698 -channel, alpha: See 1. (line 158)
5.699 -CIECAM02: See 3.3. (line 625)
5.700 -circle-of-confusion: See 7.6.1. (line 2126)
5.701 -color appearance model: See 3.3. (line 625)
5.702 -color space, sRGB: See 3.3. (line 627)
5.703 -compression: See 3.2. (line 441)
5.704 -compression, deflate: See 3.2. (line 456)
5.705 -compression, JPEG: See 3.2. (line 447)
5.706 -compression, LZW: See 3.2. (line 462)
5.707 -compression, packbits: See 3.2. (line 466)
5.708 -contrast enhancement, local: See 7.6.5.3. (line 2366)
5.709 -contrast weighting using a blend of methods: See 4.4.3. (line 1566)
5.710 -contrast weighting using laplacian-of-gaussian:See 4.4.2. (line 1468)
5.711 -contrast weighting using standard deviation: See 4.4.1. (line 1399)
5.712 -conversion, L*a*b*: See 3.5. (line 963)
5.713 -conversion, raw: See 2. (line 230)
5.714 -dark frame: See 7.6.6. (line 2478)
5.715 -decision tree, focus stacking: See 7.6.5.5. (line 2443)
5.716 -default output filename: See 3.2. (line 513)
5.717 -deflate compression: See 3.2. (line 456)
5.718 -delimiters, option: See 3.6. (line 1130)
5.719 -depth-of-field: See 7.6.1. (line 2129)
5.720 -depth-of-focus increase: See 7.6. (line 2110)
5.721 -digital blending: See 7.3.2. (line 2056)
5.722 -disabling average: See 4.1.2. (line 1230)
5.723 -double precision float, IEEE754: See 3.3. (line 688)
5.724 -dynamic range increase <1>: See 7.4. (line 2094)
5.725 -dynamic range increase: See 7.3. (line 1991)
5.726 -edge detection, laplacian: See 7.6.5.2. (line 2346)
5.727 -entropy: See 4.5. (line 1627)
5.728 -entropy, definition: See 4.5. (line 1624)
5.729 -estimators: See 4.4.1.2. (line 1449)
5.730 -expectation value: See 4.4.1.1. (line 1433)
5.731 -expert focus stacking tips: See 7.6.6. (line 2466)
5.732 -exposure series: See 7.3. (line 1991)
5.733 -exposure series, common misconceptions: See 7.3.2. (line 2053)
5.734 -exposure series, tips for beginners: See 7.3.1. (line 2029)
5.735 -filename template: See 3.5. (line 1026)
5.736 -filename, literal: See 3. (line 287)
5.737 -flash exposure series: See 7.4. (line 2094)
5.738 -focus stacking decision tree: See 7.6.5.5. (line 2443)
5.739 -focus stacking, advanced: See 7.6.5. (line 2229)
5.740 -focus stacking, basic: See 7.6.4. (line 2201)
5.741 -focus stacks: See 7.6. (line 2110)
5.742 -focus stacks, fusing: See 7.6.3. (line 2163)
5.743 -focus stacks, preparation: See 7.6.2. (line 2149)
5.744 -focus stacks, why create them: See 7.6.1. (line 2120)
5.745 -format of response file: See 3.1.1. (line 343)
5.746 + (line 2431)
5.747 +Burt-Adelson multiresolution spline: See 1. (line 118)
5.748 +channel width: See 3.3. (line 691)
5.749 +channel, alpha: See 1. (line 161)
5.750 +CIECAM02: See 3.3. (line 680)
5.751 +circle-of-confusion: See 7.6.1. (line 2037)
5.752 +color appearance model: See 3.3. (line 680)
5.753 +color space, sRGB: See 3.3. (line 682)
5.754 +compression: See 3.2. (line 496)
5.755 +compression, deflate: See 3.2. (line 511)
5.756 +compression, JPEG: See 3.2. (line 502)
5.757 +compression, LZW: See 3.2. (line 517)
5.758 +compression, packbits: See 3.2. (line 521)
5.759 +contrast enhancement, local: See 7.6.5.3. (line 2213)
5.760 +contrast weighting using a blend of methods: See 4.4.3. (line 1513)
5.761 +contrast weighting using laplacian-of-gaussian:See 4.4.2. (line 1451)
5.762 +contrast weighting using standard deviation: See 4.4.1. (line 1382)
5.763 +conversion, L*a*b*: See 3.5. (line 982)
5.764 +conversion, raw: See 2. (line 233)
5.765 +dark frame: See 7.6.6. (line 2325)
5.766 +decision tree, focus stacking: See 7.6.5.5. (line 2290)
5.767 +default output filename: See 3.2. (line 568)
5.768 +deflate compression: See 3.2. (line 511)
5.769 +delimiters, option: See 3.6. (line 1149)
5.770 +depth-of-field: See 7.6.1. (line 2040)
5.771 +depth-of-focus increase: See 7.6. (line 2021)
5.772 +digital blending: See 7.3.2. (line 1967)
5.773 +disabling average: See 4.1.2. (line 1249)
5.774 +double precision float, IEEE754: See 3.3. (line 743)
5.775 +dynamic range increase <1>: See 7.4. (line 2005)
5.776 +dynamic range increase: See 7.3. (line 1902)
5.777 +edge detection, laplacian: See 7.6.5.2. (line 2193)
5.778 +entropy: See 4.5. (line 1574)
5.779 +entropy, definition: See 4.5. (line 1571)
5.780 +estimators: See 4.4.1.2. (line 1432)
5.781 +expectation value: See 4.4.1.1. (line 1416)
5.782 +expert focus stacking tips: See 7.6.6. (line 2313)
5.783 +exposure series: See 7.3. (line 1902)
5.784 +exposure series, common misconceptions: See 7.3.2. (line 1964)
5.785 +exposure series, tips for beginners: See 7.3.1. (line 1940)
5.786 +filename template: See 3.5. (line 1045)
5.787 +filename, literal: See 3. (line 290)
5.788 +flash exposure series: See 7.4. (line 2005)
5.789 +focus stacking decision tree: See 7.6.5.5. (line 2290)
5.790 +focus stacking, advanced: See 7.6.5. (line 2140)
5.791 +focus stacking, basic: See 7.6.4. (line 2112)
5.792 +focus stacks: See 7.6. (line 2021)
5.793 +focus stacks, fusing: See 7.6.3. (line 2074)
5.794 +focus stacks, preparation: See 7.6.2. (line 2060)
5.795 +focus stacks, why create them: See 7.6.1. (line 2031)
5.796 +format of response file: See 3.1.1. (line 347)
5.797 free documentation license (FDL): See Appendix C.
5.798 - (line 2770)
5.799 -fusing, local-contrast-based: See 7.6.3. (line 2163)
5.800 + (line 2617)
5.801 +fusing, local-contrast-based: See 7.6.3. (line 2074)
5.802 general index:
5.803 - See ``General Index''. (line 3286)
5.804 + See ``General Index''. (line 3143)
5.805 +glob(7): See 3.1.3. (line 460)
5.806 +globbing algorithm literal: See 3.1.3. (line 446)
5.807 +globbing algorithm none: See 3.1.3. (line 468)
5.808 +globbing algorithm sh: See 3.1.3. (line 477)
5.809 +globbing algorithm shell: See 3.1.3. (line 471)
5.810 +globbing algorithm wildcard: See 3.1.3. (line 446)
5.811 +globbing algorithms: See 3.1.3. (line 437)
5.812 GNU free documentation license: See Appendix C.
5.813 - (line 2770)
5.814 -grammar, response file: See 3.1.1. (line 357)
5.815 -grammar, syntactic comment: See 3.1.2. (line 430)
5.816 -gray projector: See 3.5. (line 932)
5.817 -gray projector, average: See 3.5. (line 943)
5.818 -gray projector, channel-mixer: See 3.5. (line 949)
5.819 -gray projector, l-star: See 3.5. (line 963)
5.820 -gray projector, lightness: See 3.5. (line 973)
5.821 -gray projector, luminance: See 3.5. (line 978)
5.822 -gray projector, value: See 3.5. (line 984)
5.823 -half precision float, OpenEXR: See 3.3. (line 703)
5.824 -helpful programs: See 8. (line 2500)
5.825 -hot pixels: See 7.6.6. (line 2478)
5.826 -Hugin: See A.2. (line 2674)
5.827 -ICC profile: See 3.3. (line 627)
5.828 -IEEE754 double precision float: See 3.3. (line 688)
5.829 -IEEE754 single precision float: See 3.3. (line 679)
5.830 -image cache: See 6. (line 1810)
5.831 -image cache, block size: See 3.3. (line 614)
5.832 -image cache, cache size: See 3.3. (line 733)
5.833 -image cache, location: See 6. (line 1821)
5.834 -image, multi-layer: See 1. (line 166)
5.835 -images, fusable: See 7.1. (line 1887)
5.836 + (line 2617)
5.837 +grammar, response file: See 3.1.1. (line 361)
5.838 +grammar, syntactic comment: See 3.1.2. (line 429)
5.839 +gray projector: See 3.5. (line 951)
5.840 +gray projector, average: See 3.5. (line 962)
5.841 +gray projector, channel-mixer: See 3.5. (line 968)
5.842 +gray projector, l-star: See 3.5. (line 982)
5.843 +gray projector, lightness: See 3.5. (line 992)
5.844 +gray projector, luminance: See 3.5. (line 997)
5.845 +gray projector, value: See 3.5. (line 1003)
5.846 +half precision float, OpenEXR: See 3.3. (line 758)
5.847 +helpful programs: See 8. (line 2347)
5.848 +hot pixels: See 7.6.6. (line 2325)
5.849 +Hugin: See A.2. (line 2521)
5.850 +ICC profile: See 3.3. (line 682)
5.851 +IEEE754 double precision float: See 3.3. (line 743)
5.852 +IEEE754 single precision float: See 3.3. (line 734)
5.853 +image cache: See 6. (line 1721)
5.854 +image cache, block size: See 3.3. (line 669)
5.855 +image cache, cache size: See 3.3. (line 788)
5.856 +image cache, location: See 6. (line 1732)
5.857 +image, multi-layer: See 1. (line 169)
5.858 +images, fusable: See 7.1. (line 1798)
5.859 index, general:
5.860 - See ``General Index''. (line 3286)
5.861 + See ``General Index''. (line 3143)
5.862 index, option:
5.863 - See ``Option Index''. (line 3231)
5.864 + See ``Option Index''. (line 3088)
5.865 index, program:
5.866 - See ``Program Index''. (line 3190)
5.867 -input mask: See 5.1. (line 1729)
5.868 -invocation: See 3. (line 283)
5.869 -JPEG compression: See 3.2. (line 447)
5.870 -KImageFuser: See A.2. (line 2674)
5.871 -L*a*b* conversion: See 3.5. (line 963)
5.872 -laplacian edge detection: See 7.6.5.2. (line 2346)
5.873 -Laplacian of Gaussian (LoG): See 4.4.2. (line 1468)
5.874 -lens distortion, correction of: See 2. (line 243)
5.875 -levels, pyramid: See 3.2. (line 481)
5.876 -LibJPEG: See 8. (line 2557)
5.877 -LibPNG: See 8. (line 2560)
5.878 -LibTiff: See 8. (line 2564)
5.879 -light probe: See 7.3.2. (line 2075)
5.880 -literal filename: See 3. (line 287)
5.881 -local analysis window: See 4.4.1. (line 1399)
5.882 -local contrast enhancement: See 7.6.5.3. (line 2366)
5.883 -local contrast problem: See 7.6.5.1. (line 2236)
5.884 -local-contrast-based fusing: See 7.6.3. (line 2163)
5.885 -LZW compression: See 3.2. (line 462)
5.886 -mask template character, %: See 3.5. (line 1054)
5.887 -mask template character, B: See 3.5. (line 1103)
5.888 -mask template character, b: See 3.5. (line 1097)
5.889 -mask template character, D: See 3.5. (line 1094)
5.890 -mask template character, d: See 3.5. (line 1088)
5.891 -mask template character, E: See 3.5. (line 1122)
5.892 -mask template character, e: See 3.5. (line 1116)
5.893 -mask template character, F: See 3.5. (line 1112)
5.894 -mask template character, f: See 3.5. (line 1106)
5.895 -mask template character, i: See 3.5. (line 1057)
5.896 -mask template character, n: See 3.5. (line 1072)
5.897 -mask template character, P: See 3.5. (line 1085)
5.898 -mask template character, p: See 3.5. (line 1077)
5.899 -mask template characters, table of: See 3.5. (line 1053)
5.900 -mask, binary: See 5. (line 1717)
5.901 -mask, filename template: See 3.5. (line 1026)
5.902 -mask, input files: See 5.1. (line 1729)
5.903 -mask, saving: See 3.5. (line 1023)
5.904 -mask, weight: See 5. (line 1717)
5.905 -masks, understanding: See 5. (line 1717)
5.906 -memory, tuning usage of: See 6. (line 1807)
5.907 -Mertens-Kautz-Van Reeth exposure fusion: See 1. (line 100)
5.908 -mode of operation (SDev, LoG, ...): See 4.4.4. (line 1608)
5.909 -multi-directory TIFF: See 1. (line 166)
5.910 -multi-layer image: See 1. (line 166)
5.911 -natural sharp-unsharp transition: See 7.6.6. (line 2493)
5.912 -noise reduction: See 7.2. (line 1969)
5.913 + See ``Program Index''. (line 3038)
5.914 +index, syntactic-comment:
5.915 + See ``Syntactic-Comment Index''. (line 3079)
5.916 +input mask: See 5.1. (line 1640)
5.917 +invocation: See 3. (line 286)
5.918 +JPEG compression: See 3.2. (line 502)
5.919 +KImageFuser: See A.2. (line 2521)
5.920 +L*a*b* conversion: See 3.5. (line 982)
5.921 +laplacian edge detection: See 7.6.5.2. (line 2193)
5.922 +Laplacian of Gaussian (LoG): See 4.4.2. (line 1451)
5.923 +lens distortion, correction of: See 2. (line 246)
5.924 +levels, pyramid: See 3.2. (line 536)
5.925 +LibJPEG: See 8. (line 2404)
5.926 +LibPNG: See 8. (line 2407)
5.927 +LibTiff: See 8. (line 2411)
5.928 +light probe: See 7.3.2. (line 1986)
5.929 +literal filename: See 3. (line 290)
5.930 +local analysis window: See 4.4.1. (line 1382)
5.931 +local contrast enhancement: See 7.6.5.3. (line 2213)
5.932 +local contrast problem: See 7.6.5.1. (line 2147)
5.933 +local-contrast-based fusing: See 7.6.3. (line 2074)
5.934 +LZW compression: See 3.2. (line 517)
5.935 +mask template character, %: See 3.5. (line 1073)
5.936 +mask template character, B: See 3.5. (line 1122)
5.937 +mask template character, b: See 3.5. (line 1116)
5.938 +mask template character, D: See 3.5. (line 1113)
5.939 +mask template character, d: See 3.5. (line 1107)
5.940 +mask template character, E: See 3.5. (line 1141)
5.941 +mask template character, e: See 3.5. (line 1135)
5.942 +mask template character, F: See 3.5. (line 1131)
5.943 +mask template character, f: See 3.5. (line 1125)
5.944 +mask template character, i: See 3.5. (line 1076)
5.945 +mask template character, n: See 3.5. (line 1091)
5.946 +mask template character, P: See 3.5. (line 1104)
5.947 +mask template character, p: See 3.5. (line 1096)
5.948 +mask template characters, table of: See 3.5. (line 1072)
5.949 +mask, binary: See 5. (line 1628)
5.950 +mask, filename template: See 3.5. (line 1045)
5.951 +mask, input files: See 5.1. (line 1640)
5.952 +mask, saving: See 3.5. (line 1042)
5.953 +mask, weight: See 5. (line 1628)
5.954 +masks, understanding: See 5. (line 1628)
5.955 +memory, tuning usage of: See 6. (line 1718)
5.956 +Mertens-Kautz-Van Reeth exposure fusion: See 1. (line 103)
5.957 +mode of operation (SDev, LoG, ...): See 4.4.4. (line 1555)
5.958 +multi-directory TIFF: See 1. (line 169)
5.959 +multi-layer image: See 1. (line 169)
5.960 +natural sharp-unsharp transition: See 7.6.6. (line 2340)
5.961 +noise reduction: See 7.2. (line 1880)
5.962 Octave: See Appendix A.
5.963 - (line 2584)
5.964 -OpenEXR, data format: See 3.3. (line 699)
5.965 -OpenEXR, half precision float: See 3.3. (line 703)
5.966 -option delimiters: See 3.6. (line 1130)
5.967 + (line 2431)
5.968 +OpenEXR, data format: See 3.3. (line 754)
5.969 +OpenEXR, half precision float: See 3.3. (line 758)
5.970 +option delimiters: See 3.6. (line 1149)
5.971 option index:
5.972 - See ``Option Index''. (line 3231)
5.973 -options, common: See 3.2. (line 438)
5.974 -options, expert: See 3.5. (line 806)
5.975 -options, extended: See 3.3. (line 610)
5.976 -options, fusion: See 3.4. (line 747)
5.977 -output file compression: See 3.2. (line 441)
5.978 -output filename, default: See 3.2. (line 513)
5.979 -output image, set size of: See 3.3. (line 713)
5.980 -overview: See 1. (line 100)
5.981 -packbits compression: See 3.2. (line 466)
5.982 -parallax error: See 2. (line 253)
5.983 -photometric alignment: See 2. (line 245)
5.984 -pixels, hot: See 7.6.6. (line 2478)
5.985 -polarization series: See 7.5. (line 2101)
5.986 -probability function: See 4.4.1.1. (line 1430)
5.987 + See ``Option Index''. (line 3088)
5.988 +options, common: See 3.2. (line 493)
5.989 +options, expert: See 3.5. (line 861)
5.990 +options, extended: See 3.3. (line 665)
5.991 +options, fusion: See 3.4. (line 802)
5.992 +order, of processing: See 3.1. (line 300)
5.993 +output file compression: See 3.2. (line 496)
5.994 +output filename, default: See 3.2. (line 568)
5.995 +output image, set size of: See 3.3. (line 768)
5.996 +overview: See 1. (line 103)
5.997 +packbits compression: See 3.2. (line 521)
5.998 +parallax error: See 2. (line 256)
5.999 +photometric alignment: See 2. (line 248)
5.1000 +pixels, hot: See 7.6.6. (line 2325)
5.1001 +polarization series: See 7.5. (line 2012)
5.1002 +probability function: See 4.4.1.1. (line 1413)
5.1003 problem reports: See Appendix A.
5.1004 - (line 2587)
5.1005 -problem, local contrast: See 7.6.5.1. (line 2236)
5.1006 -profile, ICC: See 3.3. (line 627)
5.1007 + (line 2434)
5.1008 +problem, local contrast: See 7.6.5.1. (line 2147)
5.1009 +processing order: See 3.1. (line 300)
5.1010 +profile, ICC: See 3.3. (line 682)
5.1011 program index:
5.1012 - See ``Program Index''. (line 3190)
5.1013 -programs, helpful additional: See 8. (line 2500)
5.1014 -pyramid levels: See 3.2. (line 481)
5.1015 -raw conversion: See 2. (line 230)
5.1016 -response file <1>: See 3.1. (line 294)
5.1017 -response file: See 3. (line 287)
5.1018 -response file, force recognition of: See 3.1.1. (line 394)
5.1019 -response file, format: See 3.1.1. (line 343)
5.1020 -response file, grammar: See 3.1.1. (line 357)
5.1021 -response file, syntactic comment: See 3.1.2. (line 420)
5.1022 -saturation enhancement: See 7.5. (line 2101)
5.1023 -scaling of parameters: See 4.4.4. (line 1608)
5.1024 -sensor, use of clean: See 7.6.6. (line 2469)
5.1025 -series, exposure: See 7.3. (line 1991)
5.1026 -series, flash exposure: See 7.4. (line 2094)
5.1027 -series, polarization: See 7.5. (line 2101)
5.1028 -series, simple: See 7.2. (line 1969)
5.1029 -simple series: See 7.2. (line 1969)
5.1030 -single precision float, IEEE754: See 3.3. (line 679)
5.1031 + See ``Program Index''. (line 3038)
5.1032 +programs, helpful additional: See 8. (line 2347)
5.1033 +pyramid levels: See 3.2. (line 536)
5.1034 +raw conversion: See 2. (line 233)
5.1035 +response file <1>: See 3.1. (line 297)
5.1036 +response file: See 3. (line 290)
5.1037 +response file, comment (#): See 3.1.1. (line 347)
5.1038 +response file, force recognition of: See 3.1.1. (line 391)
5.1039 +response file, format: See 3.1.1. (line 347)
5.1040 +response file, grammar: See 3.1.1. (line 361)
5.1041 +response file, syntactic comment: See 3.1.2. (line 417)
5.1042 +saturation enhancement: See 7.5. (line 2012)
5.1043 +scaling of parameters: See 4.4.4. (line 1555)
5.1044 +sensor, use of clean: See 7.6.6. (line 2316)
5.1045 +series, exposure: See 7.3. (line 1902)
5.1046 +series, flash exposure: See 7.4. (line 2005)
5.1047 +series, polarization: See 7.5. (line 2012)
5.1048 +series, simple: See 7.2. (line 1880)
5.1049 +simple series: See 7.2. (line 1880)
5.1050 +single precision float, IEEE754: See 3.3. (line 734)
5.1051 SourceForge <1>: See Appendix A.
5.1052 - (line 2590)
5.1053 -SourceForge: See 1. (line 172)
5.1054 + (line 2437)
5.1055 +SourceForge: See 1. (line 175)
5.1056 SourceForge, tracker: See Appendix A.
5.1057 - (line 2590)
5.1058 -sRGB color space: See 3.3. (line 627)
5.1059 -standard deviation: See 4.4.1.1. (line 1439)
5.1060 -statistical moments: See 4.4.1.1. (line 1430)
5.1061 -subtraction of dark frame: See 7.6.6. (line 2478)
5.1062 -sweet spot aperture: See 7.6.1. (line 2138)
5.1063 -syntactic comment, grammar: See 3.1.2. (line 430)
5.1064 -syntactic comment, response file: See 3.1.2. (line 420)
5.1065 -TIFF, multi-directory: See 1. (line 166)
5.1066 -tiffcopy: See 1. (line 166)
5.1067 -tiffsplit: See 1. (line 166)
5.1068 -tips, focus stacking experts: See 7.6.6. (line 2466)
5.1069 -TMPDIR: See 6. (line 1821)
5.1070 + (line 2437)
5.1071 +sRGB color space: See 3.3. (line 682)
5.1072 +standard deviation: See 4.4.1.1. (line 1422)
5.1073 +statistical moments: See 4.4.1.1. (line 1413)
5.1074 +subtraction of dark frame: See 7.6.6. (line 2325)
5.1075 +sweet spot aperture: See 7.6.1. (line 2049)
5.1076 +syntactic comment, grammar: See 3.1.2. (line 429)
5.1077 +syntactic comment, response file: See 3.1.2. (line 417)
5.1078 +syntactic-comment index:
5.1079 + See ``Syntactic-Comment Index''. (line 3079)
5.1080 +TIFF, multi-directory: See 1. (line 169)
5.1081 +tiffcopy: See 1. (line 169)
5.1082 +tiffsplit: See 1. (line 169)
5.1083 +tips, focus stacking experts: See 7.6.6. (line 2313)
5.1084 +TMPDIR: See 6. (line 1732)
5.1085 tracker, SourceForge: See Appendix A.
5.1086 - (line 2590)
5.1087 -transformation, affine: See 2. (line 243)
5.1088 -transition, natural sharp-unsharp: See 7.6.6. (line 2493)
5.1089 -understanding masks: See 5. (line 1717)
5.1090 -variance: See 4.4.1.1. (line 1436)
5.1091 -weight mask: See 5. (line 1717)
5.1092 -weight, entropy: See 3.4. (line 758)
5.1093 -weight, exposure: See 3.4. (line 766)
5.1094 -weight, local contrast: See 3.4. (line 751)
5.1095 -weighted average: See 4.1.1. (line 1218)
5.1096 -weighting functions: See 4. (line 1177)
5.1097 -weighting, contrast using a blend of methods: See 4.4.3. (line 1566)
5.1098 -weighting, contrast using laplacian-of-gaussian:See 4.4.2. (line 1468)
5.1099 -weighting, contrast using standard deviation: See 4.4.1. (line 1399)
5.1100 -weighting, exposure <1>: See 4.2. (line 1250)
5.1101 -weighting, exposure: See 1. (line 124)
5.1102 -weighting, general concept of: See 4.1. (line 1184)
5.1103 -weighting, local contrast <1>: See 4.4. (line 1375)
5.1104 -weighting, local contrast: See 1. (line 133)
5.1105 -weighting, local entropy <1>: See 4.5. (line 1622)
5.1106 -weighting, local entropy: See 1. (line 138)
5.1107 -weighting, saturation <1>: See 4.3. (line 1340)
5.1108 -weighting, saturation: See 1. (line 129)
5.1109 -window, local-analysis: See 4.4.1. (line 1399)
5.1110 -workflow: See 2. (line 195)
5.1111 -workflow with Enblend: See 2. (line 206)
5.1112 -workflow with Enfuse: See 2. (line 206)
5.1113 -wrap around: See 3.2. (line 560)
5.1114 + (line 2437)
5.1115 +transformation, affine: See 2. (line 246)
5.1116 +transition, natural sharp-unsharp: See 7.6.6. (line 2340)
5.1117 +understanding masks: See 5. (line 1628)
5.1118 +variance: See 4.4.1.1. (line 1419)
5.1119 +weight mask: See 5. (line 1628)
5.1120 +weight, entropy: See 3.4. (line 813)
5.1121 +weight, exposure: See 3.4. (line 821)
5.1122 +weight, local contrast: See 3.4. (line 806)
5.1123 +weighted average: See 4.1.1. (line 1237)
5.1124 +weighting functions: See 4. (line 1196)
5.1125 +weighting, contrast using a blend of methods: See 4.4.3. (line 1513)
5.1126 +weighting, contrast using laplacian-of-gaussian:See 4.4.2. (line 1451)
5.1127 +weighting, contrast using standard deviation: See 4.4.1. (line 1382)
5.1128 +weighting, exposure <1>: See 4.2. (line 1269)
5.1129 +weighting, exposure: See 1. (line 127)
5.1130 +weighting, general concept of: See 4.1. (line 1203)
5.1131 +weighting, local contrast <1>: See 4.4. (line 1358)
5.1132 +weighting, local contrast: See 1. (line 136)
5.1133 +weighting, local entropy <1>: See 4.5. (line 1569)
5.1134 +weighting, local entropy: See 1. (line 141)
5.1135 +weighting, saturation <1>: See 4.3. (line 1323)
5.1136 +weighting, saturation: See 1. (line 132)
5.1137 +window, local-analysis: See 4.4.1. (line 1382)
5.1138 +workflow: See 2. (line 198)
5.1139 +workflow with Enblend: See 2. (line 209)
5.1140 +workflow with Enfuse: See 2. (line 209)
5.1141 +wrap around: See 3.2. (line 615)
6.1 --- a/doc/enfuse.texi Mon Nov 09 11:10:46 2009 +0100
6.2 +++ b/doc/enfuse.texi Mon Nov 09 14:14:33 2009 +0100
6.3 @@ -17,6 +17,8 @@
6.4 @set default-image-cache-cachesize 1024@dmn{MB}
6.5 @set default-image-cache-blocksize 2048@dmn{KB}
6.6
6.7 +@c Define a new index for syntactic comments.
6.8 +@defcodeindex sc
6.9 @c Define a new index for options.
6.10 @defcodeindex op
6.11 @c %**end of header
6.12 @@ -126,6 +128,7 @@
6.13 * List of Tables:: List of all tables
6.14 * List of Figures:: List of all figures
6.15 * Program Index:: Names of programs referenced
6.16 +* Syntactic-Comment Index:: Keys of syntactic comments
6.17 * Option Index:: Index of all options
6.18 * General Index:: Topic index
6.19
6.20 @@ -4303,6 +4306,14 @@
6.21 @printindex pg
6.22
6.23
6.24 +@node Syntactic-Comment Index
6.25 +@unnumbered Syntactic-Comment Index
6.26 +@cindex syntactic-comment index
6.27 +@cindex index, syntactic-comment
6.28 +
6.29 +@printindex sc
6.30 +
6.31 +
6.32 @node Option Index
6.33 @unnumbered Option Index
6.34 @cindex option index
7.1 --- a/doc/filespec.texi Mon Nov 09 11:10:46 2009 +0100
7.2 +++ b/doc/filespec.texi Mon Nov 09 14:14:33 2009 +0100
7.3 @@ -1,12 +1,16 @@
7.4 +@cindex @samp{@@} (response file prefix)
7.5 A response file contains names of images or other response filenames.
7.6 Introduce response file names with an at-character (@samp{@@}).
7.7
7.8 +@cindex processing order
7.9 +@cindex order, of processing
7.10 Enblend and Enfuse process the list @var{INPUT} strictly from left to
7.11 -right, expanding response files in depth-first order. The following
7.12 +right, expanding response files in depth-first order. (Multi-layer
7.13 +files are processed from first layer to the last.) The following
7.14 examples only show Enblend, but Enfuse works exactly the same.
7.15
7.16 @table @asis
7.17 -@item Solely literal filenames.
7.18 +@item Solely image filenames.
7.19 Example:
7.20 @example
7.21 enblend image-1.tif image-2.tif image-3.tif
7.22 @@ -66,6 +70,7 @@
7.23 @c @menu
7.24 @c * Response File Format:: Definition of the files' format
7.25 @c * Syntactic Comments:: Control interpretation of response files
7.26 +@c * Globbing Algorithms:: Various ways to glob filenames
7.27 @c @end menu
7.28
7.29 @c @node Response File Format
7.30 @@ -73,6 +78,8 @@
7.31 @cindex response file, format
7.32 @cindex format of response file
7.33
7.34 +@cindex @samp{#} (response file comment)
7.35 +@cindex response file, comment (@samp{#})
7.36 Response files contain one filename per line. Blank lines or lines
7.37 beginning with a sharp sign (@samp{#}) are ignored; the latter can
7.38 serve as comments. Filenames that begin with an at-character
7.39 @@ -117,18 +124,9 @@
7.40
7.41 @noindent
7.42 The above grammar might unpleasantly surprise the user in the
7.43 -some ways:
7.44 +some ways.
7.45
7.46 @table @asis
7.47 -@item Literal filenames
7.48 -Inside a response file all filenames are treated as literals. No
7.49 -filename globbing or filename expansion is performed. This is, for
7.50 -example, the line
7.51 -@example
7.52 -img_*.tif
7.53 -@end example
7.54 -stands for exactly one file, called @samp{img_*.tif}.
7.55 -
7.56 @item Whitespace trimmed at both line ends
7.57 For convenience, whitespace at the beginning and at the end of each
7.58 line is ignored. However, this implies that response files cannot
7.59 @@ -145,26 +143,29 @@
7.60 img-1.33ev.tif
7.61 img+0.67ev.tif
7.62 @end example
7.63 -only the first line contains a comment, whereas the second lines
7.64 +only the first line contains a comment, whereas the second line
7.65 includes none. Rather, it refers to a file called
7.66 @w{@samp{img-@/0.33ev.tif # "middle" EV}}.
7.67
7.68 @item Image filenames cannot start with @samp{@@}
7.69 -An at-sign always introduces a response file, even if the filename's
7.70 -extension hints towards an image.
7.71 +An at-sign invariably introduces a response file, even if the
7.72 +filename's extension hints towards an image.
7.73 @end table
7.74
7.75 @cindex response file, force recognition of
7.76 If Enblend or Enfuse do not recognize a response file, they will skip
7.77 the file and issue a warning. To force a file being recognized as a
7.78 -response file add one of the following syntactic comments (see below)
7.79 -to the @emph{first} line of the file.
7.80 +response file add one of the following syntactic comments to the
7.81 +@emph{first} line of the file.
7.82
7.83 @example
7.84 @group
7.85 -# response-file: true
7.86 -# enblend-response-file: true
7.87 -# enfuse-response-file: true
7.88 +@scindex response-file
7.89 +response-file: true
7.90 +@scindex enblend-response-file
7.91 +enblend-response-file: true
7.92 +@scindex enfuse-response-file
7.93 +enfuse-response-file: true
7.94 @end group
7.95 @end example
7.96
7.97 @@ -195,7 +196,10 @@
7.98
7.99 Comments that follow the format described in
7.100 @ref{Table:response-file-syntactic-comment} are treated as
7.101 -instructions how to interpret the rest of the response file.
7.102 +instructions how to interpret the rest of the response file. A
7.103 +syntactic comment is effective immediately and its effect persists to
7.104 +the end of the response file, unless another syntactic comment undoes
7.105 +it.
7.106
7.107 @float Table,Table:response-file-syntactic-comment
7.108 @multitable {@var{syntactic-comment}} {::=} {abcdefghijklmnopqrstuvwxyzabcdefghijklm}
7.109 @@ -219,3 +223,91 @@
7.110 @end float
7.111
7.112 Unknown syntactic comments are silently ignored.
7.113 +
7.114 +
7.115 +@c @node Globbing Algorithms
7.116 +@subsection Globbing Algorithms
7.117 +@cindex globbing algorithms
7.118 +@cindex algorithms, globbing
7.119 +
7.120 +The three equivalent syntactic keys
7.121 +@itemize
7.122 +@item
7.123 +@scindex glob
7.124 +@code{glob},
7.125 +@item
7.126 +@scindex globbing
7.127 +@code{globbing}, or
7.128 +@item
7.129 +@scindex filename-globbing
7.130 +@code{filename-globbing}
7.131 +@end itemize
7.132 +control the algorithm that Enblend or Enfuse use to glob filenames in
7.133 +response files.
7.134 +
7.135 +@cindex globbing algorithm @samp{literal}
7.136 +@cindex globbing algorithm @samp{wildcard}
7.137 +All versions of Enblend and Enfuse support at least two algorithms:
7.138 +@code{literal}, which is the default, and @code{wildcard}. See
7.139 +@ref{Table:globbing-algorithms} for a list of all possible globbing
7.140 +algorithms. To find out about the algorithms in your version of
7.141 +Enblend or Enfuse team up the options@tie{}@option{--version} and
7.142 +@option{--verbose}.
7.143 +
7.144 +@float Table,Table:globbing-algorithms
7.145 +@table @code
7.146 +@item literal
7.147 +@cindex globbing algorithm @samp{literal}
7.148 +Do not glob. Interpret all filenames in response files as literals.
7.149 +This is the default.
7.150 +
7.151 +Please keep in mind that whitespace at both ends of a line in a
7.152 +response file @emph{always} gets discarded.
7.153 +
7.154 +@item wildcard
7.155 +@cindex globbing algorithm @samp{wildcard}
7.156 +@cindex glob(7)
7.157 +Glob using the wildcard characters@tie{}@samp{?}, @samp{*}, @samp{[},
7.158 +and @samp{]}.
7.159 +
7.160 +The @acronym{W*N32} implementation only globs the filename part of a
7.161 +path, whereas all other implementations perform wildcard expansion in
7.162 +@emph{all} path components. Also see
7.163 +@uref{http://www.kernel.org/@/doc/@/man-pages/@/online/@/pages/@/man7/@/glob.7.html,
7.164 +glob(7)}.
7.165 +
7.166 +@item none
7.167 +@cindex globbing algorithm @samp{none}
7.168 +Alias for @code{literal}.
7.169 +
7.170 +@item shell
7.171 +@cindex globbing algorithm @samp{shell}
7.172 +The @code{shell} globbing algorithm works as @code{literal} does. In
7.173 +addition, it interprets the wildcard characters@tie{}@samp{@{},
7.174 +@samp{@}}, and @samp{~}. This makes the expansion process behave more
7.175 +like common @acronym{UN*X} shells.
7.176 +
7.177 +@item sh
7.178 +@cindex globbing algorithm @samp{sh}
7.179 +Alias for @code{shell}.
7.180 +@end table
7.181 +
7.182 +@caption{Globbing algorithms for the use in response files}
7.183 +@shortcaption{Globbing algorithms}
7.184 +
7.185 +@cindex globbing algorithms
7.186 +@cindex algorithms, globbing
7.187 +@end float
7.188 +
7.189 +Example:
7.190 +@example
7.191 +@group
7.192 +# Horizontal panorama
7.193 +# 15 images
7.194 +
7.195 +# filename-globbing: wildcard
7.196 +
7.197 +image_000[0-9].tif
7.198 +image_001[0-4].tif
7.199 +@end group
7.200 +@end example
8.1 --- a/src/enblend.cc Mon Nov 09 11:10:46 2009 +0100
8.2 +++ b/src/enblend.cc Mon Nov 09 14:14:33 2009 +0100
8.3 @@ -355,6 +355,15 @@
8.4 "Supported file extensions: " << vigra::impexListExtensions() << "\n\n";
8.5 }
8.6
8.7 + cout << "Supported following globbing algorithms:\n";
8.8 + const enblend::algorithm_list algos = enblend::known_globbing_algorithms();
8.9 + for (enblend::algorithm_list::const_iterator i = algos.begin(); i != algos.end(); ++i) {
8.10 + cout <<
8.11 + " " << i->first << "\n" <<
8.12 + " " << i->second << "\n";
8.13 + }
8.14 + cout << "\n";
8.15 +
8.16 if (Verbose >= VERBOSE_SIGNATURE_REPORTING) {
8.17 cout.flush();
8.18 std::wcout << sig.message() << L"\n\n";
8.19 @@ -380,6 +389,9 @@
8.20 "Usage: enblend [options] [--output=IMAGE] INPUT...\n" <<
8.21 "Blend INPUT images into a single IMAGE.\n" <<
8.22 "\n" <<
8.23 + "INPUT... are image filenames or response filenames. Response\n" <<
8.24 + "filenames start with an \"" << RESPONSE_FILE_PREFIX_CHAR << "\" character.\n"
8.25 + "\n" <<
8.26 "Common options:\n" <<
8.27 " -V, --version output version information and exit\n" <<
8.28 " -a pre-assemble non-overlapping images\n" <<
9.1 --- a/src/enfuse.cc Mon Nov 09 11:10:46 2009 +0100
9.2 +++ b/src/enfuse.cc Mon Nov 09 14:14:33 2009 +0100
9.3 @@ -306,6 +306,15 @@
9.4 "Supported file extensions: " << vigra::impexListExtensions() << "\n\n";
9.5 }
9.6
9.7 + cout << "Supported following globbing algorithms:\n";
9.8 + const enblend::algorithm_list algos = enblend::known_globbing_algorithms();
9.9 + for (enblend::algorithm_list::const_iterator i = algos.begin(); i != algos.end(); ++i) {
9.10 + cout <<
9.11 + " " << i->first << "\n" <<
9.12 + " " << i->second << "\n";
9.13 + }
9.14 + cout << "\n";
9.15 +
9.16 if (Verbose >= VERBOSE_SIGNATURE_REPORTING) {
9.17 cout.flush();
9.18 std::wcout << sig.message() << L"\n\n";
9.19 @@ -331,6 +340,9 @@
9.20 "Usage: enfuse [options] [--output=IMAGE] INPUT...\n" <<
9.21 "Fuse INPUT images into a single IMAGE.\n" <<
9.22 "\n" <<
9.23 + "INPUT... are image filenames or response filenames. Response\n" <<
9.24 + "filenames start with an \"" << RESPONSE_FILE_PREFIX_CHAR << "\" character.\n"
9.25 + "\n" <<
9.26 "Common options:\n" <<
9.27 " -V, --version output version information and exit\n" <<
9.28 " -h, --help print this help message and exit\n" <<
10.1 --- a/src/filespec.cc Mon Nov 09 11:10:46 2009 +0100
10.2 +++ b/src/filespec.cc Mon Nov 09 14:14:33 2009 +0100
10.3 @@ -19,6 +19,13 @@
10.4 */
10.5
10.6
10.7 +#include <glob.h>
10.8 +#include <unistd.h>
10.9 +
10.10 +#ifdef _WIN32
10.11 +#include <io.h>
10.12 +#endif
10.13 +
10.14 #include <cerrno>
10.15 #include <fstream>
10.16 #include <iomanip>
10.17 @@ -26,21 +33,6 @@
10.18 #include <list>
10.19 #include <map>
10.20
10.21 -//#define WANT_WILDCARD_GLOBBING
10.22 -
10.23 -#ifdef WANT_WILDCARD_GLOBBING
10.24 -#ifdef _WIN32
10.25 -// ...
10.26 -#else
10.27 -#include <glob.h>
10.28 -#include <unistd.h>
10.29 -#endif // _WIN32
10.30 -#endif // WANT_WILDCARD_GLOBBING
10.31 -
10.32 -#ifdef _WIN32
10.33 -#include <io.h>
10.34 -#endif
10.35 -
10.36 #include <boost/assign/list_of.hpp>
10.37
10.38 #include "vigra/imageinfo.hxx"
10.39 @@ -306,7 +298,6 @@
10.40 };
10.41
10.42
10.43 -#ifdef WANT_WILDCARD_GLOBBING
10.44 #ifdef _WIN32
10.45
10.46 class WildcardGlobbingAlgorithm: public AbstractGlobbingAlgorithm
10.47 @@ -403,7 +394,6 @@
10.48 };
10.49
10.50 #endif // _WIN32
10.51 -#endif // WANT_WILDCARD_GLOBBING
10.52
10.53
10.54 #define MAKE_ALGORITHM(m_algorithm_pointer) \
10.55 @@ -413,10 +403,6 @@
10.56 std::make_pair(true, m_algorithm_pointer)
10.57
10.58
10.59 -// List of algorithm name / algorithm description pairs
10.60 -typedef std::list<std::pair<std::string, std::string> > algorithm_list;
10.61 -
10.62 -
10.63 class Globbing
10.64 {
10.65 // Map from the names of the algorithms or aliases to the
10.66 @@ -431,12 +417,10 @@
10.67 installed_algorithms_ =
10.68 boost::assign::map_list_of
10.69 ("literal", MAKE_ALGORITHM(new LiteralGlobbingAlgorithm))
10.70 -#ifdef WANT_WILDCARD_GLOBBING
10.71 ("wildcard", MAKE_ALGORITHM(new WildcardGlobbingAlgorithm))
10.72 #ifndef _WIN32
10.73 ("shell", MAKE_ALGORITHM(new ShellGlobbingAlgorithm))
10.74 -#endif //_WIN32
10.75 -#endif //WAND_WILDCARD_GLOBBING
10.76 +#endif
10.77 ;
10.78
10.79 setup_alias("literal", "none");
10.80 @@ -521,7 +505,7 @@
10.81
10.82
10.83 algorithm_list
10.84 -known_algorithms()
10.85 +known_globbing_algorithms()
10.86 {
10.87 Globbing glob;
10.88 return glob.get_known_algorithms();
10.89 @@ -641,7 +625,9 @@
10.90 ++line_number;
10.91
10.92 const key_value_pair comment = get_syntactic_comment(buffer);
10.93 - if ((comment.first == "glob" || comment.first == "globbing") &&
10.94 + if ((comment.first == "glob" ||
10.95 + comment.first == "globbing" ||
10.96 + comment.first == "filename-globbing") &&
10.97 !comment.second.empty())
10.98 // We silently ignore all other keys or empty
10.99 // values with the right key.
11.1 --- a/src/filespec.h Mon Nov 09 11:10:46 2009 +0100
11.2 +++ b/src/filespec.h Mon Nov 09 14:14:33 2009 +0100
11.3 @@ -49,6 +49,14 @@
11.4
11.5 /** Answer whether we suspect filename is a response file. */
11.6 bool maybe_response_file(const std::string& filename);
11.7 +
11.8 +
11.9 + /** List of algorithm name / algorithm description pairs */
11.10 + typedef std::list<std::pair<std::string, std::string> > algorithm_list;
11.11 +
11.12 + /** Answer a list of all globbing algorithms including aliases
11.13 + * that are known, i.e., have been compiled in. */
11.14 + algorithm_list known_globbing_algorithms();
11.15 }
11.16
11.17 #endif /* __FILESPEC_H__ */