X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fio-libmagick.c;h=0a31c0afccb23031885b2098471d470da7ca9d54;hb=0aa30d3990cdc6be559d83c161e86edcec206421;hp=60d3615941c0330fa7fa833670ea394f5ef54026;hpb=bf5edbdd5b56a0d2e239e96dd476c7a9a562506a;p=libucw.git

diff --git a/images/io-libmagick.c b/images/io-libmagick.c
index 60d36159..0a31c0af 100644
--- a/images/io-libmagick.c
+++ b/images/io-libmagick.c
@@ -9,13 +9,13 @@
 
 #undef LOCAL_DEBUG
 
-#include "lib/lib.h"
-#include "lib/mempool.h"
-#include "lib/fastbuf.h"
-#include "images/images.h"
-#include "images/error.h"
-#include "images/color.h"
-#include "images/io-main.h"
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
+#include <ucw/fastbuf.h>
+#include <images/images.h>
+#include <images/error.h>
+#include <images/color.h>
+#include <images/io-main.h>
 
 #include <sys/types.h>
 #include <stdlib.h>
@@ -82,7 +82,7 @@ libmagick_read_header(struct image_io *io)
   DBG("libmagick_read_header()");
 
   /* Read entire stream */
-  sh_off_t file_size = bfilesize(io->fastbuf) - btell(io->fastbuf);
+  ucw_off_t file_size = bfilesize(io->fastbuf) - btell(io->fastbuf);
   if (unlikely(file_size > MAX_FILE_SIZE))
     {
       IMAGE_ERROR(io->context, IMAGE_ERROR_READ_FAILED, "Too long stream.");
@@ -203,7 +203,7 @@ libmagick_read_data(struct image_io *io)
 #       define IMAGE_WALK_DO_STEP do{ \
 	  walk_pos[0] = libmagick_pixel_to_gray(src); \
 	  src++; }while(0)
-#       include "images/image-walk.h"
+#       include <images/image-walk.h>
 	break;
 
       case 2:
@@ -216,7 +216,7 @@ libmagick_read_data(struct image_io *io)
 	  walk_pos[0] = libmagick_pixel_to_gray(src); \
 	  walk_pos[1] = ALPHA_TO_BYTE(src->opacity); \
 	  src++; }while(0)
-#       include "images/image-walk.h"
+#       include <images/image-walk.h>
 	break;
 
       case 3:
@@ -230,7 +230,7 @@ libmagick_read_data(struct image_io *io)
 	  walk_pos[1] = QUANTUM_TO_BYTE(src->green); \
 	  walk_pos[2] = QUANTUM_TO_BYTE(src->blue); \
 	  src++; }while(0)
-#       include "images/image-walk.h"
+#       include <images/image-walk.h>
 	break;
 
       case 4:
@@ -245,7 +245,7 @@ libmagick_read_data(struct image_io *io)
 	  walk_pos[2] = QUANTUM_TO_BYTE(src->blue); \
 	  walk_pos[3] = ALPHA_TO_BYTE(src->opacity); \
 	  src++; }while(0)
-#       include "images/image-walk.h"
+#       include <images/image-walk.h>
 	break;
 
       default:
@@ -333,7 +333,7 @@ libmagick_write(struct image_io *io)
 	  dest->blue = BYTE_TO_QUANTUM(walk_pos[0]); \
 	  dest->opacity = 0; \
 	  dest++; }while(0)
-#       include "images/image-walk.h"
+#       include <images/image-walk.h>
 	break;
 
       case 2:
@@ -348,7 +348,7 @@ libmagick_write(struct image_io *io)
 	  dest->blue = BYTE_TO_QUANTUM(walk_pos[0]); \
 	  dest->opacity = BYTE_TO_ALPHA(walk_pos[1]); \
 	  dest++; }while(0)
-#       include "images/image-walk.h"
+#       include <images/image-walk.h>
 	break;
 
       case 3:
@@ -363,7 +363,7 @@ libmagick_write(struct image_io *io)
 	  dest->blue = BYTE_TO_QUANTUM(walk_pos[2]); \
 	  dest->opacity = 0; \
 	  dest++; }while(0)
-#       include "images/image-walk.h"
+#       include <images/image-walk.h>
 	break;
 
       case 4:
@@ -378,7 +378,7 @@ libmagick_write(struct image_io *io)
 	  dest->blue = BYTE_TO_QUANTUM(walk_pos[2]); \
 	  dest->opacity = BYTE_TO_ALPHA(walk_pos[3]); \
 	  dest++; }while(0)
-#       include "images/image-walk.h"
+#       include <images/image-walk.h>
 	break;
 
       default: