main/vigra/vigra1.6.0.patch

109          /** construct image of size width x height, use the specified allocator.
111 -    BasicImage(int width, int height, Alloc const & alloc = Alloc())
123 -        vigra_precondition((width >= 0) && (height >= 0),
124 -             "BasicImage::BasicImage(int width, int height): "
127               "width and height must be >= 0.\n");
129 -        resize(width, height, value_type());
159          /** construct image of size width*height and initialize every
164 -    BasicImage(int width, int height, value_type const & d, Alloc const & alloc = Alloc())
176 -        vigra_precondition((width >= 0) && (height >= 0),
177 -             "BasicImage::BasicImage(int width, int height, value_type const & ): "
180               "width and height must be >= 0.\n");
182 -        resize(width, height, d);
215          /** construct image of size width*height and copy the data from the
218 -    BasicImage(int width, int height, const_pointer d, Alloc const & alloc = Alloc())
230 -        vigra_precondition((width >= 0) && (height >= 0),
231 -             "BasicImage::BasicImage(int width, int height, const_pointer ): "
234               "width and height must be >= 0.\n");
236 -        resizeCopy(width, height, d);
272 -    void resize(int width, int height)
275 -        if(width != width_ || height != height_)
276 -            resize(width, height, value_type());
299 -    void resize(int width, int height, value_type const & d);
305 -    void resizeCopy(int width, int height, const_pointer data);
314 -BasicImage<PIXELTYPE, Alloc>::resize(int width, int height, value_type const & d)
317 -    vigra_precondition((width >= 0) && (height >= 0),
318 -         "BasicImage::resize(int width, int height, value_type const &): "
321           "width and height must be >= 0.\n");
323 -    if (width_ != width || height_ != height)  // change size?
328 -        if(width*height > 0)
331 -            if (width*height != width_*height_) // different sizes, must reallocate
334 -                newdata = allocator_.allocate(typename Alloc::size_type(width*height));
335 -                std::uninitialized_fill_n(newdata, width*height, d);
336 -                newlines = initLineStartArray(newdata, width, height);
345 -                std::fill_n(newdata, width*height, d);
346 -                newlines = initLineStartArray(newdata, width, height);
357 -        height_ = height;
361 -    else if(width*height > 0) // keep size, re-init data
364 -        std::fill_n(data_, width*height, d);
372 -BasicImage<PIXELTYPE, Alloc>::resizeCopy(int width, int height, const_pointer data)
375 -    int newsize = width*height;
376 -    if (width_ != width || height_ != height)  // change size?
387 -                newlines = initLineStartArray(newdata, width, height);
396 -                newlines = initLineStartArray(newdata, width, height);
407 -        height_ = height;
422 -BasicImage<PIXELTYPE, Alloc>::initLineStartArray(value_type * data, int width, int height)
425 -    value_type ** lines = pallocator_.allocate(typename Alloc::size_type(height));
426 -    for(int y=0; y<height; ++y)
512 -    Size2D(int width, int height)
513 -    : Diff2D(width, height)
591 -    void setSize(int width, int height)
594 -        lowerRight_ = upperLeft_ + Size2D(width, height);