[Pkg-phototools-devel] [enblend cvs 5/5] Fix segfault by reverting the respective patch. [debian/patches/segfault.sf2027314.dpatch]

[Andreas Metzler]

---
 debian/changelog                         |    2 ++
 debian/patches/00list                    |    2 +-
 debian/patches/segfault.sf2027314.dpatch |   28 ++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 1 deletions(-)
 create mode 100644 debian/patches/segfault.sf2027314.dpatch

diff --git a/debian/changelog b/debian/changelog
index 636e5ac..dba2e11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ enblend (3.1~cvs20080801+dfsg-0.1) experimental; urgency=low
       although they currently would be pulled in by other build-depends.
     + Add libopenexr-dev and pkg-config.
   * (Mindless) update of debian/patches/type_mismatch.dpatch.
+  * Fix segfault by reverting the respective patch.
+    debian/patches/segfault.sf2027314.dpatch
   * Add debian/README.dfsgify, describing how the tarball was built.
   * Patch m4/ax_check_glut.m4 to get rid of unnecesary linking against -lICE
     -lSM -lXmu -lXi.
diff --git a/debian/patches/00list b/debian/patches/00list
index 69a7b12..9be03ce 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,3 +1,3 @@
 type_mismatch.dpatch
 gcc4.3-includes.dpatch
-
+segfault.sf2027314
diff --git a/debian/patches/segfault.sf2027314.dpatch b/debian/patches/segfault.sf2027314.dpatch
new file mode 100644
index 0000000..4ddc779
--- /dev/null
+++ b/debian/patches/segfault.sf2027314.dpatch
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## segfault.sf2027314.dpatch by Andreas Metzler <ametzler at debian.org>
+##
+## DP: enblend in CVS head segfaults.
+## DP: http://sourceforge.net/tracker/index.php?func=detail&aid=2027314&group_id=123407&atid=696410
+## DP: This patch simply reverts the broken part of the commit.
+
+ at DPATCH@
+diff -urNad enblend-3.1~cvs20080801+dfsg~/include/vigra/cachedfileimage.hxx enblend-3.1~cvs20080801+dfsg/include/vigra/cachedfileimage.hxx
+--- enblend-3.1~cvs20080801+dfsg~/include/vigra/cachedfileimage.hxx	2008-07-21 04:48:26.000000000 +0000
++++ enblend-3.1~cvs20080801+dfsg/include/vigra/cachedfileimage.hxx	2008-08-02 14:32:40.000000000 +0000
+@@ -762,12 +762,12 @@
+     }
+ 
+     CachedFileImageIteratorBase& operator=(const CachedFileImageIteratorBase &r) {
+-        // Note that we change i first so that the assigment to y causes us to get notified
+-        // about the new y coordinate in the new image.
+-        currentRow = NULL;
+-        i = r.i;
+         x = r.x;
+         y = r.y;
++        i = r.i;
++        currentRow = NULL;
++        y.setNotify(this);
++        _notify(y());
+         return *this;
+     }
+ 
-- 
1.5.6.3