X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=cf%2Fimages;h=ab8dc24ed8c04f81efc0f87f0d8f6825e0d560cb;hb=a256e152851c4fa89635a5739f66d31913aaae7f;hp=21e4968f867670d8272a50cb6b06bab91fc4e3b0;hpb=7c0df9a273f05c823fe19e34eb12cbdd6928de85;p=libucw.git

diff --git a/cf/images b/cf/images
index 21e4968f..ab8dc24e 100644
--- a/cf/images
+++ b/cf/images
@@ -5,48 +5,48 @@
 ImageLib {
 
 # Default tracing level (0 to disable)
-Trace		0
+Trace			0
 
-# Limits for image allocation. ImageMaxDim must be less than 1<<16.
-ImageMaxDim	0xffff
-ImageMaxBytes	256M
+# Limits for image allocation
+ImageMaxDim		0xffff		# Maximum width/height (at most 64k-1)
+ImageMaxBytes		256M		# Maximum size in bytes
 
 }
 
+#if CONFIG_IMAGES_DUP || CONFIG_IMAGES_SIM
 ######## Image signatures #######################################################
 
 ImageSig {
 
-# Sherlock use regions based image comparision to search similar images.
-# To enable this feature, enable imagesig analyser to extract
-# various regions features needed for comparisions. Sets of these features
-# are called "image signature" and there are stored in attributes 'H'.
+# To find similar images, Sherlock uses comparison based on regions.
+# First of all, the imagesim analyser extracts various region features.
+# Sets of these features are called "image signatures" and they are stored
+# in the `H' attribute of image objects.
 
-# Signatures are later processed by chewer to build an effective
-# search structure finally used by images. See Indexer and Search
+# Signatures are later processed by the indexer to build an effective
+# search structure finally used by the search server. See Indexer and Search
 # sections for more options.
 
-
 # Minimum image size to apply segmentation. Smaller images are always
-# compared with simple "average" method (see ImageSig.CompareMethod).
-MinWidth	16
-MinHeight	16
+# compared by the simple "average" method (see ImageSig.CompareMethod).
+MinWidth		16
+MinHeight		16
 
-# List of subdivision thresholds in first phase of segmentation.
-# Lower the values to increase average number of regions and vice versa.
+# List of subdivision thresholds in the first phase of segmentation.
+# Lower the values to increase the average number of regions and vice versa.
 PreQuantThresholds	6 12 15 20 25 25 30 30 40 40 50 50 60 60 60
 
-# Settings for second phase of segmentation - usually not so important.
-# We use iterative algorithm to improve average error from the first phase.
+# Settings for the second phase of segmentation -- usually not so important.
+# We use an iterative algorithm to improve the average error from the first phase.
 # We stop the process after PostQuantMaxSteps or if we get only PostQuantThreshold
-# percentual improvement in comparision with the previous step.
+# percentual improvement over the previous step.
 PostQuantMinSteps	2
 PostQuantMaxSteps	10
 PostQuantThreshold	1
 
 # BorderBonus and BorderSize parameters can increase or decrease the weight
 # of image pixels near the borders. Weight of all pixels more than BorderSize * MIN(cols, rows)
-# pixels far from the edges is 128. Then this value continuously decrese/increse up to 128+BorderSize.
+# pixels far from the edges is 128. Then this value continuously decreses/increses up to 128+BorderSize.
 BorderSize		0.4
 BorderBonus		-50
 
@@ -58,7 +58,7 @@ InertiaScale		2 0.5 0.05
 # set it to zero to disable the algorithm completely.
 TexturedThreshold	0.32
 
-# Signatures comparision method (integrated|fuzzy|average):
+# Signature comparison method:
 #
 #   integrated
 #	based on: James Z. Wang, Jia Li and Gio Wiederhold,
@@ -75,15 +75,17 @@ TexturedThreshold	0.32
 #
 CompareMethod		integrated
 
-# Array of multiplicative constants in feature vectors distance computation
+# Array of multiplicative constants in feature vector distance computation
 # (L, u, v, LH, HL, HH, I1, I2, I3, X, Y). Each one must be an integer in range 0..15, default is 4.
 CompareFeaturesWeights	4 6 6 4 4 4 4 4 4 4 4
 
 }
 
-######## Duplicates finder ######################################################
+#endif
+#ifdef CONFIG_IMAGES_DUP
+######## Duplicate finder #######################################################
 
 ImageDup {
-# Image duplicates do not work yet.
+# Detection of image duplicates does not work yet.
 }
-
+#endif