diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-01-15 07:59:34 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2015-01-15 07:59:34 +0000 |
| commit | 389991ba5f715a2612db8f80c534b64a2b7b3d5e (patch) | |
| tree | 5d7234aca6e9fad334c1b951a2684a7833a28d95 /Build | |
| parent | bb3f6eb79fcb90e229c175394728f5f8ed603c46 (diff) | |
texk/dvisvgm: Build fix for ppc-darwin gcc-4.2 (from Mojca)
git-svn-id: svn://tug.org/texlive/trunk@36061 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
3 files changed, 28 insertions, 2 deletions
diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/ChangeLog index 11386cabcda..9727d726061 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/ChangeLog +++ b/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2015-01-15 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-10-pow-int-int (new): Build fix for ppc-darwin gcc-4.2, + from Mojca Miklavec <mojca.miklavec.lists@gmail.com>. + 2015-01-11 Karl Berry <karl@tug.org> * patch-09-funccall (new): LLVM/Clang build (or bug) fix. diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/patch-10-pow-int-int b/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/patch-10-pow-int-int new file mode 100644 index 00000000000..88dc645bb03 --- /dev/null +++ b/Build/source/texk/dvisvgm/dvisvgm-1.9-PATCHES/patch-10-pow-int-int @@ -0,0 +1,21 @@ +diff -ur dvisvgm-1.9.orig/src/Color.cpp dvisvgm-1.9/src/Color.cpp +--- dvisvgm-1.9.orig/src/Color.cpp 2014-12-28 10:30:00.000000000 +0100 ++++ dvisvgm-1.9/src/Color.cpp 2015-01-15 08:53:11.346590193 +0100 +@@ -469,7 +469,7 @@ + double c1 = sqrt(a1*a1 + b1*b1); + double c2 = sqrt(a2*a2 + b2*b2); + double cm = (c1+c2)/2; +- double g = (1-sqrt(pow(cm, 7)/(pow(cm, 7)+pow(25, 7))))/2; ++ double g = (1-sqrt(pow(cm, 7)/(pow(cm, 7)+pow(25.0, 7))))/2; + double aa1 = a1*(1+g); + double aa2 = a2*(1+g); + double cc1 = sqrt(aa1*aa1 + b1*b1); +@@ -492,7 +492,7 @@ + double sc = 1 + 0.045*ccm; + double sh = 1 + 0.015*ccm*t; + double dtheta = 30*exp(-sqr(hm-275)/25); +- double rc = 2*sqrt(pow(ccm, 7)/(pow(ccm, 7)+pow(25, 7))); ++ double rc = 2*sqrt(pow(ccm, 7)/(pow(ccm, 7)+pow(25.0, 7))); + double rt = -rc*sin(2*dtheta); + return sqrt(sqr(dl/sl) + sqr(dcc/sc) + sqr(dhh/sh) + rt*dcc/sc*dhh/sh); + } diff --git a/Build/source/texk/dvisvgm/dvisvgm-1.9/src/Color.cpp b/Build/source/texk/dvisvgm/dvisvgm-1.9/src/Color.cpp index b131074ada4..fe27b8eb087 100644 --- a/Build/source/texk/dvisvgm/dvisvgm-1.9/src/Color.cpp +++ b/Build/source/texk/dvisvgm/dvisvgm-1.9/src/Color.cpp @@ -469,7 +469,7 @@ double Color::deltaE (const Color &c) const { double c1 = sqrt(a1*a1 + b1*b1); double c2 = sqrt(a2*a2 + b2*b2); double cm = (c1+c2)/2; - double g = (1-sqrt(pow(cm, 7)/(pow(cm, 7)+pow(25, 7))))/2; + double g = (1-sqrt(pow(cm, 7)/(pow(cm, 7)+pow(25.0, 7))))/2; double aa1 = a1*(1+g); double aa2 = a2*(1+g); double cc1 = sqrt(aa1*aa1 + b1*b1); @@ -492,7 +492,7 @@ double Color::deltaE (const Color &c) const { double sc = 1 + 0.045*ccm; double sh = 1 + 0.015*ccm*t; double dtheta = 30*exp(-sqr(hm-275)/25); - double rc = 2*sqrt(pow(ccm, 7)/(pow(ccm, 7)+pow(25, 7))); + double rc = 2*sqrt(pow(ccm, 7)/(pow(ccm, 7)+pow(25.0, 7))); double rt = -rc*sin(2*dtheta); return sqrt(sqr(dl/sl) + sqr(dcc/sc) + sqr(dhh/sh) + rt*dcc/sc*dhh/sh); } |