Changeset 36470

Timestamp:

Feb 1, 2014, 6:07:03 AM (12 years ago)

Author:

eugene

Message:

do not plot out of range points

Location:

branches/eam_branches/ipp-20131211/Ohana/src

Files:

• kapa2/src/bDrawObjects.c (modified) (11 diffs)
• libkapa/src/bDrawFuncs.c (modified) (2 diffs)

branches/eam_branches/ipp-20131211/Ohana/src/kapa2/src/bDrawObjects.c

@@ -315 +315 @@
         D = scaleSize ? dz*z[i] : ds;
         FillRectangle (buffer, sx, sy, 2*D, 2*D);
+        // plot range saturated by bDrawRectFill
       }
     }
@@ -335 +336 @@
         D = scaleSize ? dz*z[i] : ds;
         DrawRectangle (buffer, sx, sy, 2*D, 2*D);
+        // plot range saturated by bDrawRectOpen
       }
     }
@@ -356 +358 @@
         DrawLine (buffer, sx - D, sy, sx + D, sy);
         DrawLine (buffer, sx, sy - D, sx, sy + D);
+        // out-of-range points skipped by bDrawPoint
       }
     }
@@ -377 +380 @@
         DrawLine (buffer, sx + D, sy - D, sx - D, sy + D);
         DrawLine (buffer, sx - D, sy - D, sx + D, sy + D);
+        // out-of-range points skipped by bDrawPoint
       }
     }
@@ -398 +402 @@
         // FillTriangle (buffer, sx - D, sy - 0.58*D, sx + D, sy - 0.58*D, sx, sy + 1.15*D);
         FillTriangle (buffer, sx, sy + 0.58*D, D, -1.73*D);
+        // out-of-range points skipped by bDrawPoint
       }
     }
@@ -418 +423 @@
         D = scaleSize ? dz*z[i] : ds;
         OpenTriangle (buffer, sx - D, sy + 0.58*D, sx + D, sy + 0.58*D, sx, sy - 1.15*D);
+        // out-of-range points skipped by bDrawPoint
       }
     }
@@ -440 +446 @@
         DrawLine (buffer, sx, sy, sx + D, sy - 0.58*D);
         DrawLine (buffer, sx, sy, sx,     sy + 1.15*D);
+        // out-of-range points skipped by bDrawPoint
       }
     }
@@ -460 +467 @@
         D = scaleSize ? dz*z[i] : ds;
         DrawCircle (buffer, sx, sy, D);
+        // out-of-range points skipped by bDrawPoint
       }
     }
@@ -484 +492 @@
         DrawLine (buffer, sx - 0.58*D, sy + 0.81*D, sx - 0.95*D, sy - 0.31*D);
         DrawLine (buffer, sx - 0.95*D, sy - 0.31*D, sx + 0.00*D, sy - 1.00*D);
+        // out-of-range points skipped by bDrawPoint
       }
     }
@@ -509 +518 @@
         DrawLine (buffer, sx + 0.50*D, sy - 0.87*D, sx - 0.50*D, sy - 0.87*D);
         DrawLine (buffer, sx - 0.50*D, sy - 0.87*D, sx -      D, sy);
+        // out-of-range points skipped by bDrawPoint
       }
     }
@@ -529 +539 @@
         D = scaleSize ? dz*z[i] : ds;
         FillCircle (buffer, sx, sy, D);
+        // out-of-range points skipped by bDrawLineHorizontal
       }
     }

branches/eam_branches/ipp-20131211/Ohana/src/libkapa/src/bDrawFuncs.c

@@ -247 +247 @@
   int i;
 
+  if (Y <  0) return;
+  if (Y >= buffer[0].Ny) return;
+
   for (i = X1; i < X2; i++) {
+    if (i <  0) continue;
+    if (i >= buffer[0].Nx) continue;
     if (buffer[0].Nbyte == 1) {
       buffer[0].pixels[Y][i] = buffer->bColor;
@@ -263 +268 @@
   int i;
 
+  if (X <  0) return;
+  if (X >= buffer[0].Nx) return;
+
   for (i = Y1; i < Y2; i++) {
+    if (i <  0) continue;
+    if (i >= buffer[0].Ny) continue;
     if (buffer[0].Nbyte == 1) {
       buffer[0].pixels[i][X] = buffer->bColor;