partially updated free/mkdist

diff --git a/cf/images b/cf/images
index 0f4a331dae4a33d0e2103555063b048c678ed807..3e4b6ede7efffc55a2a3f2b4720a7f27abdd531e 100644 (file)
--- 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 a268525e6c919adf75b6b24df83dd642103ff39a..658d9fb100ad899810db5acbc6173527ff426170 100644 (file)
--- 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
 }