Skip to content

Fix transform on clipped images#437

Merged
ystrot merged 1 commit intoexyte:masterfrom
stephsharp:fix-transform
Jun 27, 2018
Merged

Fix transform on clipped images#437
ystrot merged 1 commit intoexyte:masterfrom
stephsharp:fix-transform

Conversation

@stephsharp
Copy link
Contributor

@stephsharp stephsharp commented Jun 25, 2018

transform-fix

Note: depends on #436

@stephsharp
Copy link
Contributor Author

stephsharp commented Jun 25, 2018 •
edited
Loading

Investigating the broken test.

Clip is missing when parsing masking-path-02-b-manual:

          "clip" : {
            "x" : 60,
            "w" : 80,
            "type" : "Rect",
            "y" : 60,
            "h" : 80
          }

Looks like TransformedLocus is not Serializable.

@f3dm76
Copy link
Collaborator

f3dm76 commented Jun 26, 2018

Hello, Thank you very much for your contribution. About the test, you are right. I added serialization for TransformedLocus. We'll let you know once it is merged

@f3dm76
Copy link
Collaborator

f3dm76 commented Jun 26, 2018 •
edited
Loading

Hello again, TransformedLocus serialization was merged to master, could you please renew the pull request to restart the tests?

@stephsharp stephsharp force-pushed the fix-transform branch 2 times, most recently from 16f89a0 to 6abb303 Compare June 26, 2018 14:54
stephsharp
stephsharp commented Jun 26, 2018
View reviewed changes
Source/svg/SVGParser.swift Outdated
let transform = transformBoundingBoxLocus(respectiveLocus: userSpaceLocus.locus, absoluteLocus: locus)
return TransformedLocus(locus: userSpaceLocus.locus, transform: transform)
}
if let userSpaceTransform = userSpaceLocus.transform, userSpaceTransform != Transform.identity {
Copy link
Contributor Author

@stephsharp stephsharp Jun 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a check here to only return a TransformedLocus if the transform is not the identity matrix.

@stephsharp
Copy link
Contributor Author

stephsharp commented Jun 26, 2018

Thanks @f3dm76, tests are passing now!

@f3dm76
Copy link
Collaborator

f3dm76 commented Jun 27, 2018 •
edited
Loading

Hello, looks good, but it seems like it's easier to just put TransformedLocus directly into UserSpaceLocus.locus. Then there's no need for UserSpaceLocus.transform at all.

@stephsharp
Copy link
Contributor Author

stephsharp commented Jun 27, 2018

Great idea! I've updated the PR.

@ystrot ystrot added this to the 0.9.2 milestone Jun 27, 2018
@ystrot ystrot self-assigned this Jun 27, 2018
@ystrot ystrot merged commit 30dc952 into exyte:master Jun 27, 2018
@ystrot
Copy link
Member

ystrot commented Jun 27, 2018

Hi Stephanie,

Thanks for your help!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ystrot ystrot ystrot approved these changes

Assignees

@ystrot ystrot

Labels

None yet

Projects

None yet

Milestone

0.9.2

Development

Successfully merging this pull request may close these issues.

3 participants

@stephsharp @f3dm76 @ystrot