diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2011-07-02 06:11:08 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2011-07-02 06:11:08 +0000 |
| commit | 07c8dea2b0361314ac4bbf0e45dd4c33ce11f206 (patch) | |
| tree | d5452b36543452b5e79e9c7c688c897a6b87dfe8 /src/display | |
| parent | compatibility for building with clang, this failed for 2 reasons. (diff) | |
| download | inkscape-07c8dea2b0361314ac4bbf0e45dd4c33ce11f206.tar.gz inkscape-07c8dea2b0361314ac4bbf0e45dd4c33ce11f206.zip | |
Applying patch from Campbell Barton to help building on other than gcc.
(bzr r10399)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/nr-filter-gaussian.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/display/nr-filter-gaussian.cpp b/src/display/nr-filter-gaussian.cpp index 326c37160..14e305f96 100644 --- a/src/display/nr-filter-gaussian.cpp +++ b/src/display/nr-filter-gaussian.cpp @@ -525,8 +525,8 @@ gaussian_pass_FIR(Geom::Dim2 d, double deviation, cairo_surface_t *src, cairo_su { int scr_len = _effect_area_scr(deviation); // Filter kernel for x direction - FIRValue kernel[scr_len+1]; - _make_kernel(kernel, deviation); + std::vector<FIRValue> kernel(scr_len + 1); + _make_kernel(&kernel[0], deviation); int stride = cairo_image_surface_get_stride(src); int w = cairo_image_surface_get_width(src); @@ -539,13 +539,13 @@ gaussian_pass_FIR(Geom::Dim2 d, double deviation, cairo_surface_t *src, cairo_su filter2D_FIR<unsigned char,1>( cairo_image_surface_get_data(dest), d == Geom::X ? 1 : stride, d == Geom::X ? stride : 1, cairo_image_surface_get_data(src), d == Geom::X ? 1 : stride, d == Geom::X ? stride : 1, - w, h, kernel, scr_len, num_threads); + w, h, &kernel[0], scr_len, num_threads); break; case CAIRO_FORMAT_ARGB32: ///< Premultiplied 8 bit RGBA filter2D_FIR<unsigned char,4>( cairo_image_surface_get_data(dest), d == Geom::X ? 4 : stride, d == Geom::X ? stride : 4, cairo_image_surface_get_data(src), d == Geom::X ? 4 : stride, d == Geom::X ? stride : 4, - w, h, kernel, scr_len, num_threads); + w, h, &kernel[0], scr_len, num_threads); break; default: assert(false); |