summaryrefslogtreecommitdiffstats
path: root/src/sp-mesh-array.cpp
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2013-03-29 19:54:30 +0000
committer~suv <suv-sf@users.sourceforge.net>2013-03-29 19:54:30 +0000
commit8b605523195bcad80c4a3134134066e677282640 (patch)
tree7258ae78c0ae7e2ee7519dcecead8b1fc34ca78f /src/sp-mesh-array.cpp
parentmerge from trunk (r12240) (diff)
parentHeader cleanup (diff)
downloadinkscape-8b605523195bcad80c4a3134134066e677282640.tar.gz
inkscape-8b605523195bcad80c4a3134134066e677282640.zip
merge from trunk (r12258)
(bzr r11668.1.65)
Diffstat (limited to 'src/sp-mesh-array.cpp')
-rw-r--r--src/sp-mesh-array.cpp18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/sp-mesh-array.cpp b/src/sp-mesh-array.cpp
index 249f9562e..2c3c7fa65 100644
--- a/src/sp-mesh-array.cpp
+++ b/src/sp-mesh-array.cpp
@@ -317,21 +317,26 @@ Geom::Point SPMeshPatchI::getTensorPoint( guint k ) {
assert( k < 4 );
- guint i, j;
+ guint i = 0;
+ guint j = 0;
switch ( k ) {
case 0:
- i = 1; j = 1;
+ i = 1;
+ j = 1;
break;
case 1:
- i = 1; j = 2;
+ i = 1;
+ j = 2;
break;
case 2:
- i = 2; j = 2;
+ i = 2;
+ j = 2;
break;
case 3:
- i = 2; j = 1;
+ i = 2;
+ j = 1;
break;
}
@@ -342,7 +347,6 @@ Geom::Point SPMeshPatchI::getTensorPoint( guint k ) {
p = coonsTensorPoint( k );
}
return p;
-
}
/**
@@ -522,7 +526,7 @@ gdouble SPMeshPatchI::getOpacity( guint i ) {
assert( i < 4 );
- gdouble opacity;
+ gdouble opacity = 0.0;
switch ( i ) {
case 0:
opacity = (*nodes)[ row ][ col ]->opacity;