From 491b1b752d5aa2e7d779f91e36fc4e0c8a5c53ac Mon Sep 17 00:00:00 2001
From: Pavel Charvat <pavel.charvat@netcentrum.cz>
Date: Sat, 3 Mar 2007 14:12:11 +0100
Subject: [PATCH] partially updated free/mkdist

---
 cf/images       | 5 ++++-
 images/config.c | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/cf/images b/cf/images
index 0f4a331d..3e4b6ede 100644
--- a/cf/images
+++ b/cf/images
@@ -13,6 +13,7 @@ ImageMaxBytes		256M		# Maximum size in bytes
 
 }
 
+#ifndef CONFIG_FREE
 ######## Image signatures #######################################################
 
 ImageSig {
@@ -80,9 +81,11 @@ CompareFeaturesWeights	4 6 6 4 4 4 4 4 4 4 4
 
 }
 
+#endif
+#ifdef CONFIG_IMAGES_DUP
 ######## Duplicate finder #######################################################
 
 ImageDup {
 # Detection of image duplicates does not work yet.
 }
-
+#endif
diff --git a/images/config.c b/images/config.c
index a268525e..658d9fb1 100644
--- a/images/config.c
+++ b/images/config.c
@@ -9,7 +9,9 @@
 #include "lib/lib.h"
 #include "lib/conf.h"
 #include "images/images.h"
+#ifndef CONFIG_FREE
 #include "images/signature.h"
+#endif
 
 #include <string.h>
 
@@ -18,6 +20,7 @@ uns image_trace;
 uns image_max_dim = 0xffff;
 uns image_max_bytes = ~0U;
 
+#ifndef CONFIG_FREE
 /* ImageSig section */
 uns image_sig_min_width;
 uns image_sig_min_height;
@@ -31,6 +34,7 @@ double image_sig_inertia_scale[3];
 double image_sig_textured_threshold;
 int image_sig_compare_method;
 uns image_sig_cmp_features_weights[IMAGE_REG_F + IMAGE_REG_H];
+#endif
 
 static struct cf_section image_lib_config = {
   CF_ITEMS{
@@ -41,6 +45,7 @@ static struct cf_section image_lib_config = {
   }
 };
 
+#ifndef CONFIG_FREE
 static struct cf_section image_sig_config = {
   CF_ITEMS{
     CF_UNS("MinWidth", &image_sig_min_width),
@@ -58,10 +63,13 @@ static struct cf_section image_sig_config = {
     CF_END
   }
 };
+#endif
 
 static void CONSTRUCTOR
 images_init_config(void)
 {
   cf_declare_section("ImageLib", &image_lib_config, 0);
+#ifndef CONFIG_FREE
   cf_declare_section("ImageSig", &image_sig_config, 0);
+#endif
 }
-- 
2.39.5