[Git][freetype/freetype][master] 2 commits: [sfnt] Add missing blend mode 'plus' to 'COLR' v1.

[Werner Lemberg (@wl)]

Werner Lemberg pushed to branch master at FreeType / FreeType

Commits:

• e40ae756
  by Dominik Röttsches at 2021-08-09T19:25:26+02:00

  [sfnt] Add missing blend mode 'plus' to 'COLR' v1.
  
  * include/freetype/ftcolor.h (FT_Composite_Mode): Add missing blend mode
  'plus' after it was added to the spec.
  

• fed55210
  by Werner Lemberg at 2021-08-09T19:27:34+02:00

  * src/sfnt/ttcolr.c (tt_face_get_color_glyph_clipbox): Minor fix.
  

2 changed files:

• include/freetype/ftcolor.h
• src/sfnt/ttcolr.c

Changes:

include/freetype/ftcolor.h

---

...	...	@@ -740,22 +740,23 @@ FT_BEGIN_HEADER
740	740	FT_COLR_COMPOSITE_SRC_ATOP = 9,
741	741	FT_COLR_COMPOSITE_DEST_ATOP = 10,
742	742	FT_COLR_COMPOSITE_XOR = 11,
743		- FT_COLR_COMPOSITE_SCREEN = 12,
744		- FT_COLR_COMPOSITE_OVERLAY = 13,
745		- FT_COLR_COMPOSITE_DARKEN = 14,
746		- FT_COLR_COMPOSITE_LIGHTEN = 15,
747		- FT_COLR_COMPOSITE_COLOR_DODGE = 16,
748		- FT_COLR_COMPOSITE_COLOR_BURN = 17,
749		- FT_COLR_COMPOSITE_HARD_LIGHT = 18,
750		- FT_COLR_COMPOSITE_SOFT_LIGHT = 19,
751		- FT_COLR_COMPOSITE_DIFFERENCE = 20,
752		- FT_COLR_COMPOSITE_EXCLUSION = 21,
753		- FT_COLR_COMPOSITE_MULTIPLY = 22,
754		- FT_COLR_COMPOSITE_HSL_HUE = 23,
755		- FT_COLR_COMPOSITE_HSL_SATURATION = 24,
756		- FT_COLR_COMPOSITE_HSL_COLOR = 25,
757		- FT_COLR_COMPOSITE_HSL_LUMINOSITY = 26,
758		- FT_COLR_COMPOSITE_MAX = 27
	743	+ FT_COLR_COMPOSITE_PLUS = 12,
	744	+ FT_COLR_COMPOSITE_SCREEN = 13,
	745	+ FT_COLR_COMPOSITE_OVERLAY = 14,
	746	+ FT_COLR_COMPOSITE_DARKEN = 15,
	747	+ FT_COLR_COMPOSITE_LIGHTEN = 16,
	748	+ FT_COLR_COMPOSITE_COLOR_DODGE = 17,
	749	+ FT_COLR_COMPOSITE_COLOR_BURN = 18,
	750	+ FT_COLR_COMPOSITE_HARD_LIGHT = 19,
	751	+ FT_COLR_COMPOSITE_SOFT_LIGHT = 20,
	752	+ FT_COLR_COMPOSITE_DIFFERENCE = 21,
	753	+ FT_COLR_COMPOSITE_EXCLUSION = 22,
	754	+ FT_COLR_COMPOSITE_MULTIPLY = 23,
	755	+ FT_COLR_COMPOSITE_HSL_HUE = 24,
	756	+ FT_COLR_COMPOSITE_HSL_SATURATION = 25,
	757	+ FT_COLR_COMPOSITE_HSL_COLOR = 26,
	758	+ FT_COLR_COMPOSITE_HSL_LUMINOSITY = 27,
	759	+ FT_COLR_COMPOSITE_MAX = 28
759	760
760	761	} FT_Composite_Mode;
761	762

src/sfnt/ttcolr.c

---

...	...	@@ -863,7 +863,7 @@
863	863
864	864	format = FT_NEXT_BYTE( p1 );
865	865
866		- if ( format < 0 || format > 1 )
	866	+ if ( format > 1 )
867	867	return 0;
868	868
869	869	/* `face->root.size->metrics.x_scale` and `y_scale` are factors */

—
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.