From: Cristy Date: Thu, 3 May 2018 16:15:26 +0000 (-0400) Subject: Latest autoconf / automake updates X-Git-Tag: 7.0.7-31~31 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=debb50111050feedd314658cc9f53a230a3b8c43;p=imagemagick Latest autoconf / automake updates --- diff --git a/MagickCore/draw.c b/MagickCore/draw.c index 2ca6605eb..5c4f61df3 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -6494,6 +6494,34 @@ static void TraceSquareLinecap(PrimitiveInfo *primitive_info, static PrimitiveInfo *TraceStrokePolygon(const Image *image, const DrawInfo *draw_info,const PrimitiveInfo *primitive_info) { +#define CheckPathExtent(extent) \ + if (q >= (ssize_t) (max_strokes-(extent)-6*BezierQuantum-360)) \ + { \ + if (~max_strokes < (extent+6*BezierQuantum+360)) \ + { \ + path_p=(PointInfo *) RelinquishMagickMemory(path_p); \ + path_q=(PointInfo *) RelinquishMagickMemory(path_q); \ + } \ + else \ + { \ + max_strokes+=extent+6*BezierQuantum+360; \ + path_p=(PointInfo *) ResizeQuantumMemory(path_p,max_strokes, \ + sizeof(*path_p)); \ + path_q=(PointInfo *) ResizeQuantumMemory(path_q,max_strokes, \ + sizeof(*path_q)); \ + } \ + if ((path_p == (PointInfo *) NULL) || (path_q == (PointInfo *) NULL)) \ + { \ + if (path_p != (PointInfo *) NULL) \ + path_p=(PointInfo *) RelinquishMagickMemory(path_p); \ + if (path_q != (PointInfo *) NULL) \ + path_q=(PointInfo *) RelinquishMagickMemory(path_q); \ + polygon_primitive=(PrimitiveInfo *) \ + RelinquishMagickMemory(polygon_primitive); \ + return((PrimitiveInfo *) NULL); \ + } \ + } + typedef struct _LineSegment { double @@ -6736,32 +6764,7 @@ static PrimitiveInfo *TraceStrokePolygon(const Image *image, box_q[3].y)/(slope.p-slope.q)); box_q[4].y=(double) (slope.p*(box_q[4].x-box_q[0].x)+box_q[0].y); } - if (q >= (ssize_t) (max_strokes-6*BezierQuantum-360)) - { - if (~max_strokes < (6*BezierQuantum+360)) - { - path_p=(PointInfo *) RelinquishMagickMemory(path_p); - path_q=(PointInfo *) RelinquishMagickMemory(path_q); - } - else - { - max_strokes+=6*BezierQuantum+360; - path_p=(PointInfo *) ResizeQuantumMemory(path_p,max_strokes, - sizeof(*path_p)); - path_q=(PointInfo *) ResizeQuantumMemory(path_q,max_strokes, - sizeof(*path_q)); - } - if ((path_p == (PointInfo *) NULL) || (path_q == (PointInfo *) NULL)) - { - if (path_p != (PointInfo *) NULL) - path_p=(PointInfo *) RelinquishMagickMemory(path_p); - if (path_q != (PointInfo *) NULL) - path_q=(PointInfo *) RelinquishMagickMemory(path_q); - polygon_primitive=(PrimitiveInfo *) - RelinquishMagickMemory(polygon_primitive); - return((PrimitiveInfo *) NULL); - } - } + CheckPathExtent(0); dot_product=dx.q*dy.p-dx.p*dy.q; if (dot_product <= 0.0) switch (draw_info->linejoin) @@ -6817,6 +6820,7 @@ static PrimitiveInfo *TraceStrokePolygon(const Image *image, theta.q+=2.0*MagickPI; arc_segments=(size_t) ceil((double) ((theta.q-theta.p)/ (2.0*sqrt((double) (1.0/mid))))); + CheckPathExtent(arc_segments); path_q[q].x=box_q[1].x; path_q[q].y=box_q[1].y; q++; @@ -6889,6 +6893,7 @@ static PrimitiveInfo *TraceStrokePolygon(const Image *image, theta.p+=2.0*MagickPI; arc_segments=(size_t) ceil((double) ((theta.p-theta.q)/ (2.0*sqrt((double) (1.0/mid))))); + CheckPathExtent(arc_segments); path_p[p++]=box_p[1]; for (j=1; j < (ssize_t) arc_segments; j++) { diff --git a/config/ar-lib b/config/ar-lib index 05094d34c..92bbe0866 100755 --- a/config/ar-lib +++ b/config/ar-lib @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # Wrapper for Microsoft lib.exe me=ar-lib diff --git a/config/compile b/config/compile index 2ab71e4ea..de0005d4f 100755 --- a/config/compile +++ b/config/compile @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # Wrapper for compilers which do not understand '-c -o'. scriptversion=2016-01-11.22; # UTC diff --git a/config/config.guess b/config/config.guess index a74484427..717b22874 100755 --- a/config/config.guess +++ b/config/config.guess @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # Attempt to guess a canonical system name. # Copyright 1992-2017 Free Software Foundation, Inc. diff --git a/config/config.sub b/config/config.sub index 932128b33..f4bafc180 100755 --- a/config/config.sub +++ b/config/config.sub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # Configuration validation subroutine script. # Copyright 1992-2017 Free Software Foundation, Inc. diff --git a/config/depcomp b/config/depcomp index b39f98f9a..30379e224 100755 --- a/config/depcomp +++ b/config/depcomp @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # depcomp - compile a program generating dependencies as side-effects scriptversion=2016-01-11.22; # UTC diff --git a/config/ltmain.sh b/config/ltmain.sh index 0f0a2da3f..30be9c82c 100644 --- a/config/ltmain.sh +++ b/config/ltmain.sh @@ -7272,10 +7272,12 @@ func_mode_link () # -tp=* Portland pgcc target processor selection # --sysroot=* for sysroot support # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ + -specs=*) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" diff --git a/config/missing b/config/missing index c6e379584..b7e571efa 100755 --- a/config/missing +++ b/config/missing @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # Common wrapper for a few potentially missing GNU programs. scriptversion=2016-01-11.22; # UTC diff --git a/config/mkinstalldirs b/config/mkinstalldirs index a31ce6d02..a1c49d4e8 100755 --- a/config/mkinstalldirs +++ b/config/mkinstalldirs @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # mkinstalldirs --- make directory hierarchy scriptversion=2016-01-11.22; # UTC diff --git a/config/tap-driver.sh b/config/tap-driver.sh index 82efa96c0..3f6aa3a1c 100755 --- a/config/tap-driver.sh +++ b/config/tap-driver.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # Copyright (C) 2011-2017 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify diff --git a/config/test-driver b/config/test-driver index 0218a01f6..de1e61da1 100755 --- a/config/test-driver +++ b/config/test-driver @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # test-driver - basic testsuite driver script. scriptversion=2016-01-11.22; # UTC diff --git a/configure b/configure index 177db09ff..a815db257 100755 --- a/configure +++ b/configure @@ -4554,7 +4554,7 @@ MAGICK_PATCHLEVEL_VERSION=31 MAGICK_VERSION=7.0.7-31 -MAGICK_GIT_REVISION=14243:d9d23d85b:20180502 +MAGICK_GIT_REVISION=14247:3b2ed44d6:20180503 # Substitute library versioning