(no commit message)

diff --git a/magick/quantum-private.h b/magick/quantum-private.h
index 008cd59720aa772ddf03a20c72a363351f14b76f..ec8cae2be201c705f6ab0909d2abeb6361c22f49 100644 (file)
--- a/magick/quantum-private.h
+++ b/magick/quantum-private.h
@@ -562,6 +562,10 @@ static inline unsigned long ScaleQuantumToMap(const Quantum quantum)
 
 static inline unsigned short ScaleQuantumToShort(const Quantum quantum)
 {
+  if (quantum <= 0.0)
+    return(0);
+  if ((quantum/65537.0) >= 65535.0)
+    return(65535);
   return((unsigned short) (quantum/281479271743489.0+0.5));
 }