From d5dafdbb48e984e52218640888ae7fa8feb36032 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Fri, 29 Aug 2014 17:23:53 +0200 Subject: [PATCH 1/2] Update tight_bbox.py Typo in the figure parameter --- lib/matplotlib/tight_bbox.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/matplotlib/tight_bbox.py b/lib/matplotlib/tight_bbox.py index f98a6bc10369..69ff23abf426 100644 --- a/lib/matplotlib/tight_bbox.py +++ b/lib/matplotlib/tight_bbox.py @@ -83,6 +83,6 @@ def process_figure_for_rasterizing(fig, bbox_inches_restore, fixed_dpi=None): bbox_inches, restore_bbox = bbox_inches_restore restore_bbox() - r = adjust_bbox(figure, bbox_inches, fixed_dpi) + r = adjust_bbox(fig, bbox_inches, fixed_dpi) return bbox_inches, r From 17cc6dd4597f08593c223290f256b7705a1e56e6 Mon Sep 17 00:00:00 2001 From: jowr Date: Tue, 2 Sep 2014 15:49:40 +0200 Subject: [PATCH 2/2] Added tests to bbox_tight --- .../bbox_inches_tight_raster.pdf | Bin 0 -> 5070 bytes .../bbox_inches_tight_raster.png | Bin 0 -> 11458 bytes .../bbox_inches_tight_raster.svg | 235 ++++++++++++++++++ lib/matplotlib/tests/test_bbox_tight.py | 10 +- 4 files changed, 244 insertions(+), 1 deletion(-) create mode 100644 lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_raster.pdf create mode 100644 lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_raster.png create mode 100644 lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_raster.svg diff --git a/lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_raster.pdf b/lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_raster.pdf new file mode 100644 index 0000000000000000000000000000000000000000..c702c926aad7fa725da6303cbb4b6794ff3e09dd GIT binary patch literal 5070 zcmeHLeN+=y7N0~=m_w}=*NU$Cq|0Y1Gn4OF#6U2}7Mhe$^&C+d!UO^#6O%zPx{9!h z-LAOX*6LbBy0)jRR4dimRm*}}kLR>%YuDZ4N{idt6)WO*Qx9(4_a;md6Ciu~XKPN* z%$xh}yYIf=y?5^18)wMUJw>I;@VK|TLF*x$0wiFI%ki`{KoqR7Gl0<29BpMw0b!s^ z87GiHhJ28ojx)9r#HjLHus~m2&X_o$XidIV?`(F(no{ldXoT zBk?i?nW_R(1&OrGXPj)6!vv8*NaPEm5Lj?qs3Mf(1ZsZHrzUz9wA5Lw5GFwAtnjQ^ zjEOCQD{~oJDOUz4WDg#0C+A@3O1!$U@}<0IKP02pxz+0kO?*e*p_1RqYNvh`F*j=R zdzl-K7fwIXw*A$2TW&92Jp26J8+PfmJr^#l@0prbc(P7=Fmqeu?v{!3mX=RGmYRO5 zUOg*zpzeNQZky;|^@R<~V%zsNs6of4+j<-7*RSlm+P3`3TaP5=DKe(aI9vVC-=oGX{|dC%-?qIT$Foujl1B| z2d}-z?JBrzHGgT)9-7y(@JLruZ^eN*-yPFE_ubLoJ+FGjx~O>T#-n}V6I<<#FKv7` zPl4}ye8JmCPb@TWE0bJv@P?P;n)|?>E#~&aV~gC$VVBq1&&HhU{by#U@S#BUA@)h?gl}nsmzFM@U z>ZBRD?;xauj?6=iY$BDY1m{NHHE1TE?T|MLw#%SA?v(*)gYn{XTf#&G3WW-hAraW9 z;o1Cx3PnuNzR2x^h$z$qWpXG$1%@Z(cLZX-r3CtvLIQQwvR2k%w9_W&Yo5T!cF-^o z<}#MjG7iW{sOS)mi4(@EVvc_=@PX@dR6a(9!wD|}BGbY-4U9v}R@zw`iYOI2rPr6Q zo^N|+ta(yBUB6-6W07?kV_x02ckbiyxw)V1-kuy!y|7zBN22EKNU>d= z2KlY+_wF8l;mi|Tk8Jv+WAXWPS6Fn{je++|vvr$_Mkg#;{X^vyw9tL^_}BkHTzYnP zQ%@S=TE6B+(S3fS?)v4kSLU>>8Z-T={ywCH_2BJmt;U_%WZg0S=l8qhh<(|ej`wyV zlBr_Jp5FNj{sL$$W_iA1d*{Z?<6)5C3%;ka+NriKn|Q@)(AV%DC3C zKiVFhfA{$h!}{Y5?(L_eF$`OMQPs2&2RzF=+hs*=TInJ1#sC z>wdinGyEk1iwc{7CEp3FSz9C4yxD}2;|y2}WEw5TvCS^A=9|AhijDp@5{)}G8c}n; z9-9=Ah!sH6C{cLLuV;yxZ#F_jpaeKB0?i`{O+N7(j5O%|HwYBE`BE4*sU^XGgJFak z)cvDs)xHZS&XZq4534DGmXJ7vEpHMIrDlXo?O6#Y0yMj=G1gHs}=( zUCsM0_CoQa-)fx~!pGGOEFU5r3I!V_S9{YTD#e6ssAa2Q@dInBXDlU7*hb*n6#1xs z;AygWdMmyflkzL}2raDqISXscLcNg0teFy$l96gsLdj(kiTX)Wl0cFPNqmE)q{;+a z35k_7XScGP)lv-XC1y}en<`+H3t4zk?1LOssywwi1(b1|eI`NpmZq|f(j>p4wA#U# zaS~8Uob>*HLN1reff;ydNOSZ9upsxa$z(EEgg!_km1@{7381Mc*cJ((si|N-wR8wR z*o_HXODdpQ0^~`R!88dOyoXX5M3X3_L1!b?YG~#M_mC*4pgm;JQh|IjIq8QB=b$ZC v#=$qR5B`KUq%bQNu@DJ$x=gFY$a-} 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 literal 0 HcmV?d00001 diff --git a/lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_raster.svg b/lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_raster.svg new file mode 100644 index 000000000000..8f70e2942303 --- /dev/null +++ b/lib/matplotlib/tests/baseline_images/test_bbox_tight/bbox_inches_tight_raster.svg @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/matplotlib/tests/test_bbox_tight.py b/lib/matplotlib/tests/test_bbox_tight.py index b0041a24fdd7..881b1e52bcec 100644 --- a/lib/matplotlib/tests/test_bbox_tight.py +++ b/lib/matplotlib/tests/test_bbox_tight.py @@ -84,7 +84,15 @@ def test_bbox_inches_tight_clipping(): path.vertices *= 0.25 patch.set_clip_path(path, transform=ax.transAxes) plt.gcf().artists.append(patch) - + + +@image_comparison(baseline_images=['bbox_inches_tight_raster'], + remove_text=True, savefig_kwarg={'bbox_inches': 'tight'}) +def test_bbox_inches_tight_raster(): + """Test rasterization with tight_layout""" + fig = plt.figure() + ax = fig.add_subplot(111) + ax.plot([1.0, 2.0], rasterized=True) if __name__ == '__main__': import nose