Skip to content

fix spelling mistakes; change character encoding from CP1252 and ISO-8859-15 to UTF-8 #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ gptoolbox - Geometry Processing Toolbox

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

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

Here's an incomplete list of cool features this matlab toolbox contains:
Here's an incomplete list of cool features this MATLAB toolbox contains:

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

The functions have been organized into folders based on their primary
application:
Expand All @@ -45,7 +45,7 @@ application:

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

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

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

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

In MATLAB issue:

cd mex
compile_qptoolbox_mex
compile_gptoolbox_mex

#### Compile `toolbox_fast_marching` ####

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

## Documentation ##
For now, documentation is limited to a per-function basis. For example, to find
Expand Down
2 changes: 1 addition & 1 deletion external/combn.m
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
% See also PERMS, NCHOOSEK
% and COMBNSUB, ALLCOMB, and PERMPOS on the File Exchange

% tested in Matlab R13, R14, 2010b
% tested in MATLAB R13, R14, 2010b
% version 4.3 (apr 2013)
% (c) Jos van der Geest
% email: [email protected]
Expand Down
30 changes: 15 additions & 15 deletions external/cprintf.m
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
%
% CPRINTF then displays the text in the Command Window using the
% specified STYLE argument. The accepted styles are those used for
% Matlab's syntax highlighting (see: File / Preferences / Colors /
% MATLAB's syntax highlighting (see: File / Preferences / Colors /
% M-file Syntax Highlighting Colors), and also user-defined colors.
%
% The possible pre-defined STYLE names are:
Expand All @@ -33,11 +33,11 @@
% STYLE beginning with '*' will be bold (R2011b+ only). For example:
% '*Blue' is bold blue;
% '*Comments' is bold green etc.
% Note: Matlab does not currently support both bold and underline,
% Note: MATLAB does not currently support both bold and underline,
% only one of them can be used in a single cprintf command. But of
% course bold and underline can be mixed by using separate commands.
%
% STYLE also accepts a regular Matlab RGB vector, that can be underlined
% STYLE also accepts a regular MATLAB RGB vector, that can be underlined
% and bolded: -[0,1,1] means underlined cyan, '*[1,0,0]' is bold red.
%
% STYLE is case-insensitive and accepts unique partial strings just
Expand All @@ -63,8 +63,8 @@
% Please send to Yair Altman (altmany at gmail dot com)
%
% Warning:
% This code heavily relies on undocumented and unsupported Matlab
% functionality. It works on Matlab 7+, but use at your own risk!
% This code heavily relies on undocumented and unsupported MATLAB
% functionality. It works on MATLAB 7+, but use at your own risk!
%
% A technical description of the implementation can be found at:
% <a href="http://undocumentedmatlab.com/blog/cprintf/">http://UndocumentedMatlab.com/blog/cprintf/</a>
Expand All @@ -75,7 +75,7 @@
%
% 2. In R2011a and earlier, consecutive differently-colored multi-line
% CPRINTFs sometimes display incorrectly on the bottom line.
% As far as I could tell this is due to a Matlab bug. Examples:
% As far as I could tell this is due to a MATLAB bug. Examples:
% >> cprintf('-str','under\nline'); cprintf('err','red\n'); % hidden 'red', unhidden '_'
% >> cprintf('str','regu\nlar'); cprintf('err','red\n'); % underline red (not purple) 'lar'
%
Expand All @@ -88,7 +88,7 @@
% the last character of an underlined segment is not underlined for
% some unknown reason (add an extra space character to make it look better)
%
% 5. In old Matlab versions (e.g., Matlab 7.1 R14), multi-line styles
% 5. In old MATLAB versions (e.g., MATLAB 7.1 R14), multi-line styles
% only affect the first line. Single-line styles work as expected.
% R14 also appends a single space after underlined segments.
%
Expand All @@ -102,7 +102,7 @@
% 2011-03-04: Performance improvement
% 2010-06-27: Fix for R2010a/b; fixed edge case reported by Sharron; CPRINTF with no args runs the demo
% 2009-09-28: Fixed edge-case problem reported by Swagat K
% 2009-05-28: corrected nargout behavior sugegsted by Andreas G�b
% 2009-05-28: corrected nargout behavior sugegsted by Andreas Gäb
% 2009-05-13: First version posted on <a href="http://www.mathworks.com/matlabcentral/fileexchange/authors/27420">MathWorks File Exchange</a>
%
% See also:
Expand Down Expand Up @@ -142,7 +142,7 @@

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

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

% Check if the remaining style sting is a numeric vector
Expand All @@ -288,7 +288,7 @@
end
end

