-
-
Notifications
You must be signed in to change notification settings - Fork 5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add patch for unsafe narrowing breaking OSX build
- Loading branch information
Showing
2 changed files
with
35 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
recipes/connectome-workbench/patches/0001-Fix-unsafe-narrowing.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
From cc3d4d74235978b136f637620032595cb388933b Mon Sep 17 00:00:00 2001 | ||
From: Chris Markiewicz <[email protected]> | ||
Date: Mon, 14 Oct 2024 13:49:05 -0400 | ||
Subject: [PATCH] Fix unsafe narrowing | ||
|
||
--- | ||
src/Algorithms/AlgorithmCiftiSeparate.cxx | 4 ++-- | ||
1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/src/Algorithms/AlgorithmCiftiSeparate.cxx b/src/Algorithms/AlgorithmCiftiSeparate.cxx | ||
index 9a64a262e..f49c04e73 100644 | ||
--- a/src/Algorithms/AlgorithmCiftiSeparate.cxx | ||
+++ b/src/Algorithms/AlgorithmCiftiSeparate.cxx | ||
@@ -654,7 +654,7 @@ void AlgorithmCiftiSeparate::getCroppedVolSpace(const CiftiFile* ciftiIn, const | ||
int64_t numVoxels = (int64_t)myMap.size(); | ||
if (numVoxels > 0) | ||
{//make a voxel bounding box to minimize memory usage | ||
- int extrema[6] = { myMap[0].m_ijk[0], | ||
+ int64_t extrema[6] = { myMap[0].m_ijk[0], | ||
myMap[0].m_ijk[0], | ||
myMap[0].m_ijk[1], | ||
myMap[0].m_ijk[1], | ||
@@ -699,7 +699,7 @@ void AlgorithmCiftiSeparate::getCroppedVolSpaceAll(const CiftiFile* ciftiIn, con | ||
int64_t numVoxels = (int64_t)myMap.size(); | ||
if (numVoxels > 0) | ||
{//make a voxel bounding box to minimize memory usage | ||
- int extrema[6] = { myMap[0].m_ijk[0], | ||
+ int64_t extrema[6] = { myMap[0].m_ijk[0], | ||
myMap[0].m_ijk[0], | ||
myMap[0].m_ijk[1], | ||
myMap[0].m_ijk[1], | ||
-- | ||
2.45.2 | ||
|