graphics/ImageMagick6: update to 6.9.12-49
The const fixes introduced in 06ba562579
have been integrated upstream.
This commit is contained in:
parent
7e7769a68c
commit
13f8152768
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= ImageMagick
|
||||
DISTVERSION= 6.9.12-48
|
||||
DISTVERSION= 6.9.12-49
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= graphics perl5
|
||||
MASTER_SITES= https://www.imagemagick.org/download/ \
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1652114428
|
||||
SHA256 (ImageMagick-6.9.12-48.tar.xz) = 8bf31cb269a8a26ad1cfd537ffabe55819ff719b7d269f1387a6164b93722323
|
||||
SIZE (ImageMagick-6.9.12-48.tar.xz) = 9144340
|
||||
TIMESTAMP = 1652810834
|
||||
SHA256 (ImageMagick-6.9.12-49.tar.xz) = 57bd77747248d0546996666310be9cba17f6001166b7028a31272bf1e20f0a49
|
||||
SIZE (ImageMagick-6.9.12-49.tar.xz) = 9145276
|
||||
|
|
|
@ -1,38 +0,0 @@
|
|||
--- magick/log.c.orig 2022-05-05 04:09:18 UTC
|
||||
+++ magick/log.c
|
||||
@@ -394,7 +394,7 @@ MagickExport void CloseMagickLog(void)
|
||||
% const char *GetLogEventMask(void)
|
||||
%
|
||||
*/
|
||||
-MagickExport const LogEventType GetLogEventMask(void)
|
||||
+MagickExport LogEventType GetLogEventMask(void)
|
||||
{
|
||||
ExceptionInfo
|
||||
*exception;
|
||||
@@ -515,7 +515,7 @@ static int LogInfoCompare(const void *x,const void *y)
|
||||
}
|
||||
#endif
|
||||
|
||||
-MagickExport const LogInfo **GetLogInfoList(const char *pattern,
|
||||
+MagickExport LogInfo **GetLogInfoList(const char *pattern,
|
||||
size_t *number_preferences,ExceptionInfo *exception)
|
||||
{
|
||||
const LogInfo
|
||||
@@ -674,7 +674,7 @@ MagickExport char **GetLogList(const char *pattern,
|
||||
% const char *GetLogName(void)
|
||||
%
|
||||
*/
|
||||
-MagickExport const char *GetLogName(void)
|
||||
+MagickExport char *GetLogName(void)
|
||||
{
|
||||
return(log_name);
|
||||
}
|
||||
@@ -1930,7 +1930,7 @@ MagickExport void SetLogMethod(MagickLogMethod method)
|
||||
% o name: Specifies the new client name.
|
||||
%
|
||||
*/
|
||||
-MagickExport const char *SetLogName(const char *name)
|
||||
+MagickExport char *SetLogName(const char *name)
|
||||
{
|
||||
if ((name != (char *) NULL) && (*name != '\0'))
|
||||
(void) CopyMagickString(log_name,name,MaxTextExtent);
|
|
@ -1,20 +0,0 @@
|
|||
--- magick/log.h.orig 2022-05-05 04:04:28 UTC
|
||||
+++ magick/log.h
|
||||
@@ -66,14 +66,14 @@ typedef void
|
||||
extern MagickExport char
|
||||
**GetLogList(const char *,size_t *,ExceptionInfo *);
|
||||
|
||||
-extern MagickExport const char
|
||||
+extern MagickExport char
|
||||
*GetLogName(void) magick_attribute((__pure__)),
|
||||
*SetLogName(const char *);
|
||||
|
||||
-extern MagickExport const LogEventType
|
||||
+extern MagickExport LogEventType
|
||||
GetLogEventMask(void) magick_attribute((__pure__));
|
||||
|
||||
-extern MagickExport const LogInfo
|
||||
+extern MagickExport LogInfo
|
||||
**GetLogInfoList(const char *,size_t *,ExceptionInfo *);
|
||||
|
||||
extern MagickExport LogEventType
|
|
@ -1,80 +0,0 @@
|
|||
--- magick/pixel-accessor.h.orig 2022-05-05 04:22:46 UTC
|
||||
+++ magick/pixel-accessor.h
|
||||
@@ -103,12 +103,12 @@ extern "C" {
|
||||
#define SetPixelYellow(pixel,value) ((pixel)->blue=(Quantum) (value))
|
||||
#define SetPixelY(pixel,value) ((pixel)->red=(Quantum) (value))
|
||||
|
||||
-static inline const MagickRealType AbsolutePixelValue(const MagickRealType x)
|
||||
+static inline MagickRealType AbsolutePixelValue(const MagickRealType x)
|
||||
{
|
||||
return(x < 0.0f ? -x : x);
|
||||
}
|
||||
|
||||
-static inline const Quantum ClampPixel(const MagickRealType value)
|
||||
+static inline Quantum ClampPixel(const MagickRealType value)
|
||||
{
|
||||
if (value < 0.0f)
|
||||
return((Quantum) 0);
|
||||
@@ -121,7 +121,7 @@ static inline const Quantum ClampPixel(const MagickRea
|
||||
#endif
|
||||
}
|
||||
|
||||
-static inline const double PerceptibleReciprocal(const double x)
|
||||
+static inline double PerceptibleReciprocal(const double x)
|
||||
{
|
||||
double
|
||||
sign;
|
||||
@@ -135,7 +135,7 @@ static inline const double PerceptibleReciprocal(const
|
||||
return(sign/MagickEpsilon);
|
||||
}
|
||||
|
||||
-static inline const MagickRealType GetPixelLuma(
|
||||
+static inline MagickRealType GetPixelLuma(
|
||||
const Image *magick_restrict image,const PixelPacket *magick_restrict pixel)
|
||||
{
|
||||
MagickRealType
|
||||
@@ -147,7 +147,7 @@ static inline const MagickRealType GetPixelLuma(
|
||||
return(intensity);
|
||||
}
|
||||
|
||||
-static inline const MagickRealType GetPixelLuminance(
|
||||
+static inline MagickRealType GetPixelLuminance(
|
||||
const Image *magick_restrict image,const PixelPacket *magick_restrict pixel)
|
||||
{
|
||||
MagickRealType
|
||||
@@ -165,7 +165,7 @@ static inline const MagickRealType GetPixelLuminance(
|
||||
return(intensity);
|
||||
}
|
||||
|
||||
-static inline const MagickBooleanType IsPixelAtDepth(const Quantum pixel,
|
||||
+static inline MagickBooleanType IsPixelAtDepth(const Quantum pixel,
|
||||
const QuantumAny range)
|
||||
{
|
||||
Quantum
|
||||
@@ -183,7 +183,7 @@ static inline const MagickBooleanType IsPixelAtDepth(c
|
||||
return(pixel == quantum ? MagickTrue : MagickFalse);
|
||||
}
|
||||
|
||||
-static inline const MagickBooleanType IsPixelGray(const PixelPacket *pixel)
|
||||
+static inline MagickBooleanType IsPixelGray(const PixelPacket *pixel)
|
||||
{
|
||||
MagickRealType
|
||||
green_blue,
|
||||
@@ -197,7 +197,7 @@ static inline const MagickBooleanType IsPixelGray(cons
|
||||
return(MagickFalse);
|
||||
}
|
||||
|
||||
-static inline const MagickBooleanType IsPixelMonochrome(
|
||||
+static inline MagickBooleanType IsPixelMonochrome(
|
||||
const PixelPacket *pixel)
|
||||
{
|
||||
MagickRealType
|
||||
@@ -217,7 +217,7 @@ static inline const MagickBooleanType IsPixelMonochrom
|
||||
return(MagickFalse);
|
||||
}
|
||||
|
||||
-static inline const Quantum PixelPacketIntensity(const PixelPacket *pixel)
|
||||
+static inline Quantum PixelPacketIntensity(const PixelPacket *pixel)
|
||||
{
|
||||
MagickRealType
|
||||
intensity;
|
Loading…
Reference in New Issue