Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build with -Werror #177

Merged
merged 1 commit into from
May 8, 2022
Merged

Fix build with -Werror #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions magick/log.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ MagickExport void CloseMagickLog(void)
% const char *GetLogEventMask(void)
%
*/
MagickExport const LogEventType GetLogEventMask(void)
MagickExport LogEventType GetLogEventMask(void)
{
ExceptionInfo
*exception;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions magick/log.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions magick/pixel-accessor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -121,7 +121,7 @@ static inline const Quantum ClampPixel(const MagickRealType value)
#endif
}

static inline const double PerceptibleReciprocal(const double x)
static inline double PerceptibleReciprocal(const double x)
{
double
sign;
Expand All @@ -135,7 +135,7 @@ static inline const double PerceptibleReciprocal(const double x)
return(sign/MagickEpsilon);
}

static inline const MagickRealType GetPixelLuma(
static inline MagickRealType GetPixelLuma(
const Image *magick_restrict image,const PixelPacket *magick_restrict pixel)
{
MagickRealType
Expand All @@ -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
Expand All @@ -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
Expand All @@ -183,7 +183,7 @@ static inline const MagickBooleanType IsPixelAtDepth(const Quantum pixel,
return(pixel == quantum ? MagickTrue : MagickFalse);
}

static inline const MagickBooleanType IsPixelGray(const PixelPacket *pixel)
static inline MagickBooleanType IsPixelGray(const PixelPacket *pixel)
{
MagickRealType
green_blue,
Expand All @@ -197,7 +197,7 @@ static inline const MagickBooleanType IsPixelGray(const PixelPacket *pixel)
return(MagickFalse);
}

static inline const MagickBooleanType IsPixelMonochrome(
static inline MagickBooleanType IsPixelMonochrome(
const PixelPacket *pixel)
{
MagickRealType
Expand All @@ -217,7 +217,7 @@ static inline const MagickBooleanType IsPixelMonochrome(
return(MagickFalse);
}

static inline const Quantum PixelPacketIntensity(const PixelPacket *pixel)
static inline Quantum PixelPacketIntensity(const PixelPacket *pixel)
{
MagickRealType
intensity;
Expand Down