wbrawner/homebrew-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

aamath: fix patch

Browse source 
Closes #45660.

Signed-off-by: FX Coudert <fxcoudert@gmail.com>
This commit is contained in:
FX Coudert 2019-10-21 19:32:03 +02:00
parent 41ef317e6c
commit f6834007e7
1 changed files with 4 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
Formula/aamath.rb
View file

@ -17,7 +17,10 @@ class Aamath < Formula
# Fix build on clang; patch by Homebrew team
# https://github.com/Homebrew/homebrew/issues/23872
patch :DATA
patch do
url "https://raw.githubusercontent.com/Homebrew/formula-patches/85fa66a9/aamath/0.3.patch"
sha256 "9443881d7950ac8d2da217a23ae3f2c936fbd6880f34dceba717f1246d8608f1"
end
def install
ENV.deparallelize
@ -33,67 +36,3 @@ class Aamath < Formula
assert_match /#{Regexp.escape("f(x + h) = f(x) + h f'(x)")}/, s
end
end
__END__
diff --git a/expr.cc b/expr.cc
index 7bc0ee3..8f4eaf7 100644
--- a/expr.cc
+++ b/expr.cc
@@ -1192,7 +1192,7 @@ IntegralOnInterval::render_head() const
class SumSymbol : public OpSymbol {
public:
- void render(Canvas& c, int r, int c) const;
+ void render(Canvas& canvas, int r, int c) const;
};
void
@@ -1208,7 +1208,7 @@ SumSymbol::render(Canvas& canvas, int r, int c) const
class ProductSymbol : public OpSymbol {
public:
- void render(Canvas& c, int r, int c) const;
+ void render(Canvas& canvas, int r, int c) const;
};
void
@@ -1612,7 +1612,7 @@ Matrix::render() const
int cols = num_cols();
int rows = num_rows();
- CanvasPtr ec[cols * rows];
+ CanvasPtr *ec = new CanvasPtr[cols * rows];
Size sz[cols * rows];
int row_height[rows];
@@ -1692,6 +1692,8 @@ Matrix::render() const
canvas->center();
+ delete[] ec;
+
return canvas;
}
diff --git a/expr.h b/expr.h
index 000ebd4..d233da9 100644
--- a/expr.h
+++ b/expr.h
@@ -451,7 +451,7 @@ class Integral : public OpOnFunction {
virtual CanvasPtr render_head() const;
- void render_symbol(Canvas& c, int r, int c, int h) const;
+ void render_symbol(Canvas& canvas, int r, int c, int h) const;
virtual CanvasPtr render() const;
};
@@ -467,7 +467,7 @@ class IntegralOnInterval : public Integral, public OpOverInterval {
class OpSymbol {
public:
- virtual void render(Canvas& c, int r, int c) const = 0;
+ virtual void render(Canvas& canvas, int r, int c) const = 0;
};
class SumOrProduct : public OpOnFunction {