X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fio-libmagick.c;h=3636163174a183cbf1400713c965ccad5e6b9068;hb=1bc3bb66e47ec02003658fb3040aef0ffd7b7540;hp=0a31c0afccb23031885b2098471d470da7ca9d54;hpb=fa7aa6d9457616ce28f97c83eaa616d0ff276870;p=libucw.git

diff --git a/images/io-libmagick.c b/images/io-libmagick.c
index 0a31c0af..36361631 100644
--- a/images/io-libmagick.c
+++ b/images/io-libmagick.c
@@ -25,13 +25,13 @@
 
 #define MAX_FILE_SIZE (1 << 30)
 #define QUANTUM_SCALE (QuantumDepth - 8)
-#define QUANTUM_TO_BYTE(x) ((uns)(x) >> QUANTUM_SCALE)
-#define BYTE_TO_QUANTUM(x) ((uns)(x) << QUANTUM_SCALE)
+#define QUANTUM_TO_BYTE(x) ((uint)(x) >> QUANTUM_SCALE)
+#define BYTE_TO_QUANTUM(x) ((uint)(x) << QUANTUM_SCALE)
 #define ALPHA_TO_BYTE(x) (255 - QUANTUM_TO_BYTE(x))
 #define BYTE_TO_ALPHA(x) (BYTE_TO_QUANTUM(255 - (x)))
 
 static pthread_mutex_t libmagick_mutex = PTHREAD_MUTEX_INITIALIZER;
-static uns libmagick_counter;
+static uint libmagick_counter;
 
 struct magick_read_data {
   ExceptionInfo exception;
@@ -88,7 +88,7 @@ libmagick_read_header(struct image_io *io)
       IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Too long stream.");
       return 0;
     }
-  uns buf_size = file_size;
+  uint buf_size = file_size;
   byte *buf = xmalloc(buf_size);
   breadb(io->fastbuf, buf, buf_size);
 
@@ -169,8 +169,8 @@ libmagick_read_data(struct image_io *io)
 
   /* Prepare the image */
   struct image_io_read_data_internals rdi;
-  uns read_flags = io->flags;
-  uns cs = read_flags & IMAGE_COLOR_SPACE;
+  uint read_flags = io->flags;
+  uint cs = read_flags & IMAGE_COLOR_SPACE;
   if (cs != COLOR_SPACE_GRAYSCALE && cs != COLOR_SPACE_RGB)
     read_flags = (read_flags & ~IMAGE_COLOR_SPACE & IMAGE_PIXEL_FORMAT) | COLOR_SPACE_RGB;
   if ((read_flags & IMAGE_IO_USE_BACKGROUND) && !(read_flags & IMAGE_ALPHA))