Changeset 25295

Timestamp:

Sep 8, 2009, 4:25:57 PM (17 years ago)

Author:

eugene

Message:

do not display image without pixels

File:

• branches/eam_branches/20090715/Ohana/src/kapa2/src/Image.c (modified) (3 diffs)

branches/eam_branches/20090715/Ohana/src/kapa2/src/Image.c

@@ -48 +48 @@
 
   // set the center and expansion for the pictures:
-  image[0].picture.X      = 0.0;
-  image[0].picture.Y      = 0.0;
+  image[0].picture.Xc     = 0.0;
+  image[0].picture.Yc     = 0.0;
   image[0].picture.expand = 1;
   image[0].picture.flipx  = FALSE;
   image[0].picture.flipy  = FALSE;
 
-  image[0].zoom.X         = 0.0;
-  image[0].zoom.Y         = 0.0;
-  image[0].zoom.expand    = +5;
+  image[0].zoom.Xc        = 0.0;
+  image[0].zoom.Yc        = 0.0;
+  image[0].zoom.expand    = 5;
   image[0].zoom.flipx     = FALSE;
   image[0].zoom.flipy     = FALSE;
 
-  image[0].wide.X         = 0.0;
-  image[0].wide.Y         = 0.0;
+  image[0].wide.Xc        = 0.0;
+  image[0].wide.Yc        = 0.0;
   image[0].wide.expand    = -5;
   image[0].wide.flipx     = FALSE;
@@ -144 +144 @@
                   image[0].picture.dx+1, image[0].picture.dy+1);
   
-  XPutImage (graphic[0].display, graphic[0].window, graphic[0].gc,
-             image[0].picture.pix, 0, 0, 
-             image[0].picture.x + 1, image[0].picture.y + 1, 
-             image[0].picture.dx, image[0].picture.dy);
+  if (image[0].picture.pix) {
+    XPutImage (graphic[0].display, graphic[0].window, graphic[0].gc,
+               image[0].picture.pix, 0, 0, 
+               image[0].picture.x + 1, image[0].picture.y + 1, 
+               image[0].picture.dx, image[0].picture.dy);
+  }
 
   for (i = 0; i < NOVERLAYS; i++) {
@@ -156 +158 @@
 
   if (image[0].location) {
-    XPutImage (graphic[0].display, graphic[0].window, graphic[0].gc,
-               image[0].cmapbar.pix, 0, 0, 
-               image[0].cmapbar.x, image[0].cmapbar.y, 
-               image[0].cmapbar.dx, image[0].cmapbar.dy);
-
-    XPutImage (graphic[0].display, graphic[0].window, graphic[0].gc,
-               image[0].wide.pix, 0, 0, 
-               image[0].wide.x, image[0].wide.y, 
-               image[0].wide.dx, image[0].wide.dy);
+    if (image[0].cmapbar.pix) {
+      XPutImage (graphic[0].display, graphic[0].window, graphic[0].gc,
+                 image[0].cmapbar.pix, 0, 0, 
+                 image[0].cmapbar.x, image[0].cmapbar.y, 
+                 image[0].cmapbar.dx, image[0].cmapbar.dy);
+    }
+    if (image[0].wide.pix) {
+        XPutImage (graphic[0].display, graphic[0].window, graphic[0].gc,
+                   image[0].wide.pix, 0, 0, 
+                   image[0].wide.x, image[0].wide.y, 
+                   image[0].wide.dx, image[0].wide.dy);
+    }
 
     CrossHairs (graphic, &image[0].zoom);