Coverity issues

diff --git a/ChangeLog b/ChangeLog
index 5d8f2e4f312f244a28e1b785c29f8ed7f7f78e67..3af90eeef146e3922888b6479bcc4c8b8161d279 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-12-29  7.0.8-22 Cristy  <quetzlzacatenango@image...>
+  * Support negative rotations in a geometry (e.g. -10x-10+10+10).
+  * Return expected canvas offset after a crop with gravity.
+
 2018-12-27  7.0.8-21 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.8-21, GIT revision 15179:114be1716:20181227
 

diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
index 6264136a81e335c657b7e546914a8238a90be0bd..99a0c1b0ea387bc59020c60fc31d6d0a765d2968 100644 (file)
--- a/MagickCore/pixel-accessor.h
+++ b/MagickCore/pixel-accessor.h
@@ -463,6 +463,8 @@ static inline MagickBooleanType IsPixelAtDepth(const Quantum pixel,
   Quantum
     quantum;
 
+  if (range == 0)
+    return(MagickTrue);
 #if !defined(MAGICKCORE_HDRI_SUPPORT)
   quantum=(Quantum) (((MagickRealType) QuantumRange*((QuantumAny)
     (((MagickRealType) range*pixel)/QuantumRange+0.5)))/range+0.5);

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 2cffa02e0da23dcf27de1acf62307b7fd040b36d..e6cfb16f58afe65c3ccbdaa64cca310e1dd953a0 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -4076,7 +4076,7 @@ WandPrivate MagickBooleanType CLIListOperatorImages(MagickCLI *cli_wand,
           if (parse < 0)
             CLIWandExceptArgBreak(OptionError,"UnrecognizedEvaluateOperator",
               option,arg1);
-          new_images=EvaluateImages(_images,(MagickEvaluateOperator)parse,
+          new_images=EvaluateImages(_images,(MagickEvaluateOperator) parse,
             _exception);
           break;
         }

diff --git a/coders/cube.c b/coders/cube.c
index 4f95d6fae97675b5c76360d98c075f60415f4dd4..af78b637f0c704f896f566a09631e53bc944f2bf 100644 (file)
--- a/coders/cube.c
+++ b/coders/cube.c
@@ -204,7 +204,7 @@ static Image *ReadCUBEImage(const ImageInfo *image_info,
             char
               *q;
 
-            if (n >= (cube_level*cube_level*cube_level))
+            if (n >= (ssize_t) (cube_level*cube_level*cube_level))
               break;
             q=buffer;
             cube[n].r=StringToDouble(q,&q);

diff --git a/coders/sixel.c b/coders/sixel.c
index d09485aba57ba0259dd8dbc4d8f8bd529e14a00c..a8a658f352ceaa65f65fdf01b2591769a2e5339c 100644 (file)
--- a/coders/sixel.c
+++ b/coders/sixel.c
@@ -596,7 +596,7 @@ static void sixel_advance(sixel_output_t *context, int nwrite)
 {
     if ((context->pos += nwrite) >= SIXEL_OUTPUT_PACKET_SIZE) {
         WriteBlob(context->image,SIXEL_OUTPUT_PACKET_SIZE,context->buffer);
-        memcpy(context->buffer,
+        memmove(context->buffer,
                context->buffer + SIXEL_OUTPUT_PACKET_SIZE,
                (context->pos -= SIXEL_OUTPUT_PACKET_SIZE));
     }