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
constify CanonImage->rgb and make a copy in find_islandname
[ypp-sc-tools.web-live.git]
/
pctb
/
convert.c
diff --git
a/pctb/convert.c
b/pctb/convert.c
index 8101fb920a40adafad02ab92ed4efd5181c2ae44..8386c1609a0f68f85a0936a0df953b26c120f2c2 100644
(file)
--- a/
pctb/convert.c
+++ b/
pctb/convert.c
@@
-66,7
+66,9
@@
FILE *screenshot_file;
const char *o_ocean, *o_pirate;
int o_quiet;
const char *o_ocean, *o_pirate;
int o_quiet;
-enum flags o_flags= ff_dict_fetch|ff_dict_submit|ff_dict_pirate;
+enum flags o_flags=
+ ff_charset_allowedit |
+ ff_dict_fetch|ff_dict_submit|ff_dict_pirate;
static void vbadusage(const char *fmt, va_list) FMT(1,0) NORET;
static void vbadusage(const char *fmt, va_list al) {
static void vbadusage(const char *fmt, va_list) FMT(1,0) NORET;
static void vbadusage(const char *fmt, va_list al) {
@@
-123,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);
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",
if (DEBUGP(rsync))
fprintf(stderr,"executing rsync to fetch %s to %s\n",remote,local);
execlp(rsync, "rsync",
@@
-195,7
+197,8
@@
int main(int argc, char **argv) {
else if (IS("--find-island")) o_flags |= ffs_printisland;
else if (IS("--single-page")) o_flags |= ff_singlepage;
else if (IS("--quiet")) o_quiet= 1;
else if (IS("--find-island")) o_flags |= ffs_printisland;
else if (IS("--single-page")) o_flags |= ff_singlepage;
else if (IS("--quiet")) o_quiet= 1;
- else if (IS("--edit-charset")) o_flags |= ff_editcharset;
+ else if (IS("--edit-charset")) o_flags |= ff_charset_edit;
+ else if (IS("--no-edit-charset")) o_flags &= ~(ffm_charset);
else if (IS("--test-servers")) o_flags |= ff_testservers;
else if (IS("--dict-local-only")) o_flags &= ~ffs_dict;
else if (IS("--dict-read-only")) o_flags &= (~ffs_dict | ff_dict_fetch);
else if (IS("--test-servers")) o_flags |= ff_testservers;
else if (IS("--dict-local-only")) o_flags &= ~ffs_dict;
else if (IS("--dict-read-only")) o_flags &= (~ffs_dict | ff_dict_fetch);
@@
-264,10
+267,12
@@
int main(int argc, char **argv) {
o_serv_dict_submit, o_flags & ff_dict_submit);
if (!o_screenshot_fn)
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 */
/* Actually do the work */
+ canon_colour_prepare();
+
if (o_mode & mf_findwindow) {
screenshot_startup();
find_yppclient_window();
if (o_mode & mf_findwindow) {
screenshot_startup();
find_yppclient_window();
@@
-294,7
+299,8
@@
int main(int argc, char **argv) {
open_screenshot_file("w");
if (o_flags & ff_singlepage) take_one_screenshot();
else take_screenshots();
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))
}
if (o_mode & mf_readscreenshot) {
if ((o_flags & ff_upload) && !(o_flags & ff_testservers))
@@
-305,7
+311,7
@@
int main(int argc, char **argv) {
}
if (o_mode & mf_analyse) {
if (o_flags & ff_needisland) {
}
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) );
if (o_flags & ff_printisland)
printf("%s, %s\n", archipelago, island);
sysassert(! setenv("YPPSC_ISLAND",island,1) );