X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=images%2Fimage-sim-test.c;h=ed43e0f2d6f24dd5aff474a28d0022b369bb6878;hb=c8c688e0b06fdacb20b28b66b9b0608dae8ca0dc;hp=1a54909138b767bf0d002486227c19837b8dda33;hpb=314027856c1d6ccb92bc625f4284cd36655fb154;p=libucw.git

diff --git a/images/image-sim-test.c b/images/image-sim-test.c
index 1a549091..ed43e0f2 100644
--- a/images/image-sim-test.c
+++ b/images/image-sim-test.c
@@ -7,11 +7,11 @@
  *	of the GNU General Public License.
  */
 
-#include "lib/lib.h"
-#include "lib/getopt.h"
-#include "lib/fastbuf.h"
-#include "lib/base64.h"
-#include "lib/base224.h"
+#include "ucw/lib.h"
+#include "ucw/getopt.h"
+#include "ucw/fastbuf.h"
+#include "ucw/base64.h"
+#include "ucw/base224.h"
 #include "images/images.h"
 #include "images/color.h"
 #include "images/signature.h"
@@ -68,7 +68,7 @@ static byte *segmentation_name_2;
 static uns display_base64;
 static uns display_base224;
 
-#define MSG(x...) do{ if (verbose) log(L_INFO, ##x); }while(0)
+#define MSG(x...) do{ if (verbose) msg(L_INFO, ##x); }while(0)
 #define TRY(x) do{ if (!(x)) exit(1); }while(0)
 
 static void
@@ -112,7 +112,7 @@ static void
 write_segmentation(struct image_sig_data *data, byte *fn)
 {
   MSG("Writing segmentation to %s", fn);
-  
+
   struct fastbuf *fb = bopen(fn, O_WRONLY | O_CREAT | O_TRUNC, 4096);
   struct image *img;
   TRY(img = image_new(&ctx, data->image->cols, data->image->rows, COLOR_SPACE_RGB, NULL));
@@ -127,9 +127,9 @@ write_segmentation(struct image_sig_data *data, byte *fn)
       luv[2] = ((int)data->regions[i].a[2] - 128) * (4 / 2.55);
       luv_to_xyz_exact(xyz, luv);
       xyz_to_srgb_exact(srgb, xyz);
-      c[0] = CLAMP(srgb[0] * 255, 0, 255); 
-      c[1] = CLAMP(srgb[1] * 255, 0, 255); 
-      c[2] = CLAMP(srgb[2] * 255, 0, 255); 
+      c[0] = CLAMP(srgb[0] * 255, 0, 255);
+      c[1] = CLAMP(srgb[1] * 255, 0, 255);
+      c[2] = CLAMP(srgb[2] * 255, 0, 255);
       for (struct image_sig_block *block = data->regions[i].blocks; block; block = block->next)
         {
 	  uns x1 = block->x * 4;
@@ -152,7 +152,7 @@ write_segmentation(struct image_sig_data *data, byte *fn)
 
   io.fastbuf = fb;
   io.image = img;
-  io.format = image_file_name_to_format(fn); 
+  io.format = image_file_name_to_format(fn);
   TRY(image_io_write(&io));
   image_io_reset(&io);