Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Rewrite of image infrastructure#5718

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
tacaswell merged 65 commits intomatplotlib:masterfrommdboom:image-interpolation
Feb 18, 2016
Merged
Show file tree
Hide file tree
Changes from1 commit
Commits
Show all changes
65 commits
Select commitHold shift + click to select a range
cf11aea
Remove Image class. Replace with resample func
mdboomDec 22, 2015
3b7d1bb
Agg backend shouldn't do its own image interp
mdboomDec 22, 2015
c9cae50
Update interpolation_methods.py to use viridis
mdboomDec 22, 2015
4a05302
Remove svg.image_noscale rcParam
mdboomDec 22, 2015
0aa222a
Rewrite image classes
mdboomDec 22, 2015
0793aa2
Update backends for new API
mdboomDec 22, 2015
1384c7c
Use transforms to rotate image, not hack
mdboomDec 22, 2015
9148c7f
Update tests
mdboomDec 22, 2015
820479e
Decrease generated code size
mdboomDec 22, 2015
fad84c8
Remove explicit LICENSE.
mdboomDec 22, 2015
64e84ea
Numpy 1.6 compatibility
mdboomDec 30, 2015
0be04c0
Add Agg filter test
mdboomDec 30, 2015
a8643f1
Fix formatting
mdboomDec 30, 2015
5df79f0
Mark test as known fail on Numpy 1.6
mdboomDec 30, 2015
b436f1a
Update draw_image API doc
mdboomDec 30, 2015
dfbc39d
Fix reference counting
mdboomDec 30, 2015
9d3b468
[skip-ci] PEP8
mdboomDec 30, 2015
f9d8534
Update what's new
mdboomDec 30, 2015
7b32cd8
Fix demo_annotation_box.py
mdboomDec 30, 2015
6e60ebf
Fix #3057: Don't composite when interpolation == 'none'
mdboomDec 30, 2015
dc66ed0
Remove broken example
mdboomDec 30, 2015
7cccfb3
Support 16-bit grayscale
mdboomDec 30, 2015
5073f6e
Fix permissions on demo_image_affine.py
mdboomDec 31, 2015
625e80a
Fix alpha handling for interpolation == 'none'
mdboomDec 31, 2015
c778cfc
Use `kind` instead of `issubclass`
mdboomDec 31, 2015
9fe6658
Update docstring
mdboomDec 31, 2015
d61ac2a
Revert change
mdboomDec 31, 2015
b3318fd
Make demo_text_path.py work again
mdboomDec 31, 2015
ffbbf05
Remove extraneous space
mdboomDec 31, 2015
fbb55c8
Privatize self._images
mdboomDec 31, 2015
34d6cc8
Simplify expression
mdboomJan 1, 2016
4c5a3bf
Update docstring
mdboomJan 1, 2016
9448208
Fix #5520: Don't round up if already rounded
mdboomJan 5, 2016
83f4bc9
Merge pull request #17 from tacaswell/image-interpolation
mdboomJan 4, 2016
d5030a4
Use abs() for NEAREST check
mdboomJan 5, 2016
55c1abb
Image composite respecting z-order
mdboomJan 5, 2016
fe376c4
Fix #4280: Preserve size when saving images
mdboomJan 5, 2016
5266fde
Python 2.x fix
mdboomJan 5, 2016
9285c3a
Update composite_images docstring
mdboomJan 7, 2016
e2b2bbe
Refine can_composite
mdboomJan 7, 2016
b894683
Improve make_image docstring
mdboomJan 7, 2016
4e43c8b
Use X.ndim over len(X.shape)
mdboomJan 7, 2016
8665697
Use float32 when applying alpha
mdboomJan 7, 2016
d21a6ed
Use output.shape
mdboomJan 7, 2016
2d2a126
Add unsampled kwarg everywhere
mdboomJan 7, 2016
6d3518a
PEP8
mdboomJan 7, 2016
0b8d693
Use super()
mdboomJan 7, 2016
0f43f68
Put shape in exception
mdboomJan 7, 2016
cd0e7e0
Case insensitive check for PNG extension
mdboomJan 7, 2016
e62832f
Fix Numpy version check
mdboomJan 7, 2016
e7d54d5
@cleanup unnecessary here
mdboomJan 7, 2016
3e532e1
Make BboxImage work
mdboomJan 7, 2016
cfad8d9
Reinstate strictness of test_imsave_color_alpha
mdboomJan 7, 2016
e52c26f
PEP8
mdboomJan 7, 2016
0469ab7
Fix has image test in Axes
mdboomJan 7, 2016
b391f08
Refactor image compositing logic into a single function
mdboomJan 7, 2016
89365c1
Properly handle NULL composite image
mdboomJan 11, 2016
7f2f375
PEP8
mdboomJan 11, 2016
9827d1f
Consistent handling of empty composite images
mdboomJan 11, 2016
5be66de
Rename lena variable
mdboomJan 29, 2016
bd521cd
Update docstring to reflect reality
mdboomJan 29, 2016
d6b22a5
Address more minor comments in the PR
mdboomFeb 2, 2016
fff1d66
Increase tolerance on Windows
mdboomFeb 17, 2016
da6c00b
Increase tolerance of png_suite test
mdboomFeb 17, 2016
c9b2425
PEP8
mdboomFeb 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
PrevPrevious commit
NextNext commit
Agg backend shouldn't do its own image interp
  • Loading branch information
