Author: hdu
Date: Mon Feb 11 14:50:32 2013
New Revision: 1444805
URL: http://svn.apache.org/r1444805
Log:
fix vigra patch for BasicImage::resizeCopy()
"data_" is an actual data pointer but "data" is a member function
(since vigra-1.4). The method resizeCopy() seems to confuse data and data_
which the clang compiler was happy to point out. The OOo patch to vigra-1.4
already solved that problem but it was lost in the upgrade to vigra-1.6
Modified:
openoffice/trunk/main/vigra/vigra1.6.0.patch
Modified: openoffice/trunk/main/vigra/vigra1.6.0.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vigra/vigra1.6.0.patch?rev=1444805&r1=1444804&r2=1444805&view=diff
==============================================================================
--- openoffice/trunk/main/vigra/vigra1.6.0.patch (original)
+++ openoffice/trunk/main/vigra/vigra1.6.0.patch Mon Feb 11 14:50:32 2013
@@ -379,7 +379,7 @@ diff -uprN misc/vigra1.6.0/include/vigra
{
value_type * newdata = 0;
value_type ** newlines = 0;
-@@ -1124,8 +1156,8 @@ BasicImage<PIXELTYPE, Alloc>::resizeCopy
+@@ -1124,15 +1156,15 @@ BasicImage<PIXELTYPE, Alloc>::resizeCopy
if (newsize != width_*height_) // different sizes, must reallocate
{
newdata = allocator_.allocate(typename
Alloc::size_type(newsize));
@@ -390,6 +390,15 @@ diff -uprN misc/vigra1.6.0/include/vigra
deallocate();
}
else // need only to reshape
+ {
+ newdata = data_;
+- std::copy(data, data + newsize, newdata);
+- newlines = initLineStartArray(newdata, width, height);
++ std::copy(src_data, src_data + newsize, newdata);
++ newlines = initLineStartArray(newdata, w, h);
+ pallocator_.deallocate(lines_, typename
Alloc::size_type(height_));
+ }
+ }
@@ -1143,12 +1175,12 @@ BasicImage<PIXELTYPE, Alloc>::resizeCopy
data_ = newdata;
