Browse files

Merged revisions 1601 via svnmerge from

https://babelfish.arc.nasa.gov/svn/visionworkbench/trunk

........
  r1601 | mdh | 2009-02-24 18:40:44 -0800 (Tue, 24 Feb 2009) | 3 lines
  
  Fix how ImageResourceView detects when it's asked for scalar-valued 
  pixels when deciding how to handle multi-channel source data.
........
  • Loading branch information...
2 parents 99eaa27 + 956bd24 commit b310d199fefa24e8fe7b04c538ecf307ef0c0dd9 @novas0x2a novas0x2a committed Feb 25, 2009
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/vw/Image/ImageResourceView.h
View
2 src/vw/Image/ImageResourceView.h
@@ -104,7 +104,7 @@ namespace vw {
// On the other hand, the user has requested a scalar pixel type
// but the file has a multi-channel pixel type, then we force a
// multi-plane interpretation.
- if (PixelNumChannels<PixelT>::value == 1 && m_rsrc->channels() >= 1 && m_rsrc->planes() == 1) {
+ if (IsScalar<PixelT>::value && m_rsrc->channels() >= 1 && m_rsrc->planes() == 1) {
m_planes = m_rsrc->channels();
}
}

0 comments on commit b310d19

Please sign in to comment.