From 27cf9de104bf341e38d90df30bfbfde3dad608c4 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 13 Jan 2007 07:34:23 +0000 Subject: [PATCH] formatting, copyright years --- ChangeLog | 16 +++++++++------- src/base/ftbitmap.c | 6 ++++-- src/truetype/ttinterp.c | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 463fd9cac..638b9fa79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,14 @@ +2007-01-12 David Turner + + * src/base/ftbitmap.c (ft_bitmap_assure_buffer): Fix memory stomping + bug in the bitmap emboldener if the pitch of the source bitmap is + much larger than its width. + + * src/truetype/ttinterp.c (Update_Max): Fix aliasing-related + compilation warning. + 2007-01-12 Werner Lemberg - * src/base/ftbitmap.c: fixing memory stomping bug in the - bitmap embolderner when the pitch of the source bitmap is - *much* larger than its width - - * src/truetype/ttinterp.c: fixing aliasing-related compilation - warning - * builds/unix/install-sh, builds/unix/mkinstalldirs: Updated from `automake' CVS module from sources.redhat.com. diff --git a/src/base/ftbitmap.c b/src/base/ftbitmap.c index 7a7e65bcf..50c9382c0 100644 --- a/src/base/ftbitmap.c +++ b/src/base/ftbitmap.c @@ -5,7 +5,7 @@ /* FreeType utility functions for converting 1bpp, 2bpp, 4bpp, and 8bpp */ /* bitmaps into 8bpp format (body). */ /* */ -/* Copyright 2004, 2005, 2006 by */ +/* Copyright 2004, 2005, 2006, 2007 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -171,7 +171,8 @@ if ( bitmap->pitch > 0 ) { - FT_Int len = ( width + ppb - 1 ) / ppb; + FT_Int len = ( width + ppb - 1 ) / ppb; + for ( i = 0; i < bitmap->rows; i++ ) FT_MEM_COPY( buffer + new_pitch * ( ypixels + i ), @@ -181,6 +182,7 @@ { FT_Int len = ( width + ppb - 1 ) / ppb; + for ( i = 0; i < bitmap->rows; i++ ) FT_MEM_COPY( buffer + new_pitch * i, bitmap->buffer + pitch * i, len ); diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index b7e105fbe..e43261322 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -4,7 +4,7 @@ /* */ /* TrueType bytecode interpreter (body). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */