Skip to content

Commit 45b7425

Browse files
authored
Merge pull request #597 from Monstertov/fix-typos
Fix typos without newline changes
2 parents d5113e2 + a2dc275 commit 45b7425

File tree

42 files changed

+62
-62
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+62
-62
lines changed

3rdParty/QtWavFile/WavFile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* The git repo for Qt multimedia code and exmamples is https://code.qt.io/qt/qtmultimedia.git
88
* The version of the code is Qt5.
99
* Since the code is licensed by Qt under BSD, we can safely use it with our code base, provided
10-
* that we have the orignal BSD license below and release the source code.
10+
* that we have the original BSD license below and release the source code.
1111
*/
1212

1313
/****************************************************************************

Common/Cpp/LifetimeSanitizer.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ void LifetimeSanitizer::check_usage() const{
110110
}
111111
auto iter = sanitizer_map.find(this);
112112
if (iter == sanitizer_map.end()){
113-
std::cerr << "Use non-existant: " << this << " : " << m_name << std::endl;
113+
std::cerr << "Use non-existent: " << this << " : " << m_name << std::endl;
114114
terminate_with_dump();
115115
}
116116
if (m_token != SANITIZER_TOKEN || m_self != this){
@@ -128,7 +128,7 @@ void LifetimeSanitizer::start_using() const{
128128
}
129129
auto iter = sanitizer_map.find(this);
130130
if (iter == sanitizer_map.end()){
131-
std::cerr << "Start using non-existant: " << this << " : " << m_name << std::endl;
131+
std::cerr << "Start using non-existent: " << this << " : " << m_name << std::endl;
132132
terminate_with_dump();
133133
}
134134
if (m_token != SANITIZER_TOKEN || m_self != this){
@@ -147,7 +147,7 @@ void LifetimeSanitizer::done_using() const{
147147
}
148148
auto iter = sanitizer_map.find(this);
149149
if (iter == sanitizer_map.end()){
150-
std::cerr << "Done using non-existant: " << this << " : " << m_name << std::endl;
150+
std::cerr << "Done using non-existent: " << this << " : " << m_name << std::endl;
151151
terminate_with_dump();
152152
}
153153
if (m_token != SANITIZER_TOKEN || m_self != this){
@@ -183,13 +183,13 @@ void LifetimeSanitizer::internal_destruct(){
183183

184184
auto iter = sanitizer_map.find(this);
185185
if (iter == sanitizer_map.end()){
186-
std::cerr << "LifetimeSanitizer - Free non-existant: " << this << " : " << m_name << std::endl;
186+
std::cerr << "LifetimeSanitizer - Free non-existent: " << this << " : " << m_name << std::endl;
187187
terminate_with_dump();
188188
}
189189
sanitizer_map.erase(this);
190190

191191
if (m_token != SANITIZER_TOKEN || m_self != this){
192-
std::cerr << "LifetimeSanitizer - Free non-existant: " << this << " : " << m_name << std::endl;
192+
std::cerr << "LifetimeSanitizer - Free non-existent: " << this << " : " << m_name << std::endl;
193193
terminate_with_dump();
194194
}
195195
if (m_use_counter != 0){

Common/Qt/WidgetStackFixedAspectRatio.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ void WidgetStackFixedAspectRatio::resize_to_width(int width){
118118
// cout << "WidgetStackFixedAspectRatio::resize_to_width(): " << width << " <- " << previous_width << endl;
119119

120120
if (width > previous_width && width < previous_width + 50 && !m_debouncer.check(width)){
121-
// cout << "Supressing potential infinite resizing loop." << endl;
121+
// cout << "Suppressing potential infinite resizing loop." << endl;
122122
return;
123123
}
124124

SerialPrograms/Scripts/check_detector_regions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
"""
44
A script used to fine-tune detection box placements and check the color stats from those boxes.
5-
After using image_viewer.py to get an intial box placement, you can place the box values
5+
After using image_viewer.py to get an initial box placement, you can place the box values
66
(x, y, width, height) into this script, repeating the line
77
add_infer_box_to_image(raw_image, <x>, <y>, <width>, <height>, image)
88
to add a box onto the image.

SerialPrograms/Scripts/image_viewer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
Single left clicking on a pixel shows you the info of that pixel. Note it may also print the
99
alpha channel value.
1010
11-
- Press 'w', 's', 'a', 'd' to move the slected pixels around.
11+
- Press 'w', 's', 'a', 'd' to move the selected pixels around.
1212
13-
To draw a box: left click and drag the rectange.
13+
To draw a box: left click and drag the rectangle.
1414
You can draw multiple boxes on the screen.
1515
1616
- Press 'i' to dump the information of those boxes so you can copy them into the code,
@@ -42,7 +42,7 @@ def __init__(self, image, highlight_list = []):
4242
self.mouse_down = False
4343
self.mouse_move_counter = 0
4444
self.nc = image.shape[2] # num_channel
45-
# The size of the cross used to highlight a slected pixel
45+
# The size of the cross used to highlight a selected pixel
4646
self.cross_size = max(1, min(self.width, self.height) // 200)
4747

4848
def _solid_color(self, color):

SerialPrograms/Source/CommonFramework/AudioPipeline/UI/AudioDisplayWidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ void AudioDisplayWidget::update_size(){
181181
}
182182

183183
if (height > m_previous_height && height < m_previous_height + 10 && !m_debouncer.check(height)){
184-
// cout << "Supressing potential infinite resizing loop." << endl;
184+
// cout << "Suppressing potential infinite resizing loop." << endl;
185185
return;
186186
}
187187

SerialPrograms/Source/CommonTools/Audio/AudioPerSpectrumDetectorBase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ bool AudioPerSpectrumDetectorBase::process_spectrums(
9999
}
100100

101101
const size_t sample_rate = new_spectrums[0].sample_rate;
102-
// Lazy intialization of the spectrogram matcher.
102+
// Lazy initialization of the spectrogram matcher.
103103
if (m_matcher == nullptr || m_matcher->sample_rate() != sample_rate){
104104
m_logger.log("Loading spectrogram...");
105105
m_matcher = build_spectrogram_matcher(sample_rate);

SerialPrograms/Source/CommonTools/Audio/SpectrogramMatcher.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ SpectrogramMatcher::SpectrogramMatcher(
6767

6868
const size_t halfSampleRate = sample_rate / 2;
6969

70-
// The frquency range from [0.0, halfSampleRate / numFrequencies, 2.0 halfSampleRate / numFrequencies, ... (numFrequencies-1) halfSampleRate / numFrequencies]
70+
// The frequency range from [0.0, halfSampleRate / numFrequencies, 2.0 halfSampleRate / numFrequencies, ... (numFrequencies-1) halfSampleRate / numFrequencies]
7171
// Since human can only hear as high as 20KHz sound, matching on frequencies >= 20KHz is meaningless.
7272
// So the index i of the max frequency we should be matching is the one with
7373
// i * halfSampleRate/numFrequencies <= 20KHz
@@ -368,7 +368,7 @@ float SpectrogramMatcher::match(const std::vector<AudioSpectrum>& new_spectrums)
368368
// Match the full template
369369
std::tie(score, m_lastScale) = match_sub_template(0);
370370
}else{
371-
// Match each indivdual sub-template
371+
// Match each individual sub-template
372372
for (size_t sub_template = 0; sub_template < m_templateRange.size(); sub_template++){
373373
float sub_template_score = FLT_MAX;
374374
float sub_template_scale = 1.0f;

SerialPrograms/Source/CommonTools/ImageMatch/ExactImageDictionaryMatcher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace ImageMatch{
2323

2424
// Generate candidate images to be matched against by translating the input image area
2525
// (`box` on `screen`) around.
26-
// The returned candidate images are scaled to match template shape `dimenstion`.
26+
// The returned candidate images are scaled to match template shape `dimension`.
2727
// `tolerance`: how much translation variances to produce.
2828
// e.g. tolerance of 1 means translating the candidate images around so that it can match
2929
// the template with at most 1 pixel off on the template image.

SerialPrograms/Source/CommonTools/Images/ImageGradient.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace PokemonAutomation{
1818
size_t count_horizontal_translucent_border_pixels(const ImageViewRGB32& image, const Color& threshold, bool dark_top){
1919
// Gradient on each color channel at each pixel in one row
2020
std::vector<int16_t> gradients(image.width() * 3, 0);
21-
// Whetehr a color channel is zero for each pixel in one row
21+
// Whether a color channel is zero for each pixel in one row
2222
std::vector<bool> is_zero(image.width() * 3, false);
2323

2424
if (image.height() == 0 || image.width() == 0){

0 commit comments

Comments
 (0)