JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #28917 from disassembler/photivo

Browse Source 
photivo: fixes build with gcc6
This commit is contained in:
Jörg Thalheim 2017-09-03 09:03:25 +01:00 committed by GitHub
commit 89e1245c65
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 ;