@mdboom
mdboom committedFeb 17, 2016
commit3b7d1bb73f73ca667f3978e9d8201112761d6ee9
12 changes: 3 additions & 9 deletionslib/matplotlib/backends/backend_agg.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -321,7 +321,7 @@ def option_scale_image(self):
"""
agg backend support arbitrary scaling of image.
"""
returnTrue
returnFalse

def restore_region(self, region, bbox=None, xy=None):
"""
Expand DownExpand Up@@ -389,28 +389,22 @@ def post_processing(image, dpi):
# For agg_filter to work, the rendere's method need
# to overridden in the class. See draw_markers, and draw_path_collections

from matplotlib._image import fromarray

width, height = int(self.width), int(self.height)

buffer, bounds = self.tostring_rgba_minimized()

l, b, w, h = bounds


self._renderer = self._filter_renderers.pop()
self._update_methods()

if w > 0 and h > 0:
img = np.fromstring(buffer, np.uint8)
img, ox, oy = post_processing(img.reshape((h, w, 4)) / 255.,
self.dpi)
image = fromarray(img, 1)

gc = self.new_gc()
self._renderer.draw_image(gc,
l+ox, height - b - h +oy,
image)
self._renderer.draw_image(
gc, l + ox, height - b - h + oy, img)


def new_figure_manager(num, *args, **kwargs):
Expand Down
55 changes: 12 additions & 43 deletionssrc/_backend_agg.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -158,11 +158,7 @@ class RendererAgg
void draw_image(GCAgg &gc,
double x,
double y,
ImageArray &image,
double w,
double h,
agg::trans_affine trans,
bool resize);
ImageArray &image);

template <class PathGenerator,
class TransformArray,
Expand DownExpand Up@@ -832,11 +828,7 @@ template <class ImageArray>
inline void RendererAgg::draw_image(GCAgg &gc,
double x,
double y,
ImageArray &image,
double w,
double h,
agg::trans_affine trans,
bool resize)
ImageArray &image)
{
double alpha = gc.alpha;

Expand All@@ -850,21 +842,11 @@ inline void RendererAgg::draw_image(GCAgg &gc,
image.data(), (unsigned)image.dim(1), (unsigned)image.dim(0), -(int)image.dim(1) * 4);
pixfmt pixf(buffer);

if (resize |has_clippath) {
if (has_clippath) {
agg::trans_affine mtx;
agg::path_storage rect;

if (resize) {
mtx *= agg::trans_affine_scaling(1, -1);
mtx *= agg::trans_affine_translation(0, image.dim(0));
mtx *= agg::trans_affine_scaling(w / (image.dim(1)), h / (image.dim(0)));
mtx *= agg::trans_affine_translation(x, y);
mtx *= trans;
mtx *= agg::trans_affine_scaling(1.0, -1.0);
mtx *= agg::trans_affine_translation(0.0, (double)height);
} else {
mtx *= agg::trans_affine_translation((int)x, (int)(height - (y + image.dim(0))));
}
mtx *= agg::trans_affine_translation((int)x, (int)(height - (y + image.dim(0))));

rect.move_to(0, 0);
rect.line_to(image.dim(1), 0);
Expand All@@ -891,30 +873,17 @@ inline void RendererAgg::draw_image(GCAgg &gc,
span_conv_alpha conv_alpha(alpha);
span_conv spans(image_span_generator, conv_alpha);

if (has_clippath) {
typedef agg::pixfmt_amask_adaptor<pixfmt, alpha_mask_type> pixfmt_amask_type;
typedef agg::renderer_base<pixfmt_amask_type> amask_ren_type;
typedef agg::renderer_scanline_aa<amask_ren_type, color_span_alloc_type, span_conv>
typedef agg::pixfmt_amask_adaptor<pixfmt, alpha_mask_type> pixfmt_amask_type;
typedef agg::renderer_base<pixfmt_amask_type> amask_ren_type;
typedef agg::renderer_scanline_aa<amask_ren_type, color_span_alloc_type, span_conv>
renderer_type_alpha;

pixfmt_amask_type pfa(pixFmt, alphaMask);
amask_ren_type r(pfa);
renderer_type_alpha ri(r, sa, spans);

theRasterizer.add_path(rect2);
agg::render_scanlines(theRasterizer, scanlineAlphaMask, ri);
} else {
typedef agg::renderer_base<pixfmt> ren_type;
typedef agg::renderer_scanline_aa<ren_type, color_span_alloc_type, span_conv>
renderer_type;

ren_type r(pixFmt);
renderer_type ri(r, sa, spans);

theRasterizer.add_path(rect2);
agg::render_scanlines(theRasterizer, slineP8, ri);
}
pixfmt_amask_type pfa(pixFmt, alphaMask);
amask_ren_type r(pfa);
renderer_type_alpha ri(r, sa, spans);

theRasterizer.add_path(rect2);
agg::render_scanlines(theRasterizer, scanlineAlphaMask, ri);
} else {
set_clipbox(gc.cliprect, rendererBase);
rendererBase.blend_from(
Expand Down
22 changes: 5 additions & 17 deletionssrc/_backend_agg_wrapper.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -284,34 +284,22 @@ static PyObject *PyRendererAgg_draw_image(PyRendererAgg *self, PyObject *args, P
double x;
double y;
numpy::array_view<agg::int8u, 3> image;
double w = 0;
double h = 0;
agg::trans_affine trans;
bool resize = false;

if (!PyArg_ParseTuple(args,
"O&ddO&|ddO&:draw_image",
"O&ddO&:draw_image",
&convert_gcagg,
&gc,
&x,
&y,
&image.converter_contiguous,
&image,
&w,
&h,
&convert_trans_affine,
&trans)) {
&image)) {
return NULL;
}

if (PyTuple_Size(args) == 4) {
x = mpl_round(x);
y = mpl_round(y);
} else {
resize = true;
}
x = mpl_round(x);
y = mpl_round(y);

CALL_CPP("draw_image", (self->x->draw_image(gc, x, y, image, w, h, trans, resize)));
CALL_CPP("draw_image", (self->x->draw_image(gc, x, y, image)));

Py_RETURN_NONE;
}
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp