1.1 --- a/VERSION Sat Oct 31 15:17:47 2009 +0100
1.2 +++ b/VERSION Sat Oct 31 15:17:48 2009 +0100
1.3 @@ -1,1 +1,1 @@
1.4 -4.0-dd32463fe9de
1.5 +4.0-06c64ccdaae3
2.1 --- a/doc/enblend.info Sat Oct 31 15:17:47 2009 +0100
2.2 +++ b/doc/enblend.info Sat Oct 31 15:17:48 2009 +0100
2.3 @@ -99,7 +99,7 @@
2.4 *note Figure:photographic-workflow:: shows where Enblend and Enfuse sit
2.5 in this tool chain.
2.6
2.7 - Figure 2.1: Photographic workflow with Enblend and Enfuse.
2.8 +Figure 2.1: Photographic workflow with Enblend and Enfuse.
2.9
2.10 Take Images
2.11 Take _multiple_ images to form a panorama, an exposure series, a
3.1 --- a/doc/enfuse.info Sat Oct 31 15:17:47 2009 +0100
3.2 +++ b/doc/enfuse.info Sat Oct 31 15:17:48 2009 +0100
3.3 @@ -200,7 +200,7 @@
3.4 *note Figure:photographic-workflow:: shows where Enblend and Enfuse sit
3.5 in this tool chain.
3.6
3.7 - Figure 2.1: Photographic workflow with Enblend and Enfuse.
3.8 +Figure 2.1: Photographic workflow with Enblend and Enfuse.
3.9
3.10 Take Images
3.11 Take _multiple_ images to form a panorama, an exposure series, a
3.12 @@ -713,42 +713,6 @@
3.13 image (for example 255 or 65535). *note Figure:entropy-cutoff::
3.14 shows an example.
3.15
3.16 -
3.17 - +-----------+------------+-----------+------------+-----------+
3.18 - + + + + + +
3.19 - | : : : : |
3.20 - 1 ++......................................................####***
3.21 - | : : : : #**** |
3.22 - | : : : : *** |
3.23 - | : : : : *** |
3.24 - | : : : **** |
3.25 - 0.8 ++..............................................***..........++
3.26 - | : : : **** : |
3.27 - | : : : *** : |
3.28 - | : : : *** : |
3.29 - | : : :**** : |
3.30 - 0.6 ++..................................***......................++
3.31 - | : : ****: : |
3.32 - | : : *** : : |
3.33 - | : : *** : : |
3.34 - | : :**** : : |
3.35 - 0.4 ++......................***..................................++
3.36 - | : ****: : : |
3.37 - | : *** : : : |
3.38 - | : *** : : : |
3.39 - | : **** : : : |
3.40 - 0.2 ++..........***..............................................++
3.41 - | **** : : : |
3.42 - | *** : : : : |
3.43 - | *** : : : : |
3.44 - | **** : : : : |
3.45 - 0 ***#.................................................Y.******++
3.46 - | : EntropyCutoff(Y, Lower, Upper) ###### |
3.47 - + + + + + +
3.48 - +-----------+------------+-----------+------------+-----------+
3.49 - 0 0.2 0.4 0.6 0.8 1
3.50 - Y
3.51 -
3.52 Figure 3.1: Linear lightness Y in comparison with an
3.53 entropy-cutoff function for LOWER-CUTOFF = 5% and UPPER-CUTOFF =
3.54 90% which are rather extreme values.
3.55 @@ -1122,42 +1086,6 @@
3.56 defaults to 0.5 and Sigma defaults to 0.2. *note Figure:gaussian::
3.57 shows a Gaussian.
3.58
3.59 -
3.60 - 1 ++----------+------------+---*****---+------------+----------++
3.61 - + + + * * + Gaussian(Y) ****** +
3.62 - | ** ** |
3.63 - | ** ** |
3.64 - | * * |
3.65 - | * * |
3.66 - 0.8 ++ * * ++
3.67 - | * * |
3.68 - | * * |
3.69 - | * * |
3.70 - | * * |
3.71 - | * * |
3.72 - 0.6 ++ * * ++
3.73 - | * * |
3.74 - | * * |
3.75 - | * * |
3.76 - | * * |
3.77 - | ** ** |
3.78 - | * * |
3.79 - 0.4 ++ * * ++
3.80 - | * * |
3.81 - | * * |
3.82 - | ** ** |
3.83 - | * * |
3.84 - | ** ** |
3.85 - 0.2 ++ ** ** ++
3.86 - | ** ** |
3.87 - | * * |
3.88 - | ** ** |
3.89 - |*** ***|
3.90 - * + + + + *
3.91 - 0 ++----------+------------+-----------+------------+----------++
3.92 - 0 0.2 0.4 0.6 0.8 1
3.93 - Y
3.94 -
3.95 Figure 4.1: Gaussian function with the parameters MU = 0.5 and SIGMA =
3.96 0.2.
3.97
3.98 @@ -1251,7 +1179,7 @@
3.99 *note Figure:local-analysis-window:: shows two windows with different
3.100 sizes.
3.101
3.102 - Figure 4.2: Examples of local analysis windows for the sizes 3 and 5.
3.103 +Figure 4.2: Examples of local analysis windows for the sizes 3 and 5.
3.104 "C" marks the center where the pixel gets the weight. "N" are
3.105 neighboring pixels, which all contribute equally to the weight.
3.106
3.107 @@ -1340,42 +1268,6 @@
3.108 origin, which is why we can easily plot it in *note
3.109 Figure:laplacian-of-gaussian::, setting R = sqrt(x^2 + y^2).
3.110
3.111 -
3.112 - 1 ++--------------+---------------+---------------+--------------++
3.113 - + + ***** + +
3.114 - | : **** : ******* : |
3.115 - | : ** : *******: |
3.116 - 0 ++.....................**.......................*****************
3.117 - | : ** : : |
3.118 - | : * : : |
3.119 - | : ** : : |
3.120 - | : * : : |
3.121 - -1 ++...............**............................................++
3.122 - | :* : : |
3.123 - | * : : |
3.124 - | * : : |
3.125 - -2 ++.............*...............................................++
3.126 - | * : : : |
3.127 - | ** : : : |
3.128 - | * : : : |
3.129 - | * : : : |
3.130 - -3 ++.........*...................................................++
3.131 - | * : : : |
3.132 - | * : : : |
3.133 - | ** : : : |
3.134 - -4 ++......*......................................................++
3.135 - | * : : : |
3.136 - | * : : : |
3.137 - | * : : : |
3.138 - | ** : : : |
3.139 - -5 ***............................................................++
3.140 - | : : : |
3.141 - | : LaplacianOfGaussian(R, 0.5) ****** |
3.142 - + + + + +
3.143 - -6 ++--------------+---------------+---------------+--------------++
3.144 - 0 0.5 1 1.5 2
3.145 - R
3.146 -
3.147 Figure 4.3: Laplacian-of-Gaussian function for sigma = 0.5.
3.148
3.149 See also HIPR2: Laplacian of Gaussian
3.150 @@ -1484,42 +1376,6 @@
3.151 lim(p * log_a(1 / p), p -> 0) = 0.
3.152 *note Figure:entropy:: shows an entropy function.
3.153
3.154 -
3.155 - 1 ++----------+------------+-*********-+------------+----------++
3.156 - + + **** **** Entropy(p) ****** +
3.157 - | *** *** |
3.158 - | *** *** |
3.159 - | ** ** |
3.160 - | ** ** |
3.161 - 0.8 ++ ** ** ++
3.162 - | * * |
3.163 - | * * |
3.164 - | * * |
3.165 - | * * |
3.166 - | * * |
3.167 - 0.6 ++ * * ++
3.168 - | * * |
3.169 - | * * |
3.170 - | * * |
3.171 - | * * |
3.172 - | * * |
3.173 - | * * |
3.174 - 0.4 ++ * * ++
3.175 - | * * |
3.176 - | * * |
3.177 - | * * |
3.178 - | * * |
3.179 - | * * |
3.180 - 0.2 ++* *++
3.181 - | * *|
3.182 - |* *|
3.183 - |* *|
3.184 - | |
3.185 - + + + + + +
3.186 - 0 ++----------+------------+-----------+------------+----------++
3.187 - 0 0.2 0.4 0.6 0.8 1
3.188 - p
3.189 -
3.190 Figure 4.4: Entropy function H for an experiment with exactly two
3.191 outcomes.
3.192
3.193 @@ -2105,73 +1961,9 @@
3.194 Images *note Figure:sharp-edge:: and *note Figure:smooth-edge:: show
3.195 plots of the matrices `sharp_edge' and `smooth_edge'.
3.196
3.197 -
3.198 -
3.199 -
3.200 -
3.201 - sharp_edge ******
3.202 - 250 $$$$$$
3.203 - 200 %%%%%%
3.204 - 150 @@@@@@
3.205 - ### 100 &&&&&&
3.206 - ### # 50 ======
3.207 - ### #
3.208 - # ## #
3.209 - 300 ++ ### # #
3.210 - 250 |+ ## # #
3.211 - | ##### # #
3.212 - 200 |+ # # # # # #####
3.213 - | # # # # ## ########
3.214 - 100 |+ ## # ##*# ########### ############
3.215 - | # # -#* # ## ######## ## |
3.216 - 50 |+ ## ## -%%@** ###### ## ##### |
3.217 - | ## ## -@%%@@&&**## ######## ## |
3.218 - 0 ##### -#=&&&======####. ## ####---- |
3.219 - | ####+==&@@@@%%@@&** ########. ##.+ ---- 4
3.220 - | --- ==&@@ .%%$$%@@&* ## #####.... --+
3.221 - | -- ++=&&@ .%% %%@@& ==*###.. ##.. ..+ 3
3.222 - +--- =&.@%%%%@@&===.. #####..... ---
3.223 - 0 + -----=&&&& ======.... .| .. 2
3.224 - 1 ==&&@@@@&& = ......|. ---
3.225 - 2 --@-&-= +.. | ..- 1
3.226 - 3----- |+--
3.227 - 4- 0
3.228 -
3.229 Figure 7.1: 3D plot augmented by contour plot of the matrix
3.230 `sharp_edge'.
3.231
3.232 -
3.233 -
3.234 -
3.235 -
3.236 - smooth_edge ******
3.237 - 250 $$$$$$
3.238 - 200 %%%%%%
3.239 - 150 @@@@@@
3.240 - 100 &&&&&&
3.241 - 50 ======
3.242 - ########
3.243 - ######## ## |
3.244 - 300 ++ ######## ######### |
3.245 - 250 |+ ####### ######### ## |
3.246 - | ## ######## ######## |
3.247 - 200 |+ ######## ######## ## |
3.248 - | #### ######## ######### |
3.249 - 100 |+ ########################## |
3.250 - | ######### ######### | |
3.251 - 50 |+ ## ######### -==-----| |
3.252 - |######### ---+.. ==.+ &&-------- |
3.253 - 0 ## --- .===.... && |.+@@@ ---%%--- |
3.254 - | --++... ==. &&&....@@@ .%% -$$ 4
3.255 - | --- ===....&&& ..@@| ...%%%.. $$-+
3.256 - | -- ++.. ====. && .....@@. | %% ..$ 3
3.257 - +--- ==.......&& .. @@ .|.%%... $$-
3.258 - 0 + ---=-- &&......@@ .%% .$ 2
3.259 - 1 ---&&- +.. @@ ...%%%|. $$-
3.260 - 2 ---@@- +%% | ..$ 1
3.261 - 3--%-- |+$$
3.262 - 4- 0
3.263 -
3.264 Figure 7.2: 3D plot augmented by contour plot of the matrix
3.265 `smooth_edge'.
3.266
3.267 @@ -2292,7 +2084,7 @@
3.268 Figure *note Figure:focus-stacking-decision-tree:: helps the user to
3.269 arrive at a well-fused focus stack with as few steps as possible.
3.270
3.271 - Figure 7.3: Focus stacking decision tree.
3.272 +Figure 7.3: Focus stacking decision tree.
3.273
3.274 Always start with the default, contrast weighting with a local
3.275 contrast window. Only if seams appear as described in *note Advanced
3.276 @@ -3034,50 +2826,50 @@
3.277 Program Index
3.278 *************
3.279
3.280 -ale: See 8. (line 2363)
3.281 -align_image_stack (Hugin): See 8. (line 2370)
3.282 -cinepaint <1>: See 8. (line 2382)
3.283 +ale: See 8. (line 2155)
3.284 +align_image_stack (Hugin): See 8. (line 2162)
3.285 +cinepaint <1>: See 8. (line 2174)
3.286 cinepaint: See 3.2. (line 574)
3.287 -convert (ImageMagick): See 8. (line 2393)
3.288 -dcraw <1>: See 8. (line 2353)
3.289 +convert (ImageMagick): See 8. (line 2185)
3.290 +dcraw <1>: See 8. (line 2145)
3.291 dcraw: See 2. (line 203)
3.292 -display (ImageMagick): See 8. (line 2393)
3.293 -exiftool: See 8. (line 2421)
3.294 -exrdisplay (OpenEXR): See 8. (line 2399)
3.295 -fulla (Hugin): See 8. (line 2370)
3.296 -gimp <1>: See 8. (line 2389)
3.297 +display (ImageMagick): See 8. (line 2185)
3.298 +exiftool: See 8. (line 2213)
3.299 +exrdisplay (OpenEXR): See 8. (line 2191)
3.300 +fulla (Hugin): See 8. (line 2162)
3.301 +gimp <1>: See 8. (line 2181)
3.302 gimp <2>: See 3.2. (line 574)
3.303 gimp: See 2. (line 203)
3.304 -gm (GraphicsMagick): See 8. (line 2393)
3.305 -hugin <1>: See 8. (line 2367)
3.306 -hugin <2>: See 7.1. (line 1743)
3.307 +gm (GraphicsMagick): See 8. (line 2185)
3.308 +hugin <1>: See 8. (line 2159)
3.309 +hugin <2>: See 7.1. (line 1599)
3.310 hugin <3>: See 3.2. (line 565)
3.311 hugin: See 2. (line 203)
3.312 -identify (ImageMagick) <1>: See 8. (line 2393)
3.313 -identify (ImageMagick): See 5.1. (line 1582)
3.314 -montage (ImageMagick): See 8. (line 2393)
3.315 -nona (Hugin) <1>: See 8. (line 2370)
3.316 +identify (ImageMagick) <1>: See 8. (line 2185)
3.317 +identify (ImageMagick): See 5.1. (line 1438)
3.318 +montage (ImageMagick): See 8. (line 2185)
3.319 +nona (Hugin) <1>: See 8. (line 2162)
3.320 nona (Hugin): See 3.2. (line 565)
3.321 PanoTools: See 2. (line 203)
3.322 -pfshdrcalibrate (PFScalibration): See 8. (line 2402)
3.323 -pfsin (PFSTools): See 8. (line 2402)
3.324 -pfsout (PFSTools): See 8. (line 2402)
3.325 -pfstmo_* (PFStmo): See 8. (line 2402)
3.326 -pfsview (PFSTools): See 8. (line 2402)
3.327 -PTmender (PanoTools): See 8. (line 2375)
3.328 -PTOptimizer (PanoTools): See 8. (line 2375)
3.329 -tifficc (LittleCMS): See 8. (line 2425)
3.330 -tiffinfo (libtiff) <1>: See 8. (line 2417)
3.331 -tiffinfo (libtiff): See 5.1. (line 1582)
3.332 -ufraw <1>: See 8. (line 2356)
3.333 +pfshdrcalibrate (PFScalibration): See 8. (line 2194)
3.334 +pfsin (PFSTools): See 8. (line 2194)
3.335 +pfsout (PFSTools): See 8. (line 2194)
3.336 +pfstmo_* (PFStmo): See 8. (line 2194)
3.337 +pfsview (PFSTools): See 8. (line 2194)
3.338 +PTmender (PanoTools): See 8. (line 2167)
3.339 +PTOptimizer (PanoTools): See 8. (line 2167)
3.340 +tifficc (LittleCMS): See 8. (line 2217)
3.341 +tiffinfo (libtiff) <1>: See 8. (line 2209)
3.342 +tiffinfo (libtiff): See 5.1. (line 1438)
3.343 +ufraw <1>: See 8. (line 2148)
3.344 ufraw: See 2. (line 203)
3.345 -ufraw-batch: See 8. (line 2356)
3.346 +ufraw-batch: See 8. (line 2148)
3.347 Option Index
3.348 ************
3.349
3.350 --compression: See 3.1. (line 290)
3.351 --contrast-edge-scale: See 3.4. (line 679)
3.352 ---contrast-min-curvature: See 3.4. (line 852)
3.353 +--contrast-min-curvature: See 3.4. (line 816)
3.354 --contrast-weight: See 3.3. (line 600)
3.355 --contrast-window-size: See 3.4. (line 659)
3.356 --ContrastWindowSize (deprecated): See 3.4. (line 659)
3.357 @@ -3085,26 +2877,26 @@
3.358 --EdgeScale (deprecated): See 3.4. (line 679)
3.359 --entropy-cutoff: See 3.4. (line 700)
3.360 --entropy-weight: See 3.3. (line 607)
3.361 ---entropy-window-size: See 3.4. (line 765)
3.362 +--entropy-window-size: See 3.4. (line 729)
3.363 --EntropyCutoff (deprecated): See 3.4. (line 700)
3.364 ---EntropyWindowSize (deprecated): See 3.4. (line 765)
3.365 +--EntropyWindowSize (deprecated): See 3.4. (line 729)
3.366 --exposure-mu: See 3.3. (line 623)
3.367 --exposure-sigma: See 3.3. (line 633)
3.368 --exposure-weight: See 3.3. (line 615)
3.369 ---gray-projector: See 3.4. (line 781)
3.370 ---GrayProjector (deprecated): See 3.4. (line 781)
3.371 ---hard-mask <1>: See 7.6.6. (line 2331)
3.372 ---hard-mask <2>: See 4.1.2. (line 1079)
3.373 ---hard-mask: See 3.4. (line 838)
3.374 ---HardMask (deprecated): See 3.4. (line 838)
3.375 +--gray-projector: See 3.4. (line 745)
3.376 +--GrayProjector (deprecated): See 3.4. (line 745)
3.377 +--hard-mask <1>: See 7.6.6. (line 2123)
3.378 +--hard-mask <2>: See 4.1.2. (line 1043)
3.379 +--hard-mask: See 3.4. (line 802)
3.380 +--HardMask (deprecated): See 3.4. (line 802)
3.381 --help: See 3.1. (line 327)
3.382 ---MinCurvature (deprecated): See 3.4. (line 852)
3.383 +--MinCurvature (deprecated): See 3.4. (line 816)
3.384 --output: See 3.1. (line 360)
3.385 --saturation-weight: See 3.3. (line 644)
3.386 ---save-masks: See 3.4. (line 870)
3.387 ---SaveMasks (deprecated): See 3.4. (line 870)
3.388 ---soft-mask: See 3.4. (line 898)
3.389 ---SoftMask (deprecated): See 3.4. (line 898)
3.390 +--save-masks: See 3.4. (line 834)
3.391 +--SaveMasks (deprecated): See 3.4. (line 834)
3.392 +--soft-mask: See 3.4. (line 862)
3.393 +--SoftMask (deprecated): See 3.4. (line 862)
3.394 --verbose: See 3.1. (line 367)
3.395 --version: See 3.1. (line 402)
3.396 --wContrast (deprecated): See 3.3. (line 600)
3.397 @@ -3113,7 +2905,7 @@
3.398 --wExposureSigma (deprecated): See 3.3. (line 633)
3.399 --wrap: See 3.1. (line 409)
3.400 --wSaturation (deprecated): See 3.3. (line 644)
3.401 --b <1>: See 6. (line 1656)
3.402 +-b <1>: See 6. (line 1512)
3.403 -b: See 3.2. (line 463)
3.404 -c: See 3.2. (line 474)
3.405 -d: See 3.2. (line 485)
3.406 @@ -3121,7 +2913,7 @@
3.407 -g: See 3.2. (line 570)
3.408 -h: See 3.1. (line 327)
3.409 -l: See 3.1. (line 330)
3.410 --m <1>: See 6. (line 1656)
3.411 +-m <1>: See 6. (line 1512)
3.412 -m: See 3.2. (line 582)
3.413 -o: See 3.1. (line 360)
3.414 -V: See 3.1. (line 402)
3.415 @@ -3132,31 +2924,31 @@
3.416
3.417 360o panoramas: See 3.1. (line 409)
3.418 a.tif: See 3.1. (line 362)
3.419 -advanced focus stacking: See 7.6.5. (line 2078)
3.420 +advanced focus stacking: See 7.6.5. (line 1934)
3.421 advanced focus stacking, recognizing faint edges:See 7.6.5.4.
3.422 - (line 2236)
3.423 -advanced focus stacking, suppressing noise: See 7.6.5.4. (line 2236)
3.424 + (line 2028)
3.425 +advanced focus stacking, suppressing noise: See 7.6.5.4. (line 2028)
3.426 affine transformation: See 2. (line 240)
3.427 alpha channel <1>: See 2. (line 261)
3.428 alpha channel: See 1. (line 155)
3.429 alpha channel, associated: See 3.2. (line 570)
3.430 -aperture, sweet spot: See 7.6.1. (line 1987)
3.431 -applications of enfuse: See 7. (line 1729)
3.432 +aperture, sweet spot: See 7.6.1. (line 1843)
3.433 +applications of enfuse: See 7. (line 1585)
3.434 authors, list of: See Appendix B.
3.435 - (line 2580)
3.436 -average, disabling: See 4.1.2. (line 1079)
3.437 -average, weighted: See 4.1.1. (line 1067)
3.438 -basic focus stacking: See 7.6.4. (line 2050)
3.439 -binary mask: See 5. (line 1566)
3.440 + (line 2372)
3.441 +average, disabling: See 4.1.2. (line 1043)
3.442 +average, weighted: See 4.1.1. (line 1031)
3.443 +basic focus stacking: See 7.6.4. (line 1906)
3.444 +binary mask: See 5. (line 1422)
3.445 bits per channel: See 3.2. (line 485)
3.446 -blending exposures: See 7.3.2. (line 1905)
3.447 +blending exposures: See 7.3.2. (line 1761)
3.448 bug reports: See Appendix A.
3.449 - (line 2433)
3.450 + (line 2225)
3.451 Burt-Adelson multiresolution spline: See 1. (line 112)
3.452 channel width: See 3.2. (line 485)
3.453 channel, alpha: See 1. (line 155)
3.454 CIECAM02: See 3.2. (line 474)
3.455 -circle-of-confusion: See 7.6.1. (line 1975)
3.456 +circle-of-confusion: See 7.6.1. (line 1831)
3.457 color appearance model: See 3.2. (line 474)
3.458 color space, sRGB: See 3.2. (line 476)
3.459 compression: See 3.1. (line 290)
3.460 @@ -3164,127 +2956,127 @@
3.461 compression, JPEG: See 3.1. (line 296)
3.462 compression, LZW: See 3.1. (line 311)
3.463 compression, packbits: See 3.1. (line 315)
3.464 -contrast enhancement, local: See 7.6.5.3. (line 2215)
3.465 -contrast weighting using a blend of methods: See 4.4.3. (line 1415)
3.466 -contrast weighting using laplacian-of-gaussian:See 4.4.2. (line 1317)
3.467 -contrast weighting using standard deviation: See 4.4.1. (line 1248)
3.468 -conversion, L*a*b*: See 3.4. (line 812)
3.469 +contrast enhancement, local: See 7.6.5.3. (line 2007)
3.470 +contrast weighting using a blend of methods: See 4.4.3. (line 1307)
3.471 +contrast weighting using laplacian-of-gaussian:See 4.4.2. (line 1245)
3.472 +contrast weighting using standard deviation: See 4.4.1. (line 1176)
3.473 +conversion, L*a*b*: See 3.4. (line 776)
3.474 conversion, raw: See 2. (line 227)
3.475 -dark frame: See 7.6.6. (line 2327)
3.476 -decision tree, focus stacking: See 7.6.5.5. (line 2292)
3.477 +dark frame: See 7.6.6. (line 2119)
3.478 +decision tree, focus stacking: See 7.6.5.5. (line 2084)
3.479 default output filename: See 3.1. (line 362)
3.480 deflate compression: See 3.1. (line 305)
3.481 -delimiters, option: See 3.5. (line 979)
3.482 -depth-of-field: See 7.6.1. (line 1978)
3.483 -depth-of-focus increase: See 7.6. (line 1959)
3.484 -digital blending: See 7.3.2. (line 1905)
3.485 -disabling average: See 4.1.2. (line 1079)
3.486 +delimiters, option: See 3.5. (line 943)
3.487 +depth-of-field: See 7.6.1. (line 1834)
3.488 +depth-of-focus increase: See 7.6. (line 1815)
3.489 +digital blending: See 7.3.2. (line 1761)
3.490 +disabling average: See 4.1.2. (line 1043)
3.491 double precision float, IEEE754: See 3.2. (line 537)
3.492 -dynamic range increase <1>: See 7.4. (line 1943)
3.493 -dynamic range increase: See 7.3. (line 1840)
3.494 -edge detection, laplacian: See 7.6.5.2. (line 2195)
3.495 -entropy: See 4.5. (line 1476)
3.496 -entropy, definition: See 4.5. (line 1473)
3.497 -estimators: See 4.4.1.2. (line 1298)
3.498 -expectation value: See 4.4.1.1. (line 1282)
3.499 -expert focus stacking tips: See 7.6.6. (line 2315)
3.500 -exposure series: See 7.3. (line 1840)
3.501 -exposure series, common misconceptions: See 7.3.2. (line 1902)
3.502 -exposure series, tips for beginners: See 7.3.1. (line 1878)
3.503 -filename template: See 3.4. (line 875)
3.504 -flash exposure series: See 7.4. (line 1943)
3.505 -focus stacking decision tree: See 7.6.5.5. (line 2292)
3.506 -focus stacking, advanced: See 7.6.5. (line 2078)
3.507 -focus stacking, basic: See 7.6.4. (line 2050)
3.508 -focus stacks: See 7.6. (line 1959)
3.509 -focus stacks, fusing: See 7.6.3. (line 2012)
3.510 -focus stacks, preparation: See 7.6.2. (line 1998)
3.511 -focus stacks, why create them: See 7.6.1. (line 1969)
3.512 +dynamic range increase <1>: See 7.4. (line 1799)
3.513 +dynamic range increase: See 7.3. (line 1696)
3.514 +edge detection, laplacian: See 7.6.5.2. (line 1987)
3.515 +entropy: See 4.5. (line 1368)
3.516 +entropy, definition: See 4.5. (line 1365)
3.517 +estimators: See 4.4.1.2. (line 1226)
3.518 +expectation value: See 4.4.1.1. (line 1210)
3.519 +expert focus stacking tips: See 7.6.6. (line 2107)
3.520 +exposure series: See 7.3. (line 1696)
3.521 +exposure series, common misconceptions: See 7.3.2. (line 1758)
3.522 +exposure series, tips for beginners: See 7.3.1. (line 1734)
3.523 +filename template: See 3.4. (line 839)
3.524 +flash exposure series: See 7.4. (line 1799)
3.525 +focus stacking decision tree: See 7.6.5.5. (line 2084)
3.526 +focus stacking, advanced: See 7.6.5. (line 1934)
3.527 +focus stacking, basic: See 7.6.4. (line 1906)
3.528 +focus stacks: See 7.6. (line 1815)
3.529 +focus stacks, fusing: See 7.6.3. (line 1868)
3.530 +focus stacks, preparation: See 7.6.2. (line 1854)
3.531 +focus stacks, why create them: See 7.6.1. (line 1825)
3.532 free documentation license (FDL): See Appendix C.
3.533 - (line 2619)
3.534 -fusing, local-contrast-based: See 7.6.3. (line 2012)
3.535 + (line 2411)
3.536 +fusing, local-contrast-based: See 7.6.3. (line 1868)
3.537 general index:
3.538 - See ``General Index''. (line 3133)
3.539 + See ``General Index''. (line 2925)
3.540 GNU free documentation license: See Appendix C.
3.541 - (line 2619)
3.542 -gray projector: See 3.4. (line 781)
3.543 -gray projector, average: See 3.4. (line 792)
3.544 -gray projector, channel-mixer: See 3.4. (line 798)
3.545 -gray projector, l-star: See 3.4. (line 812)
3.546 -gray projector, lightness: See 3.4. (line 822)
3.547 -gray projector, luminance: See 3.4. (line 827)
3.548 -gray projector, value: See 3.4. (line 833)
3.549 + (line 2411)
3.550 +gray projector: See 3.4. (line 745)
3.551 +gray projector, average: See 3.4. (line 756)
3.552 +gray projector, channel-mixer: See 3.4. (line 762)
3.553 +gray projector, l-star: See 3.4. (line 776)
3.554 +gray projector, lightness: See 3.4. (line 786)
3.555 +gray projector, luminance: See 3.4. (line 791)
3.556 +gray projector, value: See 3.4. (line 797)
3.557 half precision float, OpenEXR: See 3.2. (line 552)
3.558 -helpful programs: See 8. (line 2349)
3.559 -hot pixels: See 7.6.6. (line 2327)
3.560 -Hugin: See A.2. (line 2523)
3.561 +helpful programs: See 8. (line 2141)
3.562 +hot pixels: See 7.6.6. (line 2119)
3.563 +Hugin: See A.2. (line 2315)
3.564 ICC profile: See 3.2. (line 476)
3.565 IEEE754 double precision float: See 3.2. (line 537)
3.566 IEEE754 single precision float: See 3.2. (line 528)
3.567 -image cache: See 6. (line 1659)
3.568 +image cache: See 6. (line 1515)
3.569 image cache, block size: See 3.2. (line 463)
3.570 image cache, cache size: See 3.2. (line 582)
3.571 -image cache, location: See 6. (line 1670)
3.572 +image cache, location: See 6. (line 1526)
3.573 image, multi-layer: See 1. (line 163)
3.574 -images, fusable: See 7.1. (line 1736)
3.575 +images, fusable: See 7.1. (line 1592)
3.576 index, general:
3.577 - See ``General Index''. (line 3133)
3.578 + See ``General Index''. (line 2925)
3.579 index, option:
3.580 - See ``Option Index''. (line 3078)
3.581 + See ``Option Index''. (line 2870)
3.582 index, program:
3.583 - See ``Program Index''. (line 3037)
3.584 -input mask: See 5.1. (line 1578)
3.585 + See ``Program Index''. (line 2829)
3.586 +input mask: See 5.1. (line 1434)
3.587 invocation: See 3. (line 280)
3.588 JPEG compression: See 3.1. (line 296)
3.589 -KImageFuser: See A.2. (line 2523)
3.590 -L*a*b* conversion: See 3.4. (line 812)
3.591 -laplacian edge detection: See 7.6.5.2. (line 2195)
3.592 -Laplacian of Gaussian (LoG): See 4.4.2. (line 1317)
3.593 +KImageFuser: See A.2. (line 2315)
3.594 +L*a*b* conversion: See 3.4. (line 776)
3.595 +laplacian edge detection: See 7.6.5.2. (line 1987)
3.596 +Laplacian of Gaussian (LoG): See 4.4.2. (line 1245)
3.597 lens distortion, correction of: See 2. (line 240)
3.598 levels, pyramid: See 3.1. (line 330)
3.599 -LibJPEG: See 8. (line 2406)
3.600 -LibPNG: See 8. (line 2409)
3.601 -LibTiff: See 8. (line 2413)
3.602 -light probe: See 7.3.2. (line 1924)
3.603 -local analysis window: See 4.4.1. (line 1248)
3.604 -local contrast enhancement: See 7.6.5.3. (line 2215)
3.605 -local contrast problem: See 7.6.5.1. (line 2085)
3.606 -local-contrast-based fusing: See 7.6.3. (line 2012)
3.607 +LibJPEG: See 8. (line 2198)
3.608 +LibPNG: See 8. (line 2201)
3.609 +LibTiff: See 8. (line 2205)
3.610 +light probe: See 7.3.2. (line 1780)
3.611 +local analysis window: See 4.4.1. (line 1176)
3.612 +local contrast enhancement: See 7.6.5.3. (line 2007)
3.613 +local contrast problem: See 7.6.5.1. (line 1941)
3.614 +local-contrast-based fusing: See 7.6.3. (line 1868)
3.615 LZW compression: See 3.1. (line 311)
3.616 -mask template character, %: See 3.4. (line 903)
3.617 -mask template character, B: See 3.4. (line 952)
3.618 -mask template character, b: See 3.4. (line 946)
3.619 -mask template character, D: See 3.4. (line 943)
3.620 -mask template character, d: See 3.4. (line 937)
3.621 -mask template character, E: See 3.4. (line 971)
3.622 -mask template character, e: See 3.4. (line 965)
3.623 -mask template character, F: See 3.4. (line 961)
3.624 -mask template character, f: See 3.4. (line 955)
3.625 -mask template character, i: See 3.4. (line 906)
3.626 -mask template character, n: See 3.4. (line 921)
3.627 -mask template character, P: See 3.4. (line 934)
3.628 -mask template character, p: See 3.4. (line 926)
3.629 -mask template characters, table of: See 3.4. (line 902)
3.630 -mask, binary: See 5. (line 1566)
3.631 -mask, filename template: See 3.4. (line 875)
3.632 -mask, input files: See 5.1. (line 1578)
3.633 -mask, saving: See 3.4. (line 872)
3.634 -mask, weight: See 5. (line 1566)
3.635 -masks, understanding: See 5. (line 1566)
3.636 -memory, tuning usage of: See 6. (line 1656)
3.637 +mask template character, %: See 3.4. (line 867)
3.638 +mask template character, B: See 3.4. (line 916)
3.639 +mask template character, b: See 3.4. (line 910)
3.640 +mask template character, D: See 3.4. (line 907)
3.641 +mask template character, d: See 3.4. (line 901)
3.642 +mask template character, E: See 3.4. (line 935)
3.643 +mask template character, e: See 3.4. (line 929)
3.644 +mask template character, F: See 3.4. (line 925)
3.645 +mask template character, f: See 3.4. (line 919)
3.646 +mask template character, i: See 3.4. (line 870)
3.647 +mask template character, n: See 3.4. (line 885)
3.648 +mask template character, P: See 3.4. (line 898)
3.649 +mask template character, p: See 3.4. (line 890)
3.650 +mask template characters, table of: See 3.4. (line 866)
3.651 +mask, binary: See 5. (line 1422)
3.652 +mask, filename template: See 3.4. (line 839)
3.653 +mask, input files: See 5.1. (line 1434)
3.654 +mask, saving: See 3.4. (line 836)
3.655 +mask, weight: See 5. (line 1422)
3.656 +masks, understanding: See 5. (line 1422)
3.657 +memory, tuning usage of: See 6. (line 1512)
3.658 Mertens-Kautz-Van Reeth exposure fusion: See 1. (line 97)
3.659 -mode of operation (SDev, LoG, ...): See 4.4.4. (line 1457)
3.660 +mode of operation (SDev, LoG, ...): See 4.4.4. (line 1349)
3.661 multi-directory TIFF: See 1. (line 163)
3.662 multi-layer image: See 1. (line 163)
3.663 -natural sharp-unsharp transition: See 7.6.6. (line 2342)
3.664 -noise reduction: See 7.2. (line 1818)
3.665 +natural sharp-unsharp transition: See 7.6.6. (line 2134)
3.666 +noise reduction: See 7.2. (line 1674)
3.667 Octave: See Appendix A.
3.668 - (line 2433)
3.669 + (line 2225)
3.670 OpenEXR, data format: See 3.2. (line 548)
3.671 OpenEXR, half precision float: See 3.2. (line 552)
3.672 -option delimiters: See 3.5. (line 979)
3.673 +option delimiters: See 3.5. (line 943)
3.674 option index:
3.675 - See ``Option Index''. (line 3078)
3.676 + See ``Option Index''. (line 2870)
3.677 options, common: See 3.1. (line 287)
3.678 options, expert: See 3.4. (line 655)
3.679 options, extended: See 3.2. (line 459)
3.680 @@ -3296,67 +3088,67 @@
3.681 packbits compression: See 3.1. (line 315)
3.682 parallax error: See 2. (line 250)
3.683 photometric alignment: See 2. (line 242)
3.684 -pixels, hot: See 7.6.6. (line 2327)
3.685 -polarization series: See 7.5. (line 1950)
3.686 -probability function: See 4.4.1.1. (line 1279)
3.687 +pixels, hot: See 7.6.6. (line 2119)
3.688 +polarization series: See 7.5. (line 1806)
3.689 +probability function: See 4.4.1.1. (line 1207)
3.690 problem reports: See Appendix A.
3.691 - (line 2436)
3.692 -problem, local contrast: See 7.6.5.1. (line 2085)
3.693 + (line 2228)
3.694 +problem, local contrast: See 7.6.5.1. (line 1941)
3.695 profile, ICC: See 3.2. (line 476)
3.696 program index:
3.697 - See ``Program Index''. (line 3037)
3.698 -programs, helpful additional: See 8. (line 2349)
3.699 + See ``Program Index''. (line 2829)
3.700 +programs, helpful additional: See 8. (line 2141)
3.701 pyramid levels: See 3.1. (line 330)
3.702 raw conversion: See 2. (line 227)
3.703 -saturation enhancement: See 7.5. (line 1950)
3.704 -scaling of parameters: See 4.4.4. (line 1457)
3.705 -sensor, use of clean: See 7.6.6. (line 2318)
3.706 -series, exposure: See 7.3. (line 1840)
3.707 -series, flash exposure: See 7.4. (line 1943)
3.708 -series, polarization: See 7.5. (line 1950)
3.709 -series, simple: See 7.2. (line 1818)
3.710 -simple series: See 7.2. (line 1818)
3.711 +saturation enhancement: See 7.5. (line 1806)
3.712 +scaling of parameters: See 4.4.4. (line 1349)
3.713 +sensor, use of clean: See 7.6.6. (line 2110)
3.714 +series, exposure: See 7.3. (line 1696)
3.715 +series, flash exposure: See 7.4. (line 1799)
3.716 +series, polarization: See 7.5. (line 1806)
3.717 +series, simple: See 7.2. (line 1674)
3.718 +simple series: See 7.2. (line 1674)
3.719 single precision float, IEEE754: See 3.2. (line 528)
3.720 SourceForge <1>: See Appendix A.
3.721 - (line 2439)
3.722 + (line 2231)
3.723 SourceForge: See 1. (line 169)
3.724 SourceForge, tracker: See Appendix A.
3.725 - (line 2439)
3.726 + (line 2231)
3.727 sRGB color space: See 3.2. (line 476)
3.728 -standard deviation: See 4.4.1.1. (line 1288)
3.729 -statistical moments: See 4.4.1.1. (line 1279)
3.730 -subtraction of dark frame: See 7.6.6. (line 2327)
3.731 -sweet spot aperture: See 7.6.1. (line 1987)
3.732 +standard deviation: See 4.4.1.1. (line 1216)
3.733 +statistical moments: See 4.4.1.1. (line 1207)
3.734 +subtraction of dark frame: See 7.6.6. (line 2119)
3.735 +sweet spot aperture: See 7.6.1. (line 1843)
3.736 TIFF, multi-directory: See 1. (line 163)
3.737 tiffcopy: See 1. (line 163)
3.738 tiffsplit: See 1. (line 163)
3.739 -tips, focus stacking experts: See 7.6.6. (line 2315)
3.740 -TMPDIR: See 6. (line 1670)
3.741 +tips, focus stacking experts: See 7.6.6. (line 2107)
3.742 +TMPDIR: See 6. (line 1526)
3.743 tracker, SourceForge: See Appendix A.
3.744 - (line 2439)
3.745 + (line 2231)
3.746 transformation, affine: See 2. (line 240)
3.747 -transition, natural sharp-unsharp: See 7.6.6. (line 2342)
3.748 -understanding masks: See 5. (line 1566)
3.749 -variance: See 4.4.1.1. (line 1285)
3.750 -weight mask: See 5. (line 1566)
3.751 +transition, natural sharp-unsharp: See 7.6.6. (line 2134)
3.752 +understanding masks: See 5. (line 1422)
3.753 +variance: See 4.4.1.1. (line 1213)
3.754 +weight mask: See 5. (line 1422)
3.755 weight, entropy: See 3.3. (line 607)
3.756 weight, exposure: See 3.3. (line 615)
3.757 weight, local contrast: See 3.3. (line 600)
3.758 -weighted average: See 4.1.1. (line 1067)
3.759 -weighting functions: See 4. (line 1026)
3.760 -weighting, contrast using a blend of methods: See 4.4.3. (line 1415)
3.761 -weighting, contrast using laplacian-of-gaussian:See 4.4.2. (line 1317)
3.762 -weighting, contrast using standard deviation: See 4.4.1. (line 1248)
3.763 -weighting, exposure <1>: See 4.2. (line 1099)
3.764 +weighted average: See 4.1.1. (line 1031)
3.765 +weighting functions: See 4. (line 990)
3.766 +weighting, contrast using a blend of methods: See 4.4.3. (line 1307)
3.767 +weighting, contrast using laplacian-of-gaussian:See 4.4.2. (line 1245)
3.768 +weighting, contrast using standard deviation: See 4.4.1. (line 1176)
3.769 +weighting, exposure <1>: See 4.2. (line 1063)
3.770 weighting, exposure: See 1. (line 121)
3.771 -weighting, general concept of: See 4.1. (line 1033)
3.772 -weighting, local contrast <1>: See 4.4. (line 1224)
3.773 +weighting, general concept of: See 4.1. (line 997)
3.774 +weighting, local contrast <1>: See 4.4. (line 1152)
3.775 weighting, local contrast: See 1. (line 130)
3.776 -weighting, local entropy <1>: See 4.5. (line 1471)
3.777 +weighting, local entropy <1>: See 4.5. (line 1363)
3.778 weighting, local entropy: See 1. (line 135)
3.779 -weighting, saturation <1>: See 4.3. (line 1189)
3.780 +weighting, saturation <1>: See 4.3. (line 1117)
3.781 weighting, saturation: See 1. (line 126)
3.782 -window, local-analysis: See 4.4.1. (line 1248)
3.783 +window, local-analysis: See 4.4.1. (line 1176)
3.784 workflow: See 2. (line 192)
3.785 workflow with Enblend: See 2. (line 203)
3.786 workflow with Enfuse: See 2. (line 203)
4.1 --- a/src/Makefile.am Sat Oct 31 15:17:47 2009 +0100
4.2 +++ b/src/Makefile.am Sat Oct 31 15:17:48 2009 +0100
4.3 @@ -12,7 +12,8 @@
4.4 float_cast.h global.h gpu.cc gpu.h mask.h \
4.5 nearest.h numerictraits.h openmp.h path.h pyramid.h \
4.6 filenameparse.h filenameparse.cc \
4.7 - self_test.h self_test.cc
4.8 + self_test.h self_test.cc \
4.9 + tiff_message.h tiff_message.cc
4.10 enblend_LDFLAGS = $(AM_LDFLAGS) $(OPENGL_CFLAGS)
4.11 enblend_LDADD = vigra_impex/libvigra_impex.a $(OPENGL_LIBS) @EXTRA_LIBS@
4.12 enblend_CXXFLAGS = $(AM_CXXFLAGS) $(OPENGL_CFLAGS) \
4.13 @@ -23,7 +24,8 @@
4.14 enfuse.h enfuse.cc fixmath.h float_cast.h \
4.15 global.h mga.h numerictraits.h openmp.h pyramid.h \
4.16 filenameparse.h filenameparse.cc \
4.17 - self_test.h self_test.cc
4.18 + self_test.h self_test.cc \
4.19 + tiff_message.h tiff_message.cc
4.20 enfuse_LDFLAGS = $(AM_LDFLAGS)
4.21 enfuse_LDADD = vigra_impex/libvigra_impex.a @EXTRA_LIBS@
4.22 enfuse_CXXFLAGS = $(AM_CXXFLAGS) \
5.1 --- a/src/enblend.cc Sat Oct 31 15:17:47 2009 +0100
5.2 +++ b/src/enblend.cc Sat Oct 31 15:17:48 2009 +0100
5.3 @@ -75,6 +75,7 @@
5.4 #include "global.h"
5.5 #include "signature.h"
5.6 #include "self_test.h"
5.7 +#include "tiff_message.h"
5.8
5.9 typedef struct {
5.10 unsigned int kmax; // maximum number of moves for a line segment
5.11 @@ -1257,10 +1258,8 @@
5.12
5.13 sig.initialize();
5.14
5.15 - // Make sure libtiff is compiled with TIF_PLATFORM_CONSOLE
5.16 - // to avoid interactive warning dialogs.
5.17 - //TIFFSetWarningHandler(NULL);
5.18 - //TIFFSetErrorHandler(NULL);
5.19 + TIFFSetWarningHandler(tiff_warning);
5.20 + TIFFSetErrorHandler(tiff_error);
5.21
5.22 // List of input files.
5.23 list<char*> inputFileNameList;
6.1 --- a/src/enfuse.cc Sat Oct 31 15:17:47 2009 +0100
6.2 +++ b/src/enfuse.cc Sat Oct 31 15:17:48 2009 +0100
6.3 @@ -75,6 +75,7 @@
6.4 #include "global.h"
6.5 #include "signature.h"
6.6 #include "self_test.h"
6.7 +#include "tiff_message.h"
6.8
6.9 // Globals
6.10 const std::string command("enfuse");
6.11 @@ -1341,10 +1342,8 @@
6.12
6.13 sig.initialize();
6.14
6.15 - // Make sure libtiff is compiled with TIF_PLATFORM_CONSOLE
6.16 - // to avoid interactive warning dialogs.
6.17 - //TIFFSetWarningHandler(NULL);
6.18 - //TIFFSetErrorHandler(NULL);
6.19 + TIFFSetWarningHandler(tiff_warning);
6.20 + TIFFSetErrorHandler(tiff_error);
6.21
6.22 // List of input files.
6.23 list<char*> inputFileNameList;
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/src/tiff_message.cc Sat Oct 31 15:17:48 2009 +0100
7.3 @@ -0,0 +1,93 @@
7.4 +/*
7.5 + * Copyright (C) 2009 Dr. Christoph L. Spiel
7.6 + *
7.7 + * This file is part of Enblend.
7.8 + *
7.9 + * Enblend is free software; you can redistribute it and/or modify
7.10 + * it under the terms of the GNU General Public License as published by
7.11 + * the Free Software Foundation; either version 2 of the License, or
7.12 + * (at your option) any later version.
7.13 + *
7.14 + * Enblend is distributed in the hope that it will be useful,
7.15 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
7.16 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7.17 + * GNU General Public License for more details.
7.18 + *
7.19 + * You should have received a copy of the GNU General Public License
7.20 + * along with Enblend; if not, write to the Free Software
7.21 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
7.22 + */
7.23 +
7.24 +
7.25 +#include <cstring>
7.26 +#include <iostream>
7.27 +#include <set>
7.28 +#include <string>
7.29 +
7.30 +#include <boost/scoped_ptr.hpp>
7.31 +
7.32 +#ifdef HAVE_CONFIG_H
7.33 +#include <config.h>
7.34 +#endif
7.35 +
7.36 +#include "tiff_message.h"
7.37 +
7.38 +
7.39 +extern const std::string command;
7.40 +
7.41 +std::set<std::string> tiff_messages;
7.42 +
7.43 +
7.44 +void
7.45 +flush_buffers()
7.46 +{
7.47 + fflush(stdout);
7.48 + std::cout.flush();
7.49 + std::wcout.flush();
7.50 +}
7.51 +
7.52 +
7.53 +/** tiff_message mangles the error and warning messages from the TIFF
7.54 + * library to make them look more like Enblend/Enfuse messages.
7.55 + *
7.56 + * For the messages tend to occur repeatedly, we keep track of every
7.57 + * message and only pass on their first appearance. The library
7.58 + * always includes the name of the offending TIFF file, thus we get
7.59 + * each message once for each file. */
7.60 +void
7.61 +tiff_message(const char* message_class,
7.62 + const char* /*module*/, const char* format, va_list arguments)
7.63 +{
7.64 + const size_t buffer_size = 4096;
7.65 + boost::scoped_ptr<char> buffer(new char[buffer_size]);
7.66 + vsnprintf(buffer.get(), buffer_size, format, arguments);
7.67 + const std::string message(buffer.get());
7.68 +
7.69 + if (tiff_messages.count(message) == 0)
7.70 + {
7.71 + tiff_messages.insert(message);
7.72 +
7.73 + // IMPLEMENTATION NOTE: We do not know, where we are called,
7.74 + // therefore we must flush all buffers before we print our
7.75 + // message.
7.76 + flush_buffers();
7.77 +
7.78 + std::cerr << command << ": " << message_class << ": " << message << std::endl;
7.79 + }
7.80 +}
7.81 +
7.82 +
7.83 +void
7.84 +tiff_warning(const char* module, const char* format, va_list arguments)
7.85 +{
7.86 + tiff_message("warning", module, format, arguments);
7.87 +}
7.88 +
7.89 +
7.90 +void
7.91 +tiff_error(const char* module, const char* format, va_list arguments)
7.92 +{
7.93 + tiff_message("error", module, format, arguments);
7.94 +}
7.95 +
7.96 +
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
8.2 +++ b/src/tiff_message.h Sat Oct 31 15:17:48 2009 +0100
8.3 @@ -0,0 +1,35 @@
8.4 +/*
8.5 + * Copyright (C) 2009 Dr. Christoph L. Spiel
8.6 + *
8.7 + * This file is part of Enblend.
8.8 + *
8.9 + * Enblend is free software; you can redistribute it and/or modify
8.10 + * it under the terms of the GNU General Public License as published by
8.11 + * the Free Software Foundation; either version 2 of the License, or
8.12 + * (at your option) any later version.
8.13 + *
8.14 + * Enblend is distributed in the hope that it will be useful,
8.15 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
8.16 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
8.17 + * GNU General Public License for more details.
8.18 + *
8.19 + * You should have received a copy of the GNU General Public License
8.20 + * along with Enblend; if not, write to the Free Software
8.21 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
8.22 + */
8.23 +#ifndef __TIFF_MESSAGE_H__
8.24 +#define __TIFF_MESSAGE_H__
8.25 +
8.26 +#include <stdarg.h>
8.27 +
8.28 +/** Function that intercepts warnings from the TIFF library */
8.29 +void tiff_warning(const char* module, const char* format, va_list arguments);
8.30 +
8.31 +/** Function that intercepts errors from the TIFF library */
8.32 +void tiff_error(const char* module, const char* format, va_list arguments);
8.33 +
8.34 +#endif /* __TIFF_MESSAGE_H__ */
8.35 +
8.36 +// Local Variables:
8.37 +// mode: c++
8.38 +// End: