Skip to content

Commit 133854f

Browse files
committed
fix minor spelling mistakes; change character encoding from CP1252 and ISO-8859-15 to UTF-8
1 parent 5383bac commit 133854f

File tree

158 files changed

+282
-282
lines changed

Some content is hidden

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

158 files changed

+282
-282
lines changed

Diff for: README.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ gptoolbox - Geometry Processing Toolbox
33

44
<https://github.com/alecjacobson/gptoolbox/>
55

6-
This is a toolbox of useful matlab functions for geometry processing. There are
7-
also tools related to constrainted optimization and image processing. Typically
6+
This is a toolbox of useful MATLAB functions for geometry processing. There are
7+
also tools related to constrained optimization and image processing. Typically
88
these are utility functions that are not stand alone applications.
99

10-
Here's an incomplete list of cool features this matlab toolbox contains:
10+
Here's an incomplete list of cool features this MATLAB toolbox contains:
1111

1212
- wrappers for TetGen, Triangle, QSlim, meshfix
1313
- mesh smoothing
@@ -29,7 +29,7 @@ Here's an incomplete list of cool features this matlab toolbox contains:
2929
- constructive solid geometry operations on meshes, booleans
3030
- accelerated point location in triangle and tetrahedral meshes
3131
- image dithering
32-
- deep matlab function dependency
32+
- deep MATLAB function dependency
3333

3434
The functions have been organized into folders based on their primary
3535
application:
@@ -45,7 +45,7 @@ application:
4545

4646
## Installation ##
4747
The vast majority of this code is __straight MATLAB__ (`*.m` files). Thus, only
48-
installing MATLAB and adding the qptoolbox directory and its subdirectories to
48+
installing MATLAB and adding the gptoolbox directory and its subdirectories to
4949
your MATLAB path is needed for installation. Let's assume you cloned gptoolbox
5050
at `/usr/local/gptoolbox/`, then you could issue:
5151

@@ -64,18 +64,18 @@ respective `mex/README.md` file.
6464
This strives to be full installation instructions, but will no doubt remain
6565
incomplete for some time. Begin by adding paths as above.
6666

67-
As stated above, most files are straight matlab and will _just run_ if you have
67+
As stated above, most files are straight MATLAB and will _just run_ if you have
6868
gptoolbox in your path.
6969

7070
#### Compile `/mex` ####
7171
Most of our mex files will depend on
72-
[libigl](https://github.com/libigl/libigl). The following will assume your
73-
usign a "standard" unix-y install of libigl as a static library.
72+
[libigl](https://github.com/libigl/libigl). The following will assume you are
73+
using a "standard" unix-y install of libigl as a static library.
7474

7575
In MATLAB issue:
7676

7777
cd mex
78-
compile_qptoolbox_mex
78+
compile_gptoolbox_mex
7979

8080
#### Compile `toolbox_fast_marching` ####
8181

@@ -120,8 +120,8 @@ We will probably switch to a MPL2 license in the near future.
120120
The Geometry Processing Toolbox grew out of Alec Jacobson's private codebase
121121
during his PhD, but has benefited a lot from various collaborators at NYU and
122122
ETH Zurich. Now, the Geometry Processing Toolbox is a group endeavour. If
123-
you're intersted in contributing, please contact Alec Jacobson
124-
([email protected]) or submit a pull request on github.
123+
you're interested in contributing, please contact Alec Jacobson
124+
([email protected]) or submit a pull request on GitHub.
125125

126126
## Documentation ##
127127
For now, documentation is limited to a per-function basis. For example, to find

Diff for: external/combn.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
% See also PERMS, NCHOOSEK
2727
% and COMBNSUB, ALLCOMB, and PERMPOS on the File Exchange
2828

29-
% tested in Matlab R13, R14, 2010b
29+
% tested in MATLAB R13, R14, 2010b
3030
% version 4.3 (apr 2013)
3131
% (c) Jos van der Geest
3232

Diff for: external/cprintf.m

+15-15
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
%
1111
% CPRINTF then displays the text in the Command Window using the
1212
% specified STYLE argument. The accepted styles are those used for
13-
% Matlab's syntax highlighting (see: File / Preferences / Colors /
13+
% MATLAB's syntax highlighting (see: File / Preferences / Colors /
1414
% M-file Syntax Highlighting Colors), and also user-defined colors.
1515
%
1616
% The possible pre-defined STYLE names are:
@@ -33,11 +33,11 @@
3333
% STYLE beginning with '*' will be bold (R2011b+ only). For example:
3434
% '*Blue' is bold blue;
3535
% '*Comments' is bold green etc.
36-
% Note: Matlab does not currently support both bold and underline,
36+
% Note: MATLAB does not currently support both bold and underline,
3737
% only one of them can be used in a single cprintf command. But of
3838
% course bold and underline can be mixed by using separate commands.
3939
%
40-
% STYLE also accepts a regular Matlab RGB vector, that can be underlined
40+
% STYLE also accepts a regular MATLAB RGB vector, that can be underlined
4141
% and bolded: -[0,1,1] means underlined cyan, '*[1,0,0]' is bold red.
4242
%
4343
% STYLE is case-insensitive and accepts unique partial strings just
@@ -63,8 +63,8 @@
6363
% Please send to Yair Altman (altmany at gmail dot com)
6464
%
6565
% Warning:
66-
% This code heavily relies on undocumented and unsupported Matlab
67-
% functionality. It works on Matlab 7+, but use at your own risk!
66+
% This code heavily relies on undocumented and unsupported MATLAB
67+
% functionality. It works on MATLAB 7+, but use at your own risk!
6868
%
6969
% A technical description of the implementation can be found at:
7070
% <a href="http://undocumentedmatlab.com/blog/cprintf/">http://UndocumentedMatlab.com/blog/cprintf/</a>
@@ -75,7 +75,7 @@
7575
%
7676
% 2. In R2011a and earlier, consecutive differently-colored multi-line
7777
% CPRINTFs sometimes display incorrectly on the bottom line.
78-
% As far as I could tell this is due to a Matlab bug. Examples:
78+
% As far as I could tell this is due to a MATLAB bug. Examples:
7979
% >> cprintf('-str','under\nline'); cprintf('err','red\n'); % hidden 'red', unhidden '_'
8080
% >> cprintf('str','regu\nlar'); cprintf('err','red\n'); % underline red (not purple) 'lar'
8181
%
@@ -88,7 +88,7 @@
8888
% the last character of an underlined segment is not underlined for
8989
% some unknown reason (add an extra space character to make it look better)
9090
%
91-
% 5. In old Matlab versions (e.g., Matlab 7.1 R14), multi-line styles
91+
% 5. In old MATLAB versions (e.g., MATLAB 7.1 R14), multi-line styles
9292
% only affect the first line. Single-line styles work as expected.
9393
% R14 also appends a single space after underlined segments.
9494
%
@@ -102,7 +102,7 @@
102102
% 2011-03-04: Performance improvement
103103
% 2010-06-27: Fix for R2010a/b; fixed edge case reported by Sharron; CPRINTF with no args runs the demo
104104
% 2009-09-28: Fixed edge-case problem reported by Swagat K
105-
% 2009-05-28: corrected nargout behavior sugegsted by Andreas Gäb
105+
% 2009-05-28: corrected nargout behavior sugegsted by Andreas Gäb
106106
% 2009-05-13: First version posted on <a href="http://www.mathworks.com/matlabcentral/fileexchange/authors/27420">MathWorks File Exchange</a>
107107
%
108108
% See also:
@@ -142,7 +142,7 @@
142142

143143
% In compiled mode
144144
try useDesktop = usejava('desktop'); catch, useDesktop = false; end
145-
if isdeployed | ~useDesktop %#ok<OR2> - for Matlab 6 compatibility
145+
if isdeployed | ~useDesktop %#ok<OR2> - for MATLAB 6 compatibility
146146
% do not display any formatting - use simple fprintf()
147147
% See: http://undocumentedmatlab.com/blog/bold-color-text-in-the-command-window/#comment-103035
148148
% Also see: https://mail.google.com/mail/u/0/?ui=2&shva=1#all/1390a26e7ef4aa4d
@@ -157,7 +157,7 @@
157157
if underlineFlag
158158
format = ['<a href="">' format '</a>'];
159159

160-
% Matlab 7.1 R14 (possibly a few newer versions as well?)
160+
% MATLAB 7.1 R14 (possibly a few newer versions as well?)
161161
% have a bug in rendering consecutive hyperlinks
162162
% This is fixed by appending a single non-linked space
163163
if majorVersion < 7 || (majorVersion==7 && minorVersion <= 1)
@@ -213,7 +213,7 @@
213213
if majorVersion<7 || (majorVersion==7 && minorVersion<13)
214214
if bolFlag && ~underlineFlag
215215
% Set the leading hyperlink space character ('_') to the bg color, effectively hiding it
216-
% Note: old Matlab versions have a bug in hyperlinks that need to be accounted for...
216+
% Note: old MATLAB versions have a bug in hyperlinks that need to be accounted for...
217217
%disp(' '); dumpElement(docElement)
218218
setElementStyle(docElement,'CW_BG_Color',1+underlineFlag,majorVersion,minorVersion); %+getUrlsFix(docElement));
219219
%disp(' '); dumpElement(docElement)
@@ -277,7 +277,7 @@
277277
style = style(~boldIdx);
278278
end
279279
if underlineFlag && boldFlag
280-
warning('YMA:cprintf:BoldUnderline','Matlab does not support both bold & underline')
280+
warning('YMA:cprintf:BoldUnderline','MATLAB does not support both bold & underline')
281281
end
282282

