diff -Nru macrofusion-0.7.2/CHANGELOG macrofusion-0.7.3/CHANGELOG --- macrofusion-0.7.2/CHANGELOG 2011-11-24 15:10:27.000000000 +0000 +++ macrofusion-0.7.3/CHANGELOG 2012-02-19 14:28:05.000000000 +0000 @@ -1,3 +1,9 @@ +0.7.3 (19.02.2012) + + * Bugfix: Proper opening/adding TIFF files + * pyexiv2 to read exif tags + * Russian translation (Alexandre Prokoudine, VictorR2007) + 0.7.2 (24.11.2011) * Read exif info from photos - bugfixes diff -Nru macrofusion-0.7.2/debian/changelog macrofusion-0.7.3/debian/changelog --- macrofusion-0.7.2/debian/changelog 2011-11-24 17:37:24.000000000 +0000 +++ macrofusion-0.7.3/debian/changelog 2012-02-19 15:21:38.000000000 +0000 @@ -1,3 +1,11 @@ +macrofusion (0.7.3-dhor1~all) all; urgency=low + + * Bugfix: Proper opening/adding TIFF files + * pyexiv2 to read exif tags + * Russian translation (Alexandre Prokoudine, VictorR2007) + + -- Dariusz Duma Sun, 19 Feb 2012 16:17:31 +0100 + macrofusion (0.7.2-dhor1~all) all; urgency=low * Read exif info from photos - bugfixes diff -Nru macrofusion-0.7.2/debian/control macrofusion-0.7.3/debian/control --- macrofusion-0.7.2/debian/control 2011-11-08 12:59:46.000000000 +0000 +++ macrofusion-0.7.3/debian/control 2012-02-19 15:20:26.000000000 +0000 @@ -10,7 +10,7 @@ Package: macrofusion Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-imaging, python-gtk2, libglade2-0, enfuse (>=4.0) +Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-imaging, python-gtk2, libglade2-0, python-glade2, python-pyexiv2, enfuse (>=4.0) Description: A GUI for Enfuse Program useful for fusion images/photos to get deeper DOF (Deep of Field) or more DR (Dynamic Range). diff -Nru macrofusion-0.7.2/.git/COMMIT_EDITMSG macrofusion-0.7.3/.git/COMMIT_EDITMSG --- macrofusion-0.7.2/.git/COMMIT_EDITMSG 2011-11-17 12:11:12.000000000 +0000 +++ macrofusion-0.7.3/.git/COMMIT_EDITMSG 2012-02-19 14:31:50.000000000 +0000 @@ -1 +1,19 @@ -Small fix. +Up to 0.7.3 + +# Please enter the commit message for your changes. Lines starting +# with '#' will be ignored, and an empty message aborts the commit. +# +# Committer: Dariusz Duma +# +# On branch master +# Your branch is ahead of 'origin/master' by 1 commit. +# +# Changes to be committed: +# (use "git reset HEAD^1 ..." to unstage) +# +# modified: CHANGELOG +# modified: README +# new file: locale/ru/LC_MESSAGES/MacroFusion.mo +# new file: locale/ru/LC_MESSAGES/MacroFusion.po +# modified: macrofusion.py +# diff -Nru macrofusion-0.7.2/.git/config macrofusion-0.7.3/.git/config --- macrofusion-0.7.2/.git/config 2011-11-12 05:30:42.000000000 +0000 +++ macrofusion-0.7.3/.git/config 2012-02-19 12:44:21.000000000 +0000 @@ -3,7 +3,9 @@ filemode = true bare = false logallrefupdates = true -[branch "master"] [remote "origin"] - url = ssh://salvadh0r@git.code.sf.net:22/p/macrofusion/code fetch = +refs/heads/*:refs/remotes/origin/* + url = ssh://salvadh0r@git.code.sf.net/p/macrofusion/code +[branch "master"] + remote = origin + merge = refs/heads/master Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/index and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/index differ diff -Nru macrofusion-0.7.2/.git/logs/HEAD macrofusion-0.7.3/.git/logs/HEAD --- macrofusion-0.7.2/.git/logs/HEAD 2011-11-17 12:11:12.000000000 +0000 +++ macrofusion-0.7.3/.git/logs/HEAD 2012-02-19 14:31:51.000000000 +0000 @@ -1,9 +1,3 @@ -0000000000000000000000000000000000000000 d83f8eb66841f08966cea2257f8b75ccb787935c salvadh0r 1321075561 +0100 commit (initial): new file: CHANGELOG -d83f8eb66841f08966cea2257f8b75ccb787935c a10a6c2fdc1e3170fc20404e78fddeaf0cc8b08a salvadh0r 1321076361 +0100 commit: Some typos -a10a6c2fdc1e3170fc20404e78fddeaf0cc8b08a 858ff7b8509cfc6bceb8ce871b77bbbe4453ef5e salvadh0r 1321210686 +0100 commit: Auto align images -858ff7b8509cfc6bceb8ce871b77bbbe4453ef5e 643f4cca694cd4c114abf47301113fd5bc195ac5 salvadh0r 1321210710 +0100 commit: Some UI changes -643f4cca694cd4c114abf47301113fd5bc195ac5 00765a7aad5ec28299bfd625ea9ee27e138d4cae salvadh0r 1321210744 +0100 commit: Translation -00765a7aad5ec28299bfd625ea9ee27e138d4cae 3a5e6040ab1da06afb21ae6a965697926bd641a7 salvadh0r 1321210775 +0100 commit: Some new strings -3a5e6040ab1da06afb21ae6a965697926bd641a7 b59413564a6395a1ef86adf4d0099ab199e10a11 salvadh0r 1321530793 +0100 commit: Update to 0.7 version -b59413564a6395a1ef86adf4d0099ab199e10a11 99b2e7ab9d5c8c67e2c7849bb9d181d9277cb480 salvadh0r 1321531203 +0100 commit: Some info added. -99b2e7ab9d5c8c67e2c7849bb9d181d9277cb480 7c1174b676c84c8bf7ad7163c0c3b463f09f6f2a salvadh0r 1321531872 +0100 commit: Small fix. +0000000000000000000000000000000000000000 41cf29a7ac5b698f19763a0692f082fb575a3f10 dhor 1329655461 +0100 clone: from ssh://salvadh0r@git.code.sf.net/p/macrofusion/code +41cf29a7ac5b698f19763a0692f082fb575a3f10 90be708f108881aa7970168545360df29a4e3794 dhor 1329661771 +0100 commit: Up to 0.7.3 +90be708f108881aa7970168545360df29a4e3794 ad563774c05db8c3cbd9a7c37f5ed37ece805cae dhor 1329661887 +0100 commit (amend): Up to 0.7.3 diff -Nru macrofusion-0.7.2/.git/logs/refs/heads/master macrofusion-0.7.3/.git/logs/refs/heads/master --- macrofusion-0.7.2/.git/logs/refs/heads/master 2011-11-17 12:11:12.000000000 +0000 +++ macrofusion-0.7.3/.git/logs/refs/heads/master 2012-02-19 14:31:51.000000000 +0000 @@ -1,9 +1,3 @@ -0000000000000000000000000000000000000000 d83f8eb66841f08966cea2257f8b75ccb787935c salvadh0r 1321075561 +0100 commit (initial): new file: CHANGELOG -d83f8eb66841f08966cea2257f8b75ccb787935c a10a6c2fdc1e3170fc20404e78fddeaf0cc8b08a salvadh0r 1321076361 +0100 commit: Some typos -a10a6c2fdc1e3170fc20404e78fddeaf0cc8b08a 858ff7b8509cfc6bceb8ce871b77bbbe4453ef5e salvadh0r 1321210686 +0100 commit: Auto align images -858ff7b8509cfc6bceb8ce871b77bbbe4453ef5e 643f4cca694cd4c114abf47301113fd5bc195ac5 salvadh0r 1321210710 +0100 commit: Some UI changes -643f4cca694cd4c114abf47301113fd5bc195ac5 00765a7aad5ec28299bfd625ea9ee27e138d4cae salvadh0r 1321210744 +0100 commit: Translation -00765a7aad5ec28299bfd625ea9ee27e138d4cae 3a5e6040ab1da06afb21ae6a965697926bd641a7 salvadh0r 1321210775 +0100 commit: Some new strings -3a5e6040ab1da06afb21ae6a965697926bd641a7 b59413564a6395a1ef86adf4d0099ab199e10a11 salvadh0r 1321530793 +0100 commit: Update to 0.7 version -b59413564a6395a1ef86adf4d0099ab199e10a11 99b2e7ab9d5c8c67e2c7849bb9d181d9277cb480 salvadh0r 1321531203 +0100 commit: Some info added. -99b2e7ab9d5c8c67e2c7849bb9d181d9277cb480 7c1174b676c84c8bf7ad7163c0c3b463f09f6f2a salvadh0r 1321531872 +0100 commit: Small fix. +0000000000000000000000000000000000000000 41cf29a7ac5b698f19763a0692f082fb575a3f10 dhor 1329655461 +0100 clone: from ssh://salvadh0r@git.code.sf.net/p/macrofusion/code +41cf29a7ac5b698f19763a0692f082fb575a3f10 90be708f108881aa7970168545360df29a4e3794 dhor 1329661771 +0100 commit: Up to 0.7.3 +90be708f108881aa7970168545360df29a4e3794 ad563774c05db8c3cbd9a7c37f5ed37ece805cae dhor 1329661887 +0100 commit (amend): Up to 0.7.3 diff -Nru macrofusion-0.7.2/.git/logs/refs/remotes/origin/master macrofusion-0.7.3/.git/logs/refs/remotes/origin/master --- macrofusion-0.7.2/.git/logs/refs/remotes/origin/master 2011-11-17 12:11:19.000000000 +0000 +++ macrofusion-0.7.3/.git/logs/refs/remotes/origin/master 2012-02-19 14:32:07.000000000 +0000 @@ -1,6 +1 @@ -0000000000000000000000000000000000000000 d83f8eb66841f08966cea2257f8b75ccb787935c salvadh0r 1321075849 +0100 update by push -d83f8eb66841f08966cea2257f8b75ccb787935c a10a6c2fdc1e3170fc20404e78fddeaf0cc8b08a salvadh0r 1321076366 +0100 update by push -a10a6c2fdc1e3170fc20404e78fddeaf0cc8b08a 3a5e6040ab1da06afb21ae6a965697926bd641a7 salvadh0r 1321210794 +0100 update by push -3a5e6040ab1da06afb21ae6a965697926bd641a7 b59413564a6395a1ef86adf4d0099ab199e10a11 salvadh0r 1321530812 +0100 update by push -b59413564a6395a1ef86adf4d0099ab199e10a11 99b2e7ab9d5c8c67e2c7849bb9d181d9277cb480 salvadh0r 1321531209 +0100 update by push -99b2e7ab9d5c8c67e2c7849bb9d181d9277cb480 7c1174b676c84c8bf7ad7163c0c3b463f09f6f2a salvadh0r 1321531879 +0100 update by push +41cf29a7ac5b698f19763a0692f082fb575a3f10 ad563774c05db8c3cbd9a7c37f5ed37ece805cae dhor 1329661927 +0100 update by push Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/00/765a7aad5ec28299bfd625ea9ee27e138d4cae and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/00/765a7aad5ec28299bfd625ea9ee27e138d4cae differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/00/ed1dd9dd89bebbb273d2ab40637c4580b70a68 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/00/ed1dd9dd89bebbb273d2ab40637c4580b70a68 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/01/f86f3d6dd35ef898a0740f999cffc41400b450 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/01/f86f3d6dd35ef898a0740f999cffc41400b450 differ diff -Nru macrofusion-0.7.2/.git/objects/04/3c5c49ad2bb4d3d389740e32e13f62ca2b1cd5 macrofusion-0.7.3/.git/objects/04/3c5c49ad2bb4d3d389740e32e13f62ca2b1cd5 --- macrofusion-0.7.2/.git/objects/04/3c5c49ad2bb4d3d389740e32e13f62ca2b1cd5 2011-11-12 05:25:56.000000000 +0000 +++ macrofusion-0.7.3/.git/objects/04/3c5c49ad2bb4d3d389740e32e13f62ca2b1cd5 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -xA -0E&B($nEdmgd@,߽~X$2^:RD[B$JXŗd=c4Gߊ\+ec;}?2 \ No newline at end of file Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/05/cd8c9971b3ce2e9801d326ce0b4aa1f40070bf and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/05/cd8c9971b3ce2e9801d326ce0b4aa1f40070bf differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/06/206b9d7176255794c01b5797f2034712598efd and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/06/206b9d7176255794c01b5797f2034712598efd differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/07/e0f4c1404a431821d3a8339d51c06a464ed05f and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/07/e0f4c1404a431821d3a8339d51c06a464ed05f differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/08/2c404c1395b343bd58755a4163c08dea2762d6 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/08/2c404c1395b343bd58755a4163c08dea2762d6 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/0b/3b260e6cbb703c85e15f43ca79bf7d1dbcd2eb and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/0b/3b260e6cbb703c85e15f43ca79bf7d1dbcd2eb differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/0c/fbf08886fca9a91cb753ec8734c84fcbe52c9f differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/11/32539b3c306814ae892cde35f1767bd2c20e34 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/11/32539b3c306814ae892cde35f1767bd2c20e34 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/12/820da56a677e1db8fca0a2d1982329d019ca68 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/12/820da56a677e1db8fca0a2d1982329d019ca68 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/13/6fcc7d7d08cf71521011c7f86bc01203d2999d and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/13/6fcc7d7d08cf71521011c7f86bc01203d2999d differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/13/b8a21b752c799b75ed72a103256ef38d9b61f9 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/13/b8a21b752c799b75ed72a103256ef38d9b61f9 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/16/3aaf8d82b6c54f23c45f32895dbdfdcc27b047 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/16/3aaf8d82b6c54f23c45f32895dbdfdcc27b047 differ diff -Nru macrofusion-0.7.2/.git/objects/1a/e2ed204d3436630e603a5a8b97ab692fd0092b macrofusion-0.7.3/.git/objects/1a/e2ed204d3436630e603a5a8b97ab692fd0092b --- macrofusion-0.7.2/.git/objects/1a/e2ed204d3436630e603a5a8b97ab692fd0092b 2011-11-17 11:53:13.000000000 +0000 +++ macrofusion-0.7.3/.git/objects/1a/e2ed204d3436630e603a5a8b97ab692fd0092b 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -x+)JMU0a040031QML.w+-g0w})woG<4?o5,* .f6n!׏#? -:&$ \ No newline at end of file Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/1d/58dd9b08c93cb447f2e0c78a9294d64293c3c2 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/1d/58dd9b08c93cb447f2e0c78a9294d64293c3c2 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/21/aa4d5d0e2daad303aec430e71b1d2bb1d2d363 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/21/aa4d5d0e2daad303aec430e71b1d2bb1d2d363 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/22/2a87b793e9a5b60b4727e8718c39f2e6dd3f08 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/22/2a87b793e9a5b60b4727e8718c39f2e6dd3f08 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/27/a95c634112ace2357cdb17aae62c150020987a and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/27/a95c634112ace2357cdb17aae62c150020987a differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/2b/3f751bfbc2b1f798fd3576abbb333be3a5a09e and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/2b/3f751bfbc2b1f798fd3576abbb333be3a5a09e differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/2d/6e2647e33254fca508e74f48bdfefa44de4c0a and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/2d/6e2647e33254fca508e74f48bdfefa44de4c0a differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/2f/0fc67629984031e4b65721fec880d2f411f56e and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/2f/0fc67629984031e4b65721fec880d2f411f56e differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/2f/5d20ba8251904f8fb9f1e322ae1fc156b07a97 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/2f/5d20ba8251904f8fb9f1e322ae1fc156b07a97 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/30/b9702feb7b43ea818d4ea7c72a55f1eaf814b6 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/30/b9702feb7b43ea818d4ea7c72a55f1eaf814b6 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/32/aa10de642d40b1f138c7ba75dc2f409da99bb8 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/32/aa10de642d40b1f138c7ba75dc2f409da99bb8 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/37/45e91edea09ae2bf1249a481aadf9ea3c48c26 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/37/45e91edea09ae2bf1249a481aadf9ea3c48c26 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/38/8f4f0ae0e0d8045f55d38237cde8d048bb5d72 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/38/8f4f0ae0e0d8045f55d38237cde8d048bb5d72 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/3a/5e6040ab1da06afb21ae6a965697926bd641a7 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/3a/5e6040ab1da06afb21ae6a965697926bd641a7 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/40/8e2bf3baf1b88081367e7ab85d68a001012528 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/40/8e2bf3baf1b88081367e7ab85d68a001012528 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/41/708f0f2c348d860564dc6efc070a6b4f09f8e4 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/41/708f0f2c348d860564dc6efc070a6b4f09f8e4 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/42/5ab1eee79a0c27a5c39faa68af8671652adea3 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/42/5ab1eee79a0c27a5c39faa68af8671652adea3 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/44/002088cc580ee83f3a334d9809d320e18109d1 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/44/002088cc580ee83f3a334d9809d320e18109d1 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/45/a4fb75db864000d01701c0f7a51864bd4daabf and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/45/a4fb75db864000d01701c0f7a51864bd4daabf differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/48/8d8ce768a106c8117812f18763237eb1a3d950 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/48/8d8ce768a106c8117812f18763237eb1a3d950 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/49/d25ae9262de012ae219c53c4dc33f67d604b4a and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/49/d25ae9262de012ae219c53c4dc33f67d604b4a differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/4c/9ee0c608970eebab04a90a6dc14937706d41c6 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/4c/9ee0c608970eebab04a90a6dc14937706d41c6 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/4d/5091fa1ebac9ba7299ed10930034d152f906f1 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/4d/5091fa1ebac9ba7299ed10930034d152f906f1 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/4e/e8a5599038f5a87a18a3c00661339f43b862ed and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/4e/e8a5599038f5a87a18a3c00661339f43b862ed differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/4f/3d847962db1d6b5730b1ed9a40059f02b43809 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/4f/3d847962db1d6b5730b1ed9a40059f02b43809 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/4f/6bcef7678e250892c6a6603c5ab145c9a6ac7a and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/4f/6bcef7678e250892c6a6603c5ab145c9a6ac7a differ diff -Nru macrofusion-0.7.2/.git/objects/51/17289d06c92ce60395c21688cfd9c96bb031bb macrofusion-0.7.3/.git/objects/51/17289d06c92ce60395c21688cfd9c96bb031bb --- macrofusion-0.7.2/.git/objects/51/17289d06c92ce60395c21688cfd9c96bb031bb 2011-11-17 11:52:37.000000000 +0000 +++ macrofusion-0.7.3/.git/objects/51/17289d06c92ce60395c21688cfd9c96bb031bb 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -x%M@0akҥphk$'ө } P#& eRɰSaꓹ۲) %Xo߬ng(lg6o$ \ No newline at end of file diff -Nru macrofusion-0.7.2/.git/objects/51/6929aae4217f3d5ae224c684be84e61df13cff macrofusion-0.7.3/.git/objects/51/6929aae4217f3d5ae224c684be84e61df13cff --- macrofusion-0.7.2/.git/objects/51/6929aae4217f3d5ae224c684be84e61df13cff 2011-11-12 05:25:56.000000000 +0000 +++ macrofusion-0.7.3/.git/objects/51/6929aae4217f3d5ae224c684be84e61df13cff 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -xU1 -0 a瞢ABilMh,x|t?$~\e&PXP5qfWگgwwI"&g\|fTp5 \ No newline at end of file Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/56/4463c8640b94a3b279244b82504da54cee85c1 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/56/4463c8640b94a3b279244b82504da54cee85c1 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/58/4f0fb7cd2b1c02f42ae8c97cdb0b6a4cccfa4f and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/58/4f0fb7cd2b1c02f42ae8c97cdb0b6a4cccfa4f differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/59/4dc1c8c42315f313c18aa030fc4c880674c8ea and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/59/4dc1c8c42315f313c18aa030fc4c880674c8ea differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/5a/1106f237a86425319141047247bb82128ea754 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/5a/1106f237a86425319141047247bb82128ea754 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/5a/4291b773dc1c9a07c71faa0d9b62efe399b054 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/5a/4291b773dc1c9a07c71faa0d9b62efe399b054 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/5a/93c40756049334c9ae0929b3ad25456776311e and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/5a/93c40756049334c9ae0929b3ad25456776311e differ diff -Nru macrofusion-0.7.2/.git/objects/5c/5a3b284287171c93ca6ce5c3f89b8af4e8c93b macrofusion-0.7.3/.git/objects/5c/5a3b284287171c93ca6ce5c3f89b8af4e8c93b --- macrofusion-0.7.2/.git/objects/5c/5a3b284287171c93ca6ce5c3f89b8af4e8c93b 2011-11-12 05:25:56.000000000 +0000 +++ macrofusion-0.7.3/.git/objects/5c/5a3b284287171c93ca6ce5c3f89b8af4e8c93b 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -xM -@ )B[Aw=ޕK:v.væz0)È6~f"m8ْUB>`[%BRKV Sjc :ms< -VQ -Nyю MN2kI?K45|mn}܏Ea5W \ No newline at end of file Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/5f/7d31e56f12e35234dbe9290cf029972a6c01b2 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/5f/7d31e56f12e35234dbe9290cf029972a6c01b2 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/5f/cdc97f3f7d7e383159d9b70ac7130c76e1968f and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/5f/cdc97f3f7d7e383159d9b70ac7130c76e1968f differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/63/5a4d562b0e5237219a41c81249982cb968c208 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/63/5a4d562b0e5237219a41c81249982cb968c208 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/64/3f4cca694cd4c114abf47301113fd5bc195ac5 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/64/3f4cca694cd4c114abf47301113fd5bc195ac5 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/65/8b25e596843e6e03dab630ff3f6642ab7bbdc9 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/65/8b25e596843e6e03dab630ff3f6642ab7bbdc9 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/67/e2c871c693af465c008f873739a302cf53465d and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/67/e2c871c693af465c008f873739a302cf53465d differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/68/57a8d448bcc1e54f65f369c6f4105fb69fd953 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/68/57a8d448bcc1e54f65f369c6f4105fb69fd953 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/69/36af25b672597eef9edfa1bd03f4a2b32501d9 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/69/36af25b672597eef9edfa1bd03f4a2b32501d9 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/6e/38024e3018b331b549d1f72d7ab20230df7f5a and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/6e/38024e3018b331b549d1f72d7ab20230df7f5a differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/6f/092e8a46199ad4d494eb3276ff4e7fe14ffd3c and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/6f/092e8a46199ad4d494eb3276ff4e7fe14ffd3c differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/6f/53be98f8acf0d904e1044d1366e58eda84ad7a and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/6f/53be98f8acf0d904e1044d1366e58eda84ad7a differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/73/0067ee198baab0fe9dda0ff0146edb210ce9ab and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/73/0067ee198baab0fe9dda0ff0146edb210ce9ab differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/74/2f2d0744800921137a946ce2d9612aa4d1b040 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/74/2f2d0744800921137a946ce2d9612aa4d1b040 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/7c/1174b676c84c8bf7ad7163c0c3b463f09f6f2a and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/7c/1174b676c84c8bf7ad7163c0c3b463f09f6f2a differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/7f/6bcb75a318f24d405180e21c58810b000cf9cf and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/7f/6bcb75a318f24d405180e21c58810b000cf9cf differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/81/3290ed5cb7c90af7d3ed7695cec32f9ca3d793 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/81/3290ed5cb7c90af7d3ed7695cec32f9ca3d793 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/82/77e191881c1783d150e86c16cffa6741a79f8f and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/82/77e191881c1783d150e86c16cffa6741a79f8f differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/84/3b5028aaf6bb71bfef0b42da400bc7b31a5ca4 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/84/3b5028aaf6bb71bfef0b42da400bc7b31a5ca4 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/84/6613d99cb976bb2dfc23dcd497e5e547d5a37c and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/84/6613d99cb976bb2dfc23dcd497e5e547d5a37c differ diff -Nru macrofusion-0.7.2/.git/objects/85/8ff7b8509cfc6bceb8ce871b77bbbe4453ef5e macrofusion-0.7.3/.git/objects/85/8ff7b8509cfc6bceb8ce871b77bbbe4453ef5e --- macrofusion-0.7.2/.git/objects/85/8ff7b8509cfc6bceb8ce871b77bbbe4453ef5e 2011-11-13 18:58:06.000000000 +0000 +++ macrofusion-0.7.3/.git/objects/85/8ff7b8509cfc6bceb8ce871b77bbbe4453ef5e 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -xM -0@a92$e:@HS7ps -{[EE[M7ޒ% o<Oe\%dL53h&")=P+=K#RCW8|˸צ1 VnI9(-P!# ڛ|R&2WI`~6]h68Mgʶ1{ -KMI?XV^ߛz(O} -]Aw )!a!.bqz \ No newline at end of file diff -Nru macrofusion-0.7.2/.git/objects/99/b2e7ab9d5c8c67e2c7849bb9d181d9277cb480 macrofusion-0.7.3/.git/objects/99/b2e7ab9d5c8c67e2c7849bb9d181d9277cb480 --- macrofusion-0.7.2/.git/objects/99/b2e7ab9d5c8c67e2c7849bb9d181d9277cb480 2011-11-17 12:00:03.000000000 +0000 +++ macrofusion-0.7.3/.git/objects/99/b2e7ab9d5c8c67e2c7849bb9d181d9277cb480 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -xA0 @YdN e@[z ,mۖW?g\}Qd梅UK<0rޡc -d5NAsB99y+KtnzRXSdpABt`٧j:?FrD \ No newline at end of file diff -Nru macrofusion-0.7.2/.git/objects/9e/1e075a8f13a80ca7203aa2ee0a9c89e78f9ed9 macrofusion-0.7.3/.git/objects/9e/1e075a8f13a80ca7203aa2ee0a9c89e78f9ed9 --- macrofusion-0.7.2/.git/objects/9e/1e075a8f13a80ca7203aa2ee0a9c89e78f9ed9 2011-11-12 05:25:56.000000000 +0000 +++ macrofusion-0.7.3/.git/objects/9e/1e075a8f13a80ca7203aa2ee0a9c89e78f9ed9 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -x}SKo0ٿb&*K)D{R=T=G{VFYR~|< Ux{PԶ&+ɼb[hp PZ Ζְ-5x=H[x]K,>wy " ]pw[='Az6ɪfk>=XKI*"?Qš"XwNڤ%?Αp+ #:rA8NWNMN1$9rQ$)1P&s$}}AjnvU"_R& #xPH6ä#ln hXަ~7ԟp_Oh]_# -ea3n?렠3Mmlat|VEEY]ǝB:V".؆/Р%M̶H㏟_[0: \ No newline at end of file Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/a1/0a6c2fdc1e3170fc20404e78fddeaf0cc8b08a and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/a1/0a6c2fdc1e3170fc20404e78fddeaf0cc8b08a differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/aa/a4b6a2114639aa1dfdf0d6dcbb6cfcb3f6ef04 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/aa/a4b6a2114639aa1dfdf0d6dcbb6cfcb3f6ef04 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/ad/563774c05db8c3cbd9a7c37f5ed37ece805cae and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/ad/563774c05db8c3cbd9a7c37f5ed37ece805cae differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/b0/6896edf01eb42bbe8fcb5cc9b81eabb33eea3e and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/b0/6896edf01eb42bbe8fcb5cc9b81eabb33eea3e differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/b3/1627b386f859e9e6368bdb226044847491240a and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/b3/1627b386f859e9e6368bdb226044847491240a differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/b3/3dc7a244409ae31495cd53e6c9545cce71ff83 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/b3/3dc7a244409ae31495cd53e6c9545cce71ff83 differ diff -Nru macrofusion-0.7.2/.git/objects/b5/9413564a6395a1ef86adf4d0099ab199e10a11 macrofusion-0.7.3/.git/objects/b5/9413564a6395a1ef86adf4d0099ab199e10a11 --- macrofusion-0.7.2/.git/objects/b5/9413564a6395a1ef86adf4d0099ab199e10a11 2011-11-17 11:53:13.000000000 +0000 +++ macrofusion-0.7.3/.git/objects/b5/9413564a6395a1ef86adf4d0099ab199e10a11 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -xM0 @} -'0 @hથ07->xK6Ɇ*К㬭aR)D -RwU\J(0E+QDmFJ~noY*؈j%EgV?1oQ`gO%ZK0f?GRb{ΛȔרQX\aD&'Y6Δ.Pt]͔ט0O*7 V`R5hJH3F G7@hV{VP*=v|%d"D#1㞶{G}G9(-`IiH叚NmPg9t-=1G񀆦d b1v)x%\+vNiN)vP#:]"r᫬i|:_0MNbʧ8{sϼ8L \ No newline at end of file Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/d7/4790ca19df1c3c210f8ffae13c8640564bbd44 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/d7/4790ca19df1c3c210f8ffae13c8640564bbd44 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/d8/3f8eb66841f08966cea2257f8b75ccb787935c and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/d8/3f8eb66841f08966cea2257f8b75ccb787935c differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/dc/325f979f0db60236150c5cc85fb9a6370a1d4a and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/dc/325f979f0db60236150c5cc85fb9a6370a1d4a differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/dc/7586301e3191a914827f300edecaed782c1d07 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/dc/7586301e3191a914827f300edecaed782c1d07 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/df/a26f1793dd108665ec829241acf88508bf6385 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/df/a26f1793dd108665ec829241acf88508bf6385 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/e1/3b5fa6b6a3f8195c412540e9ff4e04c684b705 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/e1/3b5fa6b6a3f8195c412540e9ff4e04c684b705 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/e2/91c80f0fcabe66d9b060957e8ad08bcca932d6 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/e2/91c80f0fcabe66d9b060957e8ad08bcca932d6 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/e5/55edda1a5b29bbcd91c17254ba5795689d9808 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/e5/55edda1a5b29bbcd91c17254ba5795689d9808 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/ea/9991c6f36140d59b27cdc940989015a2761d84 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/ea/9991c6f36140d59b27cdc940989015a2761d84 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/eb/8c17dd05f0684bb0c823f7706bf61c10876de2 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/eb/8c17dd05f0684bb0c823f7706bf61c10876de2 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/ec/7322382b95a436406b9221b4b2ddbb5375479c and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/ec/7322382b95a436406b9221b4b2ddbb5375479c differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/ec/d343022d70aaa54187b1ec21fc29aef29d4d97 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/ec/d343022d70aaa54187b1ec21fc29aef29d4d97 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/ee/6a0556929e58bd441ebb1d2ad326e5f021f0bc and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/ee/6a0556929e58bd441ebb1d2ad326e5f021f0bc differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/ee/f2e60c41d2b2458706e5a9fec4838796a68e71 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/ee/f2e60c41d2b2458706e5a9fec4838796a68e71 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/f6/5a8e86a0c13647fcd9db6d65bd44ad8872d373 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/f6/5a8e86a0c13647fcd9db6d65bd44ad8872d373 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/f7/c626613b2e4707262586ae98c003d4f125a206 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/f7/c626613b2e4707262586ae98c003d4f125a206 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/fa/9a4788975e647ca2a9ad0518e9bbdf28034574 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/fa/9a4788975e647ca2a9ad0518e9bbdf28034574 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/fb/6c52b4f83c08e6abdfc3f9ebb6896743ad6137 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/fb/6c52b4f83c08e6abdfc3f9ebb6896743ad6137 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/fc/e04386884f96b58509f7243552dabfcd258a00 and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/fc/e04386884f96b58509f7243552dabfcd258a00 differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/fd/c3ca42711fc19027dfd01df8035b24985fbb2c and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/fd/c3ca42711fc19027dfd01df8035b24985fbb2c differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/fe/121ef9517c764c601b86a2a578df62895dc10a and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/fe/121ef9517c764c601b86a2a578df62895dc10a differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/pack/pack-558825682c8bf3ea82030abb46043c107f86ff0b.idx and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/pack/pack-558825682c8bf3ea82030abb46043c107f86ff0b.idx differ Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/.git/objects/pack/pack-558825682c8bf3ea82030abb46043c107f86ff0b.pack and /tmp/L4EZsAdQrW/macrofusion-0.7.3/.git/objects/pack/pack-558825682c8bf3ea82030abb46043c107f86ff0b.pack differ diff -Nru macrofusion-0.7.2/.git/packed-refs macrofusion-0.7.3/.git/packed-refs --- macrofusion-0.7.2/.git/packed-refs 1970-01-01 00:00:00.000000000 +0000 +++ macrofusion-0.7.3/.git/packed-refs 2012-02-19 12:44:21.000000000 +0000 @@ -0,0 +1,2 @@ +# pack-refs with: peeled +41cf29a7ac5b698f19763a0692f082fb575a3f10 refs/remotes/origin/master diff -Nru macrofusion-0.7.2/.git/refs/heads/master macrofusion-0.7.3/.git/refs/heads/master --- macrofusion-0.7.2/.git/refs/heads/master 2011-11-17 12:11:12.000000000 +0000 +++ macrofusion-0.7.3/.git/refs/heads/master 2012-02-19 14:31:51.000000000 +0000 @@ -1 +1 @@ -7c1174b676c84c8bf7ad7163c0c3b463f09f6f2a +ad563774c05db8c3cbd9a7c37f5ed37ece805cae diff -Nru macrofusion-0.7.2/.git/refs/remotes/origin/HEAD macrofusion-0.7.3/.git/refs/remotes/origin/HEAD --- macrofusion-0.7.2/.git/refs/remotes/origin/HEAD 1970-01-01 00:00:00.000000000 +0000 +++ macrofusion-0.7.3/.git/refs/remotes/origin/HEAD 2012-02-19 12:44:21.000000000 +0000 @@ -0,0 +1 @@ +ref: refs/remotes/origin/master diff -Nru macrofusion-0.7.2/.git/refs/remotes/origin/master macrofusion-0.7.3/.git/refs/remotes/origin/master --- macrofusion-0.7.2/.git/refs/remotes/origin/master 2011-11-17 12:11:19.000000000 +0000 +++ macrofusion-0.7.3/.git/refs/remotes/origin/master 2012-02-19 14:32:07.000000000 +0000 @@ -1 +1 @@ -7c1174b676c84c8bf7ad7163c0c3b463f09f6f2a +ad563774c05db8c3cbd9a7c37f5ed37ece805cae Binary files /tmp/ImyHpua6OE/macrofusion-0.7.2/locale/ru/LC_MESSAGES/MacroFusion.mo and /tmp/L4EZsAdQrW/macrofusion-0.7.3/locale/ru/LC_MESSAGES/MacroFusion.mo differ diff -Nru macrofusion-0.7.2/locale/ru/LC_MESSAGES/MacroFusion.po macrofusion-0.7.3/locale/ru/LC_MESSAGES/MacroFusion.po --- macrofusion-0.7.2/locale/ru/LC_MESSAGES/MacroFusion.po 1970-01-01 00:00:00.000000000 +0000 +++ macrofusion-0.7.3/locale/ru/LC_MESSAGES/MacroFusion.po 2012-02-19 14:14:17.000000000 +0000 @@ -0,0 +1,456 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: macrofusion\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-11-24 18:08+CET\n" +"PO-Revision-Date: 2012-02-03 20:24+0300\n" +"Last-Translator: Рыжих Виктор \n" +"Language-Team: home\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Russian\n" +"X-Poedit-Country: RUSSIAN FEDERATION\n" +"X-Poedit-SourceCharset: utf-8\n" + +#: macrofusion.py:95 +msgid "Generating %s thumbnail failed." +msgstr "Не удалось создать миниатюру для %s." + +#: macrofusion.py:143 +msgid "" +"Can't find Enfuse.\n" +"Please check enblend/enfuse is installed.\n" +"Stopping..." +msgstr "" +"Не найден Enfuse.\n" +"Пожалуйста, проверьте, установлен ли enblend/enfuse.\n" +"Останов..." + +#: macrofusion.py:148 +msgid "Will use all the powers of your CPU!" +msgstr "Будут использоваться все возможности вашего процессора!" + +#: macrofusion.py:166 +msgid "CPU Cores: %s" +msgstr "Ядер ЦП: %s" + +#: macrofusion.py:271 +msgid "" +"Exiftool is missing!\n" +"\n" +" Cannot copy exif info." +msgstr "" +"Exiftool отсутствует!\n" +"\n" +" Не удается скопировать информацию EXIF." + +#: macrofusion.py:278 +msgid "" +"Hugin tools (align_image_stack) are missing !\n" +"\n" +" Cannot auto align images." +msgstr "" +"Инструменты Hugin (align_image_stack) отсутствуют!\n" +"\n" +" Невозможно автоматический выровнять изображения." + +#: macrofusion.py:356 +msgid "" +".\n" +"\n" +" Revert to default value." +msgstr "" +".\n" +"\n" +" Вернитесь к значению по умолчанию." + +#: macrofusion.py:356 +msgid "" +"No such application!\n" +"\n" +" Cannot find " +msgstr "" +"Нет такого приложения!\n" +"\n" +" Не удается найти " + +#: macrofusion.py:379 +msgid "Image" +msgstr "Изображение" + +#: macrofusion.py:385 +msgid "Thumbnail" +msgstr "Миниатюра" + +#: macrofusion.py:439 +#: macrofusion.py:578 +msgid "" +"Please add or activate at least two images.\n" +"\n" +" Cannot do anything smart with the one or no image." +msgstr "" +"Пожалуйста, добавьте или активируйте по крайней мере два изображения.\n" +"\n" +" Невозможно сделать что-то умное с одним изображением или без него." + +#: macrofusion.py:502 +msgid "Calculating preview..." +msgstr "Создается предпросмотр" + +#: macrofusion.py:507 +msgid "Preview generated" +msgstr "Предпросмотр создан" + +#: macrofusion.py:533 +msgid "" +"No preview, no output, no edit.\n" +"\n" +" Game Over." +msgstr "" +"Нет предпросмотра, нет вывода, нет редактирования.\n" +"\n" +" Конец Игры." + +#: macrofusion.py:553 +msgid "Model: " +msgstr "Модель: " + +#: macrofusion.py:554 +msgid "Date: " +msgstr "Дата: " + +#: macrofusion.py:555 +msgid "Focal length: " +msgstr "Фокусное расстояние: " + +#: macrofusion.py:556 +msgid "Aperture: F/" +msgstr "Относительное отверстие: F/" + +#: macrofusion.py:557 +msgid "Exposure Time: " +msgstr "Время выдержки: " + +#: macrofusion.py:575 +msgid "" +"Can't overwrite input image!\n" +"\n" +" Please change the output filename." +msgstr "" +"Невозможно перезаписать исходное изображение!\n" +"\n" +"Пожалуйста, измените имя выходного файла." + +#: macrofusion.py:630 +msgid "Filename: " +msgstr "Имя файла: " + +#: macrofusion.py:630 +msgid "Resolution: " +msgstr "Разрешение: " + +#: macrofusion.py:635 +msgid "" +"Only JPEG and TIFF files are allowed.\n" +"\n" +"Cannot open:\n" +msgstr "" +"Разрешены только JPEG and TIFF файлы.\n" +"\n" +"Невозможно открыть:\n" + +#: macrofusion.py:654 +msgid "Add images..." +msgstr "Добавить изображения..." + +#: macrofusion.py:666 +msgid "Open images..." +msgstr "Открыть изображения..." + +#: macrofusion.py:717 +msgid "Save file..." +msgstr "Сохранить файл..." + +#: macrofusion.py:762 +msgid "" +"Please add two or more images.\n" +"\n" +" Cannot do anything smart with the one image." +msgstr "" +"Пожалуйста, добавьте два или более изображений.\n" +"\n" +"Невозможно сделать что-то умное с одним изображением." + +#: macrofusion.py:774 +msgid ":: Align photos..." +msgstr ":: Выравнивание снимков..." + +#: macrofusion.py:780 +msgid ":: Fusion photos..." +msgstr "::Сведение снимков..." + +#: macrofusion.py:803 +msgid "Fusion images..." +msgstr "Сведение изображений..." + +#: macrofusion.py:811 +msgid "Fusion, please wait..." +msgstr "Сведение, подождите пожалуйста..." + +#: macrofusion.py:816 +msgid "Fused !" +msgstr "Соединен !" + +#: ui/DOFuseInterface2.glade:22 +msgid "_File" +msgstr "Файл" + +#: ui/DOFuseInterface2.glade:65 +msgid "Remove All" +msgstr "Удалить все" + +#: ui/DOFuseInterface2.glade:119 +msgid "H_elp" +msgstr "Справка" + +#: ui/DOFuseInterface2.glade:209 +msgid "Exposure (default: 1)" +msgstr "Экспозиция (по умолчанию: 1)" + +#: ui/DOFuseInterface2.glade:270 +msgid "Contrast (default: 0)" +msgstr "Контраст (по умолчанию: 0)" + +#: ui/DOFuseInterface2.glade:330 +msgid "Saturation (default: 0.2)" +msgstr "Насыщенность (по умолчанию: 0.2)" + +#: ui/DOFuseInterface2.glade:390 +msgid "Mean exposure (default: 0.5)" +msgstr "Средняя экспозиция (по умолчанию: 0.5)" + +#: ui/DOFuseInterface2.glade:450 +msgid "Deviation (default: 0.2)" +msgstr "Отклонение (по умолчанию: 0.2)" + +#: ui/DOFuseInterface2.glade:513 +msgid "Fusion parameters" +msgstr "Параметры сведения" + +#: ui/DOFuseInterface2.glade:543 +msgid "Align" +msgstr "Выровнять" + +#: ui/DOFuseInterface2.glade:561 +msgid "Autocrop" +msgstr "Автоматически кадрировать" + +#: ui/DOFuseInterface2.glade:579 +msgid "Optimize image center shift" +msgstr "Оптимизировать сномок сдвигом центра" + +#: ui/DOFuseInterface2.glade:598 +msgid "Optimize field of view" +msgstr "Оптимизировать поле обзора" + +#: ui/DOFuseInterface2.glade:623 +msgid "Align images" +msgstr "Выравнивание снимков" + +#: ui/DOFuseInterface2.glade:643 +msgid "Fusion" +msgstr "Сведение" + +#: ui/DOFuseInterface2.glade:670 +msgid "Pyramid levels: " +msgstr "Уровни пирамиды:" + +#: ui/DOFuseInterface2.glade:726 +msgid "Force HardMask " +msgstr "Жёсткая маска " + +#: ui/DOFuseInterface2.glade:764 +msgid "Contrast window:" +msgstr "Окно контраста:" + +#: ui/DOFuseInterface2.glade:827 +msgid "Min Curvature:" +msgstr "Минимальная кривизна:" + +#: ui/DOFuseInterface2.glade:844 +msgid "%" +msgstr "%" + +#: ui/DOFuseInterface2.glade:902 +msgid "EdgeScale:" +msgstr "Масштаб края:" + +#: ui/DOFuseInterface2.glade:960 +msgid "EdgeScale" +msgstr "Масштаб края" + +#: ui/DOFuseInterface2.glade:1035 +msgid "LceScale" +msgstr "" + +#: ui/DOFuseInterface2.glade:1106 +msgid "LceFactor" +msgstr "" + +#: ui/DOFuseInterface2.glade:1142 +msgid "Use CIECAM02 color profile" +msgstr "Использовать цветовой профиль CIECAM02" + +#: ui/DOFuseInterface2.glade:1191 +msgid "" +"Mean\n" +"L-star\n" +"Lightness\n" +"Value\n" +"Luminance" +msgstr "" +"Середина\n" +"L-star\n" +"Светлота\n" +"Насыщенность\n" +"Яркость" + +#: ui/DOFuseInterface2.glade:1207 +msgid "Gray projector:" +msgstr "Проектор серого:" + +#: ui/DOFuseInterface2.glade:1244 +msgid "Expert Options" +msgstr "Опции эксперта" + +#: ui/DOFuseInterface2.glade:1260 +msgid "Expert" +msgstr "Эксперт" + +#: ui/DOFuseInterface2.glade:1294 +msgid "Preview size:" +msgstr "Размер предосмотра:" + +#: ui/DOFuseInterface2.glade:1316 +#: ui/DOFuseInterface2.glade:1359 +msgid "The larger resolution - the longer it takes to generate preview." +msgstr "Чем больше разрешение - тем больше времени требуется для подготовки предпросмотра." + +#: ui/DOFuseInterface2.glade:1335 +#: ui/DOFuseInterface2.glade:1632 +msgid "Width" +msgstr "Ширина" + +#: ui/DOFuseInterface2.glade:1378 +#: ui/DOFuseInterface2.glade:1673 +msgid "Height" +msgstr "Высота" + +#: ui/DOFuseInterface2.glade:1425 +msgid "Cache Size:" +msgstr "Размер кеша:" + +#: ui/DOFuseInterface2.glade:1439 +msgid "1024 Mb (default)" +msgstr "1024 МиБ (по умолчанию)" + +#: ui/DOFuseInterface2.glade:1495 +msgid "Bloc Size: " +msgstr "Размер блока:" + +#: ui/DOFuseInterface2.glade:1509 +msgid "2048 kb (default)" +msgstr "2048 КиБ (по умолчанию)" + +#: ui/DOFuseInterface2.glade:1569 +msgid "Final image size:" +msgstr "Конечный размер:" + +#: ui/DOFuseInterface2.glade:1579 +#: ui/DOFuseInterface2.glade:1807 +msgid "Default" +msgstr "По умолчанию" + +#: ui/DOFuseInterface2.glade:1714 +msgid "X-offset" +msgstr "Смещение X" + +#: ui/DOFuseInterface2.glade:1755 +msgid "Y-offset" +msgstr "Смещение Y" + +#: ui/DOFuseInterface2.glade:1793 +msgid "Jpeg compression:" +msgstr "Сжатие JPEG:" + +#: ui/DOFuseInterface2.glade:1861 +msgid "Tiff compression: " +msgstr "Сжатие TIFF:" + +#: ui/DOFuseInterface2.glade:1874 +msgid "" +"None\n" +"Packbits\n" +"LZW\n" +"Deflate" +msgstr "" +"Нет\n" +"Packbits\n" +"LZW\n" +"Deflate" + +#: ui/DOFuseInterface2.glade:1912 +msgid "Edit with: " +msgstr "Редактировать в: " + +#: ui/DOFuseInterface2.glade:1973 +msgid "Software Options" +msgstr "Опции программы" + +#: ui/DOFuseInterface2.glade:1999 +msgid "Copy exif info ?" +msgstr "Копировать данные EXIF?" + +#: ui/DOFuseInterface2.glade:2013 +msgid "Exif" +msgstr "EXIF" + +#: ui/DOFuseInterface2.glade:2036 +msgid "Configuration" +msgstr "Конфигурация" + +#: ui/DOFuseInterface2.glade:2068 +msgid "_Before/After" +msgstr "До/После" + +#: ui/DOFuseInterface2.glade:2086 +msgid "_Preview" +msgstr "_Предосмотр" + +#: ui/DOFuseInterface2.glade:2160 +msgid "Photos" +msgstr "Снимки" + +#: ui/DOFuseInterface2.glade:2243 +msgid "Action" +msgstr "Действие" + +#: ui/DOFuseInterface2.glade:2301 +msgid "Preview" +msgstr "Предосмотр" + +#: ui/Progress.glade:20 +msgid "label" +msgstr "Метка" + +#: ui/Progress.glade:50 +msgid "Close" +msgstr "Закрыть" + diff -Nru macrofusion-0.7.2/macrofusion.py macrofusion-0.7.3/macrofusion.py --- macrofusion-0.7.2/macrofusion.py 2011-11-24 18:01:26.000000000 +0000 +++ macrofusion-0.7.3/macrofusion.py 2012-02-19 14:49:23.000000000 +0000 @@ -18,6 +18,7 @@ import operator import cairo import random + import pyexiv2 except: print('An error occured. Python or one of its sub modules is absent...\nIt would be wise to check your python installation.') sys.exit(1) @@ -44,7 +45,7 @@ session_options_bak=[] APP = 'MacroFusion' -__VERSION__='0.7.2' +__VERSION__='0.7.3' __LICENSE__='GPL' __COPYRIGHT__='Dariusz Duma' __WEBSITE__='http://sourceforge.net/p/macrofusion' @@ -90,9 +91,13 @@ def creer_miniature(chemin,taille): outfile=donnees.previs_dossier + '/' + os.path.split(chemin)[1] try: - im = Image.open(chemin) - im.thumbnail(taille) - im.save(outfile, "JPEG") + im = gtk.gdk.pixbuf_new_from_file_at_size(chemin, taille[0], taille[1]) +# pb = gtk.gdk.pixbuf_new_from_file(chemin) +# im = Interface.pixbuf2Image(Interface(),pb) +# im = Image.open(chemin) +# im.thumbnail(taille) +# im.save(outfile, "JPEG") + im.save(outfile, "jpeg", {"quality":"98"}) except IOError: print _("Generating %s thumbnail failed.") % chemin return outfile @@ -545,18 +550,28 @@ tags={} exifinfo=None try: - im = Image.open(fichier) - if hasattr( im, '_getexif' ): - exifinfo = im._getexif() - if exifinfo != None: - for tag, value in exifinfo.items(): - decoded = TAGS.get(tag, tag) - tags[decoded] = value - if tags.get('Model'): tags2=(_("Model: ") + str(tags['Model']) + "\n") - if tags.get('DateTimeOriginal'): tags2+=(_("Date: ") + str(tags['DateTimeOriginal']) + "\n") - if tags.get('FocalLength'): tags2+=(_("Focal length: ") + str(int(int(tags['FocalLength'][0])/int(tags['FocalLength'][1]))) + "mm \n") - if tags.get('FNumber'): tags2+=(_("Aperture: F/") + str(float(float(tags['FNumber'][0])/float(tags['FNumber'][1]))) + "\n") - if tags.get('ExposureTime'): tags2+=(_("Exposure Time: ") + str(str(tags['ExposureTime'][0]/10) + "/" + str(tags['ExposureTime'][1]/10) + " s. \n")) + # im = Image.open(fichier) + im = pyexiv2.ImageMetadata(fichier) + im.read() + +# if hasattr( im, '_getexif' ): +# exifinfo = im._getexif() +# if exifinfo != None: +# for tag, value in exifinfo.items(): +# decoded = TAGS.get(tag, tag) +# tags[decoded] = value + tags_keys = im.exif_keys + if tags_keys != '': + if 'Exif.Image.Model' in tags_keys: + tags2=(_("Model: ") + str(im['Exif.Image.Model'].value) + "\n") + if 'Exif.Image.DateTimeOriginal' in tags_keys: + tags2+=(_("Date: ") + str(im['Exif.Image.DateTimeOriginal'].value) + "\n") + if 'Exif.Photo.FocalLength' in tags_keys: + tags2+=(_("Focal length: ") + str(int(im['Exif.Photo.FocalLength'].value)) + "mm \n") + if 'Exif.Photo.FNumber' in tags_keys: + tags2+=(_("Aperture: F/") + str(im['Exif.Photo.FNumber'].value) + "\n") + if 'Exif.Photo.ExposureTime' in tags_keys: + tags2+=(_("Exposure Time: ") + str(im['Exif.Photo.ExposureTime'].value) + " s. \n") except IOError: print "failed to identify", file return tags2 @@ -616,7 +631,11 @@ # gtk.accel_map_save(self.config_dir + '/accel_map') return - + + def pixbuf2Image(self, pb): + width,height = pb.get_width(),pb.get_height() + return Image.fromstring("RGB",(width,height),pb.get_pixels() ) + def put_files_to_the_list(self, fichiers): self.fichiers=fichiers @@ -624,7 +643,9 @@ self.badfiles=[] for fichier in self.fichiers: if re.search('\\.jpg$|\\.jpeg$|\\.tiff$|\\.tif$', fichier, flags=re.IGNORECASE): - im = Image.open(fichier) + pb = gtk.gdk.pixbuf_new_from_file(fichier) + im = self.pixbuf2Image(pb) +# im.save("welldone.jpg", "JPEG",quality=80) self.size=im.size self.tags2 = Gui.get_exif(fichier) if not self.tags2: diff -Nru macrofusion-0.7.2/README macrofusion-0.7.3/README --- macrofusion-0.7.2/README 2011-11-17 11:32:53.000000000 +0000 +++ macrofusion-0.7.3/README 2012-02-19 12:48:42.000000000 +0000 @@ -23,6 +23,7 @@ - python (>=2.7) - Python Imaging Library (PIL) (python-imaging) - pygtk (python-gtk2) +- pyexiv2 (python-pyexiv2) - libglade (libglade2-0) - enfuse (>=4.0) - hugin-tools (with align_image_stack) diff -Nru macrofusion-0.7.2/ui/DOFuseInterface.glade macrofusion-0.7.3/ui/DOFuseInterface.glade --- macrofusion-0.7.2/ui/DOFuseInterface.glade 2011-11-22 17:55:39.000000000 +0000 +++ macrofusion-0.7.3/ui/DOFuseInterface.glade 2012-02-19 12:44:21.000000000 +0000 @@ -1,50 +1,41 @@ - + True - False - + True - False + vertical True - False True - False - False _File True True - False gtk-open True - False - False True True - + gtk-add True - False - False True True - + @@ -52,11 +43,9 @@ gtk-remove True - False - False True True - + @@ -64,16 +53,13 @@ Remove All True - False - False True False - + True - False gtk-remove @@ -83,28 +69,23 @@ gtk-save True - False - False True True - + True - False gtk-quit True - False - False True True - + @@ -114,23 +95,18 @@ True - False - False H_elp True True - False gtk-about True - False - False True True - + @@ -140,27 +116,25 @@ False - True 0 - + True - False - 320 + 300 True - False + vertical - 200 True + 200 True - 0 0 200 20 180 200 - never + 0 0 447 44.700000000000003 402.30000000000001 447 automatic + never True @@ -169,92 +143,121 @@ - True - True - 1 0 - - + + + + True + vertical + + + True + True + + + True + vertical - + True - False + 0 - + True - False - 1 + 12 - + True - False - 12 + vertical + + + True + 0 + Exposure (default: 1) + + + False + False + 0 + + - + True - False - + True - False - 0 - Exposure (default: 1) + True + --exposure-weight=WEIGHT + weight given to well-exposed pixels + 1 0 1 0.10000000000000001 0.10000000000000001 0 + False + - False - False 0 - + True - False - - - True - True - --exposure-weight=WEIGHT - weight given to well-exposed pixels - 1 0 1 0.10000000000000001 0.10000000000000001 0 - False - - - - True - True - 0 - - - - - True - True - --exposure-weight=WEIGHT + True + --exposure-weight=WEIGHT weight given to well-exposed pixels - • - False - False - True - True - 1 0 1 0.10000000000000001 0 0 - 1 - - - False - False - 6 - 1 - - + • + 1 0 1 0.10000000000000001 0 0 + 1 False @@ -262,921 +265,714 @@ 1 + + + False + False + 1 + + + + + True + 0 + Contrast (default: 0) + + + False + False + 2 + + + + + True - + True - False - 0 - Contrast (default: 0) + True + --contrast-weight=WEIGHT + weight given to pixels in high-contrast neighborhoods + 0 0 1 0.10000000000000001 0.10000000000000001 0 + False - False - False - 2 + 0 - + True - False - - - True - True - --contrast-weight=WEIGHT - weight given to pixels in high-contrast neighborhoods - 0 0 1 0.10000000000000001 0.10000000000000001 0 - False - - - True - True - 0 - - - - - True - True - --contrast-weight=WEIGHT + True + --contrast-weight=WEIGHT weight given to pixels in high-contrast neighborhoods - • - False - False - True - True - 0 0 1 0.10000000000000001 0 0 - 1 - - - False - False - 6 - 1 - - + • + 0 0 1 0.10000000000000001 0 0 + 1 False False - 3 + 1 + + + False + False + 3 + + + + + True + 0 + Saturation (default: 0.2) + + + False + False + 4 + + + + + True - + True - False - 0 - Saturation (default: 0.2) + True + --saturation-weight=WEIGHT + weight given to highly-saturated pixels + 0.20000000000000001 0 1 0.10000000000000001 10 0 + False - False - False - 4 + 0 - + True - False - - - True - True - --saturation-weight=WEIGHT - weight given to highly-saturated pixels - 0.20000000000000001 0 1 0.10000000000000001 10 0 - False - - - True - True - 0 - - - - - True - True - --saturation-weight=WEIGHT + True + --saturation-weight=WEIGHT weight given to highly-saturated pixels - • - False - False - True - True - 0.20000000000000001 0 1 0.10000000000000001 0 0 - 1 - - - False - False - 6 - 1 - - + • + 0.20000000000000001 0 1 0.10000000000000001 0 0 + 1 False False - 5 + 1 + + + False + False + 5 + + + + + True + 0 + Mean exposure (default: 0.5) + + + False + False + 6 + + + + + True - + True - False - 0 - Mean exposure (default: 0.5) + True + --exposure-mu=MEAN + center also known as MEAN of Gaussian weighting + 0.5 0 1 0.01 0.10000000000000001 0 + False - False - False - 6 + 0 - + True - False - - - True - True - --exposure-mu=MEAN - center also known as MEAN of Gaussian weighting - 0.5 0 1 0.01 0.10000000000000001 0 - False - - - True - True - 0 - - - - - True - True - --exposure-mu=MEAN + True + --exposure-mu=MEAN center also known as MEAN of Gaussian weighting - • - False - False - True - True - 0.5 0 1 0.01 0.10000000000000001 0 - 1 - - - False - False - 6 - 1 - - + • + 0.5 0 1 0.01 0.10000000000000001 0 + 1 False False - 7 + 1 + + + False + False + 7 + + + + + True + 0 + Deviation (default: 0.2) + + + False + False + 8 + + + + + True - + True - False - 0 - Deviation (default: 0.2) + True + --exposure-sigma=SIGMA + standard deviation of Gaussian weighting + 0 0 1 0.01 0.10000000000000001 0 + False - False - False - 8 + 0 - + True - False - - - True - True - --exposure-sigma=SIGMA - standard deviation of Gaussian weighting - 0 0 1 0.01 0.10000000000000001 0 - False - - - True - True - 0 - - - - - True - True - --exposure-sigma=SIGMA - standard deviation of Gaussian weighting - • - False - False - True - True - 0.20000000000000001 0 1 0.01 0.10000000000000001 0 - 1 - - - False - False - 6 - 1 - - + True + --exposure-sigma=SIGMA + standard deviation of Gaussian weighting + • + 0.20000000000000001 0 1 0.01 0.10000000000000001 0 + 1 False False - 9 + 1 + + False + False + 9 + - - - True - False - <b>Fusion parameters</b> - True - - - label_item - - + + + + + True + <b>Fusion parameters</b> + True - False - False - 0 + label_item + + + False + False + 0 + + + + + + True + 0 --> - + True - False - 1 + 12 - - True - False - 12 - - + True - False - - - Align - True - True - False - + vertical + + + Align + True + True + False + False + True + Auto align images. - False - True - - - True - True - 0 - - - - - Autocrop - True - True - False - + + + + + + Autocrop + True + True + False + True + Auto crop the image to the area covered by all images. - False - True - - - True - True - 1 - - - - - Optimize image center shift - True - True - False - + + + + + + Optimize image center shift + True + True + False + True + Optimize image center shift for all images, except for first. Useful for aligning more distorted images. - False - True - - - True - True - 2 - - - - - Optimize field of view - True - True - False - -Optimize field of view for all images, except for first. -Useful for aligning focus stacks with slightly different magnification. - - False - True - - - True - True - 3 - - - - + - + + Optimize field of view True - False - <b>Align images</b> - True + True + False + True + +Optimize field of view for all images, except for first. +Useful for aligning focus stacks with slightly different magnification. + - - label_item - + + + + + + + + + + True + <b>Align images</b> + True - False - False - 1 + label_item - - - - True - False - Fusion - - False - tab + False + False + 1 + + + + + + True + Fusion + + + False + tab + + + + + True + 0 - + True - False - 1 + 12 - + True - False - 12 + vertical - + True - False - + + Pyramid levels: True - False - - - Pyramid levels: - True - True - False - --levels=LEVELS - number of blending LEVELS to use - False - True - - - True - True - 0 - - - - - True - True - --levels=LEVELS + True + --levels=LEVELS number of blending LEVELS to use - • - False - False - True - True - 9 0 29 1 29 0 - - - False - False - 6 - end - 1 - - + False + True - False - False 0 - + True - False + True + --levels=LEVELS + number of blending LEVELS to use + • + 9 0 29 1 29 0 False - True + False + 6 + end 1 - - - Force HardMask - True - True - False - + + + False + False + 0 + + + + + True + + + False + 1 + + + + + Force HardMask + True + True + --hard-mask force hard blend masks and no averaging on finest scale; this is especially useful for focus stacks with thin and high contrast features, but leads to increased noise. - - False - True - - - False - False - 2 - - + + False + True + + + False + False + 2 + + + + + True + + + False + 3 + + + + + True - + + Contrast window: True - False + True + --entropy-window-size=SIZE + set window SIZE for local entropy analysis + False + True - False - True - 3 + 0 - + True - False - - - Contrast window: - True - True - False - --entropy-window-size=SIZE - set window SIZE for local entropy analysis - False - True - - - True - True - 0 - - - - - True - True - + True + int + --entropy-window-size=SIZE set window SIZE for local entropy analysis. - - • - False - False - True - True - 3 3 7 1 1 0 - - - False - False - 6 - end - 1 - - + + • + 3 3 7 1 1 0 + 0 False False - 4 + 6 + end + 1 + + + False + False + 4 + + + + + True + + + False + 5 + + + + + True + + + Min Curvature: + True + True + --contrast-min-curvature=CURVATURE + minimum CURVATURE for an edge to qualify + False + True + + + False + 0 + + + - + + % True - False + True + False + True - False - True - 5 + 5 + 1 - + True - False - - - Min Curvature: - True - True - False - --contrast-min-curvature=CURVATURE - minimum CURVATURE for an edge to qualify - False - True - - - False - True - 0 - - - - - % - True - True - False - False - True - - - True - True - 5 - 1 - - - - - True - True - + True + --contrast-min-curvature=CURVATURE minimum CURVATURE for an edge to qualify. - - • - False - False - True - True - 0 -10 10 1 10 0 - - - False - False - 6 - end - 3 - - + + • + 0 -10 10 1 10 0 False False - 7 - - - - - True - False - - - False - True - 8 + 6 + end + 3 - - - EdgeScale: - True - True - False - + + + False + False + 7 + + + + + True + + + False + 8 + + + + + EdgeScale: + True + True + --contrast-edge-scale=EDGESCALE[:LCESCALE[:LCEFACTOR]] set scale on which to look for edges; positive LCESCALE switches on local contrast enhancement -by LCEFACTOR (EDGESCALE, LCESCALE, LCEFACTOR >= 0); +by LCEFACTOR (EDGESCALE, LCESCALE, LCEFACTOR >= 0); append "%" to LCESCALE for values relative to EDGESCALE; append "%" to LCEFACTOR for relative value. - False - True - - - False - True - 9 - - + False + True + + + False + 9 + + + + + True - + True - False + vertical + + - + True - False - - - True - True - + True + 1 + A non-zero value for EDGE-SCALE switches on the Laplacian-of- Gaussian (LoG) edge detection algorithm. EDGE-SCALE is the radius of the Gaussian used in the search for edges. - • - False - False - True - True - 0 0 100 0.10000000000000001 1 0 - 1 - - - False - False - 0 - - - - - True - False - EdgeScale - - - False - False - 2 - - + • + 0 0 100 0.1 1 0 + - True + False False 0 + - + True - False - - - True - False - - - True - True - -A positive LCE-SCALE turns on local contrast -enhancement (LCE) before the LoG edge detection. -LCE-SCALE is the radius of the Gaussian used in -the enhancement step, LCE-FACTOR is the weight -factor (“strength”). - - • - False - False - True - True - 0 0 100 0.10000000000000001 1 0 - 1 - - - False - False - 0 - - - - - % - True - True - False - value as % - False - True - - - True - True - 1 - - - - - True - True - 0 - - - - - True - False - LceScale - - - False - False - 1 - - + EdgeScale - True + False False 2 + + + + False + 3 + + + + + True + vertical + + + + True + horizontal + + - + True - False - - - True - False - - - True - True - -LCE-FACTOR is the weight factor (“strength”) + True + 1 + +A positive LCE-SCALE turns on local contrast +enhancement (LCE) before the LoG edge detection. +LCE-SCALE is the radius of the Gaussian used in +the enhancement step, LCE-FACTOR is the weight +factor (“strength”). - • - False - False - True - True - 0 0 100 0.10000000000000001 1 0 - 1 - - - False - False - 0 - - - - - % - True - True - False - value as % - False - True - - - True - True - 1 - - - - - True - True - 0 - - - - - True - False - LceFactor - - - False - False - 1 - - + • + 0 0 100 0.1 1 0 - True + False False - 6 - 2 + 0 - - - False - True - 10 - - - - - True - False - - - False - True - 11 - - - - - Use CIECAM02 color profile + + + % True True + value as % False - --c - -use CIECAM02 to blend colors. - - False - 0.43000000715255737 True - False - True - 12 + 1 - - - True - False + + + + + True + LceScale + + + False + False + 1 + + - False - True - 13 + False + 1 - + True - False - - + vertical + + + + + True + horizontal + + + True - False + True + 1 + +LCE-FACTOR is the weight factor (“strength”) + + • + 0 0 100 0.1 1 0 False @@ -1185,30 +981,100 @@ - + + % + True + True + value as % + False + True + + + 1 + 0 + + + + + + True - False - Mean -L-star -Lightness -Value -Luminance + LceFactor False False - 6 - end 1 - - - Gray projector: - True - True - False - + + + False + 2 + + + + + False + 10 + + + + + True + + + False + 11 + + + + + Use CIECAM02 color profile + True + True + +-c + +use CIECAM02 to blend colors. + + False + 0.43000000715255737 + True + + + False + 12 + + + + + True + + + False + 13 + + + + + True + + + True + + + False + False + 0 + + + + + Gray projector: + True + True + --gray-projector=OPERATOR apply gray-scale projection OPERATOR in exposure @@ -1216,78 +1082,111 @@ "average", "l-star", "lightness", "value", "luminance", or "channel-mixer:RED-WEIGHT:GREEN-WEIGHT:BLUE-WEIGHT". - - False - True - - - True - True - 2 - - + + False + True + + + 2 + + + + + True + Mean +L-star +Lightness +Value +Luminance False False - 14 + 6 + end + 1 + + False + False + 14 + - - - True - False - <b>Expert Options</b> - True - - - label_item - - - - 1 - - + True - False - Expert + <b>Expert Options</b> + True - 1 - False - tab + label_item + + + 1 + + + + + True + Expert + + + 1 + False + tab + + + + + + True + + + + True + 0 - + True - False + 12 - + True - False - 1 + vertical + + + True + 0 + Preview Size: + + + False + False + 0 + + - + True - False - 1 - 1 - + True - False + vertical - + True - False + True + • + The larger resolution - the longer it takes to generate preview. + 640 0 1280 1 10 0 False @@ -1296,228 +1195,244 @@ - + True - True - Lights - 100 1 100 1 10 0 - 1 - 0 - bottom - + Width - True - True + False + False 1 + + + False + 0 + + + + + True + vertical - + True True - 50 1 100 1 10 0 - 1 - 0 - bottom - + • + The larger resolution - the longer it takes to generate preview. + 640 0 1280 1 10 0 - True - True - 2 + False + False + 0 - + True - True - Shadows - 1 1 100 1 10 0 - 1 - 0 - bottom - + Height - True - True - 3 + False + False + 1 + + False + 1 + + + False + False + 1 + - + True - False - <b>Retouch</b> - True - label_item + False + 2 + + + + + True + 0 + Cache Size: + + + False + False + 3 + + + + + True + + + 1024 Mb (default) + True + True + False + True + True + + + 0 + + + + + True + True + • + 1024 0 10000 1 10 0 + + + False + False + 6 + end + 1 + + + + + False + False + 4 + + + + + True + + + False + 5 + + + + + True + 0 + Bloc Size: + + + False + False + 6 + + + + + True + + + 2048 kb (default) + True + True + False + True + True + + + 0 + + + + + True + True + • + 2048 0 10000 1 10 0 + + + False + False + 6 + end + 1 + + + + + False + False + 7 + + + + + True + + + False + 8 + + + + + True + + + True + 0 + Final image size: + + + False + False + 0 + + + + + Default + True + True + False + True + True + + + False + False + 6 + end + 1 + + + + + False + False + 9 - - - False - True - 0 - - - - - 2 - - - - - True - False - Retusz - - - 2 - False - tab - - - - - True - False - - - True - False - 1 - + True - False - 12 - - True - False - - - True - False - - - True - False - Preview size: - - - False - False - 0 - - - - - True - False - 24 - - - True - False - - - True - True - True - The larger resolution - the longer it takes to generate preview. - • - True - False - False - True - True - 640 0 1280 1 10 0 - - - False - False - 0 - - - - - True - False - Width - - - False - False - 1 - - - - - True - False - 0 - - - - - True - False - - - True - True - True - The larger resolution - the longer it takes to generate preview. - • - True - False - False - True - True - 640 0 1280 1 10 0 - - - False - False - 0 - - - - - True - False - Height - - - False - False - 1 - - - - - True - False - 1 - - - - - False - False - 6 - end - 1 - - + + True + vertical + + + True + True + • + 0 0 10000 1 10 0 + True False @@ -1526,850 +1441,497 @@ - + True - False + Width False - True + False 1 + + + False + 0 + + + + + True + vertical - + True - False - 0 - Cache Size: + True + • + 0 0 10000 1 10 0 + True False False - 2 + 0 - + True - False - - - 1024 Mb (default) - True - True - False - False - True - True - - - True - True - 0 - - - - - True - True - • - False - False - True - True - 1024 0 10000 1 10 0 - - - False - False - 6 - end - 1 - - - - - False - False - 3 - - - - - True - False - - - False - True - 4 - - - - - True - False - 0 - Bloc Size: - - - False - False - 5 - - - - - True - False - - - 2048 kb (default) - True - True - False - False - True - True - - - True - True - 0 - - - - - True - True - • - False - False - True - True - 2048 0 10000 1 10 0 - - - False - False - 6 - end - 1 - - - - - False - False - 6 - - - - - True - False - - - False - True - 7 - - - - - True - False - - - True - False - 0 - Final image size: - - - False - False - 0 - - - - - Default - True - True - False - False - True - True - - - False - False - 6 - end - 1 - - - - - False - False - 8 - - - - - True - False - - - True - False - - - True - True - • - False - False - True - True - 0 0 10000 1 10 0 - True - - - False - False - 0 - - - - - True - False - Width - - - False - False - 1 - - - - - True - False - 0 - - - - - True - False - - - True - True - • - False - False - True - True - 0 0 10000 1 10 0 - True - - - False - False - 0 - - - - - True - False - Height - - - False - False - 1 - - - - - True - False - 1 - - - - - True - False - - - True - True - • - False - False - True - True - 0 0 10000 1 10 0 - True - - - False - False - 0 - - - - - True - False - X-offset - - - False - False - 1 - - - - - True - False - 2 - - - - - True - False - - - True - True - • - False - False - True - True - 0 0 10000 1 10 0 - True - - - False - False - 0 - - - - - True - False - Y-offset - - - False - False - 1 - - - - - False - False - 3 - - - - - False - False - 9 - - - - - True - False - - - False - True - 10 - - - - - True - False - 0 - Jpeg compression: - - - False - True - 11 - - - - - True - False - - - Default - True - True - False - False - True - True - - - False - False - 0 - - - - - True - True - 85 0 100 1 10 0 - 0 - - - True - True - 6 - 1 - - - - - False - True - 12 - - - - - True - False - - - False - True - 13 - - - - - True - False - - - True - False - Tiff compression: - - - False - False - 0 - - - - - True - False - 0 - None -Packbits -LZW -Deflate - - - True - True - 6 - 1 - - + Height + + + False + False + 1 + + + + + False + 1 + + + + + True + vertical + + + True + True + • + 0 0 10000 1 10 0 + True False - True - 14 + False + 0 - + True - False + X-offset False - True - 15 + False + 1 + + + False + 2 + + + + + True + vertical - + True - False - - - True - False - Edit with: - - - False - False - 0 - - - - - True - True - True - -Enter name of graphics editor to edit images -(f.e. gimp (default), fotoxx, delaboratory) - - 24 - gimp - False - gtk-apply - False - True - False - True - - - - True - True - 6 - end - 1 - - + True + • + 0 0 10000 1 10 0 + True False - True - 16 + False + 0 - + True - False + Y-offset False - True - 17 + False + 1 + + False + False + 3 + + + False + False + 10 + - + True - False - <b>Software Options</b> - True - label_item + False + 11 - - - True - True - 2 - - - - - True - False - 1 - + + True + 0 + Jpeg compression: + + + False + 12 + + + + True - False - 12 - - Copy exif info ? + + Default True True False - False + True True + + False + False + 0 + + + + + True + True + 85 0 100 1 10 0 + 0 + + + 1 + + + False + 13 + + + + + True + + + False + 14 + - + True - False - <b>Exif</b> - True + + + True + Tiff compression: + + + False + False + 0 + + + + + True + 0 + None +Packbits +LZW +Deflate + + + False + 1 + + - label_item + False + 15 + - - False - False - 19 - + + + + + + + + + True + <b>Software Options</b> + True - 3 + label_item - - + + + + 2 + + + + + True - False - Configuration + 0 + + + True + 12 + + + Copy exif info ? + True + True + False + True + + + + + + + True + <b>Exif</b> + True + + + label_item + + - 3 - False - tab + False + False + 16 + + + + + + True + Configuration + + + 2 + False + tab + + + + + + False + False + 0 + + + + + + True + end + + + _Preview + True + True + True + True + + + + + False + False + 1 + + + + + _Before/After + True + True + True + True + + + + + + False + False + 0 + + + + + False + False + 7 + 2 + + + + + True + 0 + + + + + True + spread + + + gtk-add + True + True + True + True + + False False - 1 0 - + + gtk-remove + True + True + True + True + True + + + + + False + False + 1 + + + + + + + + True + <b>Photos</b> + True + + + label_item + + + + + + + + + True + 0 + + True - False - end + spread - - _Before/After + + gtk-quit True True True - False - True - - - + True + False False - 0 + 2 - - _Preview + + gtk-edit True True True - False True - - + True + + False False - 1 + 3 - - - False - False - 1 - 1 - - - - - True - False - 1 - - - True - False - spread - - - gtk-add - True - True - True - False - True - - - - - False - False - 0 - - - - - gtk-remove - True - True - True - False - True - True - - - - - False - False - 1 - - - - - + + gtk-save True - False - <b>Photos</b> - True + True + True + True + True + + - label_item + False + False + 4 - - True - True - 1 - 2 - - + True - False - 1 - - - True - False - spread - - - gtk-quit - True - True - True - False - True - - - - False - False - 2 - - - - - gtk-edit - True - True - True - False - True - True - - - - - False - False - 3 - - - - - gtk-save - True - True - True - False - True - True - - - - - False - False - 4 - - - - - - - True - False - <b>Action</b> - True - - - label_item - - + <b>Action</b> + True - False - True - 1 - end - 3 + label_item False - False + 6 + end 1 @@ -2377,29 +1939,37 @@ False False + 1 + + + + + False + False 0 + + True - False + vertical True - False immediate 0 none True - False immediate True - False + + @@ -2407,7 +1977,6 @@ True - False <b>Preview</b> True @@ -2417,15 +1986,13 @@ - True - True 0 + True - False False @@ -2434,32 +2001,33 @@ - - True - False - - - False - True - end - 1 - - + + True + + + + + False + end + 1 + + + - True - True 2 - True - True 1 + + # status bar + +