diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2015-12-26 18:42:49 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2015-12-26 18:42:49 +0000 |
| commit | 28cc694075fa441ea915133118c365dcf3a3be16 (patch) | |
| tree | ab665e59b00609c5dbce99cf70d4e828e8808b71 /src/libcroco/cr-enc-handler.c | |
| parent | Add option for checkerboard background. (diff) | |
| download | inkscape-28cc694075fa441ea915133118c365dcf3a3be16.tar.gz inkscape-28cc694075fa441ea915133118c365dcf3a3be16.zip | |
Rebase on libcroco 0.6.11
(bzr r14540)
Diffstat (limited to 'src/libcroco/cr-enc-handler.c')
| -rw-r--r-- | src/libcroco/cr-enc-handler.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libcroco/cr-enc-handler.c b/src/libcroco/cr-enc-handler.c index 646bf1fe2..a7c4269ad 100644 --- a/src/libcroco/cr-enc-handler.c +++ b/src/libcroco/cr-enc-handler.c @@ -89,8 +89,7 @@ cr_enc_handler_get_instance (enum CREncoding a_enc) for (i = 0; gv_default_enc_handlers[i].encoding; i++) { if (gv_default_enc_handlers[i].encoding == a_enc) { - return (CREncHandler *) - & gv_default_enc_handlers[i].encoding; + return (CREncHandler *) & gv_default_enc_handlers[i]; } } @@ -118,8 +117,7 @@ cr_enc_handler_resolve_enc_alias (const guchar * a_alias_name, g_return_val_if_fail (a_alias_name != NULL, CR_BAD_PARAM_ERROR); - alias_name_up = g_strdup (a_alias_name); - g_ascii_strup (alias_name_up, -1); + alias_name_up = (guchar *) g_ascii_strup ((const gchar *) a_alias_name, -1); for (i = 0; gv_default_aliases[i].name; i++) { if (!strcmp (gv_default_aliases[i].name, (const gchar *) alias_name_up)) { |