283283
% Check if the remaining style sting is a numeric vector
@@ -288,7 +288,7 @@
288288
end
289289
end
290290

291-
% Style = valid matlab RGB vector
291+
% Style = valid MATLAB RGB vector
292292
if isnumeric(style) && length(style)==3 && all(style<=1) && all(abs(style)>=0)
293293
if any(style<0)
294294
underlineFlag = 1;
@@ -336,14 +336,14 @@
336336
end
337337
end
338338

339-
% Convert a Matlab RGB vector into a known style name (e.g., '[255,37,0]')
339+
% Convert a MATLAB RGB vector into a known style name (e.g., '[255,37,0]')
340340
function styleName = getColorStyle(rgb)
341341
intColor = int32(rgb*255);
342342
javaColor = java.awt.Color(intColor(1), intColor(2), intColor(3));
343343
styleName = sprintf('[%d,%d,%d]',intColor);
344344
com.mathworks.services.Prefs.setColorPref(styleName,javaColor);
345345

346-
% Fix a bug in some Matlab versions, where the number of URL segments
346+
% Fix a bug in some MATLAB versions, where the number of URL segments
347347
% is larger than the number of style segments in a doc element
348348
function delta = getUrlsFix(docElement) %#ok currently unused
349349
tokens = docElement.getAttribute('SyntaxTokens');

Diff for: external/exactgeodesic/readme.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The nice property of the subdivision algorithm is that it becomes Dijkstra when
1111

1212
The input mesh is represented as two arrays: vertices (each vertex has tree coordinates) and faces (each face is represented as indices of its vertices). Most of the communication with the algorithms is done through SurfacePoints (points on the surface of the mesh; they have three coordinates and a pointer to a mesh element they belong).
1313

