Rename <mesh> to <meshgradient> per SVG 2 CR specificiation.

Note: <mesh> has been repurposed to be a special shape that tightly wraps a mesh gradient.

(bzr r15137)

1 files changed, 11 insertions, 13 deletions

diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp
index 5c0fdfe2b..d3e38485b 100644
--- a/src/sp-gradient.cpp
+++ b/src/sp-gradient.cpp
@@ -1,6 +1,6 @@
 /** \file
  * SPGradient, SPStop, SPLinearGradient, SPRadialGradient,
- * SPMesh, SPMeshRow, SPMeshPatch
+ * SPMeshGradient, SPMeshRow, SPMeshPatch
  */
 /*
  * Authors:
@@ -44,7 +44,7 @@
 #include "sp-gradient-reference.h"
 #include "sp-linear-gradient.h"
 #include "sp-radial-gradient.h"
-#include "sp-mesh.h"
+#include "sp-mesh-gradient.h"
 #include "sp-mesh-row.h"
 #include "sp-stop.h"
 
@@ -115,7 +115,7 @@ bool SPGradient::isEquivalent(SPGradient *that)
         else if (
             (SP_IS_LINEARGRADIENT(this) && SP_IS_LINEARGRADIENT(that)) ||
             (SP_IS_RADIALGRADIENT(this) && SP_IS_RADIALGRADIENT(that)) ||
-            (SP_IS_MESH(this)           && SP_IS_MESH(that))) {
+            (SP_IS_MESHGRADIENT(this)   && SP_IS_MESHGRADIENT(that))) {
             if(!this->isAligned(that))break;
         }
         else { break; }  // this should never happen, some unhandled type of gradient
@@ -200,9 +200,9 @@ bool SPGradient::isAligned(SPGradient *that)
                     (sg->fy.computed != tg->fy.computed)  ) { break; }
             } else if(  sg->cx._set || sg->cy._set || sg->fx._set || sg->fy._set || sg->r._set ) { break; } // some mix of set and not set
             // none set? assume aligned and fall through
-        } else if (SP_IS_MESH(this) && SP_IS_MESH(that)) {
-            SPMesh *sg=SP_MESH(this);
-            SPMesh *tg=SP_MESH(that);
+        } else if (SP_IS_MESHGRADIENT(this) && SP_IS_MESHGRADIENT(that)) {
+            SPMeshGradient *sg=SP_MESHGRADIENT(this);
+            SPMeshGradient *tg=SP_MESHGRADIENT(that);
  
             if( sg->x._set  !=  !tg->x._set) { break; }
             if( sg->y._set  !=  !tg->y._set) { break; }
@@ -514,7 +514,7 @@ void SPGradient::modified(guint flags)
 #endif
 
     if (flags & SP_OBJECT_CHILD_MODIFIED_FLAG) {
-        if (SP_IS_MESH(this)) {
+        if (SP_IS_MESHGRADIENT(this)) {
             this->invalidateArray();
         } else {
             this->invalidateVector();
@@ -522,7 +522,7 @@ void SPGradient::modified(guint flags)
     }
 
     if (flags & SP_OBJECT_STYLE_MODIFIED_FLAG) {
-        if (SP_IS_MESH(this)) {
+        if (SP_IS_MESHGRADIENT(this)) {
             this->ensureArray();
         } else {
             this->ensureVector();
@@ -1025,12 +1025,12 @@ void SPGradient::rebuildArray()
 {
     // std::cout << "SPGradient::rebuildArray()" << std::endl;
 
-    if( !SP_IS_MESH(this) ) {
+    if( !SP_IS_MESHGRADIENT(this) ) {
         g_warning( "SPGradient::rebuildArray() called for non-mesh gradient" );
         return;
     }
 
-    array.read( SP_MESH( this ) );
+    array.read( SP_MESHGRADIENT( this ) );
 }
 
 Geom::Affine
@@ -1121,9 +1121,7 @@ sp_gradient_create_preview_pattern(SPGradient *gr, double width)
 {
     cairo_pattern_t *pat = NULL;
 
-    // CPPIFY
-    //if( gr->get_type() != SP_GRADIENT_TYPE_MESH ) {
-    if (!SP_IS_MESH(gr)) {
+    if (!SP_IS_MESHGRADIENT(gr)) {
         gr->ensureVector();
 
         pat = cairo_pattern_create_linear(0, 0, width, 0);