X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Flibcroco%2Fcr-enc-handler.c;h=973a5f373435e2bc020ae5587748d25d9c785226;hb=5f838cdcee37934790b8e7e62ea34f188bf20fe1;hp=509793ab789b1ccf6fc6b89be7713aa24cb255e2;hpb=6b15695578f07a3f72c4c9475c1a261a3021472a;p=inkscape.git

diff --git a/src/libcroco/cr-enc-handler.c b/src/libcroco/cr-enc-handler.c
index 509793ab7..973a5f373 100644
--- a/src/libcroco/cr-enc-handler.c
+++ b/src/libcroco/cr-enc-handler.c
@@ -57,7 +57,7 @@ static struct CREncAlias gv_default_aliases[] = {
         {"UCS-4", CR_UCS_4},
         {"UCS_4", CR_UCS_4},
         {"ASCII", CR_ASCII},
-        {0, 0}
+        {(char *)0, (enum CREncoding)0}
 };
 
 static CREncHandler gv_default_enc_handlers[] = {
@@ -70,7 +70,7 @@ static CREncHandler gv_default_enc_handlers[] = {
         {CR_ASCII, cr_utils_ucs1_to_utf8, cr_utils_utf8_to_ucs1,
          cr_utils_ucs1_str_len_as_utf8, cr_utils_utf8_str_len_as_ucs1},
 
-        {0, NULL, NULL, NULL, NULL}
+        {(enum CREncoding)0, NULL, NULL, NULL, NULL}
 };
 
 /**
@@ -107,12 +107,11 @@ cr_enc_handler_resolve_enc_alias (const guchar * a_alias_name,
                                   enum CREncoding *a_enc)
 {
         gulong i = 0;
-        guchar *alias_name_up = NULL;
         enum CRStatus status = CR_ENCODING_NOT_FOUND_ERROR;
 
         g_return_val_if_fail (a_alias_name != NULL, CR_BAD_PARAM_ERROR);
 
-        alias_name_up = g_strdup (a_alias_name);
+        gchar *alias_name_up = g_strdup ((gchar *)a_alias_name);
         g_ascii_strup (alias_name_up, -1);
 
         for (i = 0; gv_default_aliases[i].name; i++) {
@@ -162,7 +161,7 @@ cr_enc_handler_convert_input (CREncHandler * a_this,
                 *a_out_len = *a_in_len;
         }
 
-        *a_out = g_malloc0 (*a_out_len);
+        *a_out = (guchar *)g_malloc0 (*a_out_len);
 
         status = a_this->decode_input (a_in, a_in_len, *a_out, a_out_len);