diff options
| author | Sven Neumann <sven@gimp.org> | 2001-08-14 16:14:14 +0000 |
|---|---|---|
| committer | Sven Neumann <neo@src.gnome.org> | 2001-08-14 16:14:14 +0000 |
| commit | 7603a0b911834098583245a84517d0cf5172c17f (patch) | |
| tree | 2f24e2c934b44ed3c133bdedfbef5ac64bd52c04 | |
| parent | b7983377840cc221c9b9ca01b1fd83947b3d8e98 (diff) | |
| download | pango-7603a0b911834098583245a84517d0cf5172c17f.tar.gz | |
composite with "saturate" semantics instead of "over" so joining glyphs
2001-08-14 Sven Neumann <sven@gimp.org>
* pango/pangoft2.c (pango_ft2_render): composite with "saturate"
semantics instead of "over" so joining glyphs get drawn correctly.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 5 | ||||
| -rw-r--r-- | pango/pangoft2.c | 16 |
8 files changed, 36 insertions, 15 deletions
@@ -1,5 +1,10 @@ 2001-08-14 Sven Neumann <sven@gimp.org> + * pango/pangoft2.c (pango_ft2_render): composite with "saturate" + semantics instead of "over" so joining glyphs get drawn correctly. + +2001-08-14 Sven Neumann <sven@gimp.org> + * pango/pangoft2.c (pango_ft2_render): composite glyphs over the buffer instead of simply copying into it so glyphs with overlapping ink rectangles do not overwrite each other. diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 2c4df5b4..b9dd64e9 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -1,5 +1,10 @@ 2001-08-14 Sven Neumann <sven@gimp.org> + * pango/pangoft2.c (pango_ft2_render): composite with "saturate" + semantics instead of "over" so joining glyphs get drawn correctly. + +2001-08-14 Sven Neumann <sven@gimp.org> + * pango/pangoft2.c (pango_ft2_render): composite glyphs over the buffer instead of simply copying into it so glyphs with overlapping ink rectangles do not overwrite each other. diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 2c4df5b4..b9dd64e9 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,10 @@ 2001-08-14 Sven Neumann <sven@gimp.org> + * pango/pangoft2.c (pango_ft2_render): composite with "saturate" + semantics instead of "over" so joining glyphs get drawn correctly. + +2001-08-14 Sven Neumann <sven@gimp.org> + * pango/pangoft2.c (pango_ft2_render): composite glyphs over the buffer instead of simply copying into it so glyphs with overlapping ink rectangles do not overwrite each other. diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 2c4df5b4..b9dd64e9 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,5 +1,10 @@ 2001-08-14 Sven Neumann <sven@gimp.org> + * pango/pangoft2.c (pango_ft2_render): composite with "saturate" + semantics instead of "over" so joining glyphs get drawn correctly. + +2001-08-14 Sven Neumann <sven@gimp.org> + * pango/pangoft2.c (pango_ft2_render): composite glyphs over the buffer instead of simply copying into it so glyphs with overlapping ink rectangles do not overwrite each other. diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 2c4df5b4..b9dd64e9 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,5 +1,10 @@ 2001-08-14 Sven Neumann <sven@gimp.org> + * pango/pangoft2.c (pango_ft2_render): composite with "saturate" + semantics instead of "over" so joining glyphs get drawn correctly. + +2001-08-14 Sven Neumann <sven@gimp.org> + * pango/pangoft2.c (pango_ft2_render): composite glyphs over the buffer instead of simply copying into it so glyphs with overlapping ink rectangles do not overwrite each other. diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 2c4df5b4..b9dd64e9 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,5 +1,10 @@ 2001-08-14 Sven Neumann <sven@gimp.org> + * pango/pangoft2.c (pango_ft2_render): composite with "saturate" + semantics instead of "over" so joining glyphs get drawn correctly. + +2001-08-14 Sven Neumann <sven@gimp.org> + * pango/pangoft2.c (pango_ft2_render): composite glyphs over the buffer instead of simply copying into it so glyphs with overlapping ink rectangles do not overwrite each other. diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 2c4df5b4..b9dd64e9 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,5 +1,10 @@ 2001-08-14 Sven Neumann <sven@gimp.org> + * pango/pangoft2.c (pango_ft2_render): composite with "saturate" + semantics instead of "over" so joining glyphs get drawn correctly. + +2001-08-14 Sven Neumann <sven@gimp.org> + * pango/pangoft2.c (pango_ft2_render): composite glyphs over the buffer instead of simply copying into it so glyphs with overlapping ink rectangles do not overwrite each other. diff --git a/pango/pangoft2.c b/pango/pangoft2.c index b44d11d3..360388b8 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -366,21 +366,7 @@ pango_ft2_render (FT_Bitmap *bitmap, case 0xff: *p = 0xff; default: - switch (*p) - { - case 0: - *p = *q; - break; - case 0xff: - break; - default: - { - gushort pixel = *(q); - gushort s = (*p)+1; - *(p) = (pixel * (256-s) + s) >> 8; - } - break; - } + *p = MIN ((gushort) *p + (gushort) *q, 0xff); break; } q++; |