Removed unnecessary depedencies on sherlock/sherlock.h.

diff --git a/images/color.c b/images/color.c
index 8003c7bed75d8d5106d5d470b5b416db022c6a56..011abb28421ed50902e58a441989e09aac48b47e 100644 (file)
--- a/images/color.c
+++ b/images/color.c
@@ -9,14 +9,14 @@
 
 #undef LOCAL_DEBUG
 
-#include "sherlock/sherlock.h"
-#include "sherlock/math.h"
+#include "lib/lib.h"
 #include "images/images.h"
 #include "images/color.h"
 #include "images/error.h"
 #include "images/math.h"
 
 #include <string.h>
+#include <math.h>
 
 uns color_space_channels[COLOR_SPACE_MAX] = {
   [COLOR_SPACE_UNKNOWN] = 0,

diff --git a/images/sig-init.c b/images/sig-init.c
index 4c45556c8acd93fa9866a325690947233082457f..3cb8cab008cb319f3b900036261baab42e90bda7 100644 (file)
--- a/images/sig-init.c
+++ b/images/sig-init.c
@@ -9,8 +9,7 @@
 
 #undef LOCAL_DEBUG
 
-#include "sherlock/sherlock.h"
-#include "sherlock/math.h"
+#include "lib/lib.h"
 #include "lib/fastbuf.h"
 #include "lib/conf.h"
 #include "images/images.h"
@@ -20,6 +19,7 @@
 #include "images/signature.h"
 
 #include <alloca.h>
+#include <math.h>
 
 int
 image_sig_init(struct image_context *ctx, struct image_sig_data *data, struct image *image)

diff --git a/images/sig-seg.c b/images/sig-seg.c
index 933a784b3a286ae07cd8e6db3630a98f68803599..74798f47fe178f8eae98802cf032ddc98ea43b66 100644 (file)
--- a/images/sig-seg.c
+++ b/images/sig-seg.c
@@ -9,7 +9,7 @@
 
 #undef LOCAL_DEBUG
 
-#include "sherlock/sherlock.h"
+#include "lib/lib.h"
 #include "lib/conf.h"
 #include "lib/heap.h"
 #include "images/images.h"

diff --git a/images/sig-txt.c b/images/sig-txt.c
index ab04143428848fa9c0eb97d5506828689e4cc7d9..5b0a7e6d3d9aad5331119260c4fd20dffb71246f 100644 (file)
--- a/images/sig-txt.c
+++ b/images/sig-txt.c
@@ -9,7 +9,7 @@
 
 #undef LOCAL_DEBUG
 
-#include "sherlock/sherlock.h"
+#include "lib/lib.h"
 #include "images/images.h"
 #include "images/signature.h"
 #include "images/math.h"