Commit8ccd2ee

authored

Merge pull request#28490 from meeseeksmachine/auto-backport-of-pr-28486-on-v3.9.x

Backport PR#28486 on branch v3.9.x (Fix CompositeGenericTransform.contains_branch_seperately)

2 parents51decc5 +b7d25c4 commit8ccd2eeCopy full SHA for 8ccd2ee

File tree

+17

-1

lines changed

+17

-1

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -667,6 +667,13 @@ def test_contains_branch(self):`
`667`	`667`
`668`	`668`	`assertnotself.stack1.contains_branch(self.tn1+self.ta2)`
`669`	`669`
	`670`	`+blend=mtransforms.BlendedGenericTransform(self.tn2,self.stack2)`
	`671`	`+x,y=blend.contains_branch_seperately(self.stack2_subset)`
	`672`	`+stack_blend=self.tn3+blend`
	`673`	`+sx,sy=stack_blend.contains_branch_seperately(self.stack2_subset)`
	`674`	`+assertxissxisFalse`
	`675`	`+assertyissyisTrue`
	`676`	`+`
`670`	`677`	`deftest_affine_simplification(self):`
`671`	`678`	`# tests that a transform stack only calls as much is absolutely`
`672`	`679`	`# necessary "non-affine" allowing the best possible optimization with`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1423,7 +1423,7 @@ def contains_branch_seperately(self, other_transform):`
`1423`	`1423`	`'transforms with 2 output dimensions')`
`1424`	`1424`	`# for a non-blended transform each separate dimension is the same, so`
`1425`	`1425`	`# just return the appropriate shape.`
`1426`		`-return[self.contains_branch(other_transform)]*2`
	`1426`	`+return(self.contains_branch(other_transform), )*2`
`1427`	`1427`
`1428`	`1428`	`def__sub__(self,other):`
`1429`	`1429`	`"""`
`@@ -2404,6 +2404,15 @@ def _iter_break_from_left_to_right(self):`
`2404`	`2404`	`forleft,rightinself._b._iter_break_from_left_to_right():`
`2405`	`2405`	`yieldself._a+left,right`
`2406`	`2406`
	`2407`	`+defcontains_branch_seperately(self,other_transform):`
	`2408`	`+# docstring inherited`
	`2409`	`+ifself.output_dims!=2:`
	`2410`	`+raiseValueError('contains_branch_seperately only supports '`
	`2411`	`+'transforms with 2 output dimensions')`
	`2412`	`+ifself==other_transform:`
	`2413`	`+return (True,True)`
	`2414`	`+returnself._b.contains_branch_seperately(other_transform)`
	`2415`	`+`
`2407`	`2416`	`depth=property(lambdaself:self._a.depth+self._b.depth)`
`2408`	`2417`	`is_affine=property(lambdaself:self._a.is_affineandself._b.is_affine)`
`2409`	`2418`	`is_separable=property(`

Comments

(0)