% Style = valid matlab RGB vector
% Style = valid MATLAB RGB vector
if isnumeric(style) && length(style)==3 && all(style<=1) && all(abs(style)>=0)
if any(style<0)
underlineFlag = 1;
Expand Down Expand Up @@ -336,14 +336,14 @@
end
end

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

% Fix a bug in some Matlab versions, where the number of URL segments
% Fix a bug in some MATLAB versions, where the number of URL segments
% is larger than the number of style segments in a doc element
function delta = getUrlsFix(docElement) %#ok currently unused
tokens = docElement.getAttribute('SyntaxTokens');
Expand Down
6 changes: 3 additions & 3 deletions external/exactgeodesic/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The nice property of the subdivision algorithm is that it becomes Dijkstra when

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).

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

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


CHANGES ON 03/03/08
- fixed libpointer conflict with matlab 2007b
- fixed cellfun error with earlier versions of matlab
- fixed libpointer conflict with MATLAB 2007b
- fixed cellfun error with earlier versions of MATLAB
2 changes: 1 addition & 1 deletion external/hex2rgb.m
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
%
% See also HEX2DEC

% Created in Matlab R2011b
% Created in MATLAB R2011b
% version 1.0 (feb 2014)
% (c) Jos van der Geest
% email: [email protected]
Expand Down
6 changes: 3 additions & 3 deletions external/matlabPyrTools/MEX/corrDn.c
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
RES = corrDn(IM, FILT, EDGES, STEP, START, STOP);
>>> See corrDn.m for documentation <<<
This is a matlab interface to the internal_reduce function.
This is a MATLAB interface to the internal_reduce function.
EPS, 7/96.
*/

#define V4_COMPAT
#include <matrix.h> /* Matlab matrices */
#include <matrix.h> /* MATLAB matrices */
#include <mex.h>

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

/* ARG 6 (optional): STOP */
Expand Down
2 changes: 1 addition & 1 deletion external/matlabPyrTools/MEX/histo.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

#define V4_COMPAT
#include <matrix.h> /* Matlab matrices */
#include <matrix.h> /* MATLAB matrices */
#include <mex.h>

#include <stddef.h> /* NULL */
Expand Down
2 changes: 1 addition & 1 deletion external/matlabPyrTools/MEX/pointOp.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RES = pointOp(IM, LUT, ORIGIN, INCREMENT, WARNINGS)
*/

#define V4_COMPAT
#include <matrix.h> /* Matlab matrices */
#include <matrix.h> /* MATLAB matrices */
#include <mex.h>

#include <stddef.h> /* NULL */
Expand Down
2 changes: 1 addition & 1 deletion external/matlabPyrTools/MEX/range2.c
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

#define V4_COMPAT
#include <matrix.h> /* Matlab matrices */
#include <matrix.h> /* MATLAB matrices */
#include <mex.h>

#include <stddef.h> /* NULL */
Expand Down
6 changes: 3 additions & 3 deletions external/matlabPyrTools/MEX/upConv.c
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
RES = upConv(IM, FILT, EDGES, STEP, START, STOP, RES);
>>> See upConv.m for documentation <<<
This is a matlab interface to the internal_expand function.
This is a MATLAB interface to the internal_expand function.
EPS, 7/96.
*/

#define V4_COMPAT
#include <matrix.h> /* Matlab matrices */
#include <matrix.h> /* MATLAB matrices */
#include <mex.h>

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

/* 7/10/97: Returning one of the args causes problems with Matlab's memory
/* 7/10/97: Returning one of the args causes problems with MATLAB's memory
manager, so we don't return anything if the result image is passed */
/* plhs[0] = arg; */
result = mxGetPr(arg6);
Expand Down
12 changes: 6 additions & 6 deletions external/matlabPyrTools/README
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
=========================== matlabPyrTools ============================

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

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

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

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

Some example script files showing usage of the code are in the
directory <dir>/TUTORIALS. There is a README file in that directory
Expand Down
6 changes: 3 additions & 3 deletions external/matlabPyrTools/TUTORIALS/README
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

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

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

Expand Down
4 changes: 2 additions & 2 deletions external/matlabPyrTools/reconSCFpyr.m
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
%
% PYR is a vector containing the N pyramid subbands, ordered from fine
% to coarse. INDICES is an Nx2 matrix containing the sizes of
% each subband. This is compatible with the MatLab Wavelet toolbox.
% each subband. This is compatible with the MATLAB Wavelet toolbox.
%
% LEVS (optional) should be a list of levels to include, or the string
% 'all' (default). 0 corresonds to the residual highpass subband.
Expand All @@ -26,7 +26,7 @@
% function, in octaves (default = 1, which gives a raised cosine for
% the bandpass filters).

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

function res = reconSCFpyr(pyr, indices, levs, bands, twidth)
Expand Down
Loading