Changeset 16228 for trunk/Ohana/src/kapa2/src/Remap24.c

Timestamp:

Jan 24, 2008, 5:45:18 PM (18 years ago)

Author:

eugene

Message:

cleaning up the image/screen relationships and remap functions

File:

• trunk/Ohana/src/kapa2/src/Remap24.c (modified) (6 diffs)

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

@@ -1 +1 @@
 # include "Ximage.h"
-
-static float slope = 1.0;
-static float start = 0.0;
-static int MaxValue = 255;
-
-// XXX inline this if needed
-static int PixelLookup(float value) {
-  int out;
-  out = MIN (MAX (slope * value - start, 0), MaxValue);
-  return (out);
-}
 
 void Remap24 (Graphic *graphic, KapaImageWidget *image, Matrix *matrix) {
@@ -17 +6 @@
   int i_start, i_end, j_start, j_end;
   int dropback, extra;  /* this is a bit of a kludge... */
-  int dx, dy, DX, DY, pixelN;
-  double expand, Rx, Ry, X, Y;
+  int dx, dy, DX, DY;
+  double expand, Sx, Sy, Ix, Iy;
   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 short *in_pix, *in_pix2;
+  unsigned char *pixel1, *pixel2, *pixel3;
   unsigned char pixvalue1, pixvalue2, pixvalue3;
-  unsigned long back;
   unsigned char back1, back2, back3;
 
+  ALLOCATE (pixel1, unsigned char, graphic[0].Npixels);
+  ALLOCATE (pixel2, unsigned char, graphic[0].Npixels);
+  ALLOCATE (pixel3, unsigned char, graphic[0].Npixels);
+
   // local arrays for pixel values
-  for (i = 0; i < 256; i++) { /* set up pixel array */
+  for (i = 0; i < graphic[0].Npixels; 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;
-  }
+  back1 = 0x0000ff & (graphic[0].back >>  0);
+  back2 = 0x0000ff & (graphic[0].back >>  8);
+  back3 = 0x0000ff & (graphic[0].back >> 16);
 
   // set up expansions
@@ -70 +51 @@
 
   /* X,Y are the image coordinates of the first image pixel */
-  X = MAX(0.5*(DX - dx*expand) - image[0].X, 0);
-  if ((int)X != X) 
-    X = (int) X + 1;
+  Ix = MAX(0.5*(DX - dx*expand) - image[0].X, 0);
+  if ((int)Ix != Ix) 
+    Ix = (int) Ix + 1;
   else 
-    X = (int) X;
-  Y = MAX(0.5*(DY - dy*expand) - image[0].Y, 0);
-  if ((int)Y != Y) 
-    Y = (int) Y + 1;
+    Ix = (int) Ix;
+  Iy = MAX(0.5*(DY - dy*expand) - image[0].Y, 0);
+  if ((int)Iy != Iy) 
+    Iy = (int) Iy + 1;
   else 
-    Y = (int) Y;
+    Iy = (int) Iy;
 
-  /* Rx,Ry are the screen coordinates of the first image pixel */
-  Rx = (X + image[0].X - 0.5*DX)/expand + 0.5*dx;
-  Ry = (Y + image[0].Y - 0.5*DY)/expand + 0.5*dy;
+  /* Sx,Sy are the screen coordinates of the first image pixel */
+  Sx = (Ix + image[0].X - 0.5*DX)/expand + 0.5*dx;
+  Sy = (Iy + image[0].Y - 0.5*DY)/expand + 0.5*dy;
 
-  i_start = MIN (MAX (Rx, 0), dx - expand_out + 1);
-  j_start = MIN (MAX (Ry, 0), dy - expand_out + 1);
+  i_start = MIN (MAX (Sx, 0), dx - expand_out + 1);
+  j_start = MIN (MAX (Sy, 0), dy - expand_out + 1);
   
   if (image[0].expand > 0) {
-    i_end = MAX (MIN (i_start + ((int)(expand*(dx-i_start)))/expand, expand_out*(DX-X) + Rx), 0);
-    j_end = MAX (MIN (j_start + ((int)(expand*(dy-j_start)))/expand, expand_out*(DY-Y) + Ry), 0);
+    i_end = MAX (MIN (i_start + ((int)(expand*(dx-i_start)))/expand, expand_out*(DX-Ix) + Sx), 0);
+    j_end = MAX (MIN (j_start + ((int)(expand*(dy-j_start)))/expand, expand_out*(DY-Iy) + Sy), 0);
   } else {
-    i_end = MAX (MIN (dx, (DX-X)/expand + Rx), 0);
-    j_end = MAX (MIN (dy, (DY-Y)/expand + Ry), 0);
+    i_end = MAX (MIN (dx, (DX-Ix)/expand + Sx), 0);
+    j_end = MAX (MIN (dy, (DY-Iy)/expand + Sy), 0);
   }    
 
@@ -100 +81 @@
 
   data = out_pix = (unsigned char *) image[0].picture.data;
-  imdata  = (float *) matrix[0].buffer;
-  in_pix  = &imdata[DX*(int)MAX(Y,0) + (int)MAX(X,0)];
+  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) **********/
@@ -133 +113 @@
     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];
+        out_pix[0] = pixel1[*in_pix2];
+        out_pix[1] = pixel2[*in_pix2];
+        out_pix[2] = pixel3[*in_pix2];
       }
     } 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];
+        pixvalue1 = pixel1[*in_pix2];
+        pixvalue2 = pixel2[*in_pix2];
+        pixvalue3 = pixel3[*in_pix2];
         out_pix2 = out_pix;
         for (jj = 0; jj < expand_out; jj++, out_pix2+=3*(dx-expand_out)+extra) {
@@ -185 +163 @@
   image[0].picture.pix = XCreateImage (graphic[0].display, graphic[0].visual, graphic[0].depth, ZPixmap, 0, 
                                         image[0].picture.data, image[0].picture.dx, image[0].picture.dy, 32, 0);
+
+  free (pixel1);
+  free (pixel2);
+  free (pixel3);
 }