Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Image.type property #42

Merged
merged 8 commits into from Aug 22, 2012
Merged

Image.type property #42

merged 8 commits into from Aug 22, 2012

Conversation

@pflorczyk
Copy link
Contributor

@pflorczyk pflorczyk commented Aug 22, 2012

I have merged and fixed the changes from pull request 33. I think it should be good now.

- Added signature for the MagickGetImageType

modified:   wand/image.py
- Exposed more tuples in _all_ defining low-level types.
- Implemented image.type() property, .e.g

    if img.type == 'grayscale':
        img.type = 'grayscalematte'
    assert img.type == 'grayscalematte'
@travisbot
Copy link

@travisbot travisbot commented Aug 22, 2012

This pull request passes (merged 8b8420de into 8ef10c8).

@travisbot
Copy link

@travisbot travisbot commented Aug 22, 2012

This pull request passes (merged fde23af into 8ef10c8).

@pflorczyk
Copy link
Contributor Author

@pflorczyk pflorczyk commented Aug 22, 2012

Sorry, still learning git... I wanted to reword merge commit but it looks like I messed up even more

@@ -21,7 +21,8 @@
from .resource import DestroyedResourceError, Resource


__all__ = 'FILTER_TYPES', 'Image', 'Iterator', 'ClosedImageError'
__all__ = 'FILTER_TYPES', 'COMPOSITE_OPS', 'CHANNELS', 'EVALUATE_OPS',\
'IMAGE_TYPES', 'Image', 'Iterator', 'ClosedImageError'

This comment has been minimized.

@dahlia

dahlia Aug 22, 2012
Collaborator

Could we use parentheses instead of a back slash? :-)

@dahlia
Copy link
Collaborator

@dahlia dahlia commented Aug 22, 2012

👍

Fixed coding style while at it.
@travisbot
Copy link

@travisbot travisbot commented Aug 22, 2012

This pull request passes (merged 60c3101 into 8ef10c8).

@travisbot
Copy link

@travisbot travisbot commented Aug 22, 2012

This pull request passes (merged 2ee0e65 into 8ef10c8).

@pflorczyk
Copy link
Contributor Author

@pflorczyk pflorczyk commented Aug 22, 2012

I have updated image.all to use parentheses. It the mean time I have also updated values in image.ALPHA_CHANNEL_TYPES to stick with naming convention in other tuples. Nothing that should affect anything outside Image.alpha_channel property (also updated)

dahlia added a commit that referenced this pull request Aug 22, 2012
@dahlia dahlia merged commit 89f5c17 into emcconville:master Aug 22, 2012
1 check passed
1 check passed
@dahlia
default The Travis build passed
Details
dahlia added a commit that referenced this pull request Aug 22, 2012
dahlia added a commit that referenced this pull request Aug 22, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants