chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.web-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
if -Drect and -Dcallout, make dictionary-manager print out whole image input
[ypp-sc-tools.web-live.git]
/
pctb
/
convert.c
diff --git
a/pctb/convert.c
b/pctb/convert.c
index 950300b588d1cc7e1e7fe9afc5409f0c4084c8d2..8101fb920a40adafad02ab92ed4efd5181c2ae44 100644
(file)
--- a/
pctb/convert.c
+++ b/
pctb/convert.c
@@
-82,9
+82,6
@@
static void open_screenshot_file(const char *mode) {
if (!screenshot_file)
fatal("could not open screenshots file `%s': %s",
o_screenshot_fn, strerror(errno));
if (!screenshot_file)
fatal("could not open screenshots file `%s': %s",
o_screenshot_fn, strerror(errno));
-
- if ((o_flags & ff_upload) && !(o_flags & ff_testservers))
- badusage("must not reuse screenshots for upload to live PCTB database");
}
static void run_analysis(void) {
}
static void run_analysis(void) {
@@
-95,7
+92,7
@@
static void run_analysis(void) {
analyse(tf);
if (o_flags & ff_upload) {
analyse(tf);
if (o_flags & ff_upload) {
- if (
o_flags & ff_singlepage
)
+ if (
npages<=1
)
fatal("Recognition successful, but refusing to upload partial data\n"
" (--single-page specified). Specify an output mode?");
}
fatal("Recognition successful, but refusing to upload partial data\n"
" (--single-page specified). Specify an output mode?");
}
@@
-130,7
+127,7
@@
void fetch_with_rsync(const char *stem) {
if (DEBUGP(rsync))
fprintf(stderr,"executing rsync to fetch %s to %s\n",remote,local);
execlp(rsync, "rsync",
if (DEBUGP(rsync))
fprintf(stderr,"executing rsync to fetch %s to %s\n",remote,local);
execlp(rsync, "rsync",
- DEBUGP(rsync) ? "-
vLt" : "-
Lt",
+ DEBUGP(rsync) ? "-
zvLt" : "-z
Lt",
"--",remote,local,(char*)0);
sysassert(!"exec rsync failed");
}
"--",remote,local,(char*)0);
sysassert(!"exec rsync failed");
}
@@
-300,13
+297,15
@@
int main(int argc, char **argv) {
progress_log("OK for you to move the mouse now.");
}
if (o_mode & mf_readscreenshot) {
progress_log("OK for you to move the mouse now.");
}
if (o_mode & mf_readscreenshot) {
+ if ((o_flags & ff_upload) && !(o_flags & ff_testservers))
+ badusage("must not reuse screenshots for upload to live PCTB database");
open_screenshot_file("r");
if (o_flags & ff_singlepage) read_one_screenshot();
else read_screenshots();
}
if (o_mode & mf_analyse) {
if (o_flags & ff_needisland) {
open_screenshot_file("r");
if (o_flags & ff_singlepage) read_one_screenshot();
else read_screenshots();
}
if (o_mode & mf_analyse) {
if (o_flags & ff_needisland) {
- find_islandname(page
0_rgbimage
);
+ find_islandname(page
_images[0]->rgb
);
if (o_flags & ff_printisland)
printf("%s, %s\n", archipelago, island);
sysassert(! setenv("YPPSC_ISLAND",island,1) );
if (o_flags & ff_printisland)
printf("%s, %s\n", archipelago, island);
sysassert(! setenv("YPPSC_ISLAND",island,1) );