* renamed sources

src/Makefile

@@ -23,18 +23,19 @@ imdb-query: query.o libimgdup.so
 imdb-query-st: query.o libimgdup.a
 	gcc $(CFLAGS) $(CPPFLAGS) -L. $^ -o $@ -static
 
-imdb_1to2: imdb_1to2.c
+imdb-1to2: imdb-1to2.c
 	gcc $(CFLAGS) $(CPPFLAGS) -o $@ $^
 
-utils: imdb-query imdb-query-st imdb_1to2
+utils: imdb-query imdb-query-st imdb-sampler imdb-1to2
 
 GMFLAGS=$(shell GraphicsMagickWand-config --cppflags --ldflags --libs)
-sampler-test: sampler.c bitmap.c sampler-test.c
+imdb-sampler: sampler.c sample.c bitmap.c
 	gcc $(CFLAGS) $(CPPFLAGS) $(GMFLAGS) -o $@ $^
 
 clean:
 	rm -f *.o
-	rm -f imdb_?to?
+	rm -f imdb-1to2
 	rm -f imdb-query
 	rm -f imdb-query-st
+	rm -f imdb-sampler
 	rm -f libimgdup*

src/sample.c

@@ -0,0 +1,97 @@
+#include "common.h"
+#include "database.h"
+#include "sample.h"
+
+#include <wand/magick_wand.h>
+
+int
+imdb_sample(imdb_rec_t * const rec,
+                  char * const source)
+{
+  MagickWand *wand = NULL;
+  MagickPassFail status = MagickPass;
+  ExceptionType severity = 0;
+  unsigned long w = 0, h = 0;
+  char *description = NULL;
+  size_t buf_size = 64 * sizeof(char);
+  unsigned char *buf = NULL;
+
+  InitializeMagick("/"); /* FIXME */
+  wand = NewMagickWand();
+  if (status == MagickPass)
+    status = MagickReadImage(wand, source);
+
+  if (status == MagickPass)
+    w = MagickGetImageHeight(wand);
+
+  if (status == MagickPass)
+    h = MagickGetImageHeight(wand);
+
+  /* 2 -> 160 : width, "cols" */
+  /* 3 -> 160 : width, "rows" */
+  if (status == MagickPass)
+    status = MagickSampleImage(wand, 160, 160);
+
+  /* TODO: color maps */
+
+  /* 2 -> 256 : number of colors */
+  /* 3 ->   0 : treedepth     -> auto */
+  /* 4 ->   0 : dither        -> none */
+  /* 5 ->   0 : measure_error -> none */
+  if (status == MagickPass)
+    status = MagickQuantizeImage(wand, 256, GRAYColorspace, 0, 0, 0);
+
+  /* 2 -> 3 : radius, in pixels */
+  /* 3 -> 2 : "for reasonable results, radius should be larger than sigma" */
+  if (status == MagickPass)
+    status = MagickBlurImage(wand, 3, 2);
+
+  if (status == MagickPass)
+    status = MagickNormalizeImage(wand);
+
+  if (status == MagickPass)
+    status = MagickEqualizeImage(wand);
+
+  /* 2 -> 16 : width, "cols" */
+  /* 3 -> 16 : width, "rows" */
+  if (status == MagickPass)
+    status = MagickSampleImage(wand, 16, 16);
+
+  /* 2 -> 50%, tuned by magick number, see 'magick/image.h' */
+  if (status == MagickPass)
+    status = MagickThresholdImage(wand, 50.0 * (MaxRGB / 100));
+
+  if (status == MagickPass)
+    status = MagickSetImageType(wand, BilevelType);
+
+  if (status == MagickPass)
+    status = MagickSetImageFormat(wand, "MONO");
+
+  if (status == MagickPass)
+    buf = MagickWriteImageBlob(wand, &buf_size);
+
+#ifdef DEBUG
+  fprintf(stderr, "sample H: %lu\n", MagickGetImageWidth(wand));
+  fprintf(stderr, "sample W: %lu\n", MagickGetImageWidth(wand));
+  fprintf(stderr, "buf size: %u\n", buf_size);
+  for (unsigned int i = 0; i < buf_size; i++)
+    fprintf(stderr, "%02X", buf[i]);
+#endif
+  assert(buf_size == 32);
+
+  if (status == MagickPass) {
+    memset(rec, 0x0, sizeof(imdb_rec_t));
+    rec->data[REC_OFF_RU] = 0xFF;
+    *((uint16_t *) &rec->data[REC_OFF_IW]) = (uint16_t) w;
+    *((uint16_t *) &rec->data[REC_OFF_IH]) = (uint16_t) h;
+    memcpy(&rec->data[REC_OFF_BM], buf, 32);
+  } else {
+    description = MagickGetException(wand, &severity);
+    fprintf(stderr, "%03d %.1024s\n", severity, description); /* FIXME */
+  }
+
+  DestroyMagickWand(wand);
+  DestroyMagick();
+
+  return (status == MagickPass) ? 0 : -1;
+}

src/sampler-test.c

