Changeset 36488

Timestamp:

Feb 6, 2014, 12:40:40 PM (12 years ago)

Author:

eugene

Message:

avoid plotting out of bounds in png

Location:

trunk/Ohana/src/libkapa/src

Files:

• KapaWindow.c (modified) (1 diff)
• bDrawFuncs.c (modified) (2 diffs)

trunk/Ohana/src/libkapa/src/KapaWindow.c

@@ -100 +100 @@
   graphdata[0].coords.pc1_1 = graphdata[0].coords.pc2_2 = 1.0;
   graphdata[0].coords.pc1_2 = graphdata[0].coords.pc2_1 = 0.0;
-  strcpy (graphdata[0].coords.ctype, "RA---LIN");
+  strcpy (graphdata[0].coords.ctype, "DEC--LIN");
   graphdata[0].coords.crval1 = 0.0;
   graphdata[0].coords.crval2 = 0.0;

trunk/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;