From d9b4470e39a6799e49d3f383273d52a075f0bf3f Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Tue, 22 Apr 2014 07:33:07 +0200 Subject: [PATCH] * src/sfnt/pngshim.c (error_callback): s/longjmp/ft_longjmp/. --- ChangeLog | 4 ++++ src/sfnt/pngshim.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7135c268b..dc78094ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-04-22 Werner Lemberg + + * src/sfnt/pngshim.c (error_callback): s/longjmp/ft_longjmp/. + 2014-04-20 Werner Lemberg [autofit] Fix Savannah bug #42148. diff --git a/src/sfnt/pngshim.c b/src/sfnt/pngshim.c index 878de1fef..9afbe5a58 100644 --- a/src/sfnt/pngshim.c +++ b/src/sfnt/pngshim.c @@ -4,7 +4,7 @@ /* */ /* PNG Bitmap glyph support. */ /* */ -/* Copyright 2013 by Google, Inc. */ +/* Copyright 2013, 2014 by Google, Inc. */ /* Written by Stuart Gill and Behdad Esfahbod. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -129,7 +129,7 @@ *error = FT_THROW( Out_Of_Memory ); #ifdef PNG_SETJMP_SUPPORTED - longjmp( png_jmpbuf( png ), 1 ); + ft_longjmp( png_jmpbuf( png ), 1 ); #endif /* if we get here, then we have no choice but to abort ... */ }