Revision: 56327
http://sourceforge.net/p/brlcad/code/56327
Author: carlmoore
Date: 2013-07-30 14:43:45 +0000 (Tue, 30 Jul 2013)
Log Message:
-----------
fix spellings and wording; remove trailing blanks/tabs
Modified Paths:
--------------
brlcad/trunk/include/icv.h
brlcad/trunk/include/vmath.h
brlcad/trunk/src/libbrep/intersect.cpp
brlcad/trunk/src/libicv/color_space.c
brlcad/trunk/src/libicv/fileformat.c
brlcad/trunk/src/librt/primitives/brep/brep.cpp
brlcad/trunk/src/librt/primitives/table.c
Modified: brlcad/trunk/include/icv.h
===================================================================
--- brlcad/trunk/include/icv.h 2013-07-30 14:37:57 UTC (rev 56326)
+++ brlcad/trunk/include/icv.h 2013-07-30 14:43:45 UTC (rev 56327)
@@ -143,9 +143,9 @@
ICV_EXPORT extern icv_image_t* icv_image_create(int width, int height,
ICV_COLOR_SPACE color_space);
/**
- * Write an image line to the data of ICV struct. Can handle unsinged char
buffers.
+ * Write an image line to the data of ICV struct. Can handle unsigned char
buffers.
*
- * Note : This function require memory allocation for ICV_UCHAR_DATA, which
inturn aquires
+ * Note : This function requires memory allocation for ICV_UCHAR_DATA, which
in turn acquires
* BU_SEM_SYSCALL semaphore.
*
* @param bif ICV struct where data is to be written
@@ -196,8 +196,8 @@
ICV_EXPORT extern icv_image_t* icv_image_load(const char *filename, int
format, int width, int height);
/**
- * This function zeroes all the data enteries of an image
- * @param img Image Strucure
+ * This function zeroes all the data entries of an image
+ * @param img Image Structure
*/
ICV_EXPORT extern icv_image_t* icv_image_zero(icv_image_t* bif);
@@ -257,10 +257,10 @@
* D6500 white.
* ICV_PIX_CRT : converts to single plane image by combining three
* planes using weights based on CRT phosphor
- * chrmaticities and D6500 white.
+ * chromaticities and D6500 white.
* ICV_PIX_SET_EQUAL: Combines the three planes using equal weights.
- * ICV_PIX_SELECT_CHANNEL: lets to select the channels
- * @param color Choses color planes to be selected for combination
+ * ICV_PIX_SELECT_CHANNEL: lets us select the channels
+ * @param color Chooses color planes to be selected for combination
* This function will need color to be specified from
* ICV_COLOR_R
* ICV_COLOR_G
@@ -272,7 +272,7 @@
* @param rweight Weight for r-plane
* @param gweight Weight for g-plane
* @param bweight Weight for b-plane
- * @retunr 0 on success on failure return 1
+ * @return 0 on success; on failure return 1
*
* User can specify weights in the arguments, for the selected
* color planes. If 0 weight is chosen this utility assigns equal
@@ -311,7 +311,7 @@
/**
* This function crops an input image.
- * This can do a screwed cropping i.e given any four points of
+ * This can do a screwed cropping, i.e. given any four points of
* quadrilateral in an image, Maps it to a rectangle of xnumXynum
* dimension
*
@@ -325,7 +325,7 @@
* /______________________|
* (llx,lly) (lrx,lry)
*
- * @return 0 on success on failure -1 and logs the error message.
+ * @return 0 on success; on failure -1; and logs the error message.
*/
ICV_EXPORT extern int icv_crop(icv_image_t *img,
Modified: brlcad/trunk/include/vmath.h
===================================================================
--- brlcad/trunk/include/vmath.h 2013-07-30 14:37:57 UTC (rev 56326)
+++ brlcad/trunk/include/vmath.h 2013-07-30 14:43:45 UTC (rev 56327)
@@ -81,7 +81,7 @@
*
* #define ABC() do { register double _f; do stuff; } while (0)
*
- * All of the macros that introduce a scope like the preceeding
+ * All of the macros that introduce a scope like the preceding
* example are written as do { } while (0) loops in order to require
* callers provide a trailing semicolon (e.g., ABC();). This helps
* preserve source code formatting.
Modified: brlcad/trunk/src/libbrep/intersect.cpp
===================================================================
--- brlcad/trunk/src/libbrep/intersect.cpp 2013-07-30 14:37:57 UTC (rev
56326)
+++ brlcad/trunk/src/libbrep/intersect.cpp 2013-07-30 14:43:45 UTC (rev
56327)
@@ -593,7 +593,7 @@
#define CCI_DEFAULT_TOLERANCE 0.001
-// The maximal depth for subdivision - trade-off between accurancy and
+// The maximal depth for subdivision - trade-off between accuracy and
// performance
#define MAX_CCI_DEPTH 8
@@ -1112,7 +1112,7 @@
#define CSI_DEFAULT_TOLERANCE 0.001
-// The maximal depth for subdivision - trade-off between accurancy and
+// The maximal depth for subdivision - trade-off between accuracy and
// performance
#define MAX_CSI_DEPTH 8
@@ -1774,7 +1774,7 @@
*/
-// The maximal depth for subdivision - trade-off between accurancy and
+// The maximal depth for subdivision - trade-off between accuracy and
// performance
#define MAX_SSI_DEPTH 8
@@ -2547,7 +2547,7 @@
int count_before = overlaps.Count();
// Not points, but a bundle of params:
- // params[i] - the seperating params on overlaps[i]
+ // params[i] - the separating params on overlaps[i]
// x - curve3d, y - curveA, z - curveB
ON_ClassArray<ON_3dPointArray> params(count_before);
@@ -2570,7 +2570,7 @@
uv = st;
if (surfB->PointAt(st.x,
st.y).DistanceTo(x_event[k].m_B[0]) > surfB->PointAt(uv.x,
uv.y).DistanceTo(x_event[k].m_B[0]))
st = uv;
- // Pull the 3D curve bace to the 2D space
+ // Pull the 3D curve back to the 2D space
if (ON_Intersect(uv, *(overlaps[i]->m_curveA), e1,
intersection_tolerance_A)
&& ON_Intersect(st, *(overlaps[i]->m_curveB), e2,
intersection_tolerance_B)) {
param.x = x_event[k].m_a[0];
@@ -2591,7 +2591,7 @@
ON_ClassArray<ON_PX_EVENT> psx3, psx4, e5, e6, e7, e8;
if (ON_Intersect(x_event[k].m_A[0], *surfA, psx3,
intersection_tolerance, 0, 0, treeA)
&& ON_Intersect(x_event[k].m_B[0], *surfB, psx4,
intersection_tolerance, 0, 0, treeB)) {
- // Pull the 3D curve bace to the 2D space
+ // Pull the 3D curve back to the 2D space
uv = psx3[0].m_b;
st = psx4[0].m_b;
if (ON_Intersect(x_event[k].m_A[1],
*(overlaps[i]->m_curveA), e5, intersection_tolerance_A)
Modified: brlcad/trunk/src/libicv/color_space.c
===================================================================
--- brlcad/trunk/src/libicv/color_space.c 2013-07-30 14:37:57 UTC (rev
56326)
+++ brlcad/trunk/src/libicv/color_space.c 2013-07-30 14:43:45 UTC (rev
56327)
@@ -40,7 +40,7 @@
long int size;
long int i = 0;
if (!ICV_IMAGE_IS_INITIALIZED(img)) {
- bu_log("icv_image_gray2rgb : Unitialized Image argument\n");
+ bu_log("icv_image_gray2rgb : Uninitialized Image argument\n");
return -1;
}
@@ -84,7 +84,7 @@
red = green = blue = 0;
if (!ICV_IMAGE_IS_INITIALIZED(img)) {
- bu_log("icv_image_rgb2gray : Unitialized Image argument\n");
+ bu_log("icv_image_rgb2gray : Uninitialized Image argument\n");
return -1;
}
@@ -173,7 +173,7 @@
/* If function is called with zero for weight of respective plane
- then devides the weight equally among all the planes */
+ then divide the weight equally among all the planes */
if (red != 0 && ZERO(rweight))
rweight = 1.0 / (double)num_color_planes;
if (green != 0 && ZERO(gweight))
Modified: brlcad/trunk/src/libicv/fileformat.c
===================================================================
--- brlcad/trunk/src/libicv/fileformat.c 2013-07-30 14:37:57 UTC (rev
56326)
+++ brlcad/trunk/src/libicv/fileformat.c 2013-07-30 14:43:45 UTC (rev
56327)
@@ -114,7 +114,7 @@
* Used to convert data from pix, bw, ppm type images for icv_image
* struct.
*
- * This doesnot free the char data.
+ * This does not free the char data.
*
* @param data pointer to the array to be converted.
* @param size Size of the array.
@@ -345,7 +345,7 @@
}
data = (unsigned char *)bu_malloc(size, "pix_load : unsigned char data");
if (read(fd, data, size) !=0) {
- bu_log("pix_load: Error Occured while Reading\n");
+ bu_log("pix_load: Error Occurred while Reading\n");
bu_free(data, "icv_image data");
return NULL;
}
@@ -385,7 +385,7 @@
}
data = (unsigned char *)bu_malloc(size, "bw_load : unsigned char data");
if (read(fd, data, size) !=0) {
- bu_log("bw_load: Error Occured while Reading\n");
+ bu_log("bw_load: Error Occurred while Reading\n");
bu_free(data, "icv_image data");
return NULL;
}
Modified: brlcad/trunk/src/librt/primitives/brep/brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/brep/brep.cpp 2013-07-30 14:37:57 UTC
(rev 56326)
+++ brlcad/trunk/src/librt/primitives/brep/brep.cpp 2013-07-30 14:43:45 UTC
(rev 56327)
@@ -792,7 +792,7 @@
/* FIXME: all constants should be documented. why this
* value? must it coincide with the constant in the
- * preceeding loop?
+ * preceding loop?
*/
if (errantcount > 3) {
return intersects;
@@ -3345,7 +3345,7 @@
RT_ADD_VLIST(info->vhead, pt1, BN_VLIST_LINE_MOVE);
// add segments until the minimum segment count is
- // acheived and the distance between the end of the last
+ // achieved and the distance between the end of the last
// segment and the endpoint is within point spacing
for (int nsegs = 0; (nsegs < min_linear_seg_count) ||
(DIST_PT_PT(pt1, endpt) > info->point_spacing); ++nsegs)
@@ -3354,7 +3354,7 @@
VMOVE(pt2, p);
// bring t2 increasingly closer to t1 until target
- // point spacing is acheived
+ // point spacing is achieved
double step = t2 - t1;
while (DIST_PT_PT(pt1, pt2) > info->point_spacing) {
step /= 2.0;
Modified: brlcad/trunk/src/librt/primitives/table.c
===================================================================
--- brlcad/trunk/src/librt/primitives/table.c 2013-07-30 14:37:57 UTC (rev
56326)
+++ brlcad/trunk/src/librt/primitives/table.c 2013-07-30 14:43:45 UTC (rev
56327)
@@ -1991,7 +1991,7 @@
rt_generic_xform,
NULL,
sizeof(struct rt_hrt_internal),
- RT_HRT_INTERNAL_MAGIC,
+ RT_HRT_INTERNAL_MAGIC,
NULL,
NULL,
NULL,
@@ -2002,7 +2002,7 @@
NULL,
NULL,
},
-
+
{
/* this entry for sanity only */
0L, ">ID_MAXIMUM", ">id_max",
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
