[med-svn] [charls] 10/10: Remove another patch applied upstream; deactivate all other patches that do not apply as expected

[Andreas Tille]

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

tille pushed a commit to branch master
in repository charls.

commit be832bc8184f823238364bdb3fa70ad123157832
Author: Andreas Tille <tille at debian.org>
Date:   Thu May 19 17:43:34 2016 +0200

    Remove another patch applied upstream; deactivate all other patches that do not apply as expected
---
 debian/patches/fix_EncoderStrategy.patch | 36 --------------------------------
 debian/patches/series                    |  9 ++++----
 2 files changed, 4 insertions(+), 41 deletions(-)

diff --git a/debian/patches/fix_EncoderStrategy.patch b/debian/patches/fix_EncoderStrategy.patch
deleted file mode 100644
index 8924dfc..0000000
--- a/debian/patches/fix_EncoderStrategy.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: [PATCH] Resolved #9. EncoderStrategy::AppendToBitStream can now
- handle the condition that a second flush is needed to create enough room in
- the 32-bit buffer.
-Author: Victor Derks <vbaderks at gmail.com>
-Bug-Debian: https://bugs.debian.org/816607
-Origin: upstream, https://github.com/team-charls/charls/commit/73d351f2df2ca267db35574ffb7a1398a6afb004
-Reviewed-By: Mathieu Malaterre <malat at debian.org>
-
---- a/encoderstrategy.h
-+++ b/encoderstrategy.h
-@@ -75,9 +75,15 @@ protected:
- 			return;
- 		}
- 		valcurrent |= value >> -bitpos;
--
- 		Flush();
- 	        
-+		// A second flush may be required if extra marker-detect bits were needed and not all bits could be written.
-+		if (bitpos < 0)
-+		{
-+			valcurrent |= value >> -bitpos;
-+			Flush();
-+		}
-+
- 		ASSERT(bitpos >=0);
- 		valcurrent |= value << bitpos;	
- 
-@@ -106,7 +112,7 @@ protected:
- 
- 			if (_isFFWritten)
- 			{
--				// insert highmost bit
-+				// JPEG-LS requirement (T.87, A.1) to detect markers: after a xFF value a single 0 bit needs to be inserted.
- 				*_position = BYTE(valcurrent >> 25);
- 				valcurrent = valcurrent << 7;			
- 				bitpos += 7;	
diff --git a/debian/patches/series b/debian/patches/series
index 20b1fd7..e4a2240 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
-charls_add_cmake_install_target.patch
-charls_add_sharedlib_soname.patch
-charls_fix_tests.patch
-stl_symbols_hack.patch
-fix_EncoderStrategy.patch
+# charls_add_cmake_install_target.patch
+# charls_add_sharedlib_soname.patch
+# charls_fix_tests.patch
+# stl_symbols_hack.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/charls.git