14-
The algorithms are available as C++ code (downloadable at http://code.google.com/p/geodesic/) and Matlab toolbox (downloadable at MathWorks File Exchange).
14+
The algorithms are available as C++ code (downloadable at http://code.google.com/p/geodesic/) and MATLAB toolbox (downloadable at MathWorks File Exchange).
1515

1616
C++ NOTES
1717
The base class of for all algorithms is GeodesicAlgorithmBase (defined in geodesic_algorithm_base.h). The most important functions defined in this class are
@@ -49,5 +49,5 @@ Danil Kirsanov, 01/2008
4949

5050

5151
CHANGES ON 03/03/08
52-
- fixed libpointer conflict with matlab 2007b
53-
- fixed cellfun error with earlier versions of matlab
52+
- fixed libpointer conflict with MATLAB 2007b
53+
- fixed cellfun error with earlier versions of MATLAB

Diff for: external/hex2rgb.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
%
2929
% See also HEX2DEC
3030

31-
% Created in Matlab R2011b
31+
% Created in MATLAB R2011b
3232
% version 1.0 (feb 2014)
3333
% (c) Jos van der Geest
3434

Diff for: external/matlabPyrTools/MEX/corrDn.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
RES = corrDn(IM, FILT, EDGES, STEP, START, STOP);
33
>>> See corrDn.m for documentation <<<
4-
This is a matlab interface to the internal_reduce function.
4+
This is a MATLAB interface to the internal_reduce function.
55
EPS, 7/96.
66
*/
77

88
#define V4_COMPAT
9-
#include <matrix.h> /* Matlab matrices */
9+
#include <matrix.h> /* MATLAB matrices */
1010
#include <mex.h>
1111

1212
#include "convolve.h"
@@ -89,7 +89,7 @@ void mexFunction(int nlhs, /* Num return vals on lhs */
8989
(y_start<1) || (y_start>y_idim))
9090
mexErrMsgTxt("START values must lie between 1 and the image dimensions.");
9191
}
92-
x_start--; /* convert from Matlab to standard C indexes */
92+
x_start--; /* convert from MATLAB to standard C indexes */
9393
y_start--;
9494

9595
/* ARG 6 (optional): STOP */

Diff for: external/matlabPyrTools/MEX/histo.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
#define V4_COMPAT
8-
#include <matrix.h> /* Matlab matrices */
8+
#include <matrix.h> /* MATLAB matrices */
99
#include <mex.h>
1010

1111
#include <stddef.h> /* NULL */

Diff for: external/matlabPyrTools/MEX/pointOp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ RES = pointOp(IM, LUT, ORIGIN, INCREMENT, WARNINGS)
55
*/
66

77
#define V4_COMPAT
8-
#include <matrix.h> /* Matlab matrices */
8+
#include <matrix.h> /* MATLAB matrices */
99
#include <mex.h>
1010

1111
#include <stddef.h> /* NULL */

Diff for: external/matlabPyrTools/MEX/range2.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66

77
#define V4_COMPAT
8-
#include <matrix.h> /* Matlab matrices */
8+
#include <matrix.h> /* MATLAB matrices */
99
#include <mex.h>
1010

1111
#include <stddef.h> /* NULL */

Diff for: external/matlabPyrTools/MEX/upConv.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/*
22
RES = upConv(IM, FILT, EDGES, STEP, START, STOP, RES);
33
>>> See upConv.m for documentation <<<
4-
This is a matlab interface to the internal_expand function.
4+
This is a MATLAB interface to the internal_expand function.
55
EPS, 7/96.
66
*/
77

88
#define V4_COMPAT
9-
#include <matrix.h> /* Matlab matrices */
9+
#include <matrix.h> /* MATLAB matrices */
1010
#include <mex.h>
1111

1212
#include "convolve.h"
@@ -109,7 +109,7 @@ void mexFunction(int nlhs, /* Num return vals on lhs */
109109
arg6 = prhs[6];
110110
if notDblMtx(arg6) mexErrMsgTxt("RES arg must be double float matrix.");
111111

112-
/* 7/10/97: Returning one of the args causes problems with Matlab's memory
112+
/* 7/10/97: Returning one of the args causes problems with MATLAB's memory
113113
manager, so we don't return anything if the result image is passed */
114114
/* plhs[0] = arg; */
115115
result = mxGetPr(arg6);

Diff for: external/matlabPyrTools/README

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
=========================== matlabPyrTools ============================
22

3-
This package contains some MatLab tools for multi-scale image
3+
This package contains some MATLAB tools for multi-scale image
44
processing. Briefly, the tools include:
55
- Recursive multi-scale image decompositions (pyramids), including
66
Laplacian pyramids, QMFs, Wavelets, and steerable pyramids. These
77
operate on 1D or 2D signals of arbitrary dimension. Data
8-
structures are compatible with the MatLab wavelet toolbox.
8+
structures are compatible with the MATLAB wavelet toolbox.
99
- Fast 2D convolution routines, with subsampling and boundary-handling.
1010
- Fast point-operations, histograms, histogram-matching.
1111
- Fast synthetic image generation: sine gratings, zone plates, fractals, etc.
@@ -16,14 +16,14 @@ processing. Briefly, the tools include:
1616
The package is available as a gnu-zipped UNIX "tar" file, accessible
1717
from the web page: http://www.cns.nyu.edu/~lcv/software.html
1818

19-
The code was originally written in Matlab version 4.2, and continues
19+
The code was originally written in MATLAB version 4.2, and continues
2020
to work in new versions (as of 12/09). To use the code (these lines
2121
are for UNIX):
2222
1) gunzip matlabPyrTools.tar.gz # unpack g'zipped file
2323
2) tar tvf matlabPyrTools.tar # view contents
2424
3) tar xvf matlabPyrTools.tar # extract into directory "matlabPyrTools"
2525
4) rm matlabPyrTools.tar # delete tarfile
26-
5) Run matlab, and execute:
26+
5) Run MATLAB, and execute:
2727
addpath(<full-pathname-of-matlabPyrTools>);
2828
help matlabPyrTools
2929

