[cairo-commit] cairo/src Makefile.am, 1.21, 1.22 cairo_ft_font.c, 1.19, 1.20

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/src
In directory pdx:/tmp/cvs-serv21464/src

Modified Files:
	Makefile.am cairo_ft_font.c 
Log Message:
        * src/Makefile.am (libcairo_la_LIBADD): Add -lz.


Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo/src/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** a/Makefile.am	24 Feb 2004 20:27:13 -0000	1.21
--- b/Makefile.am	31 Mar 2004 02:55:48 -0000	1.22
***************
*** 56,58 ****
  INCLUDES = -I$(srcdir) $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(XRENDER_CFLAGS) $(XCB_CFLAGS) $(PNG_CFLAGS)
  
! libcairo_la_LIBADD = $(CAIRO_LIBS) $(FONTCONFIG_LIBS) $(XRENDER_LIBS) $(XCB_LIBS) $(PNG_LIBS) -lm
--- 56,59 ----
  INCLUDES = -I$(srcdir) $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(XRENDER_CFLAGS) $(XCB_CFLAGS) $(PNG_CFLAGS)
  
! libcairo_la_LIBADD = $(CAIRO_LIBS) $(FONTCONFIG_LIBS) $(XRENDER_LIBS) $(XCB_LIBS) $(PNG_LIBS) -lm -lz
! 

Index: cairo_ft_font.c
===================================================================
RCS file: /cvs/cairo/cairo/src/cairo_ft_font.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** a/cairo_ft_font.c	26 Feb 2004 16:54:42 -0000	1.19
--- b/cairo_ft_font.c	31 Mar 2004 02:55:48 -0000	1.20
***************
*** 497,501 ****
  
          FT_Load_Glyph (ft->face, glyphs[i].index, FT_LOAD_DEFAULT);
!         FT_Render_Glyph (glyphslot, FT_RENDER_MODE_NORMAL);
        
          width = glyphslot->bitmap.width;
--- 497,501 ----
  
          FT_Load_Glyph (ft->face, glyphs[i].index, FT_LOAD_DEFAULT);
!         FT_Render_Glyph (glyphslot, ft_render_mode_normal);
        
          width = glyphslot->bitmap.width;