Skip to content
This repository has been archived by the owner on Jan 25, 2024. It is now read-only.

Commit

Permalink
Update ImageMagick from 7.1.1-23 -> 7.1.1-24
Browse files Browse the repository at this point in the history
  • Loading branch information
web-flow authored and MolotovCherry committed Dec 26, 2023
1 parent 570a239 commit 8b1fdf2
Show file tree
Hide file tree
Showing 643 changed files with 364 additions and 233 deletions.
2 changes: 1 addition & 1 deletion Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ OPENCL_INCLUDE_PATH := $(OPENCL_PATH)/qualcomm/include

LTDL_LIB_PATH := $(LOCAL_PATH)/libltdl-2.4.6

IMAGE_MAGICK_BASEDIR := ImageMagick-7.1.1-23
IMAGE_MAGICK_BASEDIR := ImageMagick-7.1.1-24
IMAGE_MAGICK := $(LOCAL_PATH)/$(IMAGE_MAGICK_BASEDIR)

JPEG_LIB_PATH := $(LOCAL_PATH)/libjpeg-turbo-2.0.2
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright @ 2000 ImageMagick Studio LLC, a non-profit organization
Copyright @ 1999 ImageMagick Studio LLC, a non-profit organization
dedicated to making software imaging solutions freely available.
You may not use this file except in compliance with the License. You may
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2818,9 +2818,6 @@ static ChannelStatistics *CollectOneImgStats (FxInfo * pfx, Image * img)
cs[ch].maxima *= QuantumScale;
cs[ch].minima *= QuantumScale;
cs[ch].standard_deviation *= QuantumScale;
cs[ch].kurtosis *= QuantumScale;
cs[ch].skewness *= QuantumScale;
cs[ch].entropy *= QuantumScale;
}

return cs;
Expand Down Expand Up @@ -3174,12 +3171,15 @@ static MagickBooleanType ExecuteRPN (FxInfo * pfx, fxRtT * pfxrt, fxFltType *res
}

