diff options
| author | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-11-01 16:04:19 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <cyanogenmod@cerqueira.org> | 2013-11-01 16:04:19 +0000 |
| commit | 5b18c5874f85aa819ddef822b95a66ca070421dc (patch) | |
| tree | c75d7dc57e133b09dc56c1e6e58f74b2f86238ba /include/freetype/ftbitmap.h | |
| parent | 8afe960626dbf326354b836fd4d63e05b6974195 (diff) | |
| parent | 899c67b6cfcd2010784fbf08c5415af16c526e0c (diff) | |
| download | android_external_freetype-5b18c5874f85aa819ddef822b95a66ca070421dc.tar.gz android_external_freetype-5b18c5874f85aa819ddef822b95a66ca070421dc.tar.bz2 android_external_freetype-5b18c5874f85aa819ddef822b95a66ca070421dc.zip | |
Merge tag 'android-4.4_r1' into cm-11.0cm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315eacm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0
Android 4.4 Release 1.0
Diffstat (limited to 'include/freetype/ftbitmap.h')
| -rw-r--r-- | include/freetype/ftbitmap.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/freetype/ftbitmap.h b/include/freetype/ftbitmap.h index 9274236..7dbf5ba 100644 --- a/include/freetype/ftbitmap.h +++ b/include/freetype/ftbitmap.h @@ -4,7 +4,7 @@ /* */ /* FreeType utility functions for bitmaps (specification). */ /* */ -/* Copyright 2004, 2005, 2006, 2008 by */ +/* Copyright 2004-2006, 2008, 2013 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -135,9 +135,9 @@ FT_BEGIN_HEADER /* FT_Bitmap_Convert */ /* */ /* <Description> */ - /* Convert a bitmap object with depth 1bpp, 2bpp, 4bpp, or 8bpp to a */ - /* bitmap object with depth 8bpp, making the number of used bytes per */ - /* line (a.k.a. the `pitch') a multiple of `alignment'. */ + /* Convert a bitmap object with depth 1bpp, 2bpp, 4bpp, 8bpp or 32bpp */ + /* to a bitmap object with depth 8bpp, making the number of used */ + /* bytes line (a.k.a. the `pitch') a multiple of `alignment'. */ /* */ /* <Input> */ /* library :: A handle to a library object. */ |