Merge branch 'master' of steffen.gulpe.de:steffen/SimpleSkyCam

detect.cc

@@ -213,10 +213,10 @@ void Detect::InputDetect(int *posx, int *posy) {
 		}
 }
 
-/* returns approx. gray value */
+/* returns approx. 8-bit gray value */
-inline uint16_t calc_gray(uint8_t r, uint8_t g, uint8_t b) {
+inline uint8_t calc_gray(uint8_t r, uint8_t g, uint8_t b) {
-  /* Gray ~ 0.3*R + 0.59*G + 0.11*B -> approx. 0.3125*R + 0.625*G + 0.125*B */
+  /* Gray ~ 0.3*R + 0.59*G + 0.11*B -> approx. 0.28125*R + 0.625*G + 0.09375*B */
-  return (r >> 2) + (r >> 3) + (g >> 1) + (g >> 3) + (b >> 3);
+  return (r >> 2) + (r >> 5) + (g >> 1) + (g >> 4) + (b >> 4) + (b >> 5);
 }
 
 /* returns 4-vector product */