[3depict] 02/02: * Add upstream patch to fix caching bug

[D Haley]

This is an automated email from the git hooks/post-receive script.

mycae-guest pushed a commit to branch master
in repository 3depict.

commit 03885651fecdd83f9e8d3310f9a51fbb0e6d9de8
Author: D Haley <mycae at gmx.com>
Date:   Mon Jan 20 09:26:31 2014 +0100

    * Add upstream patch to fix caching bug
---
 debian/changelog                 |  6 ++++++
 debian/patches/patch-caching-bug | 34 ++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 3 files changed, 41 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ae96210..031ab8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+3depict (0.0.15-2) unstable; urgency=medium
+
+  * Really remove unit tests (Closes: #730100)
+
+ -- D Haley <mycae at gmx.com>  Mon, 20 Jan 2014 06:25:38 +0100
+
 3depict (0.0.15-1) unstable; urgency=low
 
   * update to upstream
diff --git a/debian/patches/patch-caching-bug b/debian/patches/patch-caching-bug
new file mode 100644
index 0000000..7934637
--- /dev/null
+++ b/debian/patches/patch-caching-bug
@@ -0,0 +1,34 @@
+--- 3depict-0.0.15.orig/src/backend/filters/ionColour.cpp
++++ 3depict-0.0.15/src/backend/filters/ionColour.cpp
+@@ -82,7 +82,7 @@
+ 	if(cacheOK)
+ 	{
+ 		ASSERT(filterOutputs.size());
+-		propagateStreams(dataIn,getOut,STREAM_TYPE_IONS,false);
++		propagateStreams(dataIn,getOut,getRefreshBlockMask(),true);
+ 
+ 		propagateCache(getOut);
+ 
+--- 3depict-0.0.15.orig/src/backend/filters/rangeFile.cpp
++++ 3depict-0.0.15/src/backend/filters/rangeFile.cpp
+@@ -107,7 +107,7 @@
+ 		//We don't cache anything but our modification
+ 		//to the ion stream data types. so we propagate
+ 		//these.
+-		propagateStreams(dataIn,getOut,STREAM_TYPE_IONS,false);
++		propagateStreams(dataIn,getOut,getRefreshBlockMask(),true);
+ 			
+ 		return 0;
+ 	}
+--- 3depict-0.0.15.orig/src/backend/filters/transform.cpp
++++ 3depict-0.0.15/src/backend/filters/transform.cpp
+@@ -189,7 +189,8 @@
+ 	//use the cached copy if we have it.
+ 	if(cacheOK)
+ 	{
+-		propagateStreams(dataIn,getOut, STREAM_TYPE_IONS,false);
++		//Propagate non-ion-types into output
++		propagateStreams(dataIn,getOut, getRefreshBlockMask(),true);
+ 		propagateCache(getOut);
+ 		return 0;
+ 	}
diff --git a/debian/patches/series b/debian/patches/series
index 66ca1f9..813c58e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix-mgl-overlay-title
 debian-desktop-naming.patch
 lowercase-textdomain.patch
 FTGL-lowercase.patch
+patch-caching-bug

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/3depict.git