cope with subpixel antialiasing (urgh)

[ypp-sc-tools.db-test.git] / pctb / convert.c

diff --git a/pctb/convert.c b/pctb/convert.c
index 3c5af994c3f7c9db88c8cc22875b7979f6384bad..8386c1609a0f68f85a0936a0df953b26c120f2c2 100644 (file)
--- a/pctb/convert.c
+++ b/pctb/convert.c
@@ -125,7 +125,7 @@ void fetch_with_rsync(const char *stem) {
   
     const char *src= getenv("YPPSC_PCTB_DICT_UPDATE");
     char *remote= masprintf("%s/master-%s.txt", src, stem);
-    char *local= masprintf("#master-%s#.txt", stem);
+    char *local= masprintf("_master-%s.txt", stem);
     if (DEBUGP(rsync))
       fprintf(stderr,"executing rsync to fetch %s to %s\n",remote,local);
     execlp(rsync, "rsync",
@@ -267,10 +267,12 @@ int main(int argc, char **argv) {
             o_serv_dict_submit,  o_flags & ff_dict_submit);
 
   if (!o_screenshot_fn)
-    o_screenshot_fn= masprintf("%s/#pages#.ppm",get_vardir());
+    o_screenshot_fn= masprintf("%s/_pages.ppm",get_vardir());
 
   /* Actually do the work */
             
+  canon_colour_prepare();
+  
   if (o_mode & mf_findwindow) {
     screenshot_startup();
     find_yppclient_window();
@@ -297,7 +299,8 @@ int main(int argc, char **argv) {
     open_screenshot_file("w");
     if (o_flags & ff_singlepage) take_one_screenshot();
     else take_screenshots();
-    progress_log("OK for you to move the mouse now.");
+    progress_log("OK for you to move the mouse now, and you can"
+                " use the YPP client again.");
   }
   if (o_mode & mf_readscreenshot) {
     if ((o_flags & ff_upload) && !(o_flags & ff_testservers))
@@ -308,7 +311,7 @@ int main(int argc, char **argv) {
   }
   if (o_mode & mf_analyse) {
     if (o_flags & ff_needisland) {
-      find_islandname(page_images[0]->rgb);
+      find_islandname();
       if (o_flags & ff_printisland)
        printf("%s, %s\n", archipelago, island);
       sysassert(! setenv("YPPSC_ISLAND",island,1) );