Update buffer CopyOverlapFrom overlap checks and fixed BufferTests

Author: acpaquette

isis/src/base/objs/Buffer/Buffer.cpp

@@ -333,14 +333,14 @@ namespace Isis {
 
     // If one rectangle is on left side of other
     // if (l1.x > r2.x || l2.x > r1.x)
-    if (p_line > in.p_line + in.p_nlines ||
-        in.p_line > p_line + p_nlines)
+    if (p_line >= in.p_line + in.p_nlines ||
+        in.p_line >= p_line + p_nlines)
       isSubareaOfIn = false;
 
     // If one rectangle is above other
     // if (r1.y > l2.y || r2.y > l1.y)
-    if (p_sample + p_nsamps < in.p_sample ||
-        in.p_sample + in.p_nsamps < p_sample)
+    if (p_sample >= in.p_sample + in.p_nsamps || 
+        in.p_sample >= p_sample + p_nsamps)
       isSubareaOfIn = false;
 
     if (isSubareaOfIn) {
@@ -387,24 +387,6 @@ namespace Isis {
       }
     }
 
-    isSubareaOfIn = (p_npixels <= in.size());
-    isSubareaOfIn &= (p_sample >= in.p_sample);
-    isSubareaOfIn &= (p_line >= in.p_line);
-    isSubareaOfIn &= (p_band >= in.p_band);
-
-    int endSample = p_sample + p_nsamps - 1;
-    int otherEndSample = in.p_sample + in.p_nsamps - 1;
-
-    int endLine = p_line + p_nlines - 1;
-    int otherEndLine = in.p_line + in.p_nlines - 1;
-
-    int endBand = p_band + p_nbands - 1;
-    int otherEndBand = in.p_band + in.p_nbands - 1;
-
-    isSubareaOfIn &= (endSample <= otherEndSample);
-    isSubareaOfIn &= (endLine <= otherEndLine);
-    isSubareaOfIn &= (endBand <= otherEndBand);
-
     return isSubareaOfIn;
   }
 

isis/tests/BufferTests.cpp

@@ -126,17 +126,17 @@ TEST(BufferTest, TestBufferOutOfBound) {
   }
 }
 
-TEST(BufferTest, TestBufferScale) {
+TEST(BufferTest, TestBufferScaleSmallToBig) {
   Buffer b(4, 3, 2, Isis::SignedInteger, 0.5);
 
   EXPECT_EQ(b.SampleDimension(), 4);
   EXPECT_EQ(b.LineDimension(), 3);
   EXPECT_EQ(b.BandDimension(), 2);
 
   EXPECT_EQ(b.SampleDimensionScaled(), 2);
-  EXPECT_EQ(b.LineDimensionScaled(), 1);
+  EXPECT_EQ(b.LineDimensionScaled(), 2);
 
-  EXPECT_EQ(b.size(), 4);
+  EXPECT_EQ(b.size(), 8);
 
   for(int i = 0; i < b.size(); i++) {
     b[i] = i;
@@ -146,12 +146,40 @@ TEST(BufferTest, TestBufferScale) {
   d.CopyOverlapFrom(b);
   std::vector<int> truthBuffer = {0, 0, 1, 1,
                                   0, 0, 1, 1,
-                                  0, 0, 1, 1,
-                                  // Second band
                                   2, 2, 3, 3,
-                                  2, 2, 3, 3,
-                                  2, 2, 3, 3};
-  for (int i = 0; i < truthBuffer.size(); i++) {
+                                  // Second band
+                                  4, 4, 5, 5,
+                                  4, 4, 5, 5,
+                                  6, 6, 7, 7};
+  for (int i = 0; i < d.size(); i++) {
+    EXPECT_EQ(truthBuffer[i], d[i]);
+  }
+}
+
+TEST(BufferTest, TestBufferScaleBigToSmall) {
+  Buffer b(4, 3, 2, Isis::SignedInteger, 1);
+
+  EXPECT_EQ(b.SampleDimension(), 4);
+  EXPECT_EQ(b.LineDimension(), 3);
+  EXPECT_EQ(b.BandDimension(), 2);
+
+  EXPECT_EQ(b.SampleDimensionScaled(), 4);
+  EXPECT_EQ(b.LineDimensionScaled(), 3);
+
+  EXPECT_EQ(b.size(), 24);
+
+  for(int i = 0; i < b.size(); i++) {
+    b[i] = i;
+  }
+
+  Buffer d(4, 3, 2, Isis::SignedInteger, 0.5);
+  d.CopyOverlapFrom(b);
+  std::vector<int> truthBuffer = {4, 6,
+                                  8, 10,
+                                  // Second band
+                                  16, 18,
+                                  20, 22,};
+  for (int i = 0; i < d.size(); i++) {
     EXPECT_EQ(truthBuffer[i], d[i]);
   }
 }