MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 15:22:59 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

photivo: fixes build with gcc6

Browse source
This commit is contained in:
Samuel Leathers 2017-09-02 23:01:27 -04:00
parent 35f89413e2
commit 1398d5555c
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/applications/graphics/photivo/default.nix
View file

@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
name = "lensfun-0.3.patch";
sha256 = "0ys45x4r4bjjlx0zpd5d56rgjz7k8gxili4r4k8zx3zfka4a3zwv";
})
./gcc6.patch
];
postPatch = '' # kinda icky

13
pkgs/applications/graphics/photivo/gcc6.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git c/Sources/ptImage.cpp i/Sources/ptImage.cpp
index 9c95093..623c157 100755
--- c/Sources/ptImage.cpp
+++ i/Sources/ptImage.cpp
@@ -5291,7 +5291,7 @@ ptImage* ptImage::Box(const uint16_t MaxRadius, float* Mask) {
NewRow = NewRow < 0? -NewRow : NewRow > Height1? Height1_2-NewRow : NewRow ;
NewRow *= m_Width;
for(j = -IntRadius; j <= IntRadius; j++) {
- if (Dist[abs(i)][abs(j)] < Radius) {
+ if (Dist[int16_t(abs(i))][int16_t(abs(j))] < Radius) {
NewCol = Col+j;
NewCol = NewCol < 0? -NewCol : NewCol > Width1? Width1_2-NewCol : NewCol ;