for (i=0; i < pfx->usedElements; i++) {
ElementT
*pel;

if (i < 0) {
(void) ThrowMagickException (
pfx->exception, GetMagickModule(), OptionError,
"Bad run-time address", "%i", i);
}
ElementT *pel = &pfx->Elements[i];
pel=&pfx->Elements[i];
switch (pel->nArgs) {
case 0:
break;
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -85,25 +85,25 @@ static const PageInfo
MagickPagesize("4A0", "4768x6741"),
MagickPagesize("2A0", "3370x4768"),
MagickPagesize("a0", "2384x3370"),
MagickPagesize("a10", "74x105"),
MagickPagesize("a1", "1684x2384"),
MagickPagesize("a2", "1191x1684"),
MagickPagesize("a3", "842x1191"),
MagickPagesize("a4", "595x842"),
MagickPagesize("a4small", "595x842"),
MagickPagesize("a4", "595x842"),
MagickPagesize("a5", "420x595"),
MagickPagesize("a6", "298x420"),
MagickPagesize("a7", "210x298"),
MagickPagesize("a8", "147x210"),
MagickPagesize("a9", "105x147"),
MagickPagesize("a10", "74x105"),
MagickPagesize("archa", "648x864"),
MagickPagesize("archb", "864x1296"),
MagickPagesize("archC", "1296x1728"),
MagickPagesize("archd", "1728x2592"),
MagickPagesize("arche", "2592x3456"),
MagickPagesize("b0", "2920x4127"),
MagickPagesize("b1", "2064x2920"),
MagickPagesize("b10", "91x127"),
MagickPagesize("b1", "2064x2920"),
MagickPagesize("b2", "1460x2064"),
MagickPagesize("b3", "1032x1460"),
MagickPagesize("b4", "729x1032"),
Expand All @@ -129,8 +129,8 @@ static const PageInfo
MagickPagesize("folio", "612x936"),
MagickPagesize("halfletter", "396x612"),
MagickPagesize("isob0", "2835x4008"),
MagickPagesize("isob1", "2004x2835"),
MagickPagesize("isob10", "88x125"),
MagickPagesize("isob1", "2004x2835"),
MagickPagesize("isob2", "1417x2004"),
MagickPagesize("isob3", "1001x1417"),
MagickPagesize("isob4", "709x1001"),
Expand All @@ -148,8 +148,8 @@ static const PageInfo
MagickPagesize("jisb6", "128x182"),
MagickPagesize("ledger", "1224x792"),
MagickPagesize("legal", "612x1008"),
MagickPagesize("letter", "612x792"),
MagickPagesize("lettersmall", "612x792"),
MagickPagesize("letter", "612x792"),
MagickPagesize("monarch", "279x540"),
MagickPagesize("quarto", "610x780"),
MagickPagesize("statement", "396x612"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,6 @@
#include "ltdl.h"
#endif

#ifndef MAGICKCORE_WINDOWS_SUPPORT
#include <dlfcn.h>
#endif

/*
Define declarations.
*/
Expand Down Expand Up @@ -2479,11 +2475,7 @@ void *OsLibraryGetFunctionAddress(void *library,const char *functionName)
{
if ((library == (void *) NULL) || (functionName == (const char *) NULL))
return (void *) NULL;
#ifdef MAGICKCORE_WINDOWS_SUPPORT
return (void *) GetProcAddress((HMODULE)library,functionName);
#else
return (void *) dlsym(library,functionName);
#endif
return lt_dlsym(library,functionName);
}

static MagickBooleanType BindOpenCLFunctions()
Expand All @@ -2493,9 +2485,9 @@ static MagickBooleanType BindOpenCLFunctions()
#else
(void) memset(openCL_library,0,sizeof(MagickLibrary));
#ifdef MAGICKCORE_WINDOWS_SUPPORT
openCL_library->library=(void *)LoadLibraryA("OpenCL.dll");
openCL_library->library=(void *)lt_dlopen("OpenCL.dll");
#else
openCL_library->library=(void *)dlopen("libOpenCL.so",RTLD_NOW);
openCL_library->library=(void *)lt_dlopen("libOpenCL.so");
#endif
#define BIND(X) \
if ((openCL_library->X=(MAGICKpfn_##X)OsLibraryGetFunctionAddress(openCL_library->library,#X)) == NULL) \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,17 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
if (GetPixelGray(floodplane_image,p) != 0)
{
GetFillColor(draw_info,x,y,&fill_color,exception);
SetPixelViaPixelInfo(image,&fill_color,q);
if ((image->channel_mask & RedChannel) != 0)
SetPixelRed(image,(Quantum) fill_color.red,q);
if ((image->channel_mask & GreenChannel) != 0)
SetPixelGreen(image,(Quantum) fill_color.green,q);
if ((image->channel_mask & BlueChannel) != 0)
SetPixelBlue(image,(Quantum) fill_color.blue,q);
if ((image->channel_mask & BlackChannel) != 0)
SetPixelBlack(image,(Quantum) fill_color.black,q);
if (((image->channel_mask & AlphaChannel) != 0) &&
((image->alpha_trait & BlendPixelTrait) != 0))
SetPixelAlpha(image,(Quantum) fill_color.alpha,q);
}
p+=GetPixelChannels(floodplane_image);
q+=GetPixelChannels(image);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6410,8 +6410,10 @@ MagickExport ChannelType SetPixelChannelMask(Image *image,
MagickExport MagickBooleanType SetPixelMetaChannels(Image *image,
const size_t number_meta_channels,ExceptionInfo *exception)
{
image->number_meta_channels=MagickMin(number_meta_channels,MaxPixelChannels
-(size_t) MetaPixelChannels);
if (number_meta_channels >= (MaxPixelChannels-MetaPixelChannels))
ThrowBinaryException(CorruptImageError,"MaximumChannelsExceeded",
image->filename);
image->number_meta_channels=number_meta_channels;
InitializePixelChannelMap(image);
return(SyncImagePixelCache(image,exception));
}
Expand Down
Loading

0 comments on commit 8b1fdf2

Please sign in to comment.