source: trunk/dports/math/aamath/files/patch-expr.h.diff @ 147485

Last change on this file since 147485 was 141218, checked in by jeremyhu@…, 4 years ago

aamath: Build with clang

File size: 1.5 KB
  • expr.h

    old new class Integral : public OpOnFunction { 
    451451
    452452        virtual CanvasPtr render_head() const;
    453453
    454         void render_symbol(Canvas& c, int r, int c, int h) const;
     454        void render_symbol(Canvas& canvas, int r, int c, int h) const;
    455455
    456456        virtual CanvasPtr render() const;
    457457};
    class IntegralOnInterval : public Integr 
    467467
    468468class OpSymbol {
    469469  public:
    470         virtual void render(Canvas& c, int r, int c) const = 0;
     470        virtual void render(Canvas& canvas, int r, int c) const = 0;
    471471};
    472472
    473473class SumOrProduct : public OpOnFunction {
  • expr.cc

    old new IntegralOnInterval::render_head() const 
    11921192
    11931193class SumSymbol : public OpSymbol {
    11941194  public:
    1195         void render(Canvas& c, int r, int c) const;
     1195        void render(Canvas& canvas, int r, int c) const;
    11961196};
    11971197
    11981198void
    SumSymbol::render(Canvas& canvas, int r, 
    12081208
    12091209class ProductSymbol : public OpSymbol {
    12101210  public:
    1211         void render(Canvas& c, int r, int c) const;
     1211        void render(Canvas& canvas, int r, int c) const;
    12121212};
    12131213
    12141214void
    Matrix::render() const 
    16121612        int cols = num_cols();
    16131613        int rows = num_rows();
    16141614
    1615         CanvasPtr ec[cols * rows];
     1615        CanvasPtr *ec = new CanvasPtr[cols * rows];
    16161616        Size sz[cols * rows];
    16171617
    16181618        int row_height[rows];
    Matrix::render() const 
    16921692
    16931693        canvas->center();
    16941694
     1695    delete[] ec;
     1696
    16951697        return canvas;
    16961698}
    16971699
Note: See TracBrowser for help on using the repository browser.