[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2-demos] master 71b8b4c: Fix clang warnings.
From: |
Werner LEMBERG |
Subject: |
[freetype2-demos] master 71b8b4c: Fix clang warnings. |
Date: |
Thu, 11 May 2017 13:38:48 -0400 (EDT) |
branch: master
commit 71b8b4cad047135a4830be21a6df89d6de46b3a6
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
Fix clang warnings.
* src/ftbench.c (main): Use cast.
* src/ftview.c (N_LCD_IDXS): Cast to `int'.
(usage, parse_cmdline): Updated.
---
ChangeLog | 9 +++++++++
src/ftbench.c | 2 +-
src/ftview.c | 8 ++++----
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 497ff37..57224be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-05-11 Werner Lemberg <address@hidden>
+
+ Fix clang warnings.
+
+ * src/ftbench.c (main): Use cast.
+
+ * src/ftview.c (N_LCD_IDXS): Cast to `int'.
+ (usage, parse_cmdline): Updated.
+
2017-05-09 Alexei Podtelezhnikov <address@hidden>
[ftview] Report fractional ppem for scalable fonts.
diff --git a/src/ftbench.c b/src/ftbench.c
index c8cc8f3..3535bb3 100644
--- a/src/ftbench.c
+++ b/src/ftbench.c
@@ -995,7 +995,7 @@
case FT_LCD_FILTER_LIGHT:
case FT_LCD_FILTER_LEGACY1:
case FT_LCD_FILTER_LEGACY:
- FT_Library_SetLcdFilter( lib, filter );
+ FT_Library_SetLcdFilter( lib, (FT_LcdFilter)filter );
}
}
break;
diff --git a/src/ftview.c b/src/ftview.c
index 3ecb689..bf669cf 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -83,7 +83,7 @@
LCD_MODE_VBGR
};
-#define N_LCD_IDXS ( sizeof ( lcd_modes ) / sizeof ( int ) )
+#define N_LCD_IDXS ( (int)( sizeof ( lcd_modes ) / sizeof ( int ) ) )
enum
@@ -1836,7 +1836,7 @@
" `ADOB' (Adobe standard), `ADBC' (Adobe custom).\n"
" -m text Use `text' for rendering.\n" );
fprintf( stderr,
- " -l mode Set start-up rendering mode (0 <= mode <= %ld).\n",
+ " -l mode Set start-up rendering mode (0 <= mode <= %d).\n",
N_LCD_IDXS );
fprintf( stderr,
" -p Preload file in memory to simulate memory-mapping.\n"
@@ -1883,9 +1883,9 @@
case 'l':
status.lcd_idx = atoi( optarg );
- if ( status.lcd_idx < 0 || status.lcd_idx > (int)N_LCD_IDXS )
+ if ( status.lcd_idx < 0 || status.lcd_idx > N_LCD_IDXS )
{
- fprintf( stderr, "argument to `l' must be between 0 and %ld\n",
+ fprintf( stderr, "argument to `l' must be between 0 and %d\n",
N_LCD_IDXS );
exit( 3 );
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2-demos] master 71b8b4c: Fix clang warnings.,
Werner LEMBERG <=