Magellan Linux

Diff of /trunk/xorg-server/patches/xorg-server-1.17.1-mi-partial-pie-slice-filled-arcs-may-need-more-space.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2575 by niro, Mon Jun 15 12:22:48 2015 UTC revision 2576 by niro, Mon Jun 15 13:02:17 2015 UTC
# Line 1  Line 1 
1  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  From 41932dfbc841a1adc6512d41085ea3f8ebecb42c Mon Sep 17 00:00:00 2001
2    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">  From: Keith Packard <keithp@keithp.com>
 <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>  
 <head>  
 <title>svntogit/packages.git - Git clone of the 'packages' repository  
 </title>  
 <meta name='generator' content='cgit v0.10.2'/>  
 <meta name='robots' content='index, nofollow'/>  
 <link rel='stylesheet' type='text/css' href='/cgit.css'/>  
 <link rel='shortcut icon' href='/favicon.ico'/>  
 <link rel='alternate' title='Atom feed' href='https://projects.archlinux.org/svntogit/packages.git/atom/trunk/0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch?h=packages/xorg-server' type='application/atom+xml'/>  
 <link rel='vcs-git' href='git://projects.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
 <link rel='vcs-git' href='http://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
 <link rel='vcs-git' href='https://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
 <link rel='vcs-git' href='ssh://gerolde.archlinux.org/srv/projects/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
 </head>  
 <body>  
  <div id="archnavbar"><!-- Arch Linux global navigation bar -->  
  <div id="archnavbarlogo">  
  <p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p>  
  </div>  
  <div id="archnavbarmenu">  
  <ul id="archnavbarlist">  
  <li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li>  
  <li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li>  
  <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>  
  <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>  
  <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li>  
  <li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>  
  <li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li>  
  </ul>  
  </div>  
  </div><!-- #archnavbar -->  
 <div id='cgit'><table id='header'>  
 <tr>  
 <td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr>  
 <tr><td class='sub'>Git clone of the 'packages' repository  
 </td><td class='sub right'></td></tr></table>  
 <table class='tabs'><tr><td>  
 <a href='/svntogit/packages.git/?h=packages/xorg-server'>summary</a><a href='/svntogit/packages.git/refs/?h=packages/xorg-server'>refs</a><a href='/svntogit/packages.git/log/trunk/0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch?h=packages/xorg-server'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch?h=packages/xorg-server'>tree</a><a href='/svntogit/packages.git/commit/trunk/0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch?h=packages/xorg-server'>commit</a><a href='/svntogit/packages.git/diff/trunk/0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch?h=packages/xorg-server'>diff</a><a href='/svntogit/packages.git/stats/trunk/0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch?h=packages/xorg-server'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch'>  
 <input type='hidden' name='h' value='packages/xorg-server'/><select name='qt'>  
 <option value='grep'>log msg</option>  
 <option value='author'>author</option>  
 <option value='committer'>committer</option>  
 <option value='range'>range</option>  
 </select>  
 <input class='txt' type='text' size='10' name='q' value=''/>  
 <input type='submit' value='search'/>  
 </form>  
 </td></tr></table>  
 <div class='path'>path: <a href='/svntogit/packages.git/tree/?h=packages/xorg-server'>root</a>/<a href='/svntogit/packages.git/tree/trunk?h=packages/xorg-server'>trunk</a>/<a href='/svntogit/packages.git/tree/trunk/0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch?h=packages/xorg-server'>0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch</a></div><div class='content'>blob: 668ae21ba31bd4279d05cd762c43737737e8109d (<a href='/svntogit/packages.git/plain/trunk/0001-mi-Partial-pie-slice-filled-arcs-may-need-more-space.patch?h=packages/xorg-server'>plain</a>)  
 <table summary='blob content' class='blob'>  
 <tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>  
 <a id='n2' href='#n2'>2</a>  
 <a id='n3' href='#n3'>3</a>  
 <a id='n4' href='#n4'>4</a>  
 <a id='n5' href='#n5'>5</a>  
 <a id='n6' href='#n6'>6</a>  
 <a id='n7' href='#n7'>7</a>  
 <a id='n8' href='#n8'>8</a>  
 <a id='n9' href='#n9'>9</a>  
 <a id='n10' href='#n10'>10</a>  
 <a id='n11' href='#n11'>11</a>  
 <a id='n12' href='#n12'>12</a>  
 <a id='n13' href='#n13'>13</a>  
 <a id='n14' href='#n14'>14</a>  
 <a id='n15' href='#n15'>15</a>  
 <a id='n16' href='#n16'>16</a>  
 <a id='n17' href='#n17'>17</a>  
 <a id='n18' href='#n18'>18</a>  
 <a id='n19' href='#n19'>19</a>  
 <a id='n20' href='#n20'>20</a>  
 <a id='n21' href='#n21'>21</a>  
 <a id='n22' href='#n22'>22</a>  
 <a id='n23' href='#n23'>23</a>  
 <a id='n24' href='#n24'>24</a>  
 <a id='n25' href='#n25'>25</a>  
 <a id='n26' href='#n26'>26</a>  
 <a id='n27' href='#n27'>27</a>  
 <a id='n28' href='#n28'>28</a>  
 <a id='n29' href='#n29'>29</a>  
 <a id='n30' href='#n30'>30</a>  
 <a id='n31' href='#n31'>31</a>  
 <a id='n32' href='#n32'>32</a>  
 <a id='n33' href='#n33'>33</a>  
 <a id='n34' href='#n34'>34</a>  
 <a id='n35' href='#n35'>35</a>  
 <a id='n36' href='#n36'>36</a>  
 <a id='n37' href='#n37'>37</a>  
 <a id='n38' href='#n38'>38</a>  
 <a id='n39' href='#n39'>39</a>  
 <a id='n40' href='#n40'>40</a>  
 <a id='n41' href='#n41'>41</a>  
 <a id='n42' href='#n42'>42</a>  
 </pre></td>  
 <td class='lines'><pre><code>From 41932dfbc841a1adc6512d41085ea3f8ebecb42c Mon Sep 17 00:00:00 2001  
 From: Keith Packard &lt;keithp&#64;keithp.com&gt;  
