| @@ -1,22 +1,40 @@ | | | @@ -1,22 +1,40 @@ |
1 | $NetBSD: patch-expr.cc,v 1.1 2011/11/25 22:04:43 joerg Exp $ | | 1 | $NetBSD: patch-expr.cc,v 1.2 2013/03/24 16:52:35 joerg Exp $ |
2 | | | 2 | |
3 | --- expr.cc.orig 2011-11-25 13:49:36.000000000 +0000 | | 3 | --- expr.cc.orig 2005-03-08 02:00:02.000000000 +0000 |
4 | +++ expr.cc | | 4 | +++ expr.cc |
5 | @@ -1192,7 +1192,7 @@ IntegralOnInterval::render_head() const | | 5 | @@ -1192,7 +1192,7 @@ IntegralOnInterval::render_head() const |
6 | | | 6 | |
7 | class SumSymbol : public OpSymbol { | | 7 | class SumSymbol : public OpSymbol { |
8 | public: | | 8 | public: |
9 | - void render(Canvas& c, int r, int c) const; | | 9 | - void render(Canvas& c, int r, int c) const; |
10 | + void render(Canvas& canvas, int r, int c) const; | | 10 | + void render(Canvas& canvas, int r, int c) const; |
11 | }; | | 11 | }; |
12 | | | 12 | |
13 | void | | 13 | void |
14 | @@ -1208,7 +1208,7 @@ SumSymbol::render(Canvas& canvas, int r, | | 14 | @@ -1208,7 +1208,7 @@ SumSymbol::render(Canvas& canvas, int r, |
15 | | | 15 | |
16 | class ProductSymbol : public OpSymbol { | | 16 | class ProductSymbol : public OpSymbol { |
17 | public: | | 17 | public: |
18 | - void render(Canvas& c, int r, int c) const; | | 18 | - void render(Canvas& c, int r, int c) const; |
19 | + void render(Canvas& canvas, int r, int c) const; | | 19 | + void render(Canvas& canvas, int r, int c) const; |
20 | }; | | 20 | }; |
21 | | | 21 | |
22 | void | | 22 | void |
| | | 23 | @@ -1612,7 +1612,7 @@ Matrix::render() const |
| | | 24 | int cols = num_cols(); |
| | | 25 | int rows = num_rows(); |
| | | 26 | |
| | | 27 | - CanvasPtr ec[cols * rows]; |
| | | 28 | + CanvasPtr *ec = new CanvasPtr[cols * rows]; |
| | | 29 | Size sz[cols * rows]; |
| | | 30 | |
| | | 31 | int row_height[rows]; |
| | | 32 | @@ -1692,6 +1692,8 @@ Matrix::render() const |
| | | 33 | |
| | | 34 | canvas->center(); |
| | | 35 | |
| | | 36 | + delete[] ec; |
| | | 37 | + |
| | | 38 | return canvas; |
| | | 39 | } |
| | | 40 | |