Changeset 210

Timestamp:

03/26/06 15:35:17 (3 years ago)

Author:

goodea

Message:

re-add width and height

Files:

• trunk/hal/lpc2106-cmucam3/cc3.c (modified) (7 diffs)
• trunk/include/cc3.h (modified) (1 diff)
• trunk/lib/cc3_ilp/cc3_color_track.c (modified) (2 diffs)
• trunk/lib/cc3_ilp/cc3_ilp.c (modified) (1 diff)
• trunk/projects/cmucam2/cmucam2.c (modified) (3 diffs)
• trunk/projects/hello_world/main.c (modified) (1 diff)
• trunk/projects/jpeg-6b/main.c (modified) (1 diff)

trunk/hal/lpc2106-cmucam3/cc3.c

@@ -40 +40 @@
-static uint8_t _cc3_second_green;
-static bool _cc3_second_green_valid;
+
+static void _cc3_update_frame_bounds ();
-
-void cc3_pixbuf_load ()
@@ -212 +214 @@
-{
-  int channels;
-
-
+
-
-  if (cc3_g_current_frame.coi == CC3_ALL) {
@@ -242 +243 @@
-  uint8_t off0, off1, off2;
-
-
-
+
-
-  int row_limit = (cc3_g_current_frame.y1 - cc3_g_current_frame.y_loc)
@@ -349 +349 @@
-    cc3_g_current_frame.x1 = x1;
-    cc3_g_current_frame.y1 = y1;
+
+    _cc3_update_frame_bounds (&cc3_g_current_frame);
+
-    return 1;
-  }
@@ -375 +378 @@
-  cc3_g_current_frame.y1 = cc3_g_current_frame.raw_height;
-  cc3_g_current_frame.subsample_mode = mode;
+
+  _cc3_update_frame_bounds (&cc3_g_current_frame);
-  return 1;
-}
@@ -438 +443 @@
-  cc3_g_current_frame.y_loc = 0;
-  cc3_g_current_frame.subsample_mode = CC3_NEAREST;
+
+  _cc3_update_frame_bounds (&cc3_g_current_frame);
-}
-
@@ -582 +589 @@
-}
-
+void _cc3_update_frame_bounds (cc3_frame_t *f)
+{
+  f->width = (f->x1 - f->x0) / f->x_step;
+  f->height = (f->y1 - f->y0) / f->y_step;
+}
+
-/**
- * This sets the hardware colorspace that comes out of the camera.

trunk/include/cc3.h

@@ -83 +83 @@
-  cc3_channel_t coi;
-  cc3_subsample_mode_t subsample_mode;
+  uint16_t width, height;
-} cc3_frame_t;
-

trunk/lib/cc3_ilp/cc3_color_track.c

@@ -21 +21 @@
-{
-  uint16_t y, x;
-  int height, width;
-
-  uint8_t *row, *pixel;
@@ -43 +42 @@
-  pixel = row = cc3_malloc_rows(1);
-  
-
-
-
-
-
-
+
-    cc3_pixbuf_read_rows(row, 1);
-
-
+cc3_g_current_frame.
-      bool pixel_good = 0;
-

trunk/lib/cc3_ilp/cc3_ilp.c

@@ -8 +8 @@
-{
-  uint32_t x, y;
-  uint32_t size_x, size_y;
-  uint8_t *row = cc3_malloc_rows(1);
-
-  cc3_set_led (1);
-  size_x = (cc3_g_current_frame.x1 - cc3_g_current_frame.x0) 
-    / cc3_g_current_frame.x_step;
-  size_y = (cc3_g_current_frame.y1 - cc3_g_current_frame.y0)
-    / cc3_g_current_frame.y_step;
-
-  putchar (1);
-size_x
-size_y
-size_y
-size_y
-size_y
+cc3_g_current_frame.width
+cc3_g_current_frame.height
+cc3_g_current_frame.height
+cc3_g_current_frame.height
+cc3_g_current_frame.height
-    putchar (2);
-    
-    cc3_pixbuf_read_rows(row, 1);
-size_x * 3
+cc3_g_current_frame.width * 3U
-      putchar (row[x]);
-    }

trunk/projects/cmucam2/cmucam2.c

@@ -238 +238 @@
-{
-  cc3_image_t img;
-  uint16_t i;
-  img.channels = 3;
-
-
+
-  img.height = 1;               // image will hold just 1 row for scanline processing
-  img.pix = malloc (3 * img.width);
@@ -265 +263 @@
-  cc3_image_t img;
-  uint16_t i;
-  int height = (cc3_g_current_frame.y1 - cc3_g_current_frame.y0) / cc3_g_current_frame.y_step;
-
-  img.channels = 3;
-(cc3_g_current_frame.x1 - cc3_g_current_frame.x0) / cc3_g_current_frame.x_step
+cc3_g_current_frame.width
-  img.height = 1;               // image will hold just 1 row for scanline processing
-  img.pix = cc3_malloc_rows(1);
@@ -284 +281 @@
-          lm_width++;
-        putchar (0xAA);
-
+cc3_g_current_frame.
-          lm_height = 255;
-        else
-
+cc3_g_current_frame.
-
-        //putchar(lm_width);

trunk/projects/hello_world/main.c

@@ -69 +69 @@
-    // setup an image structure
-    img.channels=3;
-(cc3_g_current_frame.x1 - cc3_g_current_frame.x0) / cc3_g_current_frame.x_step
+cc3_g_current_frame.width
-    img.height=1;  // image will hold just 1 row for scanline processing
-    img.pix = cc3_malloc_rows(1);

trunk/projects/jpeg-6b/main.c

@@ -81 +81 @@
-
-  // parameters for jpeg image
-(cc3_g_current_frame.x1 - cc3_g_current_frame.x0) / cc3_g_current_frame.x_step
-(cc3_g_current_frame.y1 - cc3_g_current_frame.y0) / cc3_g_current_frame.y_step
+cc3_g_current_frame.width
+cc3_g_current_frame.height
-  printf( "image width=%d image height=%d\n", cinfo.image_width, cinfo.image_height );
-  cinfo.input_components = 3;