From 6b825f92c7de295f3cd04bd86d97de0e774a3efc Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 4 Jun 2010 02:01:10 +0000
Subject: [PATCH]

---
 magick/quantum-export.c  | 16 ++++++++--------
 magick/quantum-import.c  | 11 ++++++-----
 magick/quantum-private.h |  4 +++-
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/magick/quantum-export.c b/magick/quantum-export.c
index bc8480fa1..57497b494 100644
--- a/magick/quantum-export.c
+++ b/magick/quantum-export.c
@@ -178,26 +178,26 @@ static inline unsigned char *PopQuantumPixel(QuantumState *quantum_state,
   register ssize_t
     i;
 
-  register unsigned int
+  size_t
     quantum_bits;
 
   if (quantum_state->bits == 0UL)
     quantum_state->bits=8U;
   for (i=(ssize_t) depth; i > 0L; )
   {
-    quantum_bits=(unsigned int) i;
+    quantum_bits=(size_t) i;
     if (quantum_bits > quantum_state->bits)
       quantum_bits=quantum_state->bits;
-    i-=(ssize_t) quantum_bits;
-    if (quantum_state->bits == 8)
+    i-=quantum_bits;
+    if (quantum_state->bits == 8UL)
       *pixels='\0';
     quantum_state->bits-=quantum_bits;
-    *pixels|=(((pixel >> i) &~ ((~0U) << quantum_bits)) <<
+    *pixels|=(((pixel >> i) &~ ((~0UL) << quantum_bits)) <<
       quantum_state->bits);
     if (quantum_state->bits == 0UL)
       {
         pixels++;
-        quantum_state->bits=8U;
+        quantum_state->bits=8UL;
       }
   }
   return(pixels);
@@ -209,11 +209,11 @@ static inline unsigned char *PopQuantumLongPixel(QuantumState *quantum_state,
   register ssize_t
     i;
 
-  unsigned int
+  size_t
     quantum_bits;
 
   if (quantum_state->bits == 0U)
-    quantum_state->bits=32U;
+    quantum_state->bits=32UL;
   for (i=(ssize_t) depth; i > 0; )
   {
     quantum_bits=(size_t) i;
diff --git a/magick/quantum-import.c b/magick/quantum-import.c
index 1cb1051e3..9c1cbcd3b 100644
--- a/magick/quantum-import.c
+++ b/magick/quantum-import.c
@@ -198,7 +198,7 @@ static inline const unsigned char *PushQuantumPixel(
   register ssize_t
     i;
 
-  register unsigned int
+  register size_t
     quantum_bits;
 
   *quantum=(QuantumAny) 0;
@@ -207,15 +207,16 @@ static inline const unsigned char *PushQuantumPixel(
     if (quantum_state->bits == 0UL)
       {
         quantum_state->pixel=(*pixels++);
-        quantum_state->bits=8U;
+        quantum_state->bits=8UL;
       }
     quantum_bits=(size_t) i;
     if (quantum_bits > quantum_state->bits)
       quantum_bits=quantum_state->bits;
-    i-=(ssize_t) quantum_bits;
+    i-=quantum_bits;
     quantum_state->bits-=quantum_bits;
-    *quantum=(*quantum << quantum_bits) | ((quantum_state->pixel >>
-      quantum_state->bits) &~ ((~0U) << quantum_bits));
+    *quantum=(unsigned int) ((*quantum << quantum_bits) |
+      ((quantum_state->pixel >> quantum_state->bits) &~ ((~0UL) <<
+      quantum_bits)));
   }
   return(pixels);
 }
diff --git a/magick/quantum-private.h b/magick/quantum-private.h
index 2af9439f9..557f64cdf 100644
--- a/magick/quantum-private.h
+++ b/magick/quantum-private.h
@@ -35,7 +35,9 @@ typedef struct _QuantumState
     inverse_scale;
 
   unsigned int
-    pixel,
+    pixel;
+
+  size_t
     bits;
 
   const unsigned int
-- 
2.40.0