Changeset 15925 for branches/eam_branch_20071222/Ohana/src/kapa2/src/JPEGit24.c

Timestamp:

Dec 24, 2007, 5:47:04 PM (19 years ago)

Author:

eugene

Message:

lots of work to add in multiple channels, blinking, working to 3D colors

File:

• branches/eam_branch_20071222/Ohana/src/kapa2/src/JPEGit24.c (modified) (3 diffs)

branches/eam_branch_20071222/Ohana/src/kapa2/src/JPEGit24.c

@@ -84 +84 @@
   // define the color transform parameters
   MaxValue = graphic[0].Npixels - 1;
-  if (image[0].range != 0.0) {
-    slope = graphic[0].Npixels / image[0].range;
-    start = graphic[0].Npixels * image[0].zero / image[0].range;
+  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].zero;
+    start = image[0].image[0].zero;
   }
 
@@ -108 +108 @@
   dx = image[0].picture.dx;
   dy = image[0].picture.dy;
-  DX = image[0].matrix.Naxis[0];
-  DY = image[0].matrix.Naxis[1];
+  DX = image[0].image[0].matrix.Naxis[0];
+  DY = image[0].image[0].matrix.Naxis[1];
 
   /* X,Y are the image coordinates of the first image pixel */
@@ -145 +145 @@
   ALLOCATE (line_buffer, JSAMPLE, 3*dx);
 
-  imdata = (float *) image[0].matrix.buffer;
+  imdata = (float *) image[0].image[0].matrix.buffer;
   in_pix_ref = &imdata[DX*(int)MAX(Y,0) + (int)MAX(X,0)];