summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-11-17 00:03:05 +0100
committerwm4 <wm4@nowhere>2014-11-17 00:03:05 +0100
commit0c0b3f57aa688f3d2b38c5faf8178dad45302aa0 (patch)
treec8861ac9a4535616d53cb23eebdfb95249e10afd
parent547468c75e63c7ae0794c4278c916a28df7a6b61 (diff)
downloadlibass-0c0b3f57aa688f3d2b38c5faf8178dad45302aa0.tar.bz2
libass-0c0b3f57aa688f3d2b38c5faf8178dad45302aa0.tar.xz
Fix some of the recently added checks
-rw-r--r--libass/ass_bitmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libass/ass_bitmap.c b/libass/ass_bitmap.c
index cb059f1..e6bec82 100644
--- a/libass/ass_bitmap.c
+++ b/libass/ass_bitmap.c
@@ -124,7 +124,7 @@ static bool generate_tables(ASS_SynthPriv *priv, double radius)
static bool resize_tmp(ASS_SynthPriv *priv, int w, int h)
{
- if (w >= INT_MAX || (w + 1) > SIZE_MAX / 2 / sizeof(unsigned) / h)
+ if (w >= INT_MAX || (w + 1) > SIZE_MAX / 2 / sizeof(unsigned) / FFMAX(h, 1))
return false;
size_t needed = sizeof(unsigned) * (w + 1) * h;
if (priv->tmp && priv->tmp_allocated >= needed)
@@ -679,7 +679,7 @@ int outline_to_bitmap3(ASS_Renderer *render_priv, FT_Outline *outline, FT_Outlin
{
blur_radius *= 2;
int bbord = be > 0 ? sqrt(2 * be) : 0;
- int gbord = blur_radius > 0.0 ? FFMAX(blur_radius + 1, INT_MAX) : 0;
+ int gbord = blur_radius > 0.0 ? FFMIN(blur_radius + 1, INT_MAX) : 0;
int bord = FFMAX(bbord, gbord);
if (bord == 0 && (shadow_offset.x || shadow_offset.y))
bord = 1;