From f1425a549fef360c3750532de23604cd318999d8 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 27 Apr 2011 12:15:06 -0400
Subject: [PATCH] Rename hb-view.c and test.c to .cc files

---
 src/Makefile.am               | 4 ++--
 src/{hb-view.c => hb-view.cc} | 2 +-
 src/{test.c => test.cc}       | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)
 rename src/{hb-view.c => hb-view.cc} (99%)
 rename src/{test.c => test.cc} (98%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 1069307..558e697 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -114,7 +114,7 @@ if HAVE_GLIB
 if HAVE_FREETYPE
 if HAVE_CAIRO_FT
 if HAVE_CAIRO_PNG
-hb_view_SOURCES = hb-view.c
+hb_view_SOURCES = hb-view.cc
 hb_view_CPPFLAGS = $(HBCFLAGS) $(CAIRO_FT_CFLAGS) $(CAIRO_PNG_CFLAGS)
 hb_view_LDADD = libharfbuzz.la -lm $(HBLIBS) $(CAIRO_FT_LIBS) $(CAIRO_PNG_LIBS)
 bin_PROGRAMS += hb-view
@@ -127,7 +127,7 @@ main_SOURCES = main.cc
 main_CPPFLAGS = $(HBCFLAGS)
 main_LDADD = libharfbuzz.la $(HBLIBS)
 
-test_SOURCES = test.c
+test_SOURCES = test.cc
 test_CPPFLAGS = $(HBCFLAGS)
 test_LDADD = libharfbuzz.la $(HBLIBS)
 
diff --git a/src/hb-view.c b/src/hb-view.cc
similarity index 99%
rename from src/hb-view.c
rename to src/hb-view.cc
index 783c559..fdf0b80 100644
--- a/src/hb-view.c
+++ b/src/hb-view.cc
@@ -318,7 +318,7 @@ static void parse_features (char *s)
       p++;
   } while (p);
 
-  features = calloc (num_features, sizeof (*features));
+  features = (hb_feature_t *) calloc (num_features, sizeof (*features));
 
   /* now do the actual parsing */
   p = s;
diff --git a/src/test.c b/src/test.cc
similarity index 98%
rename from src/test.c
rename to src/test.cc
index 412f1fd..c185430 100644
--- a/src/test.c
+++ b/src/test.cc
@@ -79,7 +79,7 @@ main (int argc, char **argv)
 
     blob = hb_blob_create (font_data, len,
 			   HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE,
-			   destroy, user_data);
+			   user_data, destroy);
   }
 
   /* Create the face */
@@ -92,3 +92,6 @@ main (int argc, char **argv)
 
   return 0;
 }
+
+
+HB_END_DECLS
-- 
2.7.4