Imported Upstream version 2.4.1

This commit is contained in:
Ari Pollak
2010-08-11 01:23:35 -04:00
parent 258b1471f0
commit 69250d2dd6
266 changed files with 77744 additions and 54804 deletions

View File

@ -47,42 +47,42 @@
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
href="../glib/glib-Basic-Types.html#gboolean"
>gboolean</a> <a class="link" href="libgimpbase-gimprectangle.html#gimp-rectangle-intersect">gimp_rectangle_intersect</a> (<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> x1,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> y1,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> width1,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> height1,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> x2,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> y2,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> width2,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> height2,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> *dest_x,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> *dest_y,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> *dest_width,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> *dest_height);
</pre>
</div>
@ -98,42 +98,42 @@ href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
<a name="id2619151"></a><h3>
<a name="gimp-rectangle-intersect"></a>gimp_rectangle_intersect ()</h3>
<a class="indexterm" name="id2619165"></a><pre class="programlisting"><a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gboolean"
href="../glib/glib-Basic-Types.html#gboolean"
>gboolean</a> gimp_rectangle_intersect (<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> x1,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> y1,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> width1,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> height1,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> x2,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> y2,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> width2,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> height2,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> *dest_x,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> *dest_y,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> *dest_width,
<a
href="/usr/share/gtk-doc/html/glib/glib-Basic-Types.html#gint"
href="../glib/glib-Basic-Types.html#gint"
>gint</a> *dest_height);</pre>
<p>
Calculates the intersection of two rectangles.</p>
@ -186,37 +186,37 @@ Calculates the intersection of two rectangles.</p>
<tr>
<td><p><span class="term"><em class="parameter"><code>dest_x</code></em>&#160;:</span></p></td>
<td> return location for origin of intersection (may be <a
href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
href="../glib/glib-Standard-Macros.html#NULL:CAPS"
><code class="literal">NULL</code></a>)
</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>dest_y</code></em>&#160;:</span></p></td>
<td> return location for origin of intersection (may be <a
href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
href="../glib/glib-Standard-Macros.html#NULL:CAPS"
><code class="literal">NULL</code></a>)
</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>dest_width</code></em>&#160;:</span></p></td>
<td> return location for width of intersection (may be <a
href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
href="../glib/glib-Standard-Macros.html#NULL:CAPS"
><code class="literal">NULL</code></a>)
</td>
</tr>
<tr>
<td><p><span class="term"><em class="parameter"><code>dest_height</code></em>&#160;:</span></p></td>
<td> return location for height of intersection (may be <a
href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#NULL:CAPS"
href="../glib/glib-Standard-Macros.html#NULL:CAPS"
><code class="literal">NULL</code></a>)
</td>
</tr>
<tr>
<td><p><span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></p></td>
<td> <a
href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#TRUE:CAPS"
href="../glib/glib-Standard-Macros.html#TRUE:CAPS"
><code class="literal">TRUE</code></a> if the intersection is non-empty, <a
href="/usr/share/gtk-doc/html/glib/glib-Standard-Macros.html#FALSE:CAPS"
href="../glib/glib-Standard-Macros.html#FALSE:CAPS"
><code class="literal">FALSE</code></a> otherwise
</td>