Skip to content
This repository has been archived by the owner on May 12, 2024. It is now read-only.

Commit

Permalink
Updated libass to 962b1a
Browse files Browse the repository at this point in the history
 - Add more invisible characters to ass_shaper_skip_characters
 - Ignore metrics of trimmable whitespace on nonblank lines
 - Use bool and true/false assignments for GlyphInfo::skip
 - Don't halve non-empty line height even if wholly invisible
 - Revert exposing of freetype-provided family for fontselect.c
 - ass_parse: avoid UB and match vsfilter on negative-accel color animation
 - ass_fontconfig: use FcWeightToOpenTypeDouble
 - Skip fully parsing \t if there is no backslash
  • Loading branch information
Ristellise committed Sep 20, 2020
1 parent 2079f43 commit 7ed5f9c
Show file tree
Hide file tree
Showing 9 changed files with 470 additions and 101 deletions.
4 changes: 2 additions & 2 deletions build/git_version.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define BUILD_GIT_VERSION_NUMBER 9206
#define BUILD_GIT_VERSION_STRING "9206"
#define BUILD_GIT_VERSION_NUMBER 9207
#define BUILD_GIT_VERSION_STRING "9207"
#define TAGGED_RELEASE 0
#define INSTALLER_VERSION '2.0.0'
#define RESOURCE_BASE_VERSION 2, 0, 0
63 changes: 0 additions & 63 deletions vendor/exten/libass/libass/Makefile.am

This file was deleted.

22 changes: 19 additions & 3 deletions vendor/exten/libass/libass/ass.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,22 @@
extern "C" {
#endif

#if (defined(__GNUC__) && ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))) || defined(__clang__)
#define ASS_DEPRECATED(msg) __attribute__((deprecated(msg)))
#if __GNUC__ > 5 || defined(__clang__)
#define ASS_DEPRECATED_ENUM(msg) __attribute__((deprecated(msg)))
#else
#define ASS_DEPRECATED_ENUM(msg)
#endif
#elif defined(_MSC_VER)
#define ASS_DEPRECATED(msg) __declspec(deprecated(msg))
#define ASS_DEPRECATED_ENUM(msg)
#else
#define ASS_DEPRECATED(msg)
#define ASS_DEPRECATED_ENUM(msg)
#endif


/*
* A linked list of images produced by an ass renderer.
*
Expand Down Expand Up @@ -129,7 +145,7 @@ typedef enum {
/**
* Old alias for ASS_OVERRIDE_BIT_SELECTIVE_FONT_SCALE. Deprecated. Do not use.
*/
ASS_OVERRIDE_BIT_FONT_SIZE = 1 << 1,
ASS_OVERRIDE_BIT_FONT_SIZE ASS_DEPRECATED_ENUM("replaced by ASS_OVERRIDE_BIT_SELECTIVE_FONT_SCALE") = 1 << 1,
/**
* On dialogue events override: FontSize, Spacing, Blur, ScaleX, ScaleY
*/
Expand Down Expand Up @@ -402,7 +418,7 @@ void ass_set_pixel_aspect(ASS_Renderer *priv, double par);
* \param dar display aspect ratio (DAR), prescaled for output PAR
* \param sar storage aspect ratio (SAR)
*/
void ass_set_aspect_ratio(ASS_Renderer *priv, double dar, double sar);
ASS_DEPRECATED("use 'ass_set_pixel_aspect' instead") void ass_set_aspect_ratio(ASS_Renderer *priv, double dar, double sar);

/**
* \brief Set a fixed font scaling factor.
Expand Down Expand Up @@ -501,7 +517,7 @@ void ass_set_selective_style_override(ASS_Renderer *priv, ASS_Style *style);
* \param priv renderer handle
* \return success
*/
int ass_fonts_update(ASS_Renderer *priv);
ASS_DEPRECATED("it does nothing") int ass_fonts_update(ASS_Renderer *priv);

/**
* \brief Set hard cache limits. Do not set, or set to zero, for reasonable
Expand Down
Loading

0 comments on commit 7ed5f9c

Please sign in to comment.