...

ImageMagick · Dec 13, 2018 · dbee4e5 · dbee4e5
1 parent ae75b7d
commit dbee4e5
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 10 deletions.
diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
@@ -665,10 +665,10 @@ MagickExport MagickBooleanType CLAHEImage(Image *image,const size_t tile_width,
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   status=MagickTrue;
-  tile.x=(ssize_t) (PerceptibleReciprocal(tile_width)*image->columns);
-  tile.y=(ssize_t) (PerceptibleReciprocal(tile_height)*image->rows);
+  tile.x=(ssize_t) (image->columns/(tile_width == 0 ? 1 : tile_width));
   tile.x=(ssize_t) (tile.x < 2 ? 2 : tile.x >= MaxCLAHETiles ? MaxCLAHETiles-1 :
     tile.x);
+  tile.y=(ssize_t) (image->rows/(tile_height == 0 ? 1 : tile_height));
   tile.y=(ssize_t) (tile.y < 2 ? 2 : tile.y >= MaxCLAHETiles ? MaxCLAHETiles-1 :
     tile.y);
   width=((image->columns+tile.x-1)/tile.x)*tile.x;

diff --git a/aclocal.m4 b/aclocal.m4
@@ -201,7 +201,7 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999-2019 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -392,7 +392,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999-2019 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -867,7 +867,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Copyright (C) 1999-2019 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,

diff --git a/coders/tga.c b/coders/tga.c
@@ -859,6 +859,8 @@ static MagickBooleanType WriteTGAImage(const ImageInfo *image_info,Image *image,
       if (origin == TopLeftOrientation || origin == TopRightOrientation)
         tga_info.attributes|=(1UL << 5);
     }
+  if ((image->columns > 65535) || (image->rows > 65535))
+    ThrowWriterException(ImageError,"WidthOrHeightExceedsLimit");
   /*
     Write TGA header.
   */

diff --git a/config/compile b/config/compile
@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2019 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify

diff --git a/config/depcomp b/config/depcomp
@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2019 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

diff --git a/configure b/configure
@@ -4570,7 +4570,7 @@ MAGICK_PATCHLEVEL_VERSION=17
 
 MAGICK_VERSION=7.0.8-17
 
-MAGICK_GIT_REVISION=15110:d52f307da:20181210
+MAGICK_GIT_REVISION=15114:ae75b7d45:20181212
 
 
 # Substitute library versioning
@@ -35888,7 +35888,7 @@ windows_font_dir=''
 if test "${with_windows_font_dir}" != 'default'; then
   windows_font_dir="${with_windows_font_dir}/"
 else
-  for font_dir in '/usr/X11R6/lib/X11/fonts/truetype/' '/usr/X11R7/lib/X11/fonts/truetype/' '/usr/share/fonts/msttcore/'; do
+  for font_dir in '/usr/X11R6/lib/X11/fonts/truetype/' '/usr/X11R7/lib/X11/fonts/truetype/' '/usr/share/fonts/msttcore/' '/usr/share/fonts/microsoft/'; do
     if test -f "${font_dir}arial.ttf"; then
       windows_font_dir="${font_dir}"
       break 1

diff --git a/configure.ac b/configure.ac
@@ -3388,7 +3388,7 @@ windows_font_dir=''
 if test "${with_windows_font_dir}" != 'default'; then
   windows_font_dir="${with_windows_font_dir}/"
 else
-  for font_dir in '/usr/X11R6/lib/X11/fonts/truetype/' '/usr/X11R7/lib/X11/fonts/truetype/' '/usr/share/fonts/msttcore/'; do
+  for font_dir in '/usr/X11R6/lib/X11/fonts/truetype/' '/usr/X11R7/lib/X11/fonts/truetype/' '/usr/share/fonts/msttcore/' '/usr/share/fonts/microsoft/'; do
     if test -f "${font_dir}arial.ttf"; then
       windows_font_dir="${font_dir}"
       break 1