From 879e3a2b67acd853837581db9cd5d5e6300511a5 Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Thu, 12 Jun 2014 15:26:31 -0400
Subject: [PATCH 1/2] support UnionArray

---
 src/factory/pvSubArrayCopy.cpp | 43 +++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/factory/pvSubArrayCopy.cpp b/src/factory/pvSubArrayCopy.cpp
index 45d57ba..7129fe8 100644
--- a/src/factory/pvSubArrayCopy.cpp
+++ b/src/factory/pvSubArrayCopy.cpp
@@ -164,7 +164,7 @@ void copy(
     if(pvFromStride<1 || toStride<1) throw std::invalid_argument("stride must be >=1");
     StructureArrayConstPtr pvFromStructure = pvFrom.getStructureArray();
     StructureArrayConstPtr toStructure = pvTo.getStructureArray();
-    if(pvFromStructure!=toStructure) {
+    if(pvFromStructure->getStructure()!=toStructure->getStructure()) {
         throw std::invalid_argument(
             "pvSubArrayCopy structureArray pvTo and pvFrom have different structures");
     }
@@ -185,6 +185,42 @@ void copy(
     pvTo.replace(temp2);
 }
 
+void copy(
+    PVUnionArray & pvFrom,
+    size_t pvFromOffset,
+    size_t pvFromStride,
+    PVUnionArray & pvTo,
+    size_t toOffset,
+    size_t toStride,
+    size_t count)
+{
+    if(pvTo.isImmutable()) {
+        throw std::logic_error("pvSubArrayCopy  pvTo is immutable");
+    }
+    if(pvFromStride<1 || toStride<1) throw std::invalid_argument("stride must be >=1");
+    UnionArrayConstPtr pvFromUnion = pvFrom.getUnionArray();
+    UnionArrayConstPtr toUnion = pvTo.getUnionArray();
+    if(pvFromUnion->getUnion()!=toUnion->getUnion()) {
+        throw std::invalid_argument(
+            "pvSubArrayCopy unionArray pvTo and pvFrom have different unions");
+    }
+    size_t pvFromLength = pvFrom.getLength();
+    size_t num = pvFromOffset + count*pvFromStride;
+    if(num>pvFromLength) throw std::invalid_argument("pvSubArrayCopy pvFrom length error");
+    size_t newLength = toOffset + count*toStride;
+    size_t capacity = pvTo.getCapacity();
+    if(newLength>capacity) capacity = newLength;
+    shared_vector<PVUnionPtr> temp(capacity);
+    PVValueArray<PVUnionPtr>::const_svector vecFrom = pvFrom.view();
+    PVValueArray<PVUnionPtr>::const_svector vecTo = pvTo.view();
+    for(size_t i=0; i<pvTo.getLength(); ++i) temp[i] = vecTo[i];
+    for(size_t i=pvTo.getLength(); i< capacity; ++i)
+        temp[i] = getPVDataCreate()->createPVUnion(toUnion->getUnion());
+    for(size_t i=0; i<count; ++i) temp[i*toStride + toOffset] = vecFrom[i*pvFromStride+pvFromOffset];
+    shared_vector<const PVUnionPtr> temp2(freeze(temp));
+    pvTo.replace(temp2);
+}
+
 void copy(
     PVArray & pvFrom,
     size_t pvFromOffset,
@@ -215,6 +251,11 @@ void copy(
            dynamic_cast<PVStructureArray&>(pvTo),
            pvToOffset,pvToStride,count);
     }
+    if(pvFromType==unionArray) {
+           copy(dynamic_cast<PVUnionArray &>(pvFrom) ,pvFromOffset,pvFromStride,
+           dynamic_cast<PVUnionArray&>(pvTo),
+           pvToOffset,pvToStride,count);
+    }
 }
 
 void copy(

From 1132e25072e4967a1e1a390b2bb16bed1d17f5c5 Mon Sep 17 00:00:00 2001
From: Marty Kraimer <mrkraimer@comcast.net>
Date: Fri, 13 Jun 2014 09:52:30 -0400
Subject: [PATCH 2/2] fix bug related to stride

---
 src/factory/pvSubArrayCopy.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/factory/pvSubArrayCopy.cpp b/src/factory/pvSubArrayCopy.cpp
index 7129fe8..09c114b 100644
--- a/src/factory/pvSubArrayCopy.cpp
+++ b/src/factory/pvSubArrayCopy.cpp
@@ -31,8 +31,8 @@ void copy(
     if(pvTo.isImmutable()) throw std::invalid_argument("pvSubArrayCopy: pvTo is immutable");
     if(fromStride<1 || toStride<1) throw std::invalid_argument("stride must be >=1");
     size_t fromLength = pvFrom.getLength();
-    size_t num = fromOffset + count*fromStride;
-    if(num>fromLength) throw std::invalid_argument("pvSubArrayCopy pvFrom length error");
+    size_t maxcount = (fromLength -fromOffset + fromStride -1)/fromStride;
+    if(count>maxcount) throw std::invalid_argument("pvSubArrayCopy pvFrom length error");
     size_t newLength = toOffset + count*toStride;
     size_t capacity = pvTo.getCapacity();
     if(newLength>capacity) capacity = newLength;
@@ -169,8 +169,8 @@ void copy(
             "pvSubArrayCopy structureArray pvTo and pvFrom have different structures");
     }
     size_t pvFromLength = pvFrom.getLength();
-    size_t num = pvFromOffset + count*pvFromStride;
-    if(num>pvFromLength) throw std::invalid_argument("pvSubArrayCopy pvFrom length error");
+    size_t maxcount = (pvFromLength -pvFromOffset + pvFromStride -1)/pvFromStride;
+    if(count>maxcount) throw std::invalid_argument("pvSubArrayCopy pvFrom length error");
     size_t newLength = toOffset + count*toStride;
     size_t capacity = pvTo.getCapacity();
     if(newLength>capacity) capacity = newLength;
@@ -205,8 +205,8 @@ void copy(
             "pvSubArrayCopy unionArray pvTo and pvFrom have different unions");
     }
     size_t pvFromLength = pvFrom.getLength();
-    size_t num = pvFromOffset + count*pvFromStride;
-    if(num>pvFromLength) throw std::invalid_argument("pvSubArrayCopy pvFrom length error");
+    size_t maxcount = (pvFromLength -pvFromOffset + pvFromStride -1)/pvFromStride;
+    if(count>maxcount) throw std::invalid_argument("pvSubArrayCopy pvFrom length error");
     size_t newLength = toOffset + count*toStride;
     size_t capacity = pvTo.getCapacity();
     if(newLength>capacity) capacity = newLength;