[cairo-commit] [cairo-www] src/missing.mdwn

[Carl Worth]

 src/missing.mdwn |   17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

New commits:
commit 993705542e61ee9734aa1f023523a1976de4e529
Author: Carl Worth <cworth at freedesktop.org>
Date:   Thu Aug 21 06:12:43 2008 -0700

    web commit by gerdusvanzyl: remove conflict markers

diff --git a/src/missing.mdwn b/src/missing.mdwn
index 87825fe..1dd2dfc 100644
--- a/src/missing.mdwn
+++ b/src/missing.mdwn
@@ -2,22 +2,15 @@
 
 This page lists all features and API missing from cairo. Where missing is defined as features that large/common users of cairo need to provide fallbacks and work arounds for when using cairo. For example SVG libraries like librsvg uses fallbacks to implement bitmap filters and certain blend modes. The aim is make sure things that fall within the scope of cairo is indeed done in cairo.
 
-<<<<<<< HEAD:src/missing.mdwn
-
 Target users: librsvg,gecko/mozilla,inkscape
->>>>>>> dd0b3272c054ec20c865624cbbea59f7a051447c:src/missing.mdwn
 
 List References:
 http://lists.freedesktop.org/archives/cairo/2007-April/010325.html
 http://lists.freedesktop.org/archives/cairo/2007-January/009268.html
 
-<<<<<<< HEAD:src/missing.mdwn
 Discussion: <http://lists.freedesktop.org/archives/cairo/2007-January/009268.html>
 
-
-# Implementation Considerations
-=======
---Blend Modes--
+# Blend Modes
 see http://www.kaourantin.net/2005/09/some-word-on-blend-modes-in-flash.html
 * Multiply
 * Screen
@@ -36,19 +29,19 @@ The SVG specification: http://www.w3.org/TR/2003/WD-SVG12-20030715/#compositing
 and see this page for modes and the algorithms:
 http://www.pegtop.net/delphi/articles/blendmodes/
 
---Bitmap Filters--
+# Bitmap Filters
 Bitmap filters are harder to quantify since the amount of possible filters are infinite. The aim should be possibly to implement the most commonly used filters eg. blur and provide some kind of callback to implement arbitrary effects. Multiple filters per pattern/surface is also required.
 The SVG filters http://www.w3.org/TR/SVGFilter12/
 Box blur - see http://www.kaourantin.net/2005/08/implementing-blur-filter-in-flash.html
 
 
---Implementation Considerations--
+# Implementation Considerations
 An interesting development related to this is the Pixel Bender toolkit (http://labs.adobe.com/wiki/index.php/Pixel_Bender_Toolkit) which allows bitmap effects and blend modes to be written in a GLSL derived pixel language that can be executed on the CPU or the GPU. There are rumours of it going to be open sourced. LLVM could be used to implement something similar while taking advantage of optimizations on multiple architectures.
 
 Speaking of LLVM, it's wat Apple uses in its software accross hardware (mac,iphone,macpro) to provide fast software implementations of features lacking in GPU on specific hardware.
 
 Java2D has a similar flexible method.
 
---Cairo API Considerations--
+# Cairo API Considerations
 ?
->>>>>>> dd0b3272c054ec20c865624cbbea59f7a051447c:src/missing.mdwn
+