Index: anches/eam_branches/20090715/Ohana/src/kapa2/src/CreateZoom16.c
===================================================================
--- /branches/eam_branches/20090715/Ohana/src/kapa2/src/CreateZoom16.c	(revision 25285)
+++ 	(revision )
@@ -1,144 +1,0 @@
-# include "Ximage.h"
-
-void CreateZoom16 (KapaImageWidget *image, Graphic *graphic, double x, double y) {
-
-# if (0)
-  int i, j, ii, jj;
-  int i_start, i_end, j_start, j_end;
-  int dropback;  /* this is a bit of a kludge... */
-  int dx, dy, DX, DY, pixelN;
-  double expand, zoomscale, Rx, Ry;
-  int expand_in, expand_out;
-  unsigned char *out_pix, *out_pix2, *data;
-  float *imdata, *in_pix,  *in_pix2;
-  unsigned char pixel1[256], pixel2[256];
-  unsigned char pixvalue1, pixvalue2;
-  unsigned long back;
-  unsigned char back1, back2;
-
-  dx = image[0].zoom.dx;
-  dy = image[0].zoom.dy;
-
-  if (image[0].image[0].matrix.size == 0) {  /* create a test pattern */
-    REALLOCATE (image[0].zoom.data, char, 2*dy*dx);
-    bzero (image[0].zoom.data, image[0].zoom.dx*image[0].zoom.dy);
-    image[0].zoom.pix = XCreateImage (graphic[0].display, graphic[0].visual, graphic[0].depth, ZPixmap, 0, 
-				       image[0].zoom.data, image[0].zoom.dx, image[0].zoom.dy, 16, 0);
-    return;
-  }
-
-  for (i = 0; i < 256; i++) { /* set up pixel array */
-    pixel1[i] = 0x0000ff &  graphic[0].cmap[i].pixel;
-    pixel2[i] = 0x0000ff & (graphic[0].cmap[i].pixel >> 8);
-  }
-  back = graphic[0].back;
-  back1 = 0x0000ff & back;
-  back2 = 0x0000ff & (back >> 8);
-  // define the color transform parameters
-  MaxValue = graphic[0].Npixels - 1;
-  if (image[0].image[0].range != 0.0) {
-    slope = graphic[0].Npixels / image[0].image[0].range;
-    start = graphic[0].Npixels * image[0].image[0].zero / image[0].image[0].range;
-  } else {
-    slope = 1.0;
-    start = image[0].image[0].zero;
-  }
-
-  zoomscale = MAX (5, image[0].expand + 5);
-  expand = 1 / zoomscale;
-  expand_out = (int) zoomscale;
-  expand_in  = 1;
-
-  DX = image[0].image[0].matrix.Naxis[0];
-  DY = image[0].image[0].matrix.Naxis[1];
-  Rx = x - expand*(int)(0.5*(dx + 1)) + 1;
-  Ry = y - expand*(int)(0.5*(dy + 1)) + 1;
-
-  i_start = MIN (MAX (-Rx / expand, (1 - FRAC(Rx)) / expand), dx - expand_out + 1);
-  j_start = MIN (MAX (-Ry / expand, (1 - FRAC(Ry)) / expand), dy - expand_out + 1);
-  i_end   = MAX (MIN ((DX-Rx) / expand, dx - expand_out + 1), 0);
-  j_end   = MAX (MIN ((DY-Ry) / expand, dy - expand_out + 1), 0);
-  dropback = expand_out - (i_end - i_start) % expand_out;
-  if ((i_end - i_start) % expand_out == 0) dropback = 0;
-
-  data = out_pix = (unsigned char *) image[0].zoom.data;
-  imdata  = (float *) image[0].image[0].matrix.buffer;
-  in_pix  = &imdata[DX*(int)MAX(Ry,0) + (int)MAX(Rx,0)];
-
-  /********** below we do the mapping from buffer pixels (in) to picture pixels (out) **********/
-
-  if ((i_end < i_start) || (j_end < j_start)) {
-    for (j = 0; j < dx*dy; j++, out_pix++) 
-      *out_pix = back;
-    return;
-  } 
-  
-  /**** fill in bottom area ****/
-  for (j = 0; j < j_start; j++) {
-    for (i = 0; i < dx; i++, out_pix+=2) {
-      out_pix[0] = back1;
-      out_pix[1] = back2;
-    }
-  }
-
-  for (j = j_start; j < j_end; j+= expand_out, in_pix += expand_in*DX) {
-    out_pix = &data[2*j*dx];
-
-    /**** fill in area to the left of the picture ****/
-    for (jj = 0; jj < expand_out; jj++) { 
-      out_pix2 = out_pix + 2*jj*dx;
-      for (i = 0; i < i_start; i++, out_pix2+=2) {
-	out_pix2[0] = back1;
-	out_pix2[1] = back2;
-      }
-    }
-    out_pix += 2*i_start;
-    
-    /*** fill in the picture region ***/
-    in_pix2 = in_pix;
-    if (expand_out == 1) {
-      for (i = i_start; i < i_end; i++, in_pix2+= expand_in, out_pix+=2) {
-	pixelN = PixelLookup(*in_pix2);
-	out_pix[0] = pixel1[pixelN];
-	out_pix[1] = pixel2[pixelN];
-      }
-    } else {
-      for (i = i_start; i < i_end; i+= expand_out, in_pix2++, out_pix+= 2*expand_out) { 
-	pixelN = PixelLookup(*in_pix2);
-	pixvalue1 = pixel1[pixelN];
-	pixvalue2 = pixel2[pixelN];
-	out_pix2 = out_pix;
-	for (jj = 0; jj < expand_out; jj++, out_pix2+=2*(dx-expand_out)) {
-	  for (ii = 0; ii < expand_out; ii++, out_pix2+=2) {
-	    out_pix2[0] = pixvalue1; 
-	    out_pix2[1] = pixvalue2; 
-	  }
-	}
-      }
-    }
-    out_pix -= 2*dropback;
-    
-    /**** fill in area to the right of the picture ****/
-    for (jj = 0; jj < expand_out; jj++) {
-      out_pix2 = out_pix + 2*jj*dx;
-      for (i = i_end; i < dx; i++, out_pix2+=2) {
-	out_pix2[0] = back1;
-	out_pix2[1] = back2;
-      }
-    }
-  } 
-  
-  out_pix = &data[2*j_end*dx];
-  /**** fill in top area ****/
-  for (j = 0; j < (dy - j_end); j++) {
-    for (i = 0; i < dx; i++, out_pix+=2) { 
-      out_pix[0] = back1;
-      out_pix[1] = back2;
-    }
-  }
-
-  image[0].zoom.pix = XCreateImage (graphic[0].display, graphic[0].visual, graphic[0].depth, ZPixmap, 0, 
-					image[0].zoom.data, image[0].zoom.dx, image[0].zoom.dy, 16, 0);
-  
-# endif
-}
Index: anches/eam_branches/20090715/Ohana/src/kapa2/src/CreateZoom24.c
===================================================================
--- /branches/eam_branches/20090715/Ohana/src/kapa2/src/CreateZoom24.c	(revision 25285)
+++ 	(revision )
@@ -1,178 +1,0 @@
-# include "Ximage.h"
-
-void CreateZoom24 (KapaImageWidget *image, Graphic *graphic, double x, double y) {
-
-# if (0)
-  int i, j, ii, jj, extra;
-  int i_start, i_end, j_start, j_end;
-  int dropback;  /* this is a bit of a kludge... */
-  int dx, dy, DX, DY, pixelN;
-  double expand, zoomscale, Rx, Ry;
-  int expand_in, expand_out;
-  unsigned char *out_pix, *out_pix2, *data;
-  float *imdata, *in_pix, *in_pix2;
-  unsigned char pixel1[256], pixel2[256], pixel3[256];
-  unsigned char pixvalue1, pixvalue2, pixvalue3;
-  unsigned long back;
-  unsigned char back1, back2, back3;
-
-  dx = image[0].zoom.dx;
-  dy = image[0].zoom.dy;
-  extra = 4 - (dx * 3) % 4;
-
-  if (image[0].image[0].matrix.size == 0) {  /* create a test pattern */
-    REALLOCATE (image[0].zoom.data, char, dy*(3*dx+extra));
-    bzero (image[0].zoom.data, image[0].zoom.dx*image[0].zoom.dy);
-    image[0].zoom.pix = XCreateImage (graphic[0].display, graphic[0].visual, graphic[0].depth, ZPixmap, 0, 
-				       image[0].zoom.data, image[0].zoom.dx, image[0].zoom.dy, 32, 0);
-    return;
-  }
-
-  for (i = 0; i < 256; i++) { /* set up pixel array */
-    pixel1[i] = 0x0000ff &  graphic[0].cmap[i].pixel;
-    pixel2[i] = 0x0000ff & (graphic[0].cmap[i].pixel >> 8);
-    pixel3[i] = 0x0000ff & (graphic[0].cmap[i].pixel >> 16);
-  }
-  back = graphic[0].back;
-  back1 = 0x0000ff & back;
-  back2 = 0x0000ff & (back >> 8);
-  back3 = 0x0000ff & (back >> 16);
-
-  // define the color transform parameters
-  MaxValue = graphic[0].Npixels - 1;
-  if (image[0].image[0].range != 0.0) {
-    slope = graphic[0].Npixels / image[0].image[0].range;
-    start = graphic[0].Npixels * image[0].image[0].zero / image[0].image[0].range;
-  } else {
-    slope = 1.0;
-    start = image[0].image[0].zero;
-  }
-
-  zoomscale = MAX (5, image[0].expand + 5);
-  expand = 1 / zoomscale;
-  expand_out = (int) zoomscale;
-  expand_in  = 1;
-
-  DX = image[0].image[0].matrix.Naxis[0];
-  DY = image[0].image[0].matrix.Naxis[1];
-  Rx = x - expand*(int)(0.5*(dx + 1)) + 1;
-  Ry = y - expand*(int)(0.5*(dy + 1)) + 1;
-
-  i_start = MIN (MAX (-Rx / expand, (1 - FRAC(Rx)) / expand), dx - expand_out + 1);
-  j_start = MIN (MAX (-Ry / expand, (1 - FRAC(Ry)) / expand), dy - expand_out + 1);
-  i_end   = MAX (MIN ((DX-Rx) / expand, dx - expand_out + 1), 0);
-  j_end   = MAX (MIN ((DY-Ry) / expand, dy - expand_out + 1), 0);
-  dropback = expand_out - (i_end - i_start) % expand_out;
-  if ((i_end - i_start) % expand_out == 0) dropback = 0;
-
-  data = out_pix = (unsigned char *) image[0].zoom.data;
-  imdata  = (float *) image[0].image[0].matrix.buffer;
-  in_pix  = &imdata[DX*(int)MAX(Ry,0) + (int)MAX(Rx,0)];
-
-  /********** below we do the mapping from buffer pixels (in) to picture pixels (out) **********/
-
-  if ((i_end < i_start) || (j_end < j_start)) {
-    for (j = 0; j < dx*dy; j++, out_pix++) 
-      *out_pix = back;
-    return;
-  } 
-  
-  /**** fill in bottom area ****/
-  for (j = 0; j < j_start; j++) {
-    for (i = 0; i < dx; i++, out_pix+=3) {
-      out_pix[0] = back1;
-      out_pix[1] = back2;
-      out_pix[2] = back3;
-    }
-    out_pix += extra;
-  }
-
-  for (j = j_start; j < j_end; j+= expand_out, in_pix += expand_in*DX) {
-    out_pix = &data[j*(3*dx+extra)];
-
-    /**** fill in area to the left of the picture ****/
-    for (jj = 0; jj < expand_out; jj++) { 
-      out_pix2 = out_pix + jj*(3*dx + extra);
-      for (i = 0; i < i_start; i++, out_pix2+=3) {
-	out_pix2[0] = back1;
-	out_pix2[1] = back2;
-	out_pix2[2] = back3;
-      }
-    }
-    out_pix += 3*i_start;
-    
-    /*** fill in the picture region ***/
-    in_pix2 = in_pix;
-    if (expand_out == 1) {
-      for (i = i_start; i < i_end; i++, in_pix2+= expand_in, out_pix+=3) {
-	pixelN = PixelLookup(*in_pix2);
-	out_pix[0] = pixel1[pixelN];
-	out_pix[1] = pixel2[pixelN];
-	out_pix[2] = pixel3[pixelN];
-      }
-    } else {
-      for (i = i_start; i < i_end; i+= expand_out, in_pix2++, out_pix+= 3*expand_out) { 
-	pixelN   = PixelLookup(*in_pix2);
-	pixvalue1 = pixel1[pixelN];
-	pixvalue2 = pixel2[pixelN];
-	pixvalue3 = pixel3[pixelN];
-	out_pix2 = out_pix;
-	for (jj = 0; jj < expand_out; jj++, out_pix2+=3*(dx-expand_out)+extra) {
-	  for (ii = 0; ii < expand_out; ii++, out_pix2+=3) {
-	    out_pix2[0] = pixvalue1; 
-	    out_pix2[1] = pixvalue2; 
-	    out_pix2[2] = pixvalue3; 
-	  }
-	}
-      }
-    }
-    out_pix -= 3*dropback;
-    
-    /**** fill in area to the right of the picture ****/
-    for (jj = 0; jj < expand_out; jj++) {
-      out_pix2 = out_pix + jj*(3*dx+extra);
-      for (i = i_end; i < dx; i++, out_pix2+=3) {
-	out_pix2[0] = back1;
-	out_pix2[1] = back2;
-	out_pix2[2] = back3;
-      }
-    }
-  } 
-  
-  /*
-  if ((j_end - j_start) % expand_out > 0)
-    out_pix -= (expand_out - (j_end - j_start) % expand_out);
-  */
-
-  out_pix = &data[j_end*(3*dx+extra)];
-  /**** fill in top area ****/
-  for (j = 0; j < (dy - j_end); j++) {
-    for (i = 0; i < dx; i++, out_pix+=3) { 
-      out_pix[0] = back1;
-      out_pix[1] = back2;
-      out_pix[2] = back3;
-    }
-    out_pix+=extra;
-  }
-
-  /*
-  out_pix = (unsigned char *) image[0].zoom.data;
-  for (i = 0; i < dx*dy; i++) {
-    out_pix[3*i + 0] = back1;
-    out_pix[3*i + 1] = back2;
-    out_pix[3*i + 2] = back3;
-  }
-  for (j = 0; j < dy/2; j++) {
-    for (i = 0; i < dx; i++) {
-      out_pix[j*(extra + 3*dx) + 3*i + 0] = pixel1[10];
-      out_pix[j*(extra + 3*dx) + 3*i + 1] = pixel2[10];
-      out_pix[j*(extra + 3*dx) + 3*i + 2] = pixel3[10];
-    }
-
-  }
-  */
-  image[0].zoom.pix = XCreateImage (graphic[0].display, graphic[0].visual, 24, ZPixmap, 0, 
-					image[0].zoom.data, image[0].zoom.dx, image[0].zoom.dy, 32, 0);
-  
-# endif
-}
Index: anches/eam_branches/20090715/Ohana/src/kapa2/src/CreateZoom32.c
===================================================================
--- /branches/eam_branches/20090715/Ohana/src/kapa2/src/CreateZoom32.c	(revision 25285)
+++ 	(revision )
@@ -1,138 +1,0 @@
-# include "Ximage.h"
-
-void CreateZoom32 (KapaImageWidget *image, Graphic *graphic, double x, double y) {
-
-  int i, j, ii, jj;
-  int i_start, i_end, j_start, j_end;
-  int dropback;  /* this is a bit of a kludge... */
-  int dx, dy, DX, DY;
-  double expand, Ix, Iy;
-  int expand_in, expand_out;
-  unsigned int *out_pix, *out_pix2;
-  unsigned short *in_pix, *in_pix2;
-  unsigned long *pixel, pixvalue;
-  unsigned long back;
-
-  if (image[0].image[0].matrix.size == 0) {  /* create a test pattern */
-    REALLOCATE (image[0].zoom.data, char, 4*image[0].zoom.dx*image[0].zoom.dy);
-    image[0].zoom.pix = XCreateImage (graphic[0].display, graphic[0].visual, graphic[0].depth, ZPixmap, 0, 
-				       image[0].zoom.data, image[0].zoom.dx, image[0].zoom.dy, 32, 0);
-    return;
-  }
-
-  ALLOCATE (pixel, unsigned long, graphic[0].Npixels);
-
-  // local array for pixel values
-  for (i = 0; i < graphic[0].Npixels; i++) { 
-    pixel[i] = graphic[0].cmap[i].pixel;
-  }
-  back = graphic[0].back;
-
-  // set up expansions
-  assert ((image[0].zoom.expand >= 1) || (image[0].zoom.expand <= -2));
-  expand = expand_in = expand_out = 1.0;
-  if (image[0].zoom.expand > 0) {
-    expand = 1 / (1.0*image[0].zoom.expand);
-    expand_out = image[0].zoom.expand;
-    expand_in  = 1;
-  }
-  if (image[0].zoom.expand < 0) {
-    expand = fabs((double)image[0].zoom.expand);
-    expand_out = 1;
-    expand_in  = -image[0].zoom.expand;
-  }
-
-  // define the image sizes
-  dx = image[0].zoom.dx;
-  dy = image[0].zoom.dy;
-  DX = image[0].image[0].matrix.Naxis[0];
-  DY = image[0].image[0].matrix.Naxis[1];
-  
-  // x, y are the closest lit screen pixel to 0,0
-  Picture_Lower (&i_start, &j_start, &image[0].image[0].matrix, &image[0].zoom);
-
-  // x, y are the closest lit screen pixel to dx, dy
-  Picture_Upper (&i_end, &j_end, &image[0].image[0].matrix, &image[0].zoom);
-
-  // Ix,Iy are the first displayed image pixel
-  Picture_to_Image (&Ix, &Iy, i_start, j_start, &image[0].zoom);
-
-  dropback = expand_out - (i_end - i_start) % expand_out;
-  if ((i_end - i_start) % expand_out == 0) dropback = 0;
-
-  out_pix = (unsigned int *) image[0].zoom.data;
-  in_pix  = &image[0].pixmap[DX*(int)MAX(Iy,0) + (int)MAX(Ix,0)];
-
-  /********** below we do the mapping from buffer pixels (in) to picture pixels (out) **********/
-
-  // XXX can we just drop this?
-  if ((i_end < i_start) || (j_end < j_start)) {
-    for (j = 0; j < dx*dy; j++, out_pix++) 
-      *out_pix = back;
-    return;
-  } 
-
-  /**** fill in bottom area ****/
-  for (j = 0; j < dx*j_start; j++, out_pix++) {
-    *out_pix = back;
-  }
-
-  for (j = j_start; j < j_end; j+= expand_out, out_pix+=(expand_out-1)*dx, in_pix += expand_in*DX) {
-
-    /**** fill in area to the left of the picture ****/
-    for (jj = 0; (i_start > 0) && (jj < expand_out); jj++) { 
-      out_pix2 = out_pix + jj*dx;
-      for (i = 0; i < i_start; i++, out_pix2++) {
-	*out_pix2 = back;
-      }
-    }
-    out_pix += i_start;
-    
-    /*** fill in the picture region ***/
-    in_pix2 = in_pix;
-    if (expand_out == 1) {
-      for (i = i_start; i < i_end; i++, in_pix2+= expand_in, out_pix++) {
-	*out_pix = pixel[*in_pix2];
-      }
-    } else {
-      // equiv to : out_pix += (i_end - i_start) + [expand_out - (i_end - i_start) % expand_out]
-      for (i = i_start; i < i_end; i+= expand_out, in_pix2++, out_pix+= expand_out) { 
-	pixvalue = pixel[*in_pix2];
-	out_pix2 = out_pix;
-	for (jj = 0; jj < expand_out; jj++, out_pix2+=(dx-expand_out)) {
-	  for (ii = 0; ii < expand_out; ii++, out_pix2++) {
-	    *out_pix2 = pixvalue; 
-	  }
-	}
-      }
-    }
-    out_pix -= dropback;
-    
-    /**** fill in area to the right of the picture ****/
-    for (jj = 0; jj < expand_out; jj++) {
-      out_pix2 = out_pix + jj*dx;
-      for (i = i_end; i < dx; i++, out_pix2++) {
-	*out_pix2 = back;
-      }
-    }
-    out_pix += (dx - i_end);
-    assert (out_pix - (unsigned int *)image[0].zoom.data <= dx*dy);
-  } 
-  assert (out_pix - (unsigned int *)image[0].zoom.data <= dx*dy);
-  
-  if ((j_end - j_start) % expand_out > 0)
-    out_pix -= (expand_out - (j_end - j_start) % expand_out);
-  
-  assert (out_pix - (unsigned int *)image[0].zoom.data <= dx*dy);
-
-  /**** fill in top area ****/
-  for (j = 0; (j < dx*(dy - j_end)) && (out_pix - (unsigned int *)image[0].zoom.data < dx*dy); j++, out_pix++) { 
-    *out_pix = back;
-  }
-  assert (out_pix - (unsigned int *)image[0].zoom.data <= dx*dy);
-
-  image[0].zoom.pix = XCreateImage (graphic[0].display, graphic[0].visual, graphic[0].depth, ZPixmap, 0, 
-					image[0].zoom.data, image[0].zoom.dx, image[0].zoom.dy, 32, 0);
-  
-  free (pixel);
-}
Index: anches/eam_branches/20090715/Ohana/src/kapa2/src/CreateZoom8.c
===================================================================
--- /branches/eam_branches/20090715/Ohana/src/kapa2/src/CreateZoom8.c	(revision 25285)
+++ 	(revision )
@@ -1,130 +1,0 @@
-# include "Ximage.h"
-
-void CreateZoom8 (KapaImageWidget *image, Graphic *graphic, double x, double y) {
-
-# if (0)
-  int i, j, ii, jj;
-  int i_start, i_end, j_start, j_end;
-  int dropback;  /* this is a bit of a kludge... */
-  int dx, dy, DX, DY, pixelN;
-  double expand, zoomscale, Rx, Ry;
-  int expand_in, expand_out;
-  unsigned char *out_pix, *out_pix2;
-  float *imdata, *in_pix, *in_pix2;
-  unsigned long pixel[256], pixvalue;
-  unsigned long back;
-
-  if (image[0].image[0].matrix.size == 0) {  /* create a test pattern */
-    REALLOCATE (image[0].zoom.data, char, image[0].zoom.dx*image[0].zoom.dy);
-    bzero (image[0].zoom.data, image[0].zoom.dx*image[0].zoom.dy);
-    image[0].zoom.pix = XCreateImage (graphic[0].display, graphic[0].visual, graphic[0].depth, ZPixmap, 0, 
-				       image[0].zoom.data, image[0].zoom.dx, image[0].zoom.dy, 8, 0);
-    return;
-  }
-
-  for (i = 0; i < 256; i++) { /* set up pixel array */
-    pixel[i] = graphic[0].cmap[i].pixel;
-  }
-  back = graphic[0].back;
-
-  // define the color transform parameters
-  MaxValue = graphic[0].Npixels - 1;
-  if (image[0].image[0].range != 0.0) {
-    slope = graphic[0].Npixels / image[0].image[0].range;
-    start = graphic[0].Npixels * image[0].image[0].zero / image[0].image[0].range;
-  } else {
-    slope = 1.0;
-    start = image[0].image[0].zero;
-  }
-
-  zoomscale = MAX (5, image[0].expand + 5);
-  expand = 1 / zoomscale;
-  expand_out = (int) zoomscale;
-  expand_in  = 1;
-
-  dx = image[0].zoom.dx;
-  dy = image[0].zoom.dy;
-  DX = image[0].image[0].matrix.Naxis[0];
-  DY = image[0].image[0].matrix.Naxis[1];
-  Rx = x - expand*(int)(0.5*(dx + 1)) + 1;
-  Ry = y - expand*(int)(0.5*(dy + 1)) + 1;
-
-  i_start = MIN (MAX (-Rx / expand, (1 - FRAC(Rx)) / expand), dx - expand_out + 1);
-  j_start = MIN (MAX (-Ry / expand, (1 - FRAC(Ry)) / expand), dy - expand_out + 1);
-  i_end   = MAX (MIN ((DX-Rx) / expand, dx - expand_out + 1), 0);
-  j_end   = MAX (MIN ((DY-Ry) / expand, dy - expand_out + 1), 0);
-  dropback = expand_out - (i_end - i_start) % expand_out;
-  if ((i_end - i_start) % expand_out == 0) dropback = 0;
-
-  out_pix = (unsigned char *) image[0].zoom.data;
-  imdata  = (float *) image[0].image[0].matrix.buffer;
-  in_pix  = &imdata[DX*(int)MAX(Ry,0) + (int)MAX(Rx,0)];
-
-  /********** below we do the mapping from buffer pixels (in) to picture pixels (out) **********/
-
-  if ((i_end < i_start) || (j_end < j_start)) {
-    for (j = 0; j < dx*dy; j++, out_pix++) 
-      *out_pix = back;
-    return;
-  } 
-  
-  /**** fill in bottom area ****/
-  for (j = 0; j < dx*j_start; j++, out_pix++) 
-    *out_pix = back;
-  
-  for (j = j_start; j < j_end; j+= expand_out, out_pix+=(expand_out-1)*dx, in_pix += expand_in*DX) {
-
-    /**** fill in area to the left of the picture ****/
-    for (jj = 0; jj < expand_out; jj++) { 
-      out_pix2 = out_pix + jj*dx;
-      for (i = 0; i < i_start; i++, out_pix2++) {
-	*out_pix2 = back;
-      }
-    }
-    out_pix += i_start;
-    
-    /*** fill in the picture region ***/
-    in_pix2 = in_pix;
-    if (expand_out == 1) {
-      for (i = i_start; i < i_end; i++, in_pix2+= expand_in, out_pix++) {
-	pixelN = PixelLookup(*in_pix2);
-	*out_pix = pixel[pixelN];
-      }
-    } else {
-      for (i = i_start; i < i_end; i+= expand_out, in_pix2++, out_pix+= expand_out) { 
-	pixelN   = PixelLookup(*in_pix2);
-	pixvalue = pixel[pixelN];
-	out_pix2 = out_pix;
-	for (jj = 0; jj < expand_out; jj++, out_pix2+=(dx-expand_out)) {
-	  for (ii = 0; ii < expand_out; ii++, out_pix2++) {
-	    *out_pix2 = pixvalue;
-	  }
-	}
-      }
-    }
-    out_pix -= dropback;
-    
-    /**** fill in area to the right of the picture ****/
-    for (jj = 0; jj < expand_out; jj++) {
-      out_pix2 = out_pix + jj*dx;
-      for (i = i_end; i < dx; i++, out_pix2++) {
-	*out_pix2 = back;
-      }
-    }
-    out_pix += (dx - i_end);
-    
-  } 
-  
-  if ((j_end - j_start) % expand_out > 0)
-    out_pix -= expand_out - (j_end - j_start) % expand_out;
-  
-  /**** fill in top area ****/
-  for (j = 0; (j < dx*(dy - j_end)) && (out_pix - (unsigned char *) image[0].zoom.data < dx*dy); j++, out_pix++) { 
-    *out_pix = back;
-  }
-
-  image[0].zoom.pix = XCreateImage (graphic[0].display, graphic[0].visual, graphic[0].depth, ZPixmap, 0, 
-					image[0].zoom.data, image[0].zoom.dx, image[0].zoom.dy, 8, 0);
-  
-# endif
-}