Minor cleanups.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@16950 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Alexander Malmberg 2003-06-17 18:08:59 +00:00
parent ca0ae2054a
commit dc0673ffca
4 changed files with 13 additions and 5 deletions

View file

@ -1,3 +1,8 @@
2003-06-17 20:07 Alexander Malmberg <alexander@malmberg.org>
* Source/art/composite.m, Source/art/ftfont.m, Source/art/path.m:
Minor cleanups.
2003-06-17 Fred Kiefer <FredKiefer@gmx.de>
* Source/gsc/GSStreamContext.m (GSShowGlyphs::, output:length:)

View file

@ -412,11 +412,12 @@ static BOOL _rect_advance(rect_trace_t *t, int *x0, int *x1)
- (void) compositeGState: (GSGState *)source
fromRect: (NSRect)aRect
toPoint: (NSPoint)aPoint
op: (NSCompositingOperation)op
op: (NSCompositingOperation)composite_op
{
ARTGState *ags = (ARTGState *)source;
unsigned char *dst, *dst_alpha, *src, *src_alpha;
int op;
void (*blit_func)(composite_run_t *c, int num) = NULL;
NSPoint sp, dp;
@ -459,7 +460,7 @@ static BOOL _rect_advance(rect_trace_t *t, int *x0, int *x1)
BOOL dst_needs_alpha;
op = [self _composite_func: !ags->wi->has_alpha : NO
: !wi->has_alpha : &dst_needs_alpha
: op : &blit_func];
: composite_op : &blit_func];
if (op == -1)
return;

View file

@ -2706,6 +2706,8 @@ static int filters[3][7]=
/*
GSLayoutManager glyph generation code.
TODO: clean this up
*/
#include <Foundation/NSCharacterSet.h>
#include <AppKit/GSLayoutManager_internal.h>
@ -2754,7 +2756,7 @@ fb04 'ffl'
{
glyph_t *g;
unsigned int glyph_size;
int i,j;
unsigned int i,j;
unichar ch,ch2,ch3;
FTFontInfo *fi=[run->font fontInfo];

View file

@ -748,9 +748,9 @@ static void clip_svp_callback(void *data, int y, int start,
int i;
for (i = 0; i < clip_num_span; i++)
{
clip_span[i] -= ci.minx;
if (clip_span[i] < 0)
if (clip_span[i] < ci.minx)
NSLog(@"_clip_add_svp: clip_span[i]<0 when adjusting for minx");
clip_span[i] -= ci.minx;
if (clip_span[i] > ci.maxx - ci.minx)
NSLog(@"_clip_add_svp: clip_span[i] too large when adjusting for minx");
}