[Pkg-phototools-devel] [enblend cvs 3/5] (Mindless) update of debian/patches/type_mismatch.dpatch.

[Andreas Metzler]

---
 debian/changelog                    |    1 +
 debian/patches/type_mismatch.dpatch |   12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 922d046..cd7c11c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ enblend (3.1~cvs20080801+dfsg-0.1) experimental; urgency=low
     + Add zlib1g-dev, libjpeg62-dev, libpng12-dev,
       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.
 
  -- Andreas Metzler <ametzler at debian.org>  Sat, 02 Aug 2008 13:21:46 +0200
 
diff --git a/debian/patches/type_mismatch.dpatch b/debian/patches/type_mismatch.dpatch
index 42e79d1..adf12dd 100644
--- a/debian/patches/type_mismatch.dpatch
+++ b/debian/patches/type_mismatch.dpatch
@@ -4,15 +4,15 @@
 ## DP: Fixed a type mismatch when trying to instantiate std::max.
 
 @DPATCH@
-
---- a/src/anneal.h
-+++ b/src/anneal.h
-@@ -678,7 +678,7 @@
+ 
+--- a/src/anneal.h	2008-08-02 13:41:30.000000000 +0200
++++ b/src/anneal.h	2008-08-02 13:42:28.000000000 +0200
+@@ -694,7 +694,7 @@
  
              localK = stateSpace->size();
              if (localK < 2) convergedPoints[index] = true;
--            kMax = std::max(kMax, stateProbabilities->size());
-+            kMax = std::max(kMax, (unsigned int)stateProbabilities->size());
+-            kMax = std::max((size_t)kMax, stateProbabilities->size());
++            kMax = std::max((size_t)kMax, (unsigned int)stateProbabilities->size());
  
          }
  
-- 
1.5.6.3