summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2017-08-16 13:32:17 +0200
committerWerner Lemberg <wl@gnu.org>2017-08-16 13:32:17 +0200
commitcadd29de08abd1bba38d42a76efdb4971d45d01e (patch)
tree66904fb6b0dbb964c8fda02f2ea8650d0c20231e
parentc9d7c03fa1b5c6244759ade814c546da04080646 (diff)
downloadfreetype2-cadd29de08abd1bba38d42a76efdb4971d45d01e.tar.gz
* src/sfnt/pngshim.c (premultiply_data): Fix compiler warnings.
-rw-r--r--ChangeLog4
-rw-r--r--src/sfnt/pngshim.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 06ea99e9e..ca92d3275 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-08-16 Werner Lemberg <wl@gnu.org>
+
+ * src/sfnt/pngshim.c (premultiply_data): Fix compiler warnings.
+
2017-08-15 Behdad Esfahbod <behdad@behdad.org>
[sfnt] Speed up PNG image loading.
diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c
index 90a56699f..503ea4330 100644
--- a/src/sfnt/pngshim.c
+++ b/src/sfnt/pngshim.c
@@ -57,8 +57,6 @@
{
unsigned int i = 0, limit;
- FT_UNUSED( png );
-
/* the `vector_size' attribute was introduced in gcc 3.1, which */
/* predates clang; the `__BYTE_ORDER__' preprocessor symbol was */
/* introduced in gcc 4.6 and clang 3.2, respectively */
@@ -78,7 +76,7 @@
limit = row_info->rowbytes - 16 + 1;
for ( ; i < limit; i += 16 )
{
- char* base = &data[i];
+ unsigned char* base = &data[i];
v82 s, s0, s1, a;
v82 ma = { 1, 1, 3, 3, 5, 5, 7, 7 };
@@ -106,6 +104,8 @@
}
#endif /* use `vector_size' */
+ FT_UNUSED( png );
+
limit = row_info->rowbytes;
for ( ; i < limit; i += 4 )
{