[med-svn] [dicompyler] 01/01: Do not fix problems in one patch in a subsequent one.

[Andreas Tille]

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

tille pushed a commit to branch master
in repository dicompyler.

commit 737c28f05cb87f13e52519a6c3164be7a94cb8d4
Author: Andreas Tille <tille at debian.org>
Date:   Mon Sep 18 16:09:04 2017 +0200

    Do not fix problems in one patch in a subsequent one.
---
 debian/patches/01.patch                | 19 ++-----------------
 debian/patches/more_wx30_patches.patch |  6 ++++--
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/debian/patches/01.patch b/debian/patches/01.patch
index 6244747..4613dbf 100644
--- a/debian/patches/01.patch
+++ b/debian/patches/01.patch
@@ -3,23 +3,8 @@ Last-Update: Mon Sep 18 14:44:01 CEST 2017
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854837
 Description: Added support for pillow >=3.0.0 addressing changes due to commit https://github.com/python-pillow/Pillow/commit/71c95c8e5f3bba1845444a246d04646825e6bab3, small indentation fix.
 
-Index: dicompyler/dicompyler/dvhcalc.py
-===================================================================
---- dicompyler.orig/dicompyler/dvhcalc.py
-+++ dicompyler/dicompyler/dvhcalc.py
-@@ -160,7 +160,7 @@ def calculate_contour_areas(plane):
- def get_contour_mask(doselut, dosegridpoints, contour):
-     """Get the mask for the contour with respect to the dose plane."""
- 
--        grid = nx.points_inside_poly(dosegridpoints, contour)
-+    grid = nx.points_inside_poly(dosegridpoints, contour)
-     grid = grid.reshape((len(doselut[1]), len(doselut[0])))
- 
-     return grid
-Index: dicompyler/dicompyler/guiutil.py
-===================================================================
---- dicompyler.orig/dicompyler/guiutil.py
-+++ dicompyler/dicompyler/guiutil.py
+--- a/dicompyler/guiutil.py
++++ b/dicompyler/guiutil.py
 @@ -78,12 +78,12 @@ def convert_pil_to_wx(pil, alpha=True):
          Code taken from Dave Witten's imViewer-Simple.py in pydicom contrib."""
      if alpha:
diff --git a/debian/patches/more_wx30_patches.patch b/debian/patches/more_wx30_patches.patch
index 955cb3b..d3cd106 100644
--- a/debian/patches/more_wx30_patches.patch
+++ b/debian/patches/more_wx30_patches.patch
@@ -205,16 +205,18 @@ Description: More wx3.0 patches to make dicompyler run
                          if nx.pnpoly(point[0], point[1],
                                   np.array(contours[largestIndex]['data'])):
                              contour['inside'] = True
-@@ -171,9 +160,6 @@ def calculate_contour_areas(plane):
+@@ -171,10 +160,7 @@ def calculate_contour_areas(plane):
  def get_contour_mask(doselut, dosegridpoints, contour):
      """Get the mask for the contour with respect to the dose plane."""
  
 -    if matplotlib.__version__ > '1.2':
 -        grid = mpl_Path(contour).contains_points(dosegridpoints)
 -    else:
-         grid = nx.points_inside_poly(dosegridpoints, contour)
+-        grid = nx.points_inside_poly(dosegridpoints, contour)
++    grid = nx.points_inside_poly(dosegridpoints, contour)
      grid = grid.reshape((len(doselut[1]), len(doselut[0])))
  
+     return grid
 --- a/dicompyler/guiutil.py
 +++ b/dicompyler/guiutil.py
 @@ -10,9 +10,7 @@

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