IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 16255


Ignore:
Timestamp:
Jan 27, 2008, 9:18:37 AM (18 years ago)
Author:
eugene
Message:

fix up compile errors after mods to Image & Picture

Location:
trunk/Ohana/src/kapa2
Files:
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/kapa2/include/prototypes.h

    r16061 r16255  
    162162void          DrawButton          PROTO((Graphic *graphic, Button *button));
    163163void          DrawBitmap          PROTO((Graphic *graphic, int x, int y, int dx, int dy, char *bitmap, int mode));
    164 void          CrossHairs          PROTO((Graphic *graphic, KapaImageWidget *image));
     164void          CrossHairs          PROTO((Graphic *graphic, Picture *image));
    165165void          hh_hms              PROTO((char *line, double ra, double dec, char sep));
    166166
    … …  
    171171void          PaintTickmarks      PROTO((Graphic *graphic, KapaImageWidget *image));
    172172
    173 void          Screen_to_Image     PROTO((double *x1, double *y1, double x2, double y2, KapaImageWidget *image));
    174 void          Image_to_Screen     PROTO((double *x1, double *y1, double x2, double y2, KapaImageWidget *image));
     173void          Screen_to_Image     PROTO((double *x1, double *y1, double x2, double y2, Picture *picture));
     174void          Image_to_Screen     PROTO((double *x1, double *y1, double x2, double y2, Picture *picture));
    175175
    176176void          DragColorbar        PROTO((Graphic *graphic, KapaImageWidget *image, XButtonEvent *mouse_event));

  • trunk/Ohana/src/kapa2/include/structures.h

    r16228 r16255  
    9494  int      DX, DY;            // size of displayed picture (must be updated with new images...)
    9595  int      expand;            // zoomscale
    96   double   Xo, Yo;            // image pixel at screen center
     96  double   X,  Y;             // offset of image center
     97  double   Xo, Yo;            // reference image pixel (picture has X - Xo at center)
    9798  XImage  *pix;
    9899  char    *data;

  • trunk/Ohana/src/kapa2/src/ButtonFunctions.c

    r16228 r16255  
    4444int Recenter (Graphic *graphic, KapaImageWidget *image) {
    4545
    46   image[0].X = 0;
    47   image[0].Y = 0;
     46  image[0].picture.X = 0;
     47  image[0].picture.Y = 0;
    4848 
    4949  Remap (graphic, image);

  • trunk/Ohana/src/kapa2/src/Center.c

    r16228 r16255  
    1616  if (image == NULL) return (TRUE);
    1717
    18   image[0].picture.X = 0.5*image[0].image[0].matrix.Naxis[0] - X;
    19   image[0].picture.Y = 0.5*image[0].image[0].matrix.Naxis[1] - Y;
     18  image[0].picture.Xo = 0.5*image[0].image[0].matrix.Naxis[0] - X;
     19  image[0].picture.Yo = 0.5*image[0].image[0].matrix.Naxis[1] - Y;
    2020  if ((zoom != 0) && (zoom != -1)) {
    2121    image[0].picture.expand = zoom;

  • trunk/Ohana/src/kapa2/src/CreateZoom16.c

    r16011 r16255  
    1515void CreateZoom16 (KapaImageWidget *image, Graphic *graphic, double x, double y) {
    1616
     17# if (0)
    1718  int i, j, ii, jj;
    1819  int i_start, i_end, j_start, j_end;
    … …  
    152153                                        image[0].zoom.data, image[0].zoom.dx, image[0].zoom.dy, 16, 0);
    153154 
     155# endif
    154156}

  • trunk/Ohana/src/kapa2/src/CreateZoom24.c

    r16011 r16255  
    1515void CreateZoom24 (KapaImageWidget *image, Graphic *graphic, double x, double y) {
    1616
     17# if (0)
    1718  int i, j, ii, jj, extra;
    1819  int i_start, i_end, j_start, j_end;
    … …  
    186187                                        image[0].zoom.data, image[0].zoom.dx, image[0].zoom.dy, 32, 0);
    187188 
     189# endif
    188190}

  • trunk/Ohana/src/kapa2/src/CreateZoom32.c

    r16228 r16255  
    88  int dropback;  /* this is a bit of a kludge... */
    99  int dx, dy, DX, DY;
    10   double expand, zoomscale, Ix, Iy;
     10  double expand, Sx, Sy, Ix, Iy;
    1111  int expand_in, expand_out;
    1212  unsigned int *out_pix, *out_pix2;
    … …  
    3030  back = graphic[0].back;
    3131
    32   zoomscale = MAX (5, image[0].expand + 5);
    33   expand = 1 / zoomscale;
    34   expand_out = (int) zoomscale;
    35   expand_in  = 1;
     32  // set up expansions
     33  assert ((image[0].zoom.expand >= 1) || (image[0].zoom.expand <= -2));
     34  expand = expand_in = expand_out = 1.0;
     35  if (image[0].zoom.expand > 0) {
     36    expand = 1 / (1.0*image[0].zoom.expand);
     37    expand_out = image[0].zoom.expand;
     38    expand_in  = 1;
     39  }
     40  if (image[0].zoom.expand < 0) {
     41    expand = fabs((double)image[0].zoom.expand);
     42    expand_out = 1;
     43    expand_in  = -image[0].zoom.expand;
     44  }
    3645
     46  // define the image sizes
    3747  dx = image[0].zoom.dx;
    3848  dy = image[0].zoom.dy;
    … …  
    4050  DY = image[0].image[0].matrix.Naxis[1];
    4151 
    42   /* Ix,Iy are the image coordinates of the first image pixel */
    43   // x,y is the image coordinate of the zoombox center
    44   Ix = x - expand*(int)(0.5*(dx + 1)) + 1;
    45   Iy = y - expand*(int)(0.5*(dy + 1)) + 1;
     52  // Ix, Iy are the image coordinates of the 0,0 screen pixel
     53  Screen_to_Image (&Ix, &Iy, 0.0, 0.0, &image[0].picture);
    4654
    47   i_start = MIN (MAX (-Ix / expand, (1 - FRAC(Ix)) / expand), dx - expand_out + 1);
    48   j_start = MIN (MAX (-Iy / expand, (1 - FRAC(Iy)) / expand), dy - expand_out + 1);
    49   i_end   = MAX (MIN ((DX-Ix) / expand, dx - expand_out + 1), 0);
    50   j_end   = MAX (MIN ((DY-Iy) / expand, dy - expand_out + 1), 0);
     55  // Ix, Iy are now limited to valid image coordinates
     56  Ix = MIN (MAX (Ix, 0), DX);
     57  Iy = MIN (MAX (Iy, 0), DY);
     58
     59  // Sx, Sy are the screen coordinates of the Ix,Iy pixel
     60  Image_to_Screen (&Sx, &Sy, Ix,  Iy,  &image[0].picture);
     61
     62  // i_start, j_start are now limited to valid screen coordinates
     63  i_start = MIN (MAX (Sx, 0), dx);
     64  j_start = MIN (MAX (Sy, 0), dy);
     65
     66  // Ix, Iy are the image coordinates of the 0,0 screen pixel
     67  Screen_to_Image (&Ix, &Iy, dx, dy, &image[0].picture);
     68
     69  // Ix, Iy are now limited to valid image coordinates
     70  Ix = MIN (MAX (Ix, 0), DX);
     71  Iy = MIN (MAX (Iy, 0), DY);
     72
     73  // Sx, Sy are the screen coordinates of the Ix,Iy pixel
     74  Image_to_Screen (&Sx, &Sy, Ix,  Iy,  &image[0].picture);
     75
     76  // i_end, j_end are now limited to valid screen coordinates
     77  i_end = MIN (MAX (Sx, 0), dx);
     78  j_end = MIN (MAX (Sy, 0), dy);
    5179
    5280  dropback = expand_out - (i_end - i_start) % expand_out;
    … …  
    5886  /********** below we do the mapping from buffer pixels (in) to picture pixels (out) **********/
    5987
     88  // XXX can we just drop this?
    6089  if ((i_end < i_start) || (j_end < j_start)) {
    6190    for (j = 0; j < dx*dy; j++, out_pix++)

  • trunk/Ohana/src/kapa2/src/CreateZoom8.c

    r16011 r16255  
    1515void CreateZoom8 (KapaImageWidget *image, Graphic *graphic, double x, double y) {
    1616
     17# if (0)
    1718  int i, j, ii, jj;
    1819  int i_start, i_end, j_start, j_end;
    … …  
    138139                                        image[0].zoom.data, image[0].zoom.dx, image[0].zoom.dy, 8, 0);
    139140 
     141# endif
    140142}

  • trunk/Ohana/src/kapa2/src/CrossHairs.c

    r16228 r16255  
    11# include "Ximage.h"
    22
    3 void CrossHairs (Graphic *graphic, KapaImageWidget *image) {
     3void CrossHairs (Graphic *graphic, Picture *image) {
    44
    55  int x0, x1, x5, x7;
    … …  
    77  double zoomscale;
    88
    9   zoomscale = image[0].zoom;
    10   x0 = (zoomscale) * (0.5 * (ZOOM_X + 1) / zoomscale - 2.5) + image[0].zoom.x;
    11   x5 = (zoomscale) * (0.5 * (ZOOM_X + 1) / zoomscale - 0.5) + image[0].zoom.x;
    12   x7 = (zoomscale) * (0.5 * (ZOOM_X + 1) / zoomscale + 0.5) + image[0].zoom.x;
    13   x1 = (zoomscale) * (0.5 * (ZOOM_X + 1) / zoomscale + 2.5) + image[0].zoom.x;
     9  // is this totally wrong??
     10  zoomscale = image[0].expand;
     11  x0 = (zoomscale) * (0.5 * (ZOOM_X + 1) / zoomscale - 2.5) + image[0].x;
     12  x5 = (zoomscale) * (0.5 * (ZOOM_X + 1) / zoomscale - 0.5) + image[0].x;
     13  x7 = (zoomscale) * (0.5 * (ZOOM_X + 1) / zoomscale + 0.5) + image[0].x;
     14  x1 = (zoomscale) * (0.5 * (ZOOM_X + 1) / zoomscale + 2.5) + image[0].x;
    1415                                                         
    15   y4 = (zoomscale) * (0.5 * (ZOOM_Y + 1) / zoomscale - 2.5) + image[0].zoom.y;
    16   y2 = (zoomscale) * (0.5 * (ZOOM_Y + 1) / zoomscale - 0.5) + image[0].zoom.y;
    17   y0 = (zoomscale) * (0.5 * (ZOOM_Y + 1) / zoomscale + 0.5) + image[0].zoom.y;
    18   y5 = (zoomscale) * (0.5 * (ZOOM_Y + 1) / zoomscale + 2.5) + image[0].zoom.y;
     16  y4 = (zoomscale) * (0.5 * (ZOOM_Y + 1) / zoomscale - 2.5) + image[0].y;
     17  y2 = (zoomscale) * (0.5 * (ZOOM_Y + 1) / zoomscale - 0.5) + image[0].y;
     18  y0 = (zoomscale) * (0.5 * (ZOOM_Y + 1) / zoomscale + 0.5) + image[0].y;
     19  y5 = (zoomscale) * (0.5 * (ZOOM_Y + 1) / zoomscale + 2.5) + image[0].y;
    1920
    2021

  • trunk/Ohana/src/kapa2/src/CursorOps.c

    r16228 r16255  
    33void Screen_to_Image (double *x1, double *y1, double x2, double y2, Picture *picture) {
    44
    5   double expand;
     5  double xs, ys, expand;
    66
    77  expand = 1.0;
    … …  
    2323void Image_to_Screen (double *x1, double *y1, double x2, double y2, Picture *picture) {
    2424
    25   double expand;
     25  double xs, ys, expand;
    2626
    2727  /* notice that here, expand is the reciprocal of the expand above */
    … …  
    3030    expand = picture[0].expand;
    3131  } else {
    32     expand = 1 / fabs((double)image[0].expand);
     32    expand = 1 / fabs((double)picture[0].expand);
    3333  }
    3434 

  • trunk/Ohana/src/kapa2/src/Image.c

    r16228 r16255  
    5050  image[0].picture.X      = 0.0;
    5151  image[0].picture.Y      = 0.0;
     52  image[0].picture.Xo     = 0.0;
     53  image[0].picture.Yo     = 0.0;
    5254  image[0].picture.expand = 1;
    5355
    5456  image[0].zoom.X         = 0.0;
    5557  image[0].zoom.Y         = 0.0;
     58  image[0].zoom.Xo        = 0.0;
     59  image[0].zoom.Yo        = 0.0;
    5660  image[0].zoom.expand    = +5;
    5761
    5862  image[0].wide.X         = 0.0;
    5963  image[0].wide.Y         = 0.0;
     64  image[0].wide.Xo        = 0.0;
     65  image[0].wide.Yo        = 0.0;
    6066  image[0].wide.expand    = -5;
    6167
    … …  
    148154               image[0].cmapbar.dx, image[0].cmapbar.dy);
    149155
    150     CrossHairs (graphic, image);
     156    CrossHairs (graphic, &image[0].zoom);
    151157 
    152158    /* erase everything below zoom box, then draw */

  • trunk/Ohana/src/kapa2/src/InterpretKeys.c

    r16228 r16255  
    8383  // 0.5 image pixels is 1 screen pixel for expand == +2
    8484  // 2.0 image pixels is 1 screen pixel for expand == -2
    85   if (image[0].expand == 0) image[0].expand = 1;
    86   offset = (image[0].expand > 0) ? 1.0 / image[0].expand : -image[0].expand;
     85  if (image[0].picture.expand == 0) image[0].picture.expand = 1;
     86  offset = (image[0].picture.expand > 0) ? 1.0 / image[0].picture.expand : -image[0].picture.expand;
    8787  if (modstate & ControlMask) offset *= 100;
    8888
    … …  
    9393      SetColorScale (graphic, image);
    9494      Remap (graphic, image);
    95       Reorient (graphic, image, image[0].X, image[0].Y, 0);
     95      Reorient (graphic, image, image[0].picture.X, image[0].picture.Y, 0);
    9696      break;
    9797
    … …  
    100100      SetColorScale (graphic, image);
    101101      Remap (graphic, image);
    102       Reorient (graphic, image, image[0].X, image[0].Y, 0);
     102      Reorient (graphic, image, image[0].picture.X, image[0].picture.Y, 0);
    103103      break;
    104104
    … …  
    107107      SetColorScale (graphic, image);
    108108      Remap (graphic, image);
    109       Reorient (graphic, image, image[0].X, image[0].Y, 0);
     109      Reorient (graphic, image, image[0].picture.X, image[0].picture.Y, 0);
    110110      break;
    111111
    112112    case XK_KP_Home:
    113113    case XK_Home:
    114       image[0].expand = 1;
    115       Reorient (graphic, image, image[0].X, image[0].Y, 0);
     114      image[0].picture.expand = 1;
     115      Reorient (graphic, image, image[0].picture.X, image[0].picture.Y, 0);
    116116      break;
    117117    case XK_KP_End:
    118118    case XK_End:
    119       image[0].expand = 1;
     119      image[0].picture.expand = 1;
    120120      Reorient (graphic, image, 0, 0, 0);
    121121      break;
    … …  
    130130    case XK_Prior:
    131131    case XK_KP_Prior:
    132       Reorient (graphic, image, image[0].X, image[0].Y, +1);
     132      Reorient (graphic, image, image[0].picture.X, image[0].picture.Y, +1);
    133133      break;
    134134    case XK_Next:
    135135    case XK_KP_Next:
    136       Reorient (graphic, image, image[0].X, image[0].Y, -1);
     136      Reorient (graphic, image, image[0].picture.X, image[0].picture.Y, -1);
    137137      break;
    138138    case XK_Up:
    139139    case XK_KP_Up:
    140       Reorient (graphic, image, image[0].X, image[0].Y + offset, 0);
     140      Reorient (graphic, image, image[0].picture.X, image[0].picture.Y + offset, 0);
    141141      break;
    142142    case XK_Down:
    143143    case XK_KP_Down:
    144       Reorient (graphic, image, image[0].X, image[0].Y - offset, 0);
     144      Reorient (graphic, image, image[0].picture.X, image[0].picture.Y - offset, 0);
    145145      break;
    146146    case XK_Left:
    147147    case XK_KP_Left:
    148       Reorient (graphic, image, image[0].X + offset, image[0].Y, 0);
     148      Reorient (graphic, image, image[0].picture.X + offset, image[0].picture.Y, 0);
    149149      break;
    150150    case XK_Right:
    151151    case XK_KP_Right:
    152       Reorient (graphic, image, image[0].X - offset, image[0].Y, 0);
     152      Reorient (graphic, image, image[0].picture.X - offset, image[0].picture.Y, 0);
    153153      break;
    154154
    155155    case XK_KP_Add:
    156156      image[0].image[0].zero += 0.1*image[0].image[0].range;
    157       Reorient (graphic, image, image[0].X, image[0].Y, 0);
     157      Reorient (graphic, image, image[0].picture.X, image[0].picture.Y, 0);
    158158      break;
    159159    case XK_KP_Subtract:
    160160      image[0].image[0].zero -= 0.1*image[0].image[0].range;
    161       Reorient (graphic, image, image[0].X, image[0].Y, 0);
     161      Reorient (graphic, image, image[0].picture.X, image[0].picture.Y, 0);
    162162      break;
    163163

  • trunk/Ohana/src/kapa2/src/JPEGit24.c

    r16061 r16255  
    88// XXX this currently writes out the jpeg for just the active image
    99int JPEGit24 (int sock) {
     10
     11# if (0)
    1012
    1113  struct jpeg_compress_struct cinfo;
    … …  
    7577  }
    7678
     79  assert ((image[0].picture.expand >= 1) || (image[0].picture.expand <= -2));
    7780  expand = expand_in = expand_out = 1.0;
    78   if (image[0].expand == 0) /* set up expansions */
    79     image[0].expand = 1;
    80   if (image[0].expand > 0) {
    81     expand = 1 / (1.0*image[0].expand);
    82     expand_out = image[0].expand;
     81  if (image[0].picture.expand > 0) {
     82    expand = 1 / (1.0*image[0].picture.expand);
     83    expand_out = image[0].picture.expand;
    8384    expand_in  = 1;
    8485  }
    85   if (image[0].expand < 0) {
    86     expand = fabs((double)image[0].expand);
     86  if (image[0].picture.expand < 0) {
     87    expand = fabs((double)image[0].picture.expand);
    8788    expand_out = 1;
    88     expand_in  = -image[0].expand;
     89    expand_in  = -image[0].picture.expand;
    8990  }
    9091
    … …  
    232233  jpeg_destroy_compress (&cinfo);
    233234
     235
     236# endif
    234237  return (TRUE);
    235238}

  • trunk/Ohana/src/kapa2/src/PSOverlay.c

    r16228 r16255  
    99 
    1010  expand = 1.0;
    11   if (image[0].expand > 0) {
    12     expand = 1 / (1.0*image[0].expand);
     11  if (image[0].picture.expand > 0) {
     12    expand = 1 / (1.0*image[0].picture.expand);
    1313  }
    14   if (image[0].expand < 0) {
    15     expand = fabs((double)image[0].expand);
     14  if (image[0].picture.expand < 0) {
     15    expand = fabs((double)image[0].picture.expand);
    1616  }
    1717

  • trunk/Ohana/src/kapa2/src/PaintOverlay.c

    r16228 r16255  
    1111 
    1212  expand = 1.0;
    13   if (image[0].expand > 0) {
    14     expand = 1 / (1.0*image[0].expand);
     13  if (image[0].picture.expand > 0) {
     14    expand = 1 / (1.0*image[0].picture.expand);
    1515  }
    16   if (image[0].expand < 0) {
    17     expand = fabs((double)image[0].expand);
     16  if (image[0].picture.expand < 0) {
     17    expand = fabs((double)image[0].picture.expand);
    1818  }
    1919

  • trunk/Ohana/src/kapa2/src/Remap16.c

    r16228 r16255  
    33void Remap16 (Graphic *graphic, KapaImageWidget *image, Matrix *matrix) {
    44
     5# if (0)
    56  int i, j, ii, jj;
    67  int i_start, i_end, j_start, j_end;
    … …  
    165166  free (pixel1);
    166167  free (pixel2);
     168
     169# endif
    167170}
    168171

  • trunk/Ohana/src/kapa2/src/Remap24.c

    r16228 r16255  
    33void Remap24 (Graphic *graphic, KapaImageWidget *image, Matrix *matrix) {
    44
     5# if (0)
    56  int i, j, ii, jj;
    67  int i_start, i_end, j_start, j_end;
    … …  
    167168  free (pixel2);
    168169  free (pixel3);
     170
     171# endif
    169172}
    170173

  • trunk/Ohana/src/kapa2/src/Remap32.c

    r16228 r16255  
    2323
    2424  // set up expansions
     25  assert ((image[0].picture.expand >= 1) || (image[0].picture.expand <= -2));
    2526  expand = expand_in = expand_out = 1.0;
    26   if (image[0].expand == 0)
    27     image[0].expand = 1;
    28   if (image[0].expand > 0) {
    29     expand = 1 / (1.0*image[0].expand);
    30     expand_out = image[0].expand;
     27  if (image[0].picture.expand > 0) {
     28    expand = 1 / (1.0*image[0].picture.expand);
     29    expand_out = image[0].picture.expand;
    3130    expand_in  = 1;
    3231  }
    33   if (image[0].expand < 0) {
    34     expand = fabs((double)image[0].expand);
     32  if (image[0].picture.expand < 0) {
     33    expand = fabs((double)image[0].picture.expand);
    3534    expand_out = 1;
    36     expand_in  = -image[0].expand;
     35    expand_in  = -image[0].picture.expand;
    3736  }
    3837
    39   // define the image boundaries
     38  // define the image sizes
    4039  dx = image[0].picture.dx;
    4140  dy = image[0].picture.dy;

  • trunk/Ohana/src/kapa2/src/Remap8.c

    r16228 r16255  
    33void Remap8 (Graphic *graphic, KapaImageWidget *image, Matrix *matrix) {
    44
     5# if (0)
    56  int i, j, ii, jj;
    67  int i_start, i_end, j_start, j_end;
    … …  
    132133  image[0].picture.pix = XCreateImage (graphic[0].display, graphic[0].visual, graphic[0].depth, ZPixmap, 0,
    133134                                        image[0].picture.data, image[0].picture.dx, image[0].picture.dy, 8, 0);
     135
     136# endif
    134137}
    135138

  • trunk/Ohana/src/kapa2/src/StatusBox.c

    r16011 r16255  
    55  double  x, y, z;
    66
     7  z = -1;
     8
    79  if (image[0].MovePointer) {
    810    x = 0.5*image[0].image[0].matrix.Naxis[0];
    911    y = 0.5*image[0].image[0].matrix.Naxis[1];
    10     z = -1;
    11     image[0].x = x;
    12     image[0].y = y;
    13     image[0].z = z;
     12    // z = -1;
     13    image[0].zoom.x = x;
     14    image[0].zoom.y = y;
     15    // image[0].z = z;
    1416  } else {
    15     x = image[0].x;
    16     y = image[0].y;
    17     z = image[0].z;
     17    x = image[0].zoom.x;
     18    y = image[0].zoom.y;
     19    // z = image[0].z;
    1820  }
    1921 

  • trunk/Ohana/src/kapa2/src/UpdatePointer.c

    r16228 r16255  
    3030  skip:
    3131    image[0].zoom.X = x;
    32     image[0].zoom.Y = Y;
     32    image[0].zoom.Y = y;
    3333   
    3434    UpdateStatusBox (graphic, image, x, y, z, 0);
    … …  
    4040               image[0].zoom.x, image[0].zoom.y,
    4141               image[0].zoom.dx, image[0].zoom.dy);
    42     CrossHairs (graphic, image);
     42    CrossHairs (graphic, &image[0].zoom);
    4343    XFlush (graphic[0].display);
    4444  }

  • trunk/Ohana/src/kapa2/src/UpdateStatusBox.c

    r16011 r16255  
    2121    bzero (line, 100);
    2222    sprintf (line, "(%d x %d) @ %d                                         ",
    23              image[0].picture.dx, image[0].picture.dy, image[0].expand);
     23             image[0].picture.dx, image[0].picture.dy, image[0].picture.expand);
    2424    XDrawString (graphic[0].display, graphic[0].window, graphic[0].gc,
    2525                 image[0].text_x + PAD1, image[0].text_y + 4*textpad + 4*PAD1, line, 25);

  • trunk/Ohana/src/kapa2/src/bDrawOverlay.c

    r16228 r16255  
    1717 
    1818  expand = 1.0;
    19   if (image[0].expand > 0) {
    20     expand = 1 / (1.0*image[0].expand);
     19  if (image[0].picture.expand > 0) {
     20    expand = 1 / (1.0*image[0].picture.expand);
    2121  }
    22   if (image[0].expand < 0) {
    23     expand = fabs((double)image[0].expand);
     22  if (image[0].picture.expand < 0) {
     23    expand = fabs((double)image[0].picture.expand);
    2424  }
    2525

  • trunk/Ohana/src/kapa2/test/input

    r16039 r16255  
     1
     2macro test1
     3  mcreate a 512 512
     4  set x = xramp(a)
     5  tv x 0 512
     6end
    17
    28macro go
Note: See TracChangeset for help on using the changeset viewer.