[HarfBuzz] harfbuzz: Branch 'master' - 2 commits

[Behdad Esfahbod]

 .travis.yml               |    2 +-
 test/api/test-blob.c      |    2 +-
 util/helper-cairo-ansi.cc |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9596b2bf569dae6fbe268803e3cb248001f10954
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Oct 28 00:09:05 2013 +0100

    Pass CPPFLAGS=-Werror to Travis-CI
    
    We want default gcc / clang warnings to fail the CI build.

diff --git a/.travis.yml b/.travis.yml
index fd24e1c..6ab494a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ install:
   - sudo apt-get install libcairo2-dev # for utils
   - sudo apt-get install libicu-dev # for extra unicode functions
   - sudo apt-get install libgraphite2-dev # for extra shapers
-script: ./autogen.sh && make && make check
+script: ./autogen.sh && make CPPFLAGS=-Werror && make check CPPFLAGS=-Werror
 notifications:
   irc: "irc.freenode.org#harfbuzz"
   email: harfbuzz at lists.freedesktop.org
commit c77d1ade6898cea161f0709c5c5a912e14aff951
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sun Oct 27 23:52:26 2013 +0100

    Fix warnings

diff --git a/test/api/test-blob.c b/test/api/test-blob.c
index 6759920..bbb7e2e 100644
--- a/test/api/test-blob.c
+++ b/test/api/test-blob.c
@@ -270,7 +270,7 @@ test_blob_subblob (fixture_t *fixture, gconstpointer user_data)
 
   if (mm == HB_MEMORY_MODE_DUPLICATE) {
     g_assert_cmpint (fixture->freed, ==, 1);
-    fixture->data = hb_blob_get_data (b, NULL);
+    fixture->data = (char *) hb_blob_get_data (b, NULL);
   } else {
     g_assert_cmpint (fixture->freed, ==, 0);
   }
diff --git a/util/helper-cairo-ansi.cc b/util/helper-cairo-ansi.cc
index f7c0660..376bf2b 100644
--- a/util/helper-cairo-ansi.cc
+++ b/util/helper-cairo-ansi.cc
@@ -57,7 +57,7 @@ helper_cairo_surface_write_to_ansi_stream (cairo_surface_t	*surface,
     cairo_surface_reference (surface);
 
   unsigned int stride = cairo_image_surface_get_stride (surface);
-  const uint32_t *data = (uint32_t *) cairo_image_surface_get_data (surface);
+  const uint32_t *data = (uint32_t *) (void *) cairo_image_surface_get_data (surface);
 
   /* We don't have rows to spare on the terminal window...
    * Find the tight image top/bottom and only print in between. */