Skip to content

Commit 68073c3

Browse files
committed
Return int from freenect_get_ir_brightness() - fixes #433
Signed-off-by: Benn Snyder <[email protected]>
1 parent b6c2eb3 commit 68073c3

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

include/libfreenect.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -675,9 +675,9 @@ FREENECTAPI int freenect_set_flag(freenect_device *dev, freenect_flag flag, free
675675
*
676676
* @param dev Device to get IR brightness
677677
*
678-
* @return IR brightness, UINT16_MAX if error
678+
* @return IR brightness value in the range 1 - 50, < 0 if error
679679
*/
680-
FREENECTAPI uint16_t freenect_get_ir_brightness(freenect_device *dev);
680+
FREENECTAPI int freenect_get_ir_brightness(freenect_device *dev);
681681

682682
/**
683683
* Sets the brightness of the IR projector

src/flags.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,15 @@ int freenect_set_flag(freenect_device *dev, freenect_flag flag, freenect_flag_va
9393
return write_cmos_register(dev, 0x0106, cmos_value);
9494
}
9595

96-
uint16_t freenect_get_ir_brightness(freenect_device *dev)
96+
int freenect_get_ir_brightness(freenect_device *dev)
9797
{
9898
freenect_context *ctx = dev->parent;
9999

100100
const uint16_t brightness = read_register(dev, 0x15);
101101
if (brightness == UINT16_MAX)
102102
{
103103
FN_WARNING("Failed to get IR brightness!");
104+
return -1;
104105
}
105106

106107
return brightness;

0 commit comments

Comments
 (0)