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
|
Description: Fix spelling errors.
* afer -> after
* datatset -> dataset
* emtpy -> empty
* mininum -> minimum
* ommit -> omit
Author: Bas Couwenberg <sebastic@debian.org>
Forwarded: https://github.com/ec-jrc/jeolib-jiplib/pull/5
Applied-Upstream: https://github.com/ec-jrc/jeolib-jiplib/commit/630d38fda2f4008d69ee2c06721cad7684753af0
--- a/src/imageclasses/jlextractogr_lib.cc
+++ b/src/imageclasses/jlextractogr_lib.cc
@@ -2851,7 +2851,7 @@ CPLErr Jim::extractSample(VectorOgr& ogr
std::cout << "out of region: " << outOfRegion << " from " << trials << " trials"<< std::endl;
if(!ipoint){
ostringstream ess;
- ess << "Error: no random point created afer " << trials << " trials" << endl;
+ ess << "Error: no random point created after " << trials << " trials" << endl;
throw(ess.str());
}
else if(trials>=maxTrials)
--- a/src/imageclasses/jlpolygonize_lib.cc
+++ b/src/imageclasses/jlpolygonize_lib.cc
@@ -112,7 +112,7 @@ void Jim::polygonize(VectorOgr&ogrWriter
}
}
else{
- std::string errorString="Error: clould not create memory dataset for mask datatset";
+ std::string errorString="Error: clould not create memory dataset for mask dataset";
throw(errorString);
}
}
@@ -165,7 +165,7 @@ void Jim::polygonize(VectorOgr&ogrWriter
}
}
else{
- std::string errorString="Error: clould not create memory dataset for input datatset";
+ std::string errorString="Error: clould not create memory dataset for input dataset";
throw(errorString);
}
}
--- a/src/imageclasses/jlann_lib.cc
+++ b/src/imageclasses/jlann_lib.cc
@@ -110,7 +110,7 @@ std::string VectorOgr::trainANN(app::App
FANN::neural_net net;//the neural network
// if(model_opt.empty()){
- // std::string errorString="Error: filename to save model is emtpy";
+ // std::string errorString="Error: filename to save model is empty";
// throw(errorString);
// }
--- a/src/imageclasses/jlclassify_lib.cc
+++ b/src/imageclasses/jlclassify_lib.cc
@@ -103,7 +103,7 @@ void VectorOgr::train(app::AppFactory& a
throw(helpStream.str());//help was invoked, stop processing
}
if(model_opt.empty()){
- std::string errorString="Error: filename to save model is emtpy";
+ std::string errorString="Error: filename to save model is empty";
throw(errorString);
}
switch(getClassifier(method_opt[0])){
--- a/src/imageclasses/jlsml_lib.cc
+++ b/src/imageclasses/jlsml_lib.cc
@@ -103,7 +103,7 @@ void Jim::trainSML(JimList& referenceRea
try{
// doProcess=model_opt.retrieveOption(app);
// if(model_opt.empty()){
- // std::string errorString="Error: filename to save model is emtpy";
+ // std::string errorString="Error: filename to save model is empty";
// throw(errorString);
// }
// std::ofstream outputStream(model_opt[0]);
@@ -167,7 +167,7 @@ void Jim::trainSML2d(JimList& referenceR
throw(helpStream.str());//help was invoked, stop processing
}
if(model_opt.empty()){
- std::string errorString="Error: filename to save model is emtpy";
+ std::string errorString="Error: filename to save model is empty";
throw(errorString);
}
std::ofstream outputStream(model_opt[0]);
--- a/src/imageclasses/jlsvm_lib.cc
+++ b/src/imageclasses/jlsvm_lib.cc
@@ -153,7 +153,7 @@ std::string VectorOgr::trainSVM(app::App
kernelMap["sigmoid;"]=svm::sigmoid;
// if(model_opt.empty()){
- // std::string errorString="Error: filename to save model is emtpy";
+ // std::string errorString="Error: filename to save model is empty";
// throw(errorString);
// }
--- a/src/imageclasses/Jim.cc
+++ b/src/imageclasses/Jim.cc
@@ -2605,7 +2605,7 @@ CPLErr Jim::readDataPlanes(std::vector<i
/**
* @param x Reported column where minimum value in image was found (start counting from 0)
* @param y Reported row where minimum value in image was found (start counting from 0)
- * @param band Search mininum value in image for this band
+ * @param band Search minimum value in image for this band
* @return minimum value in image for the selected band
**/
double Jim::getMin(int& x, int& y, int band){
@@ -2641,7 +2641,7 @@ double Jim::getMin(int& x, int& y, int b
/**
* @param x Reported column where maximum value in image was found (start counting from 0)
* @param y Reported row where maximum value in image was found (start counting from 0)
- * @param band Search mininum value in image for this band
+ * @param band Search minimum value in image for this band
* @return maximum value in image for the selected band
**/
double Jim::getMax(int& x, int& y, int band){
--- a/src/imageclasses/jlstretch_lib.cc
+++ b/src/imageclasses/jlstretch_lib.cc
@@ -53,7 +53,7 @@ void Jim::stretch(Jim& imgWriter, app::A
Optionjl<double> nodata_opt("nodata", "nodata", "nodata value(s) (first value will be put in output image)");
Optionjl<double> src_min_opt("src_min","src_min","clip source below this minimum value");
Optionjl<double> src_max_opt("src_max","src_max","clip source above this maximum value");
- Optionjl<double> fromValue_opt("dst_min", "dst_min", "mininum value in output image", 0);
+ Optionjl<double> fromValue_opt("dst_min", "dst_min", "minimum value in output image", 0);
Optionjl<double> toValue_opt("dst_max", "dst_max", "maximum value in output image", 255);
Optionjl<double> minp_opt("cc_min", "cc_min", "cumulative count cut from");
Optionjl<double> maxp_opt("cc_max", "cc_max", "cumulative count cut to");
--- a/src/imageclasses/jlfilter1d_lib.cc
+++ b/src/imageclasses/jlfilter1d_lib.cc
@@ -64,7 +64,7 @@ using namespace filter;
* @param down (type: short) (default: 1) down sampling factor. Use value 1 for no downsampling. Use value n>1 for downsampling (aggregation)
* @param interp (type: std::string) (default: akima) type of interpolation for spectral filtering (see http://www.gnu.org/software/gsl/manual/html_node/Interpolation-Types.html)
* @param otype (type: std::string) Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image
- * @param ct (type: std::string) color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table
+ * @param ct (type: std::string) color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color table
* @return shared pointer to image object
**/
@@ -101,7 +101,7 @@ shared_ptr<Jim> Jim::filter1d(app::AppFa
* @param down (type: short) (default: 1) down sampling factor. Use value 1 for no downsampling. Use value n>1 for downsampling (aggregation)
* @param interp (type: std::string) (default: akima) type of interpolation for spectral filtering (see http://www.gnu.org/software/gsl/manual/html_node/Interpolation-Types.html)
* @param otype (type: std::string) Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image
- * @param ct (type: std::string) color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table
+ * @param ct (type: std::string) color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color table
**/
void Jim::filter1d(Jim& imgWriter, app::AppFactory& app){
Optionjl<std::string> method_opt("f", "filter", "filter function (nvalid, median, var, min, max, sum, mean, dilate, erode, close, open, mode (majority voting), only for classes), smoothnodata (smooth nodata values only) values, ismin, ismax, order (rank pixels in order), stdev, mrf, dwt, dwti, dwt_cut, dwt_cut_from, savgolay, percentile, proportion)");
@@ -123,7 +123,7 @@ void Jim::filter1d(Jim& imgWriter, app::
Optionjl<double> wavelengthOut_opt("wout", "wavelengthOut", "list of wavelengths in output spectrum (-wout band1 -wout band2 ...)");
Optionjl<std::string> interpolationType_opt("interp", "interp", "type of interpolation for spectral filtering (see http://www.gnu.org/software/gsl/manual/html_node/Interpolation-Types.html)","akima");
Optionjl<std::string> otype_opt("ot", "otype", "Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image");
- Optionjl<std::string> colorTable_opt("ct", "ct", "color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table");
+ Optionjl<std::string> colorTable_opt("ct", "ct", "color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color table");
Optionjl<short> down_opt("d", "down", "down sampling factor. Use value 1 for no downsampling. Use value n>1 for downsampling (aggregation)", 1);
Optionjl<short> verbose_opt("v", "verbose", "verbose mode if > 0", 0,2);
--- a/src/imageclasses/jlfilter2d_lib.cc
+++ b/src/imageclasses/jlfilter2d_lib.cc
@@ -67,7 +67,7 @@ using namespace filter;
* @param down (type: short) (default: 1) down sampling factor. Use value 1 for no downsampling. Use value n>1 for downsampling (aggregation)
* @param beta (type: std::string) ASCII file with beta for each class transition in Markov Random Field
* @param otype (type: std::string) Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image
- * @param ct (type: std::string) color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table
+ * @param ct (type: std::string) color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color table
* @param circular (type: bool) (default: 0) circular disc kernel for dilation and erosion
* @return shared pointer to image object
**/
@@ -99,7 +99,7 @@ shared_ptr<Jim> Jim::filter2d(const app:
* @param down (type: short) (default: 1) down sampling factor. Use value 1 for no downsampling. Use value n>1 for downsampling (aggregation)
* @param beta (type: std::string) ASCII file with beta for each class transition in Markov Random Field
* @param otype (type: std::string) Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image
- * @param ct (type: std::string) color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table
+ * @param ct (type: std::string) color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color table
* @param circular (type: bool) (default: 0) circular disc kernel for dilation and erosion
**/
void Jim::filter2d(Jim& imgWriter, const app::AppFactory& app){
@@ -119,7 +119,7 @@ void Jim::filter2d(Jim& imgWriter, const
Optionjl<bool> norm_opt("norm", "norm", "normalize tap values values when filtering",false);
Optionjl<string> padding_opt("pad","pad", "Padding method for filtering (how to handle edge effects). Choose between: symmetric, replicate, circular, zero (pad with 0).", "symmetric");
Optionjl<std::string> otype_opt("ot", "otype", "Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image");
- Optionjl<string> colorTable_opt("ct", "ct", "color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table");
+ Optionjl<string> colorTable_opt("ct", "ct", "color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color table");
Optionjl<short> down_opt("d", "down", "down sampling factor. Use value 1 for no downsampling. Use value n>1 for downsampling (aggregation)", 1);
Optionjl<string> beta_opt("beta", "beta", "ASCII file with beta for each class transition in Markov Random Field");
Optionjl<short> verbose_opt("v", "verbose", "verbose mode if > 0", 0,2);
--- a/src/imageclasses/jlfilter_lib.cc
+++ b/src/imageclasses/jlfilter_lib.cc
@@ -101,7 +101,7 @@ void Jim::filter(Jim& imgWriter, app::Ap
Optionjl<double> wavelengthOut_opt("wout", "wavelengthOut", "list of wavelengths in output spectrum (-wout band1 -wout band2 ...)");
Optionjl<std::string> interpolationType_opt("interp", "interp", "type of interpolation for spectral filtering (see http://www.gnu.org/software/gsl/manual/html_node/Interpolation-Types.html)","akima");
Optionjl<std::string> otype_opt("ot", "otype", "Data type for output image ({Byte/Int16/UInt16/UInt32/Int32/Float32/Float64/CInt16/CInt32/CFloat32/CFloat64}). Empty string: inherit type from input image");
- Optionjl<string> colorTable_opt("ct", "ct", "color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to ommit color table");
+ Optionjl<string> colorTable_opt("ct", "ct", "color table (file with 5 columns: id R G B ALFA (0: transparent, 255: solid). Use none to omit color table");
Optionjl<short> down_opt("d", "down", "down sampling factor. Use value 1 for no downsampling. Use value n>1 for downsampling (aggregation)", 1);
Optionjl<string> beta_opt("beta", "beta", "ASCII file with beta for each class transition in Markov Random Field");
// Optionjl<double> eps_opt("eps","eps", "error marging for linear feature",0);
|