@@ -1,25 +0,0 @@
-#include "common.h"
-#include "database.h"
-#include "bitmap.h"
-#include "sampler.h"
-
-int main(int argc, char **argv)
-{
-  imdb_rec_t rec;
-
-  if (argc < 2) {
-    puts("Usage: sampler-test <file>");
-    exit(EXIT_FAILURE);
-  }
-
-  memset(&rec, 0x0, sizeof(imdb_rec_t));
-
-  if (imdb_sample(&rec, argv[1]) != 0) {
-    puts("sampler failure");
-    exit(EXIT_FAILURE);
-  }
-
-  bitmap_print(&rec.data[REC_OFF_BM]);
-
-  exit(EXIT_SUCCESS);
-}

src/sampler.c

@@ -1,97 +1,25 @@
 #include "common.h"
 #include "database.h"
-#include "sampler.h"
+#include "bitmap.h"
+#include "sample.h"
 
-#include <wand/magick_wand.h>
+int main(int argc, char **argv)
-
-int
-imdb_sample(imdb_rec_t * const rec,
-                  char * const source)
 {
-  MagickWand *wand = NULL;
+  imdb_rec_t rec;
-  MagickPassFail status = MagickPass;
-  ExceptionType severity = 0;
-  unsigned long w = 0, h = 0;
-  char *description = NULL;
-  size_t buf_size = 64 * sizeof(char);
-  unsigned char *buf = NULL;
-
-  InitializeMagick("/"); /* FIXME */
-  wand = NewMagickWand();
-  if (status == MagickPass)
-    status = MagickReadImage(wand, source);
-
-  if (status == MagickPass)
-    w = MagickGetImageHeight(wand);
-
-  if (status == MagickPass)
-    h = MagickGetImageHeight(wand);
-
-  /* 2 -> 160 : width, "cols" */
-  /* 3 -> 160 : width, "rows" */
-  if (status == MagickPass)
-    status = MagickSampleImage(wand, 160, 160);
-
-  /* TODO: color maps */
-
-  /* 2 -> 256 : number of colors */
-  /* 3 ->   0 : treedepth     -> auto */
-  /* 4 ->   0 : dither        -> none */
-  /* 5 ->   0 : measure_error -> none */
-  if (status == MagickPass)
-    status = MagickQuantizeImage(wand, 256, GRAYColorspace, 0, 0, 0);
-
-  /* 2 -> 3 : radius, in pixels */
-  /* 3 -> 2 : "for reasonable results, radius should be larger than sigma" */
-  if (status == MagickPass)
-    status = MagickBlurImage(wand, 3, 2);
 
-  if (status == MagickPass)
+  if (argc < 2) {
-    status = MagickNormalizeImage(wand);
+    puts("Usage: sampler-test <file>");
-
+    exit(EXIT_FAILURE);
-  if (status == MagickPass)
+  }
-    status = MagickEqualizeImage(wand);
-
-  /* 2 -> 16 : width, "cols" */
-  /* 3 -> 16 : width, "rows" */
-  if (status == MagickPass)
-    status = MagickSampleImage(wand, 16, 16);
-
-  /* 2 -> 50%, tuned by magick number, see 'magick/image.h' */
-  if (status == MagickPass)
-    status = MagickThresholdImage(wand, 50.0 * (MaxRGB / 100));
-
-  if (status == MagickPass)
-    status = MagickSetImageType(wand, BilevelType);
-
-  if (status == MagickPass)
-    status = MagickSetImageFormat(wand, "MONO");
-
-  if (status == MagickPass)
-    buf = MagickWriteImageBlob(wand, &buf_size);
 
-#ifdef DEBUG
+  memset(&rec, 0x0, sizeof(imdb_rec_t));
-  fprintf(stderr, "sample H: %lu\n", MagickGetImageWidth(wand));
-  fprintf(stderr, "sample W: %lu\n", MagickGetImageWidth(wand));
-  fprintf(stderr, "buf size: %u\n", buf_size);
-  for (unsigned int i = 0; i < buf_size; i++)
-    fprintf(stderr, "%02X", buf[i]);
-#endif
-  assert(buf_size == 32);
 
-  if (status == MagickPass) {
+  if (imdb_sample(&rec, argv[1]) != 0) {
-    memset(rec, 0x0, sizeof(imdb_rec_t));
+    puts("sampler failure");
-    rec->data[REC_OFF_RU] = 0xFF;
+    exit(EXIT_FAILURE);
-    *((uint16_t *) &rec->data[REC_OFF_IW]) = (uint16_t) w;
-    *((uint16_t *) &rec->data[REC_OFF_IH]) = (uint16_t) h;
-    memcpy(&rec->data[REC_OFF_BM], buf, 32);
-  } else {
-    description = MagickGetException(wand, &severity);
-    fprintf(stderr, "%03d %.1024s\n", severity, description); /* FIXME */
   }
 
-  DestroyMagickWand(wand);
+  bitmap_print(&rec.data[REC_OFF_BM]);
-  DestroyMagick();
 
-  return (status == MagickPass) ? 0 : -1;
+  exit(EXIT_SUCCESS);
 }