3 --- src
/BmpFile
.cc
.orig
2013-03-01 15:07:01.000000000 +0000
5 @@
-214,10 +214,10 @@
std::vector
<SampleValueAdjacencyList
*> B
6 // create reservoir - for every i reservoir[i] contains the sample values that are neighbourss of
7 // the sample value with label i and have a lower label (and have already been found)
8 // This is necessary to use collapsing trees together with bucket sort (without huge increase in memory usage)
9 - std::vector
<BmpRGBSampleValue
*> reservoir
[svs
.size()] ;
10 + std::vector
< std::vector
<BmpRGBSampleValue
*> > reservoir(svs
.size()) ;
12 // neighbours sorted by distance (for the current source sample value)
13 - std::vector
<BmpRGBSampleValue
*> neighbours_byd
[r
+ 1] ;
14 + std::vector
< std::vector
<BmpRGBSampleValue
*> > neighbours_byd(r
+ 1) ;
16 for (std::vector
<SampleValue
*>::const_iterator srcsvit
= svs
.begin() ; srcsvit
!= svs
.end() ; srcsvit
++) {
17 BmpRGBSampleValue
* srcsv
= (BmpRGBSampleValue
*) (*srcsvit
) ;