re #1137: Merged volume reconstructor fan clipping and PixelRejectionThreshold fixes from trunk

lassoan · lassoan · commit 60ca9d3fd5ad · 2017-01-06T04:35:51.000Z
r5010 re #1137: Fixed clipping fan computation in optimized (partial or full) volume reconstruction mode --------------------- r5009 re #1137: Fixed crash in volume reconstructor when PixelRejectionThreshold was specified and Optimization was set to "NONE" ---------------------
diff --git a/PlusLib/src/PlusVolumeReconstruction/vtkPlusPasteSliceIntoVolumeHelperOptimized.h b/PlusLib/src/PlusVolumeReconstruction/vtkPlusPasteSliceIntoVolumeHelperOptimized.h
@@ -1028,7 +1028,7 @@ static void vtkOptimizedInsertSlice(vtkPlusPasteSliceIntoVolumeInsertSliceParams
       bool skipMiddleSegment = false;
       int xSkipMiddleSegmentPixStart; // first pixel that should be skipped in the middle
       int xSkipMiddleSegmentPixEnd; // last pixel that should be skipped in the middle
-      if (fanClippingEnabled)
+      if (fanClippingEnabled && xIntersectionPixStart <= xIntersectionPixEnd)
       {
         // equivalent to: xIntersectionPixStart < PlusMath::Ceil(fanLinePixelRatioLeft*y + fanOriginInPixels[0] + 1)
         // this is what the radius would be based on tan(fanAngle)
diff --git a/PlusLib/src/PlusVolumeReconstruction/vtkPlusPasteSliceIntoVolumeHelperUnoptimized.h b/PlusLib/src/PlusVolumeReconstruction/vtkPlusPasteSliceIntoVolumeHelperUnoptimized.h
@@ -331,7 +331,6 @@ static void vtkUnoptimizedInsertSlice(vtkPlusPasteSliceIntoVolumeInsertSlicePara
           if (inPixelSumAllComponents<pixelRejectionThresholdSumAllComponents)
           {
             // too dark, skip this pixel
-            inPtr += numscalars;
             continue;
           }
         }        

Original file line number	Diff line number	Diff line change
`@@ -1028,7 +1028,7 @@ static void vtkOptimizedInsertSlice(vtkPlusPasteSliceIntoVolumeInsertSliceParams`
`1028`	`1028`	`bool skipMiddleSegment = false;`
`1029`	`1029`	`int xSkipMiddleSegmentPixStart; // first pixel that should be skipped in the middle`
`1030`	`1030`	`int xSkipMiddleSegmentPixEnd; // last pixel that should be skipped in the middle`
`1031`		`- if (fanClippingEnabled)`
	`1031`	`+ if (fanClippingEnabled && xIntersectionPixStart <= xIntersectionPixEnd)`
`1032`	`1032`	`{`
`1033`	`1033`	`// equivalent to: xIntersectionPixStart < PlusMath::Ceil(fanLinePixelRatioLeft*y + fanOriginInPixels[0] + 1)`
`1034`	`1034`	`// this is what the radius would be based on tan(fanAngle)`
Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,6 @@ static void vtkUnoptimizedInsertSlice(vtkPlusPasteSliceIntoVolumeInsertSlicePara`
`331`	`331`	`if (inPixelSumAllComponents<pixelRejectionThresholdSumAllComponents)`
`332`	`332`	`{`
`333`	`333`	`// too dark, skip this pixel`
`334`		`- inPtr += numscalars;`
`335`	`334`	`continue;`
`336`	`335`	`}`
`337`	`336`	`}`