Merge branch 'master' into powerpencil

11 files changed, 19 insertions, 19 deletions

diff --git a/src/extension/internal/bluredge.cpp b/src/extension/internal/bluredge.cpp
index d1fe357da..1040ef194 100644
--- a/src/extension/internal/bluredge.cpp
+++ b/src/extension/internal/bluredge.cpp
@@ -36,7 +36,7 @@ namespace Internal {
 /**
     \brief  A function to allocated anything -- just an example here
     \param  module  Unused
-    \return Whether the load was sucessful
+    \return Whether the load was successful
 */
 bool
 BlurEdge::load (Inkscape::Extension::Extension */*module*/)
diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index 3edb58a13..972081c0d 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -606,7 +606,7 @@ CairoRenderContext::popLayer(void)
                 clip_ctx->setImageTarget(CAIRO_FORMAT_A8);
                 clip_ctx->setClipMode(CLIP_MODE_MASK);  // Raster
                 // This code ties the clipping to the document coordinates. It doesn't allow
-                // for a clipped object intially drawn off the page and then translated onto
+                // for a clipped object initially drawn off the page and then translated onto
                 // the page.
                 if (!clip_ctx->setupSurface(_width, _height)) {
                     TRACE(("clip: setupSurface failed\n"));
@@ -1482,7 +1482,7 @@ CairoRenderContext::_prepareRenderText()
 }
 
 /*  We need CairoPaintOrder as markers are rendered in a separate step and may be rendered
- *  inbetween fill and stroke.
+ *  in between fill and stroke.
  */
 bool
 CairoRenderContext::renderPathVector(Geom::PathVector const & pathv, SPStyle const *style, Geom::OptRect const &pbox, CairoPaintOrder order)
diff --git a/src/extension/internal/emf-inout.cpp b/src/extension/internal/emf-inout.cpp
index 92deb2e19..e47ce48bf 100644
--- a/src/extension/internal/emf-inout.cpp
+++ b/src/extension/internal/emf-inout.cpp
@@ -1056,7 +1056,7 @@ Emf::pix_to_abs_size(PEMF_CALLBACK_DATA d, double px)
 void
 Emf::snap_to_faraway_pair(double *x, double *y)
 {
-    if((abs(abs(*x) - faraway)/faraway <= 1e-4) && (abs(abs(*y) - faraway)/faraway <= 1e-4)){
+    if((std::abs(std::abs(*x) - faraway)/faraway <= 1e-4) && (std::abs(std::abs(*y) - faraway)/faraway <= 1e-4)){
         *x = (*x > 0 ? faraway : -faraway);
         *y = (*y > 0 ? faraway : -faraway);
     }
diff --git a/src/extension/internal/gimpgrad.cpp b/src/extension/internal/gimpgrad.cpp
index 8c348dfbb..e6a429d34 100644
--- a/src/extension/internal/gimpgrad.cpp
+++ b/src/extension/internal/gimpgrad.cpp
@@ -35,7 +35,7 @@ namespace Internal {
 /**
     \brief  A function to allocate anything -- just an example here
     \param  module  Unused
-    \return Whether the load was sucessful
+    \return Whether the load was successful
 */
 bool GimpGrad::load (Inkscape::Extension::Extension */*module*/)
 {
@@ -106,10 +106,10 @@ static Glib::ustring stop_svg(ColorRGBA const in_color, double const location)
     of entries just reading until it fails.
 
     The other small piece of trickery here is that GIMP gradients define
-    a left possition, right possition and middle possition.  SVG gradients
-    have no middle possition in them.  In order to handle this case the
+    a left position, right position and middle position.  SVG gradients
+    have no middle position in them.  In order to handle this case the
     left and right colors are averaged in a linear manner and the middle
-    possition is used for that color.
+    position is used for that color.
 
     That is another point, the GIMP gradients support many different types
     of gradients -- linear being the most simple.  This plugin assumes
diff --git a/src/extension/internal/grid.cpp b/src/extension/internal/grid.cpp
index 9e730f5e5..649859ee5 100644
--- a/src/extension/internal/grid.cpp
+++ b/src/extension/internal/grid.cpp
@@ -42,7 +42,7 @@ namespace Internal {
 /**
     \brief  A function to allocated anything -- just an example here
     \param  module  Unused
-    \return Whether the load was sucessful
+    \return Whether the load was successful
 */
 bool
 Grid::load (Inkscape::Extension::Extension */*module*/)
diff --git a/src/extension/internal/image-resolution.cpp b/src/extension/internal/image-resolution.cpp
index 57142bbdd..558276999 100644
--- a/src/extension/internal/image-resolution.cpp
+++ b/src/extension/internal/image-resolution.cpp
@@ -414,7 +414,7 @@ void ImageResolution::readmagick(char const *fn) {
     x_ = image.xResolution();
     y_ = image.yResolution();
 
-// TODO: find out why the hell the following convertion is necessary
+// TODO: find out why the hell the following conversion is necessary
     if (type == "BMP") {
         x_ = Inkscape::Util::Quantity::convert(x_, "in", "cm");
         y_ = Inkscape::Util::Quantity::convert(y_, "in", "cm");
diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp
index d7ad7e6f7..56ea46808 100644
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -82,7 +82,7 @@ static void err(const char *fmt, ...)
  * tree and finds all of the opacities and multiplies them.
  *
  * We use this for our "flat" object output.  If the code is modified
- * to reflect a tree of <groups>, then this will be unneccessary.
+ * to reflect a tree of <groups>, then this will be unnecessary.
  */
 static double effective_opacity(const SPStyle *style)
 {
diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp
index f885ef5e5..db18dd2ca 100644
--- a/src/extension/internal/odf.cpp
+++ b/src/extension/internal/odf.cpp
@@ -6,7 +6,7 @@
  * within Inkscape.  Although the initial implementations will be very lossy
  * due to the differences in the models of SVG and ODF, they will hopefully
  * improve greatly with time.  People should consider this to be a framework
- * that can be continously upgraded for ever improving fidelity.  Potential
+ * that can be continuously upgraded for ever improving fidelity.  Potential
  * developers should especially look in preprocess() and writeTree() to see how
  * the SVG tree is scanned, read, translated, and then written to ODF.
  *
@@ -1400,7 +1400,7 @@ bool OdfOutput::processStyle(SPItem *item, const Glib::ustring &id, const Glib::
         }
     }
 
-    // Dont need a new style
+    // Don't need a new style
     if (styleMatch)
     {
         return false;
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
index 604b7f807..15bc2d746 100644
--- a/src/extension/internal/pdfinput/pdf-parser.cpp
+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
@@ -2189,13 +2189,13 @@ void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) {
   int i;
 
   for (i = 0; i < nComps; ++i) {
-    if (abs(patch->color[0][0].c[i] - patch->color[0][1].c[i])
+    if (std::abs(patch->color[0][0].c[i] - patch->color[0][1].c[i])
 	  > patchColorDelta ||
-	abs(patch->color[0][1].c[i] - patch->color[1][1].c[i])
+	std::abs(patch->color[0][1].c[i] - patch->color[1][1].c[i])
 	  > patchColorDelta ||
-	abs(patch->color[1][1].c[i] - patch->color[1][0].c[i])
+	std::abs(patch->color[1][1].c[i] - patch->color[1][0].c[i])
 	  > patchColorDelta ||
-	abs(patch->color[1][0].c[i] - patch->color[0][0].c[i])
+	std::abs(patch->color[1][0].c[i] - patch->color[0][0].c[i])
 	  > patchColorDelta) {
       break;
     }
diff --git a/src/extension/internal/text_reassemble.c b/src/extension/internal/text_reassemble.c
index b23176ed5..b191d4ea2 100644
--- a/src/extension/internal/text_reassemble.c
+++ b/src/extension/internal/text_reassemble.c
@@ -63,7 +63,7 @@ Optional compiler switches for development:
   -DDBG_TR_INPUT   draw input text and their bounding rectangles in SVG output
   -DTEST           build the test program
   -DDBG_LOOP       force the test program to cycle 5 times.  Useful for finding
-                   memory leaks.  Ouput file is overwritten each time.
+                   memory leaks.  Output file is overwritten each time.
 
 
 File:      text_reassemble.c
diff --git a/src/extension/internal/text_reassemble.h b/src/extension/internal/text_reassemble.h
index 6c1acafe5..1c6c17c78 100644
--- a/src/extension/internal/text_reassemble.h
+++ b/src/extension/internal/text_reassemble.h
@@ -231,7 +231,7 @@ typedef struct {
    \brief List of all members of a single complex.
 */
 typedef struct {
-   int        *members;        /**< array of immediate children (for TR_PARA_* these are indicies 
+   int        *members;        /**< array of immediate children (for TR_PARA_* these are indices 
                                     for TR_TEXT or TR_LINE complexes also in cxi. For TR_TEXT
                                     and TR_LINE these are indices to the actual text in tpi.)         */
    uint32_t    space;          /**< storage slots allocated                                           */