Skip to content

Commit a107c59

Browse files
author
Cristy
committed
eliminate compiler warnings
1 parent 9e4608c commit a107c59

File tree

7 files changed

+45
-35
lines changed

7 files changed

+45
-35
lines changed

‎coders/png.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5297,7 +5297,7 @@ static Image *ReadOneMNGImage(MngInfo* mng_info, const ImageInfo *image_info,
52975297
chunk=(unsigned char *) AcquireQuantumMemory(length,sizeof(*chunk));
52985298
if (chunk == (unsigned char *) NULL)
52995299
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
5300-
if (ReadBlob(image,length,chunk) != length)
5300+
if (ReadBlob(image,length,chunk) != (ssize_t) length)
53015301
{
53025302
chunk=(unsigned char *) RelinquishMagickMemory(chunk);
53035303
ThrowReaderException(CorruptImageError,"CorruptImage");

‎magick.sh

+9-8
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,20 @@
1919
#
2020
# magick.sh convert -size 640x480 gradient:black-yellow gradient.png
2121

22-
top_srcdir='/home/cristy/a'
23-
top_builddir='/home/cristy/a'
22+
top_srcdir='/home/cristy/ImageMagick-6'
23+
top_builddir='/home/cristy/ImageMagick-6'
2424

25-
MAGICK_CODER_MODULE_PATH='/home/cristy/a/coders'
26-
MAGICK_CONFIGURE_SRC_PATH='/home/cristy/a/config'
27-
MAGICK_CONFIGURE_BUILD_PATH='/home/cristy/a/config'
28-
MAGICK_FILTER_MODULE_PATH='/home/cristy/a/filters'
25+
MAGICK_CODER_MODULE_PATH='/home/cristy/ImageMagick-6/coders'
26+
MAGICK_CONFIGURE_SRC_PATH='/home/cristy/ImageMagick-6/config'
27+
MAGICK_CONFIGURE_BUILD_PATH='/home/cristy/ImageMagick-6/config'
28+
MAGICK_FILTER_MODULE_PATH='/home/cristy/ImageMagick-6/filters'
2929
DIRSEP=':'
3030

3131
PATH="${top_builddir}/utilities:${PATH}"
3232

33-
if test -n "$VERBOSE"; then
34-
printf "$@"
33+
if test -n "$VERBOSE"
34+
then
35+
echo "$@"
3536
fi
3637
env \
3738
LD_LIBRARY_PATH="${top_builddir}/magick/.libs:${top_builddir}/wand/.libs${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \

‎magick/annotate.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1516,7 +1516,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
15161516
if (ft_status != 0)
15171517
{
15181518
(void) FT_Done_FreeType(library);
1519-
stream=RelinquishMagickMemory(stream);
1519+
stream=(FT_StreamRec *) RelinquishMagickMemory(stream);
15201520
ThrowFreetypeErrorException("UnableToReadFont",ft_status,args.pathname);
15211521
args.pathname=DestroyString(args.pathname);
15221522
return(MagickFalse);
@@ -1572,7 +1572,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
15721572
{
15731573
(void) FT_Done_Face(face);
15741574
(void) FT_Done_FreeType(library);
1575-
stream=RelinquishMagickMemory(stream);
1575+
stream=(FT_StreamRec *) RelinquishMagickMemory(stream);
15761576
ThrowFreetypeErrorException("UnrecognizedFontEncoding",ft_status,
15771577
encoding);
15781578
return(MagickFalse);
@@ -1605,7 +1605,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
16051605
{
16061606
(void) FT_Done_Face(face);
16071607
(void) FT_Done_FreeType(library);
1608-
stream=RelinquishMagickMemory(stream);
1608+
stream=(FT_StreamRec *) RelinquishMagickMemory(stream);
16091609
ThrowFreetypeErrorException("UnableToReadFont",ft_status,
16101610
draw_info->font);
16111611
return(MagickFalse);

‎magick/blob.c

+6-4
Original file line numberDiff line numberDiff line change
@@ -1772,9 +1772,10 @@ MagickExport unsigned char *ImageToBlob(const ImageInfo *image_info,
17721772
if (blob != (void *) NULL)
17731773
{
17741774
if (status == MagickFalse)
1775-
blob=RelinquishMagickMemory(blob);
1775+
blob=(unsigned char *) RelinquishMagickMemory(blob);
17761776
else
1777-
blob=ResizeQuantumMemory(blob,*length+1,sizeof(unsigned char));
1777+
blob=(unsigned char *) ResizeQuantumMemory(blob,*length+1,
1778+
sizeof(unsigned char));
17781779
}
17791780
}
17801781
}
@@ -2034,9 +2035,10 @@ MagickExport unsigned char *ImagesToBlob(const ImageInfo *image_info,
20342035
if (blob != (void *) NULL)
20352036
{
20362037
if (status == MagickFalse)
2037-
blob=RelinquishMagickMemory(blob);
2038+
blob=(unsigned char *) RelinquishMagickMemory(blob);
20382039
else
2039-
blob=ResizeQuantumMemory(blob,*length+1,sizeof(unsigned char));
2040+
blob=(unsigned char *) ResizeQuantumMemory(blob,*length+1,
2041+
sizeof(unsigned char));
20402042
}
20412043
}
20422044
}

‎magick/distribute-cache.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
#include <netdb.h>
8080
#include <sys/socket.h>
8181
#include <arpa/inet.h>
82-
#define CHAR_TYPE_CAST
82+
#define CHAR_TYPE_CAST (char *)
8383
#define CLOSE_SOCKET(socket) (void) close(socket)
8484
#define HANDLER_RETURN_TYPE void *
8585
#define HANDLER_RETURN_VALUE (void *) NULL

‎magick/fourier.c

+20-12
Original file line numberDiff line numberDiff line change
@@ -275,18 +275,26 @@ MagickExport Image *ComplexImages(const Image *images,const ComplexOperator op,
275275
for (x=0; x < (ssize_t) columns; x++)
276276
{
277277
QuantumPixelPacket
278-
ai = { QuantumScale*GetPixelRed(Ai), QuantumScale*GetPixelGreen(Ai),
279-
QuantumScale*GetPixelBlue(Ai), image->matte != MagickFalse ?
280-
QuantumScale*GetPixelOpacity(Ai) : OpaqueOpacity, 0 },
281-
ar = { QuantumScale*GetPixelRed(Ar), QuantumScale*GetPixelGreen(Ar),
282-
QuantumScale*GetPixelBlue(Ar), image->matte != MagickFalse ?
283-
QuantumScale*GetPixelOpacity(Ar) : OpaqueOpacity, 0 },
284-
bi = { QuantumScale*GetPixelRed(Bi), QuantumScale*GetPixelGreen(Bi),
285-
QuantumScale*GetPixelBlue(Bi), image->matte != MagickFalse ?
286-
QuantumScale*GetPixelOpacity(Bi) : OpaqueOpacity, 0 },
287-
br = { QuantumScale*GetPixelRed(Br), QuantumScale*GetPixelGreen(Br),
288-
QuantumScale*GetPixelBlue(Br), image->matte != MagickFalse ?
289-
QuantumScale*GetPixelOpacity(Br) : OpaqueOpacity, 0 },
278+
ai = { (Quantum) (QuantumScale*GetPixelRed(Ai)),
279+
(Quantum) (QuantumScale*GetPixelGreen(Ai)),
280+
(Quantum) (QuantumScale*GetPixelBlue(Ai)),
281+
(Quantum) (image->matte != MagickFalse ? QuantumScale*
282+
GetPixelOpacity(Ai) : OpaqueOpacity), 0 },
283+
ar = { (Quantum) (QuantumScale*GetPixelRed(Ar)),
284+
(Quantum) (QuantumScale*GetPixelGreen(Ar)),
285+
(Quantum) (QuantumScale*GetPixelBlue(Ar)),
286+
(Quantum) (image->matte != MagickFalse ? QuantumScale*
287+
GetPixelOpacity(Ar) : OpaqueOpacity), 0 },
288+
bi = { (Quantum) (QuantumScale*GetPixelRed(Bi)),
289+
(Quantum) (QuantumScale*GetPixelGreen(Bi)),
290+
(Quantum) (QuantumScale*GetPixelBlue(Bi)),
291+
(Quantum) (image->matte != MagickFalse ? QuantumScale*
292+
GetPixelOpacity(Bi) : OpaqueOpacity), 0 },
293+
br = { (Quantum) (QuantumScale*GetPixelRed(Br)),
294+
(Quantum) (QuantumScale*GetPixelGreen(Br)),
295+
(Quantum) (QuantumScale*GetPixelBlue(Br)),
296+
(Quantum) (image->matte != MagickFalse ? QuantumScale*
297+
GetPixelOpacity(Br) : OpaqueOpacity), 0 },
290298
ci,
291299
cr;
292300

‎magick/magic.c

+5-6
Original file line numberDiff line numberDiff line change
@@ -405,14 +405,13 @@ MagickExport const MagicInfo *GetMagicInfo(const unsigned char *magic,
405405
q=magic+p->offset;
406406
remaining=(MagickOffsetType) length-p->offset;
407407
if (LocaleCompare(p->name,"SVG") == 0)
408+
while ((remaining > 0) && (isspace(*q) != 0))
408409
{
409-
while ((remaining > 0) && (isspace(*q) != 0))
410-
{
411-
q++;
412-
remaining--;
413-
}
410+
q++;
411+
remaining--;
414412
}
415-
if ((remaining >= p->length) && (memcmp(q,p->magic,p->length) == 0))
413+
if ((remaining >= (MagickOffsetType) p->length) &&
414+
(memcmp(q,p->magic,p->length) == 0))
416415
break;
417416
p=(const MagicInfo *) GetNextValueInLinkedList(magic_cache);
418417
}

0 commit comments

Comments
 (0)