Skip to content

Commit 8a25b36

Browse files
author
Cristy
committed
verify Freetype delegate library is version 2.8 or above
1 parent fc4744f commit 8a25b36

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

MagickCore/fx.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1413,13 +1413,14 @@ static PixelChannel GetChannelQualifier (FxInfo * pfx, int op)
14131413
if (op >= FirstImgAttr && op <= (OperatorE)aNull &&
14141414
(pch->pixChan == HUE_CHANNEL ||
14151415
pch->pixChan == SAT_CHANNEL ||
1416-
pch->pixChan == LIGHT_CHANNEL)
1416+
pch->pixChan == LIGHT_CHANNEL ||
1417+
pch->pixChan == INTENSITY_CHANNEL)
14171418
)
14181419
{
14191420
(void) ThrowMagickException (
14201421
pfx->exception, GetMagickModule(), OptionError,
1421-
"Can't have image attribute with HLS qualifier at", "'%s'",
1422-
SetShortExp(pfx));
1422+
"Can't have image attribute with channel qualifier at", "'%s' at '%s'",
1423+
pfx->token, SetShortExp(pfx));
14231424
return NO_CHAN_QUAL;
14241425
}
14251426

configure

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5144,7 +5144,7 @@ MAGICK_PATCHLEVEL_VERSION=45
51445144

51455145
MAGICK_VERSION=7.1.0-45
51465146

5147-
MAGICK_GIT_REVISION=9e3fa1679:20220724
5147+
MAGICK_GIT_REVISION=fc4744f79:20220725
51485148

51495149

51505150
# Substitute library versioning
@@ -5178,7 +5178,7 @@ PACKAGE_LIB_VERSION=0x710
51785178

51795179
PACKAGE_LIB_VERSION_NUMBER=7,1,0,45
51805180

5181-
PACKAGE_RELEASE_DATE=2022-07-24
5181+
PACKAGE_RELEASE_DATE=2022-07-25
51825182

51835183

51845184
# Ensure that make can run correctly
@@ -31208,19 +31208,19 @@ if test "x$with_freetype" = "xyes"; then
3120831208
printf "%s\n" "-------------------------------------------------------------" >&6; }
3120931209

3121031210
pkg_failed=no
31211-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5
31212-
printf %s "checking for freetype2... " >&6; }
31211+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for freetype2 >= 2.8.0" >&5
31212+
printf %s "checking for freetype2 >= 2.8.0... " >&6; }
3121331213

3121431214
if test -n "$FREETYPE_CFLAGS"; then
3121531215
pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
3121631216
elif test -n "$PKG_CONFIG"; then
3121731217
if test -n "$PKG_CONFIG" && \
31218-
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
31219-
($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
31218+
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 >= 2.8.0\""; } >&5
31219+
($PKG_CONFIG --exists --print-errors "freetype2 >= 2.8.0") 2>&5
3122031220
ac_status=$?
3122131221
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3122231222
test $ac_status = 0; }; then
31223-
pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2" 2>/dev/null`
31223+
pkg_cv_FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 2.8.0" 2>/dev/null`
3122431224
test "x$?" != "x0" && pkg_failed=yes
3122531225
else
3122631226
pkg_failed=yes
@@ -31232,12 +31232,12 @@ if test -n "$FREETYPE_LIBS"; then
3123231232
pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
3123331233
elif test -n "$PKG_CONFIG"; then
3123431234
if test -n "$PKG_CONFIG" && \
31235-
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
31236-
($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
31235+
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2 >= 2.8.0\""; } >&5
31236+
($PKG_CONFIG --exists --print-errors "freetype2 >= 2.8.0") 2>&5
3123731237
ac_status=$?
3123831238
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
3123931239
test $ac_status = 0; }; then
31240-
pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2" 2>/dev/null`
31240+
pkg_cv_FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 >= 2.8.0" 2>/dev/null`
3124131241
test "x$?" != "x0" && pkg_failed=yes
3124231242
else
3124331243
pkg_failed=yes
@@ -31258,9 +31258,9 @@ else
3125831258
_pkg_short_errors_supported=no
3125931259
fi
3126031260
if test $_pkg_short_errors_supported = yes; then
31261-
FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "freetype2" 2>&1`
31261+
FREETYPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "freetype2 >= 2.8.0" 2>&1`
3126231262
else
31263-
FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "freetype2" 2>&1`
31263+
FREETYPE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "freetype2 >= 2.8.0" 2>&1`
3126431264
fi
3126531265
# Put the nasty error message in config.log where it belongs
3126631266
echo "$FREETYPE_PKG_ERRORS" >&5

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2013,7 +2013,7 @@ FREETYPE_LIBS=""
20132013
FREETYPE_PKG=""
20142014
if test "x$with_freetype" = "xyes"; then
20152015
AC_MSG_RESULT([-------------------------------------------------------------])
2016-
PKG_CHECK_MODULES([FREETYPE],[freetype2],[have_freetype=yes],[have_freetype=no])
2016+
PKG_CHECK_MODULES([FREETYPE],[freetype2 >= 2.8.0],[have_freetype=yes],[have_freetype=no])
20172017
AC_MSG_RESULT([])
20182018
fi
20192019

0 commit comments

Comments
 (0)