@@ -36,12 +36,12 @@ as well as Make files. Pre-compiled versions are included for a
3636
number of platforms. To compile on your platform, simply run
3737
compilePyrTools.m which is located in the MEX subdirectory.
3838

39-
To make sure these are in your matlab path, you can do *one* of the
39+
To make sure these are in your MATLAB path, you can do *one* of the
4040
following:
4141
1) Create a symbolic link (or macintosh "alias") for the relavent files
4242
in the main matlabPyrTools directory, or
4343
2) Copy the relavent files into the main matlabPyrTools directory, or
44-
3) Put the MEX subdirectory in your matlab path: addpath('matlabPyrTools/MEX');
44+
3) Put the MEX subdirectory in your MATLAB path: addpath('matlabPyrTools/MEX');
4545

4646
Some example script files showing usage of the code are in the
4747
directory <dir>/TUTORIALS. There is a README file in that directory

Diff for: external/matlabPyrTools/TUTORIALS/README

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11

2-
This directory contains some Matlab script files that serve to give
2+
This directory contains some MATLAB script files that serve to give
33
example usage of this code, and also to explain some of the
44
representations and algorithms.
55

6-
The files are NOT meant to be executed from the MatLab prompt (like many
7-
of the MatLab demos). You should instead read through the comments,
6+
The files are NOT meant to be executed from the MATLAB prompt (like many
7+
of the MATLAB demos). You should instead read through the comments,
88
executing the subsequent pieces of code. This gives you a chance to
99
explore as you go...
1010

Diff for: external/matlabPyrTools/reconSCFpyr.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
%
1313
% PYR is a vector containing the N pyramid subbands, ordered from fine
1414
% to coarse. INDICES is an Nx2 matrix containing the sizes of
15-
% each subband. This is compatible with the MatLab Wavelet toolbox.
15+
% each subband. This is compatible with the MATLAB Wavelet toolbox.
1616
%
1717
% LEVS (optional) should be a list of levels to include, or the string
1818
% 'all' (default). 0 corresonds to the residual highpass subband.
@@ -26,7 +26,7 @@
2626
% function, in octaves (default = 1, which gives a raised cosine for
2727
% the bandpass filters).
2828

29-
% Javier Portilla, 7/04, basing on Eero Simoncelli's Matlab Pyrtools code
29+
% Javier Portilla, 7/04, basing on Eero Simoncelli's MATLAB Pyrtools code
3030
% and our common code on texture synthesis (textureSynthesis.m).
3131

3232
function res = reconSCFpyr(pyr, indices, levs, bands, twidth)

0 commit comments

Comments
 (0)