[Git][freetype/freetype][master] 2 commits: * src/sfnt/sfwoff.c (reconstruct_glyf): Fix gcc 10 warning.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• fc082956
  by Werner Lemberg at 2022-04-01T14:50:44+02:00

  * src/sfnt/sfwoff.c (reconstruct_glyf): Fix gcc 10 warning.
  

• aee6b947
  by Werner Lemberg at 2022-04-01T14:55:12+02:00

  * builds/unix/configure.raw: Add option `--with-librsvg`.
  
  Since 'librsvg' is written in Rust, this option allows distributions to
  avoid a dependency on the entire Rust toolchain to provide the FreeType demo
  programs.
  
  Suggested by Lars Wendler in !156.
  

2 changed files:

• builds/unix/configure.raw
• src/sfnt/sfwoff2.c

Changes:

builds/unix/configure.raw

---

...	...	@@ -530,16 +530,28 @@ AC_SEARCH_LIBS([clock_gettime],
530	530	[test "$ac_cv_search_clock_gettime" = "none required" \
531	531	|| LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
532	532
533		-# 'librsvg' is needed to demonstrate SVG support.
534		-PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
535		- [have_librsvg="yes (pkg-config)"], [have_librsvg=no])
536		-
537	533	FT_DEMO_CFLAGS=""
538	534	FT_DEMO_LDFLAGS="$LIB_CLOCK_GETTIME"
539	535
540		-if test "$have_librsvg" != no; then
541		- FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG"
542		- FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS"
	536	+# 'librsvg' is needed to demonstrate SVG support.
	537	+AC_ARG_WITH([librsvg],
	538	+ [AS_HELP_STRING([--with-librsvg=@<:@yes|no|auto@:>@],
	539	+ [support OpenType SVG fonts in FreeType demo programs @<:@default=auto@:>@])],
	540	+ [], [with_librsvg=auto])
	541	+
	542	+have_librsvg=no
	543	+if test x"$with_librsvg" = xyes -o x"$with_librsvg" = xauto; then
	544	+ PKG_CHECK_MODULES([LIBRSVG], [librsvg-2.0 >= 2.46.0],
	545	+ [have_librsvg="yes (pkg-config)"], [:])
	546	+
	547	+ if test "$have_librsvg" != no; then
	548	+ FT_DEMO_CFLAGS="$FT_DEMO_CFLAGS $LIBRSVG_CFLAGS -DHAVE_LIBRSVG"
	549	+ FT_DEMO_LDFLAGS="$FT_DEMO_LDFLAGS $LIBRSVG_LIBS"
	550	+ fi
	551	+fi
	552	+
	553	+if test x"$with_librsvg" = xyes -a "$have_librsvg" = no; then
	554	+ AC_MSG_ERROR([librsvg support requested but library not found])
543	555	fi
544	556
545	557	AC_SUBST([FT_DEMO_CFLAGS])

src/sfnt/sfwoff2.c

---

...	...	@@ -973,7 +973,7 @@
973	973	/* composite glyph */
974	974	FT_Bool have_instructions = FALSE;
975	975	FT_UShort instruction_size = 0;
976		- FT_ULong composite_size;
	976	+ FT_ULong composite_size = 0;
977	977	FT_ULong size_needed;
978	978	FT_Byte* pointer = NULL;
979	979

—
View it on GitLab.
You're receiving this email because of your account on gitlab.freedesktop.org. If you'd like to receive fewer emails, you can adjust your notification settings.