Reduce coupling between _tkagg and _backend_agg modules #3778
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tacaswell
added a commit
that referenced
this pull request
Nov 11, 2014
MNT : Reduce coupling between _tkagg and _backend_agg modules
|
CC @WeatherGod - is this impacting you? |
| 'agg_vpgen_segmentator.cpp' | ||
| ] | ||
| ext.sources.extend( | ||
| os.path.join('extern', 'agg24', 'src', x) for x in agg_sources) |
There was a problem hiding this comment.
Isn't this supposed to be "agg24-svn" now?
|
Don't know if it is the source of my issues, but the movement of the agg24-svn directory and the (possibly) incorrect sourcing of agg files might explain why I am having problems regardless of which version I build. Furthermore, the changes here might definitely explain why I am getting a segfault only on master, but merely an exception with the other versions. |
| @@ -852,23 +852,24 @@ def check(self): | |||
| self.__class__.found_external = False | |||
| return str(e) + ' Using local copy.' | |||
|
|
|||
| def add_flags(self, ext): | |||
| def add_flags(self, ext, add_sources=True): | |||
| if self.found_external: | |||
| pkg_config.setup_extension(ext, 'libagg') | |||
| else: | |||
| ext.include_dirs.append('extern/agg24/include') | |||
There was a problem hiding this comment.
same point about agg24 here, too
|
Sorry -- apparently this was a merge gone awry. It was, however, fixed on Tuesday in f5bbee2 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will make it easier to move to floating-point image buffers in the near future.