Changeset 506 in cmucam

Timestamp:

03/26/07 00:56:34 (5 years ago)

Author:

goodea

Message:

indent

Location:

trunk/lib/cc3-ilp

Files:

• cc3_hsv.c (modified) (1 diff)
• cc3_hsv.h (modified) (1 diff)

trunk/lib/cc3-ilp/cc3_hsv.c

@@ -31 +31 @@
  *
  */
-inline void cc3_rgb2hsv(cc3_pixel_t *pix)
+inline void cc3_rgb2hsv (cc3_pixel_t * pix)
 {
-    uint8_t hue,sat,val;
-    uint8_t rgb_min, rgb_max;
-    rgb_max=0;
-    rgb_min=255;
-    if(pix->channel[CC3_CHANNEL_RED]>rgb_max) rgb_max=pix->channel[CC3_CHANNEL_RED];
-    if(pix->channel[CC3_CHANNEL_GREEN]>rgb_max) rgb_max=pix->channel[CC3_CHANNEL_GREEN];
-    if(pix->channel[CC3_CHANNEL_BLUE]>rgb_max) rgb_max=pix->channel[CC3_CHANNEL_BLUE];
-    if(pix->channel[CC3_CHANNEL_RED]<rgb_min) rgb_min=pix->channel[CC3_CHANNEL_RED];
-    if(pix->channel[CC3_CHANNEL_GREEN]<rgb_min) rgb_min=pix->channel[CC3_CHANNEL_GREEN];
-    if(pix->channel[CC3_CHANNEL_BLUE]<rgb_min) rgb_min=pix->channel[CC3_CHANNEL_BLUE];
+  uint8_t hue, sat, val;
+  uint8_t rgb_min, rgb_max;
+  rgb_max = 0;
+  rgb_min = 255;
+  if (pix->channel[CC3_CHANNEL_RED] > rgb_max)
+    rgb_max = pix->channel[CC3_CHANNEL_RED];
+  if (pix->channel[CC3_CHANNEL_GREEN] > rgb_max)
+    rgb_max = pix->channel[CC3_CHANNEL_GREEN];
+  if (pix->channel[CC3_CHANNEL_BLUE] > rgb_max)
+    rgb_max = pix->channel[CC3_CHANNEL_BLUE];
+  if (pix->channel[CC3_CHANNEL_RED] < rgb_min)
+    rgb_min = pix->channel[CC3_CHANNEL_RED];
+  if (pix->channel[CC3_CHANNEL_GREEN] < rgb_min)
+    rgb_min = pix->channel[CC3_CHANNEL_GREEN];
+  if (pix->channel[CC3_CHANNEL_BLUE] < rgb_min)
+    rgb_min = pix->channel[CC3_CHANNEL_BLUE];
 
 // compute V
-val = rgb_max;
-if (val == 0) {
+  val = rgb_max;
+  if (val == 0) {
     hue = sat = 0;
-    pix->channel[CC3_CHANNEL_HUE]=0;
-    pix->channel[CC3_CHANNEL_SAT]=0;
-    pix->channel[CC3_CHANNEL_VAL]=val;
+    pix->channel[CC3_CHANNEL_HUE] = 0;
+    pix->channel[CC3_CHANNEL_SAT] = 0;
+    pix->channel[CC3_CHANNEL_VAL] = val;
     return;
+  }
+
+// compute S
+  sat = 255 * (rgb_max - rgb_min) / val;
+  if (sat == 0) {
+    pix->channel[CC3_CHANNEL_HUE] = 0;
+    pix->channel[CC3_CHANNEL_SAT] = 0;
+    pix->channel[CC3_CHANNEL_VAL] = val;
+    return;
+  }
+
+// compute H
+  if (rgb_max == pix->channel[CC3_CHANNEL_RED]) {
+    hue =
+      0 + 43 * (pix->channel[CC3_CHANNEL_GREEN] -
+                pix->channel[CC3_CHANNEL_BLUE]) / (rgb_max - rgb_min);
+  }
+  else if (rgb_max == pix->channel[CC3_CHANNEL_GREEN]) {
+    hue =
+      85 + 43 * (pix->channel[CC3_CHANNEL_BLUE] -
+                 pix->channel[CC3_CHANNEL_RED]) / (rgb_max - rgb_min);
+  }
+  else {                        /* rgb_max == blue */
+
+    hue =
+      171 + 43 * (pix->channel[CC3_CHANNEL_RED] -
+                  pix->channel[CC3_CHANNEL_GREEN]) / (rgb_max - rgb_min);
+  }
+  pix->channel[CC3_CHANNEL_HUE] = hue;
+  pix->channel[CC3_CHANNEL_SAT] = sat;
+  pix->channel[CC3_CHANNEL_VAL] = val;
 }
 
-// compute S
-sat = 255*(rgb_max - rgb_min)/val;
-if (sat == 0) {
-    pix->channel[CC3_CHANNEL_HUE]=0;
-    pix->channel[CC3_CHANNEL_SAT]=0;
-    pix->channel[CC3_CHANNEL_VAL]=val;
-    return;
-}
+void cc3_rgb2hsv_row (cc3_pixel_t * pix, uint16_t size)
+{
+  uint16_t i;
 
-// compute H
-if (rgb_max == pix->channel[CC3_CHANNEL_RED]) {
-    hue = 0 + 43*(pix->channel[CC3_CHANNEL_GREEN] - pix->channel[CC3_CHANNEL_BLUE])/(rgb_max - rgb_min);
-} else if (rgb_max == pix->channel[CC3_CHANNEL_GREEN]) {
-    hue = 85 + 43*(pix->channel[CC3_CHANNEL_BLUE] - pix->channel[CC3_CHANNEL_RED])/(rgb_max - rgb_min);
-} else /* rgb_max == blue */ {
-    hue = 171 + 43*(pix->channel[CC3_CHANNEL_RED] - pix->channel[CC3_CHANNEL_GREEN])/(rgb_max - rgb_min);
-}
-pix->channel[CC3_CHANNEL_HUE]=hue;
-pix->channel[CC3_CHANNEL_SAT]=sat;
-pix->channel[CC3_CHANNEL_VAL]=val;
-}
-
-void cc3_rgb2hsv_row(cc3_pixel_t *pix, uint16_t size)
-{
-uint16_t i;
-
-for(i=0; i<size; i++ )
-        cc3_rgb2hsv(&pix[i]);
+  for (i = 0; i < size; i++)
+    cc3_rgb2hsv (&pix[i]);
 
 }
-
-

trunk/lib/cc3-ilp/cc3_hsv.h

@@ -25 +25 @@
 
 
-inline void cc3_rgb2hsv(cc3_pixel_t *pix);
-void cc3_rgb2hsv_row(cc3_pixel_t *pix, uint16_t size);
+inline void cc3_rgb2hsv (cc3_pixel_t * pix);
+void cc3_rgb2hsv_row (cc3_pixel_t * pix, uint16_t size);
 
 #endif