Changeset 243

Timestamp:

04/29/06 18:26:49 (4 years ago)

Author:

goodea

Message:

channels

Location:

trunk

Files:

• hal/lpc2106-cmucam3/cc3.c (modified) (4 diffs)
• include/cc3.h (modified) (1 diff)

trunk/hal/lpc2106-cmucam3/cc3.c

@@ -213 +213 @@
 uint8_t *cc3_malloc_rows (uint32_t rows)
 {
-  int channels;
+  int channels = cc3_g_current_frame.channels;
   int width = cc3_g_current_frame.width;
-
-  if (cc3_g_current_frame.coi == CC3_ALL) {
-    channels = 3;
-  }
-  else {
-    channels = 1;
-  }
 
   return (uint8_t *) malloc (width * channels * rows);
@@ -487 +480 @@
     return 0;                   // Sanity check on bounds
   cc3_g_current_frame.coi = chan;
+
+  cc3_g_current_frame.channels = (chan == CC3_ALL ? 3 : 1);
+
   return 1;
 }
@@ -527 +523 @@
 void cc3_frame_default ()
 {
-  cc3_g_current_frame.coi = CC3_ALL;
   cc3_g_current_frame.x_step = 1;
   cc3_g_current_frame.y_step = 1;
@@ -536 +531 @@
   cc3_g_current_frame.y_loc = 0;
   cc3_g_current_frame.subsample_mode = CC3_NEAREST;
+
+  cc3_pixbuf_set_coi(CC3_ALL);
 
   _cc3_update_frame_bounds (&cc3_g_current_frame);

trunk/include/cc3.h

@@ -84 +84 @@
   cc3_subsample_mode_t subsample_mode;
   uint16_t width, height;
+  uint8_t channels;
 } cc3_frame_t;