diff options
author | Carl Worth <cworth@cworth.org> | 2006-06-06 15:35:48 -0700 |
---|---|---|
committer | Carl Worth <cworth@cworth.org> | 2006-06-06 15:35:48 -0700 |
commit | 4670366ede0b0ed1abf47f4595a64bc5cd3c19fc (patch) | |
tree | 6200d30b9035b419bdbcd8fe68708c3d120b3996 /pixman | |
parent | 80b8deb1e4f9d0b856106031c6a7a629cca7552c (diff) |
Remove trailing whitespace from lines that look like comments.
This patch was produced with the following (GNU) sed script:
sed -i -r -e '/^[ \t]*\/?\*/ s/[ \t]+$//'
run on all *.[ch] files within cairo, (though I manually excluded
src/cairo-atsui-font.c which has a code line that appears as a comment
to this script).
Diffstat (limited to 'pixman')
-rw-r--r-- | pixman/src/fbmmx.c | 8 | ||||
-rw-r--r-- | pixman/src/fbmmx.h | 2 | ||||
-rw-r--r-- | pixman/src/icbltone.c | 10 | ||||
-rw-r--r-- | pixman/src/iccolor.c | 2 | ||||
-rw-r--r-- | pixman/src/icformat.c | 2 | ||||
-rw-r--r-- | pixman/src/icimage.c | 4 | ||||
-rw-r--r-- | pixman/src/icint.h | 8 | ||||
-rw-r--r-- | pixman/src/icrop.h | 2 | ||||
-rw-r--r-- | pixman/src/ictransform.c | 2 | ||||
-rw-r--r-- | pixman/src/pixregion.c | 12 | ||||
-rw-r--r-- | pixman/src/slim_internal.h | 2 |
11 files changed, 27 insertions, 27 deletions
diff --git a/pixman/src/fbmmx.c b/pixman/src/fbmmx.c index 1d3f7597..408c22cf 100644 --- a/pixman/src/fbmmx.c +++ b/pixman/src/fbmmx.c @@ -24,7 +24,7 @@ * * Author: Søren Sandmann (sandmann@redhat.com) * Minor Improvements: Nicholas Miell (nmiell@gmail.com) - * MMX code paths for fbcompose.c by Lars Knoll (lars@trolltech.com) + * MMX code paths for fbcompose.c by Lars Knoll (lars@trolltech.com) * * Based on work by Owen Taylor */ @@ -286,14 +286,14 @@ store8888 (__m64 v) /* Expand 16 bits positioned at @pos (0-3) of a mmx register into * * 00RR00GG00BB - * + * * --- Expanding 565 in the low word --- - * + * * m = (m << (32 - 3)) | (m << (16 - 5)) | m; * m = m & (01f0003f001f); * m = m * (008404100840); * m = m >> 8; - * + * * Note the trick here - the top word is shifted by another nibble to * avoid it bumping into the middle word */ diff --git a/pixman/src/fbmmx.h b/pixman/src/fbmmx.h index 5da42a06..1a6a27d2 100644 --- a/pixman/src/fbmmx.h +++ b/pixman/src/fbmmx.h @@ -23,7 +23,7 @@ * * Author: Søren Sandmann (sandmann@redhat.com) * Lars Knoll (lars@trolltech.com) - * + * * Based on work by Owen Taylor */ #ifdef USE_MMX diff --git a/pixman/src/icbltone.c b/pixman/src/icbltone.c index 9f0a3917..022d4982 100644 --- a/pixman/src/icbltone.c +++ b/pixman/src/icbltone.c @@ -37,7 +37,7 @@ * Example: srcX = 0 dstX = 8 (FB unit 32 dstBpp 8) * * **** **** **** **** **** **** **** **** - * ^ + * ^ * ******** ******** ******** ******** * ^ * @@ -190,7 +190,7 @@ fbBltOne (FbStip *src, pixelsPerDst = FB_UNIT / dstBpp; /* - * Number of source stipple patterns in FbStip + * Number of source stipple patterns in FbStip */ unitsPerSrc = FB_STIP_UNIT / pixelsPerDst; @@ -243,8 +243,8 @@ fbBltOne (FbStip *src, #endif /* - * Compute total number of destination words written, but - * don't count endmask + * Compute total number of destination words written, but + * don't count endmask */ nDst = nmiddle; if (startmask) @@ -633,7 +633,7 @@ fbBltOne24 (FbStip *srcLine, while (nl--) { mask = fbStipple24Bits[rot>>3][stip]; - *dst = FbOpaqueStipple (mask, + *dst = FbOpaqueStipple (mask, FbRot24(fgxor, rot), FbRot24(bgxor, rot)); dst++; diff --git a/pixman/src/iccolor.c b/pixman/src/iccolor.c index e3e2a30b..716382f4 100644 --- a/pixman/src/iccolor.c +++ b/pixman/src/iccolor.c @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. diff --git a/pixman/src/icformat.c b/pixman/src/icformat.c index 7837aeaf..033b65a8 100644 --- a/pixman/src/icformat.c +++ b/pixman/src/icformat.c @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. diff --git a/pixman/src/icimage.c b/pixman/src/icimage.c index f4fd516d..ce03a973 100644 --- a/pixman/src/icimage.c +++ b/pixman/src/icimage.c @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. @@ -304,7 +304,7 @@ pixman_image_init (pixman_image_t *image) image->subWindowMode = ClipByChildren; image->polyEdge = PolyEdgeSharp; image->polyMode = PolyModePrecise; - /* + /* * In the server this was 0 because the composite clip list * can be referenced from a window (and often is) */ diff --git a/pixman/src/icint.h b/pixman/src/icint.h index f65e26fc..d45f6328 100644 --- a/pixman/src/icint.h +++ b/pixman/src/icint.h @@ -966,7 +966,7 @@ typedef struct _PictFormat *PictFormatPtr; #define PICT_g1 PICT_FORMAT(1,PICT_TYPE_GRAY,0,0,0,0) /* - * For dynamic indexed visuals (GrayScale and PseudoColor), these control the + * For dynamic indexed visuals (GrayScale and PseudoColor), these control the * selection of colors allocated for drawing to Pictures. The default * policy depends on the size of the colormap: * @@ -997,7 +997,7 @@ typedef struct _PictFormat *PictFormatPtr; * 4x4x4 cube allocates another two and nine more are allocated to fill * in the 13 levels. When the 4x4x4 cube is not allocated, a total of * 11 cells are allocated. - */ + */ #define PictureCmapPolicyInvalid -1 #define PictureCmapPolicyDefault 0 @@ -1037,8 +1037,8 @@ typedef uint32_t xFixed_1_16; typedef int32_t xFixed_16_16; /* - * An unadorned "xFixed" is the same as xFixed_16_16, - * (since it's quite common in the code) + * An unadorned "xFixed" is the same as xFixed_16_16, + * (since it's quite common in the code) */ typedef xFixed_16_16 xFixed; #define XFIXED_BITS 16 diff --git a/pixman/src/icrop.h b/pixman/src/icrop.h index d65b5c4a..4e6ac82d 100644 --- a/pixman/src/icrop.h +++ b/pixman/src/icrop.h @@ -94,7 +94,7 @@ extern const FbMergeRopRec FbMergeRopBits[16] pixman_private; #define fbAndStip(rop,fg,pm) fbAndT(rop,fg,pm,FbStip) /* - * Stippling operations; + * Stippling operations; */ /* half of table */ diff --git a/pixman/src/ictransform.c b/pixman/src/ictransform.c index 982f9293..6e821610 100644 --- a/pixman/src/ictransform.c +++ b/pixman/src/ictransform.c @@ -15,7 +15,7 @@ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * * Author: Keith Packard, SuSE, Inc. diff --git a/pixman/src/pixregion.c b/pixman/src/pixregion.c index bb2eb4fe..9ecd04a8 100644 --- a/pixman/src/pixregion.c +++ b/pixman/src/pixregion.c @@ -109,9 +109,9 @@ slim_hidden_proto(pixman_region_union) * there is no separate list of band start pointers. * * The y-x band representation does not minimize rectangles. In particular, - * if a rectangle vertically crosses a band (the rectangle has scanlines in + * if a rectangle vertically crosses a band (the rectangle has scanlines in * the y1 to y2 area spanned by the band), then the rectangle may be broken - * down into two or more smaller rectangles stacked one atop the other. + * down into two or more smaller rectangles stacked one atop the other. * * ----------- ----------- * | | | | band 0 @@ -137,7 +137,7 @@ slim_hidden_proto(pixman_region_union) * pixman_region_validateTree. Bob Scheifler changed the representation to be more * compact when empty or a single rectangle, and did a bunch of gratuitous * reformatting. Carl Worth did further gratuitous reformatting while re-merging - * the server and client region code into libpixregion. + * the server and client region code into libpixregion. */ /* true iff two Boxes overlap */ @@ -1249,7 +1249,7 @@ slim_hidden_def(pixman_region_union); /*- *----------------------------------------------------------------------- * pixman_region_append -- - * + * * "Append" the rgn rectangles onto the end of dstrgn, maintaining * knowledge of YX-banding when it's easy. Otherwise, dstrgn just * becomes a non-y-x-banded random collection of rectangles, and not @@ -1420,7 +1420,7 @@ QuickSortRects( /*- *----------------------------------------------------------------------- * pixman_region_validate -- - * + * * Take a ``region'' which is a non-y-x-banded random collection of * rectangles, and compute a nice region which is the union of all the * rectangles. @@ -2421,7 +2421,7 @@ pixman_region16_clip_spans( if (!prgnDst->data) { /* Do special fast code with clip boundaries in registers(?) */ - /* It doesn't pay much to make use of fSorted in this case, + /* It doesn't pay much to make use of fSorted in this case, so we lump everything together. */ int clipx1, clipx2, clipy1, clipy2; diff --git a/pixman/src/slim_internal.h b/pixman/src/slim_internal.h index 5c1e5cf8..24b947a3 100644 --- a/pixman/src/slim_internal.h +++ b/pixman/src/slim_internal.h @@ -12,7 +12,7 @@ * Richard Henderson makes no representations about the suitability of this * software for any purpose. It is provided "as is" without express * or implied warranty. - * + * * RICHARD HENDERSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN * NO EVENT SHALL RICHARD HENDERSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR |