[cairo-commit] 2 commits - src/cairo.h

[Behdad Esfahbod]

 src/cairo.h |   24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

New commits:
commit cfce362375963502c4d29089b369d8e5ce2b7dcb
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Jan 29 01:27:47 2008 -0500

    [cairo_operator_t] Mark DestAtop unbounded and document boundedness

diff --git a/src/cairo.h b/src/cairo.h
index 89d5ae6..3926aaf 100644
--- a/src/cairo.h
+++ b/src/cairo.h
@@ -363,7 +363,7 @@ cairo_pop_group_to_source (cairo_t *cr);
  * @CAIRO_OPERATOR_DEST_OUT: leave destination only where there was no
  * source content
  * @CAIRO_OPERATOR_DEST_ATOP: leave destination on top of source content
- * and only there
+ * and only there (unbounded)
  * @CAIRO_OPERATOR_XOR: source and destination are shown where there is only
  * one of them
  * @CAIRO_OPERATOR_ADD: source and destination layers are accumulated
@@ -373,6 +373,11 @@ cairo_pop_group_to_source (cairo_t *cr);
  * #cairo_operator_t is used to set the compositing operator for all cairo
  * drawing operations.
  *
+ * The operators marked as <firstterm>unbounded</firstterm> modify their
+ * destination even outside of the mask layer (that is, their effect is not
+ * bound by the mask layer).  However, their effect can still be limited by
+ * way of clipping.
+ *
  * To keep things simple, the operator descriptions here
  * document the behavior for when both source and destination are either fully
  * transparent or fully opaque.  The actual implementaiton works for
commit f9b90e475ed6009e58e5f11ac713f9ea639a6900
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Jan 29 01:20:03 2008 -0500

    [doc] Fix cairo_operator_t docs to make Carl (and Keith) happy

diff --git a/src/cairo.h b/src/cairo.h
index 37a34a6..89d5ae6 100644
--- a/src/cairo.h
+++ b/src/cairo.h
@@ -367,11 +367,18 @@ cairo_pop_group_to_source (cairo_t *cr);
  * @CAIRO_OPERATOR_XOR: source and destination are shown where there is only
  * one of them
  * @CAIRO_OPERATOR_ADD: source and destination layers are accumulated
- * @CAIRO_OPERATOR_SATURATE: pixel color saturation
- *
- * #cairo_operator_t is used to set the compositing operator for drawing
- * operations. For a more detailed explanation of the effects of each
- * operator, see
+ * @CAIRO_OPERATOR_SATURATE: like over, but assuming source and dest are
+ * disjoint geometries
+ *
+ * #cairo_operator_t is used to set the compositing operator for all cairo
+ * drawing operations.
+ *
+ * To keep things simple, the operator descriptions here
+ * document the behavior for when both source and destination are either fully
+ * transparent or fully opaque.  The actual implementaiton works for
+ * translucent layers too.
+ * For a more detailed explanation of the effects of each operator, including
+ * the mathematical defitnions, see
  * <ulink url="http://cairographics.org/operators/">http://cairographics.org/operators/</ulink>.
  **/
 typedef enum _cairo_operator {