File tree Expand file tree Collapse file tree 1 file changed +5
-16
lines changed
Expand file tree Collapse file tree 1 file changed +5
-16
lines changed Original file line number Diff line number Diff line change @@ -1529,26 +1529,15 @@ CPLErr VRTProcessedDataset::IRasterIO(
15291529 if (eRWFlag == GF_Read && nXSize == nBufXSize && nYSize == nBufYSize &&
15301530 nBandCount == nBands)
15311531 {
1532- const auto IsSequentialBandMap = [panBandMap, nBandCount]()
1533- {
1534- for (int i = 0 ; i < nBandCount; ++i)
1535- {
1536- if (panBandMap[i] != i + 1 )
1537- {
1538- return false ;
1539- }
1540- }
1541- return true ;
1542- };
1543-
15441532 const int nBufTypeSize = GDALGetDataTypeSizeBytes (eBufType);
1545- const bool bIsBIPLike =
1546- nBandSpace == nBufTypeSize && nPixelSpace == nBandSpace * nBands &&
1547- nLineSpace >= nPixelSpace * nBufXSize && IsSequentialBandMap ();
1533+ const bool bIsBIPLike = nBandSpace == nBufTypeSize &&
1534+ nPixelSpace == nBandSpace * nBands &&
1535+ nLineSpace >= nPixelSpace * nBufXSize &&
1536+ IsAllBands (nBandCount, panBandMap);
15481537 const bool bIsBSQLike = nPixelSpace == nBufTypeSize &&
15491538 nLineSpace >= nPixelSpace * nBufXSize &&
15501539 nBandSpace >= nLineSpace * nBufYSize &&
1551- IsSequentialBandMap ( );
1540+ IsAllBands (nBandCount, panBandMap );
15521541 if (bIsBIPLike || bIsBSQLike)
15531542 {
15541543 GByte *pabyData = static_cast <GByte *>(pData);
You can’t perform that action at this time.
0 commit comments