More play: Added indirect heapsort.

[libucw.git] / images / image-tool.c

diff --git a/images/image-tool.c b/images/image-tool.c
index 5063d9b65382bf484d6e51b60aac6ff33764e257..1984906e97de6c6f948a6022b64d744da7a19a75 100644 (file)
--- a/images/image-tool.c
+++ b/images/image-tool.c
@@ -7,8 +7,8 @@
  *     of the GNU General Public License.
  */
 
  *     of the GNU General Public License.
  */
 

-#include "lib/lib.h"
-#include "lib/fastbuf.h"
+#include "ucw/lib.h"
+#include "ucw/fastbuf.h"

 #include "images/images.h"
 #include "images/color.h"
 
 #include "images/images.h"
 #include "images/color.h"
 


@@ -84,7 +84,7 @@ parse_color(struct color *color, byte *s)
   color_make_rgb(color, (v >> 16) & 255, (v >> 8) & 255, v & 255);
 }
 
   color_make_rgb(color, (v >> 16) & 255, (v >> 8) & 255, v & 255);
 }
 

-#define MSG(x...) do{ if (verbose) log(L_INFO, ##x); }while(0)
+#define MSG(x...) do{ if (verbose) msg(L_INFO, ##x); }while(0)

 
 int
 main(int argc, char **argv)
 
 int
 main(int argc, char **argv)


@@ -184,7 +184,7 @@ main(int argc, char **argv)
       if (io.background_color.color_space)
         {
          byte rgb[3];
       if (io.background_color.color_space)
         {
          byte rgb[3];

-         color_put_rgb(rgb, &io.background_color);
+         TRY(color_put(&ctx, &io.background_color, rgb, COLOR_SPACE_RGB));

           printf("Background:  %02x%02x%02x\n", rgb[0], rgb[1], rgb[2]);
        }
       if (io.exif_size)
           printf("Background:  %02x%02x%02x\n", rgb[0], rgb[1], rgb[2]);
        }
       if (io.exif_size)