1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
|
From: Teemu Ikonen <tpikonen@gmail.com>
Subject: Fix various typos in strings and docs
Forwarded: no
Last-Update: 2018-04-14
Git-Branch: p/typofix
Git-Diff: 6e7dd2a5b8ca679585a832b0ebf1c9..2f7c5c25d8541ca9987c526d369a19
client/imclient.c | 4 ++--
doc/imview.1 | 14 +++++++-------
io/cpostscript.cxx | 4 ++--
io/newprefio.cxx | 4 ++--
io/readps.cxx | 2 +-
server/imserver.cxx | 2 +-
server/interpreter.cxx | 6 +++---
transferFunction.cxx | 2 +-
8 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/client/imclient.c b/client/imclient.c
index 052b1f2..ea36ca9 100644
--- a/client/imclient.c
+++ b/client/imclient.c
@@ -1524,7 +1524,7 @@ int imviewputimage(IMAGE *I, /* the image we want to display */
LIARdebug("\n"
"Timings: start to put : %6.4f sec\n"
" put to beginning of upload : %6.4f sec\n"
- " begining of upload to end : %6.4f sec\n"
+ " beginning of upload to end : %6.4f sec\n"
" close conn to exit : %6.4f sec\n"
"------------------------------------- \n"
" put to close conn : %6.4f sec\n"
@@ -1997,7 +1997,7 @@ int imviewput2(IMAGE *I, /* input image */
" opening of socket to login : %6.4f sec\n"
" login to put : %6.4f sec\n"
" put to beginning of upload : %6.4f sec\n"
- " begining of upload to end : %6.4f sec\n"
+ " beginning of upload to end : %6.4f sec\n"
" end of upload to close conn : %6.4f sec\n"
" close conn to exit : %6.4f sec\n"
"------------------------------------- \n"
diff --git a/doc/imview.1 b/doc/imview.1
index 046d187..d3faba4 100644
--- a/doc/imview.1
+++ b/doc/imview.1
@@ -51,7 +51,7 @@ variable-controlled TMPDIR directory are effectively deleted.
.TP
\fB-disable_io_keys\fR
This option disables some I/O shortcut that are not menu-dependent, such as c
-that closes an image. This is useful in conjuction with options \fI-hide_menubar\fR and \fI-disable_menubar\fR
+that closes an image. This is useful in conjunction with options \fI-hide_menubar\fR and \fI-disable_menubar\fR
for limiting the user's interaction with the application.
.TP
\fB-disable_menubar\fR
@@ -68,8 +68,8 @@ restrict the user's control over \fBimview\fR.
\fB-fork\fR
Sends \fBimview\fR to the background (works on all platforms including windows). It is
better to use this option rather than the shell semantics (adding & at the end of the command
-under Unix) when the server is ran in conjuction with \fI-server\fR,
-because imview will synchonize the foreground and background processes so that the foreground
+under Unix) when the server is ran in conjunction with \fI-server\fR,
+because imview will synchronize the foreground and background processes so that the foreground
process can know the server port number.
.TP
\fB-gamma <value>\fR
@@ -170,7 +170,7 @@ Will display all images in the directory /home/talbot/images/astro/. Use
.SS "ADVANCED USAGE"
.nf
- % imview aGreyLevelImage.tif -c heat.lut
+ % imview aGreyLevelImage.tif \-c heat.lut
.fi
.PP
Will display image aGreyLevelImage.tif. Assuming this image only contains grey-level information
@@ -179,7 +179,7 @@ Will display image aGreyLevelImage.tif. Assuming this image only contains grey-l
.SS "SERVER USAGE"
.nf
- % imview -server -fork
+ % imview \-server \-fork
Port: 7600
.fi
.PP
@@ -207,7 +207,7 @@ Connection closed by foreign host.
a sample client that can upload images into imview, as follows:
.nf
- % imclient -p 7600 /home/talbot/images/astro/jupiter.tiff
+ % imclient \-p 7600 /home/talbot/images/astro/jupiter.tiff
.fi
.SH "BUGS"
.PP
@@ -230,7 +230,7 @@ are present.
.SH "FILES"
.PP
.TP
-\fB~/.imview/preferences\fR
+\fB~/.fltk/hugues.talbot_csiro.au/imview.prefs\fR
User preferences
.TP
\fB<Installation directory>/Imview/*.lut\fR
diff --git a/io/cpostscript.cxx b/io/cpostscript.cxx
index 573fbdd..678ba70 100644
--- a/io/cpostscript.cxx
+++ b/io/cpostscript.cxx
@@ -166,7 +166,7 @@ int compose_PostScript_code(HIMAGE *theImageList, /* image list */
/* case of the EPS */
if (win_type != WIN_EPS) {
- myDebug("Standart ps code to eventually print on a page");
+ myDebug("Standard ps code to eventually print on a page");
/* get the actual bounds of the window */
ps_getWindowBounds(paperType, win_type, orientation, &boundOx, &boundOy, &boundW, &boundH);
/* startup */
@@ -895,7 +895,7 @@ void ps_drawRibbon(float boundOx, float boundOy, float boundW, float boundH, FIL
/* variable */
- fprintf(tbp, "\n\n%%%% Optionnal ribbon\n");
+ fprintf(tbp, "\n\n%%%% Optional ribbon\n");
fprintf(tbp, "/nbgray 256 def\n"); /* that's a constant.. */
fprintf(tbp, "/wherex %d def\n", xpos);
fprintf(tbp, "/wherey %d def\n", ypos);
diff --git a/io/newprefio.cxx b/io/newprefio.cxx
index a3cee27..b2bc0ec 100644
--- a/io/newprefio.cxx
+++ b/io/newprefio.cxx
@@ -139,7 +139,7 @@ int imprefs::readprefs(const char *)
imPostscript.get("gspath", gspath_, "gs", DFLTSTRLEN-1);
imPostscript.get("gvpath", gvpath_, "ghostview", DFLTSTRLEN-1);
imPostscript.get("psRenderRes", psRenderRes_, 150.0);
- imPostscript.get("psDiplayRes", psDisplayRes_, 75.0);
+ imPostscript.get("psDisplayRes", psDisplayRes_, 75.0);
imPostscript.get("psRenderDepth", ival, 0);
psRenderDepth_ = (psrendertype)ival;
imPostscript.get("psRenderSmooth", ival, 0);
@@ -182,7 +182,7 @@ int imprefs::writeprefs(const char *)
imPostscript.set("gspath", gspath_);
imPostscript.set("gvpath", gvpath_);
imPostscript.set("psRenderRes", psRenderRes_);
- imPostscript.set("psDiplayRes", psDisplayRes_);
+ imPostscript.set("psDisplayRes", psDisplayRes_);
imPostscript.set("psRenderDepth", (int)psRenderDepth_);
imPostscript.set("psRenderSmooth", (int)psRenderSmooth_);
imPostscript.set("psAntialiasRender", (int)psAntialiasRender_);
diff --git a/io/readps.cxx b/io/readps.cxx
index 615bce9..269d1bf 100644
--- a/io/readps.cxx
+++ b/io/readps.cxx
@@ -209,7 +209,7 @@ void psinfo::parsefile(void)
dbgprintf("going back to beginning and shifting the origin\n");
TmpFile.seekp(0, ios_base::beg);
TmpFile << os_translate.str() << endl;
- dbgprintf("Writing %s at the begining\n", os_translate.str().c_str());
+ dbgprintf("Writing %s at the beginning\n", os_translate.str().c_str());
}
}
diff --git a/server/imserver.cxx b/server/imserver.cxx
index cd80678..bfad45d 100644
--- a/server/imserver.cxx
+++ b/server/imserver.cxx
@@ -230,7 +230,7 @@ void imview_server::manage_results(void)
for (p = lc.begin(); p != lc.end() ; p++) {
if (!(*p)->result_isempty()) {
// send the result through the socket
- srv_dbgprintf("sending result throught the socket\n");
+ srv_dbgprintf("sending result through the socket\n");
(*p)->sendResult();
}
}
diff --git a/server/interpreter.cxx b/server/interpreter.cxx
index a8e4d19..dcce601 100644
--- a/server/interpreter.cxx
+++ b/server/interpreter.cxx
@@ -657,7 +657,7 @@ int put::callback(void *buf, unsigned long nbbytes) {
// saying an image has been transmitted.
// constructs a string from a char * label
const string uniqs=myheader->label;
- srv_dbgprintf("Ok so far. Asking the GUI to please diplay img %s\n", myheader->label);
+ srv_dbgprintf("Ok so far. Asking the GUI to please display img %s\n", myheader->label);
IOBlackBox->pleaseDisplay(uniqs);
// note: we can't call the GUI directly as we are within
// the server's thread.
@@ -926,7 +926,7 @@ int reset::perform(vector<string> &l, string &result) {
int close_image::perform(vector<string> &l, string &result) {
if (mainViewer) {
if (l.size() == 0) {
- close_cb(0,0); // close the currently diplayed image
+ close_cb(0,0); // close the currently displayed image
return 0;
} else if (cmp_nocase(l[0], OVERLAY_MARKER) == 0) {
closeoverlay_cb(0,0);
@@ -1238,7 +1238,7 @@ void imagewindowfit::set
mainViewer->setdisplaymode(static_cast<displaymode>(maybenextmode));
break;
default:
- dbgprintf("Diplay mode given (%d) is incorrect\n", maybenextmode);
+ dbgprintf("Display mode given (%d) is incorrect\n", maybenextmode);
break; // don't change the display mode
}
mainMenuBar->redraw();
diff --git a/transferFunction.cxx b/transferFunction.cxx
index f15fec3..c8d3b38 100644
--- a/transferFunction.cxx
+++ b/transferFunction.cxx
@@ -559,7 +559,7 @@ void applytoallbutton_cb(Fl_Check_Button *b, transfer *panel)
applyTransferToAll = b->value();
switch (applyTransferToAll) {
case 0:
- dbgprintf("Will apply tranfer function only to currently displayed image\n");
+ dbgprintf("Will apply transfer function only to currently displayed image\n");
break;
default:
dbgprintf("Will apply transfer function to all image/components, etc\n");
|