3  Date: Wed, 8 Apr 2015 07:45:28 -0700  Date: Wed, 8 Apr 2015 07:45:28 -0700
4  Subject: [PATCH] mi: Partial pie-slice filled arcs may need more space for  Subject: [PATCH] mi: Partial pie-slice filled arcs may need more space for
5   spans   spans
# Line 110  patch just does it for all partial pie-s Line 15  patch just does it for all partial pie-s
15  easier to understand; it's just over-allocating a bit of memory, so  easier to understand; it's just over-allocating a bit of memory, so
16  that's safe.  that's safe.
17    
18  Signed-off-by: Keith Packard &lt;keithp&#64;keithp.com&gt;  Signed-off-by: Keith Packard <keithp@keithp.com>
19  Reviewed-by: Adam Jackson &lt;ajax&#64;redhat.com&gt;  Reviewed-by: Adam Jackson <ajax@redhat.com>
20  <span class="hl kwb">---</span>  ---
21   mi/mifillarc.c | 5 +++++   mi/mifillarc.c | 5 +++++
22   1 file changed, 5 insertions(+)   1 file changed, 5 insertions(+)
23    
24  diff --git a/mi/mifillarc.c b/mi/mifillarc.c  diff --git a/mi/mifillarc.c b/mi/mifillarc.c
25  index 246d70f..888519e 100644  index 246d70f..888519e 100644
26  <span class="hl kwb">--- a/mi/mifillarc.c</span>  --- a/mi/mifillarc.c
27  <span class="hl kwa">+++ b/mi/mifillarc.c</span>  +++ b/mi/mifillarc.c
28  &#64;&#64; -660,6 +660,11 &#64;&#64; miPolyFillArc(DrawablePtr pDraw, GCPtr pGC, int narcs_all, xArc * parcs)  @@ -660,6 +660,11 @@ miPolyFillArc(DrawablePtr pDraw, GCPtr pGC, int narcs_all, xArc * parcs)
29               if (narcs &amp;&amp; nspans + arc-&gt;height &gt; MAX_SPANS_PER_LOOP)               if (narcs && nspans + arc->height > MAX_SPANS_PER_LOOP)
30                   break;                   break;
31               nspans += arc-&gt;height;               nspans += arc->height;
32  <span class="hl kwa">+</span>  +
33  <span class="hl kwa">+            /* A pie-slice arc may add another pile of spans */</span>  +            /* A pie-slice arc may add another pile of spans */
34  <span class="hl kwa">+            if (pGC-&gt;arcMode == ArcPieSlice &amp;&amp;</span>  +            if (pGC->arcMode == ArcPieSlice &&
35  <span class="hl kwa">+                (-FULLCIRCLE &lt; arc-&gt;angle2 &amp;&amp; arc-&gt;angle2 &lt; FULLCIRCLE))</span>  +                (-FULLCIRCLE < arc->angle2 && arc->angle2 < FULLCIRCLE))
36  <span class="hl kwa">+                nspans += (arc-&gt;height + 1) &gt;&gt; 1;</span>  +                nspans += (arc->height + 1) >> 1;
37           }           }
38    
39           pts = points = malloc (sizeof (DDXPointRec) * nspans +           pts = points = malloc (sizeof (DDXPointRec) * nspans +
40  <span class="hl kwb">-- </span>  --
41  2.3.5  2.3.5
42    
 </code></pre></td></tr></table>  
 </div> <!-- class=content -->  
 <div class="foot" style="padding-left:1em;padding-right:1em;">  
 <p>Copyright &copy; 2002-2014 <a href="mailto:jvinet@zeroflux.org"  
 title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org"  
 title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo  
 are recognized trademarks. Some rights reserved. The registered trademark  
 Linux&reg; is used pursuant to a sublicense from LMI, the exclusive licensee  
 of Linus Torvalds, owner of the mark on a world-wide basis.</p>  
 </div>  
 </div> <!-- id=cgit -->  
 </body>  
 </html>  

Legend:
Removed from v.2575  
changed lines
  Added in v.2576