Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
fontconfig
fontconfig
Commits
767e3aa7
Commit
767e3aa7
authored
Jan 04, 2018
by
Akira TAGOH
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compiler warnings
parent
706535e1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
+7
-4
src/fccfg.c
src/fccfg.c
+1
-1
src/fcdir.c
src/fcdir.c
+4
-0
src/fcfreetype.c
src/fcfreetype.c
+2
-2
test/test-bz131804.c
test/test-bz131804.c
+0
-1
No files found.
src/fccfg.c
View file @
767e3aa7
...
...
@@ -47,7 +47,7 @@ retry_locale:
{
is_locale_initialized
=
FcTrue
;
if
(
!
fc_atomic_ptr_cmpexch
(
&
static_is_locale_initialized
,
NULL
,
(
void
*
)(
long
)
is_locale_initialized
))
(
void
*
)(
intptr_t
)
is_locale_initialized
))
goto
retry_locale
;
setlocale
(
LC_ALL
,
""
);
}
...
...
src/fcdir.c
View file @
767e3aa7
...
...
@@ -289,7 +289,9 @@ FcDirCacheScan (const FcChar8 *dir, FcConfig *config)
struct
stat
dir_stat
;
const
FcChar8
*
sysroot
=
FcConfigGetSysRoot
(
config
);
FcChar8
*
d
;
#ifndef _WIN32
int
fd
=
-
1
;
#endif
if
(
sysroot
)
d
=
FcStrBuildFilename
(
sysroot
,
dir
,
NULL
);
...
...
@@ -353,7 +355,9 @@ FcDirCacheRescan (const FcChar8 *dir, FcConfig *config)
FcStrSet
*
dirs
;
const
FcChar8
*
sysroot
=
FcConfigGetSysRoot
(
config
);
FcChar8
*
d
=
NULL
;
#ifndef _WIN32
int
fd
=
-
1
;
#endif
cache
=
FcDirCacheLoad
(
dir
,
config
,
NULL
);
if
(
!
cache
)
...
...
src/fcfreetype.c
View file @
767e3aa7
...
...
@@ -1767,7 +1767,7 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
{
weight
=
FcIsWeight
((
FcChar8
*
)
psfontinfo
.
weight
);
if
(
FcDebug
()
&
FC_DBG_SCANV
)
printf
(
"
\t
Type1 weight %s maps to %
d
\n
"
,
printf
(
"
\t
Type1 weight %s maps to %
g
\n
"
,
psfontinfo
.
weight
,
weight
);
}
...
...
@@ -1845,7 +1845,7 @@ FcFreeTypeQueryFaceInternal (const FT_Face face,
{
weight
=
FcContainsWeight
(
style
);
if
(
FcDebug
()
&
FC_DBG_SCANV
)
printf
(
"
\t
Style %s maps to weight %
d
\n
"
,
style
,
weight
);
printf
(
"
\t
Style %s maps to weight %
g
\n
"
,
style
,
weight
);
}
if
(
width
==
-
1
)
{
...
...
test/test-bz131804.c
View file @
767e3aa7
...
...
@@ -46,7 +46,6 @@ comp(const FcChar8 *l1, const FcChar8 *l2)
int
main
(
void
)
{
FcLangResult
result
;
int
i
=
1
;
/* 1 */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment