[cairo-commit] Changes to 'master'

[Christian Biesinger]

 pixman/src/fbcompose.c             |    4 ++--
 pixman/src/pixman-xserver-compat.h |    2 +-
 src/cairo-atsui-font.c             |   23 ++++++++++++-----------
 src/cairo-directfb-surface.c       |    2 +-
 src/cairo-quartz-surface.c         |   11 ++++++-----
 5 files changed, 22 insertions(+), 20 deletions(-)

New commits:
diff-tree dba214b944a16dd7ee781f495cd5fbe83f678451 (from d0e02a948e83e3b1b330c9cb0aa4930b42bf485c)
Author: Christian Biesinger <cbiesinger at web.de>
Date:   Sun Feb 26 10:46:04 2006 +0100

    Use C-style comments rather than C++-style

diff --git a/pixman/src/fbcompose.c b/pixman/src/fbcompose.c
index 2289cee..c14986c 100644
--- a/pixman/src/fbcompose.c
+++ b/pixman/src/fbcompose.c
@@ -35,8 +35,8 @@
 
 #include <math.h>
 
-// #define PIXMAN_CONVOLUTION
-// #define PIXMAN_INDEXED_FORMATS
+/* #define PIXMAN_CONVOLUTION */
+/* #define PIXMAN_INDEXED_FORMATS */
 
 static Bool
 PictureTransformPoint3d (pixman_transform_t *transform,
diff --git a/pixman/src/pixman-xserver-compat.h b/pixman/src/pixman-xserver-compat.h
index 46e2825..5113abd 100644
--- a/pixman/src/pixman-xserver-compat.h
+++ b/pixman/src/pixman-xserver-compat.h
@@ -72,8 +72,8 @@ typedef pixman_triangle_t	xTriangle;
 #define FB_SHIFT IC_SHIFT 
 #define FB_MASK IC_MASK
 #define FB_ALLONES IC_ALLONES
+#define FbMaskBits IcMaskBits
 */
-//#define FbMaskBits IcMaskBits
 
 /* XXX: We changed some function and field names which makes for some
  * ugly hacks... */
diff --git a/src/cairo-atsui-font.c b/src/cairo-atsui-font.c
index 9f3b54d..12cd329 100644
--- a/src/cairo-atsui-font.c
+++ b/src/cairo-atsui-font.c
@@ -132,7 +132,7 @@ CreateSizedCopyOfStyle(ATSUStyle inStyle
     ATSUStyle style;
     OSStatus err;
 
-    // Set the style's size
+    /* Set the style's size */
     CGAffineTransform theTransform =
         CGAffineTransformMakeWithCairoFontScale(scale);
     Fixed theSize =
@@ -174,7 +174,7 @@ _cairo_atsui_font_set_metrics (cairo_ats
             extents.height = metrics.capHeight;
             extents.max_x_advance = metrics.maxAdvanceWidth;
 
-            // The FT backend doesn't handle max_y_advance either, so we'll ignore it for now. 
+            /* The FT backend doesn't handle max_y_advance either, so we'll ignore it for now. */
             extents.max_y_advance = 0.0;
 
 	    	_cairo_scaled_font_set_metrics (&font->base, &extents);
@@ -275,7 +275,7 @@ _cairo_atsui_font_create_toy(cairo_toy_f
                                kFontNoLanguageCode, &fontID);
 
     if (err != noErr) {
-	// couldn't get the font - remap css names and try again
+	/* couldn't get the font - remap css names and try again */
 
 	if (!strcmp(family, "serif"))
 	    family = "Times";
@@ -287,7 +287,7 @@ _cairo_atsui_font_create_toy(cairo_toy_f
 	    family = "Gadget";
 	else if (!strcmp(family, "monospace"))
 	    family = "Courier";
-	else // anything else - return error instead?
+	else /* anything else - return error instead? */
 	    family = "Courier";
 
 	err = ATSUFindFontFromName(family, strlen(family),
@@ -504,7 +504,7 @@ _cairo_atsui_font_text_to_glyphs (void		
 
     err = ATSUSetTextPointerLocation(textLayout, utf16, 0, n16, n16);
 
-    // Set the style for all of the text
+    /* Set the style for all of the text */
     err = ATSUSetRunStyle(textLayout,
 			  font->style, kATSUFromTextBeginning, kATSUToTextEnd);
 
@@ -565,7 +565,7 @@ _cairo_atsui_font_old_show_glyphs (void	
 				      &rect,
 				      &extra);
 
-    // Create a CGBitmapContext for the dest surface for drawing into
+    /* Create a CGBitmapContext for the dest surface for drawing into */
     colorSpace = CGColorSpaceCreateDeviceRGB();
 
     myBitmapContext = CGBitmapContextCreate(destImageSurface->data,
@@ -633,11 +633,12 @@ _cairo_atsui_font_old_show_glyphs (void	
 		/* XXX: Need to get the text clipped */
 	}
 	
-    // TODO - bold and italic text
-    //
-    // We could draw the text using ATSUI and get bold, italics
-    // etc. for free, but ATSUI does a lot of text layout work
-    // that we don't really need...
+    /* TODO - bold and italic text
+     *
+     * We could draw the text using ATSUI and get bold, italics
+     * etc. for free, but ATSUI does a lot of text layout work
+     * that we don't really need...
+     */
 
 	
     for (i = 0; i < num_glyphs; i++) {
diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c
index be17915..45db4dd 100644
--- a/src/cairo-directfb-surface.c
+++ b/src/cairo-directfb-surface.c
@@ -150,7 +150,7 @@ static inline int cairo_to_directfb_form
 						return DSPF_A1; 
 				default:
 				{
-						//assert(0);
+						/*assert(0);*/
 						return DSPF_UNKNOWN; 
 				}
 		}
diff --git a/src/cairo-quartz-surface.c b/src/cairo-quartz-surface.c
index d7defc9..c65ca46 100644
--- a/src/cairo-quartz-surface.c
+++ b/src/cairo-quartz-surface.c
@@ -73,10 +73,11 @@ _cairo_quartz_surface_acquire_source_ima
     UInt32 imageDataSize, rowBytes;
     CGDataProviderRef dataProvider;
 
-    // We keep a cached (cairo_image_surface_t *) in the cairo_quartz_surface_t
-    // struct. If the window is ever drawn to without going through Cairo, then
-    // we would need to refetch the pixel data from the window into the cached
-    // image surface. 
+    /* We keep a cached (cairo_image_surface_t *) in the cairo_quartz_surface_t
+     * struct. If the window is ever drawn to without going through Cairo, then
+     * we would need to refetch the pixel data from the window into the cached
+     * image surface. 
+     */
     if (surface->image) {
         cairo_surface_reference(&surface->image->base);
 
@@ -257,7 +258,7 @@ cairo_surface_t *cairo_quartz_surface_cr
 	surface->clip_region = NULL;
     surface->flipped = flipped;
 
-    // Set up the image surface which Cairo draws into and we blit to & from.
+    /* Set up the image surface which Cairo draws into and we blit to & from. */
     void *foo;
     _cairo_quartz_surface_acquire_source_image(surface, &surface->image, &foo);