Menu
▾
▴
SF.net SVN: matplotlib:[8153] trunk/matplotlib/src/cntr.c
|
From: <ef...@us...> - 2010-02-24 20:48:33
|
Revision: 8153
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8153&view=rev
Author: efiring
Date: 2010-02-24 20:48:26 +0000 (Wed, 24 Feb 2010)
Log Message:
-----------
cntr.c: declare variables at start of block; fixes 2933705
Modified Paths:
--------------
trunk/matplotlib/src/cntr.c
Modified: trunk/matplotlib/src/cntr.c
===================================================================
--- trunk/matplotlib/src/cntr.c 2010-02-24 18:30:42 UTC (rev 8152)
+++ trunk/matplotlib/src/cntr.c 2010-02-24 20:48:26 UTC (rev 8153)
@@ -420,19 +420,21 @@
/* this is a saddle zone, determine whether to turn left or
* right depending on height of centre of zone relative to
* contour level. Set saddle[zone] if not already decided. */
+ int turnRight;
long zone = edge + (left > 0 ? left : 0);
if (!(saddle[zone] & SADDLE_SET))
{
+ double zcentre;
saddle[zone] = SADDLE_SET;
- double zcentre = (z[p0] + z[p0+left] + z[p1] + z[p1+left])/4.0;
+ zcentre = (z[p0] + z[p0+left] + z[p1] + z[p1+left])/4.0;
if (zcentre > site->zlevel[0])
saddle[zone] |=
(two_levels && zcentre > site->zlevel[1])
? SADDLE_GT0 | SADDLE_GT1 : SADDLE_GT0;
}
- int turnRight = level == 2 ? (saddle[zone] & SADDLE_GT1)
- : (saddle[zone] & SADDLE_GT0);
+ turnRight = level == 2 ? (saddle[zone] & SADDLE_GT1)
+ : (saddle[zone] & SADDLE_GT0);
if (z1 ^ (level == 2))
turnRight = !turnRight;
if (!turnRight)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
