Skip to content

Commit

Permalink
Merge pull request #5657 from johnhaddon/fixMacBuild
Browse files Browse the repository at this point in the history
Resample : Fix compilation on Mac
  • Loading branch information
johnhaddon authored Feb 5, 2024
2 parents a4661d7 + b7f8ca3 commit e2df22a
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/GafferImage/Resample.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1040,7 +1040,7 @@ class MergeListsByIndices
{
float depth;
int listIndex;
inline bool operator<( const HeapEntry& other )
inline bool operator<( const HeapEntry& other ) const
{
return depth > other.depth;
}
Expand Down Expand Up @@ -1525,7 +1525,6 @@ void Resample::compute( Gaffer::ValuePlug *output, const Gaffer::Context *contex
// combining step.
std::vector< std::vector< SampledDepth > > sampledPixels( inputSize.x * inputSize.y );

unsigned int totalSampledDepthsCount = 0;
MergeListsByIndices listMerger( horizontallyMixedDepths );
std::vector< float > fullyMixedDepths;

Expand Down Expand Up @@ -1574,8 +1573,6 @@ void Resample::compute( Gaffer::ValuePlug *output, const Gaffer::Context *contex
fullyMixedDepths,
sampledPixels[ y * inputSize.x + x ]
);

totalSampledDepthsCount += sampledPixels[ y * inputSize.x + x ].size();
}
}

Expand Down

0 comments on commit e2df22a

Please sign in to comment.