Return int from freenect_get_ir_brightness() - fixes #433

Signed-off-by: Benn Snyder <benn.snyder@gmail.com>
OpenKinect · Feb 13, 2015 · 68073c3 · 68073c3
1 parent b6c2eb3
commit 68073c3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/include/libfreenect.h b/include/libfreenect.h
@@ -675,9 +675,9 @@ FREENECTAPI int freenect_set_flag(freenect_device *dev, freenect_flag flag, free
  *
  * @param dev Device to get IR brightness
  *
- * @return IR brightness, UINT16_MAX if error
+ * @return IR brightness value in the range 1 - 50, < 0 if error
  */
-FREENECTAPI uint16_t freenect_get_ir_brightness(freenect_device *dev);
+FREENECTAPI int freenect_get_ir_brightness(freenect_device *dev);
 
 /**
  * Sets the brightness of the IR projector

diff --git a/src/flags.c b/src/flags.c
@@ -93,14 +93,15 @@ int freenect_set_flag(freenect_device *dev, freenect_flag flag, freenect_flag_va
 	return write_cmos_register(dev, 0x0106, cmos_value);
 }
 
-uint16_t freenect_get_ir_brightness(freenect_device *dev)
+int freenect_get_ir_brightness(freenect_device *dev)
 {
 	freenect_context *ctx = dev->parent;
 
 	const uint16_t brightness = read_register(dev, 0x15);
 	if (brightness == UINT16_MAX)
 	{
 		FN_WARNING("Failed to get IR brightness!");
+		return -1;
 	}
 
 	return brightness;