[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master 06d027e: * src/ftgrid.c: Use integer for `scale
From: |
Alexei Podtelezhnikov |
Subject: |
[freetype2-demos] master 06d027e: * src/ftgrid.c: Use integer for `scale'. Other tweaks. |
Date: |
Tue, 17 Oct 2017 22:50:30 -0400 (EDT) |
branch: master
commit 06d027ed66d60e8635d40576540d3d3aeb657b5d
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>
* src/ftgrid.c: Use integer for `scale'. Other tweaks.
---
ChangeLog | 4 ++++
src/ftgrid.c | 29 +++++++++++++----------------
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f3d2eb1..bebc497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-10-10 Alexei Podtelezhnikov <address@hidden>
+
+ * src/ftgrid.c: Use integer for `scale'. Other tweaks.
+
2017-10-16 Colin Fahey <address@hidden>
* src/output.c (put_unicode_be16_string): Fix UTF16 default.
diff --git a/src/ftgrid.c b/src/ftgrid.c
index eac7592..48ee53a 100644
--- a/src/ftgrid.c
+++ b/src/ftgrid.c
@@ -106,11 +106,11 @@
int Num; /* glyph index */
int font_index;
- FT_F26Dot6 scale;
+ int scale;
int x_origin;
int y_origin;
- FT_F26Dot6 scale_0;
+ int scale_0;
int x_origin_0;
int y_origin_0;
@@ -293,9 +293,9 @@
static void
grid_status_draw_grid( GridStatus st )
{
- int x_org = st->x_origin;
- int y_org = st->y_origin;
- FT_F26Dot6 xy_incr = st->scale;
+ int x_org = st->x_origin;
+ int y_org = st->y_origin;
+ int xy_incr = st->scale;
if ( xy_incr >= 2 )
@@ -571,8 +571,8 @@
static void
- bitmap_scale( grBitmap* bit,
- FT_F26Dot6 scale )
+ bitmap_scale( grBitmap* bit,
+ int scale )
{
unsigned char* s = bit->buffer;
unsigned char* t;
@@ -681,7 +681,7 @@
FT_Size size;
FT_GlyphSlot slot;
FT_UInt glyph_idx;
- FT_F26Dot6 scale = st->scale;
+ int scale = st->scale;
int ox = st->x_origin;
int oy = st->y_origin;
@@ -729,7 +729,7 @@
( ( size->face->glyph->metrics.horiAdvance +
size->face->glyph->lsb_delta -
size->face->glyph->rsb_delta ) *
- st->scale >> 6 ),
+ scale >> 6 ),
0,
st->disp_height,
st->axis_color );
@@ -737,14 +737,12 @@
/* show ascender and descender */
grFillHLine( st->disp_bitmap,
0,
- st->y_origin -
- ( size->face->size->metrics.ascender * st->scale >> 6 ),
+ st->y_origin - ( size->metrics.ascender * scale >> 6 ),
st->disp_width,
st->axis_color );
grFillHLine( st->disp_bitmap,
0,
- st->y_origin -
- ( size->face->size->metrics.descender * st->scale >> 6 ),
+ st->y_origin - ( size->metrics.descender * scale >> 6 ),
st->disp_width,
st->axis_color );
}
@@ -1344,7 +1342,7 @@
static void
event_grid_zoom( double zoom )
{
- FT_F26Dot6 scale_old = status.scale;
+ int scale_old = status.scale;
status.scale *= zoom;
@@ -1354,8 +1352,7 @@
if ( status.scale == scale_old && zoom > 1.0 )
status.scale++;
- sprintf( status.header_buffer, "zoom level %.0f%%",
- status.scale * 100.0 / status.scale_0 );
+ sprintf( status.header_buffer, "zoom scale %d:1", status.scale );
status.header = (const char *)status.header_buffer;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master 06d027e: * src/ftgrid.c: Use integer for `scale'. Other tweaks.,
Alexei Podtelezhnikov <=