diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-12-28 01:15:24 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-12-28 01:15:24 +0000 |
| commit | ea81a192a65a03b664dac61de21e06cea7aa97a2 (patch) | |
| tree | f21447aeb9f24320ea6c1c4cb7a05539646bb85a /src/rgb_xyz.cc | |
| parent | 75788462338b1b4f464d075465da3cb372c40004 (diff) | |
Purge assert() from src/, at least (not asdcplib).
Diffstat (limited to 'src/rgb_xyz.cc')
| -rw-r--r-- | src/rgb_xyz.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/rgb_xyz.cc b/src/rgb_xyz.cc index de8d484a..35332fc2 100644 --- a/src/rgb_xyz.cc +++ b/src/rgb_xyz.cc @@ -24,6 +24,7 @@ #include "colour_matrix.h" #include "colour_conversion.h" #include "transfer_function.h" +#include "dcp_assert.h" #include <cmath> using std::min; @@ -68,7 +69,7 @@ dcp::xyz_to_rgba ( uint8_t* argb_line = argb; for (int x = 0; x < xyz_frame->size().width; ++x) { - assert (*xyz_x >= 0 && *xyz_y >= 0 && *xyz_z >= 0 && *xyz_x < 4096 && *xyz_y < 4096 && *xyz_z < 4096); + DCP_ASSERT (*xyz_x >= 0 && *xyz_y >= 0 && *xyz_z >= 0 && *xyz_x < 4096 && *xyz_y < 4096 && *xyz_z < 4096); /* In gamma LUT */ s.x = lut_in[*xyz_x++]; @@ -144,7 +145,7 @@ dcp::xyz_to_rgb ( uint8_t* buffer_line = buffer; for (int x = 0; x < xyz_frame->size().width; ++x) { - assert (*xyz_x >= 0 && *xyz_y >= 0 && *xyz_z >= 0 && *xyz_x < 4096 && *xyz_y < 4096 && *xyz_z < 4096); + DCP_ASSERT (*xyz_x >= 0 && *xyz_y >= 0 && *xyz_z >= 0 && *xyz_x < 4096 && *xyz_y < 4096 && *xyz_z < 4096); /* In gamma LUT */ s.x = lut_in[*xyz_x++]; @@ -223,9 +224,9 @@ dcp::rgb_to_xyz ( d.y = d.y * DCI_COEFFICIENT * 65535; d.z = d.z * DCI_COEFFICIENT * 65535; - assert (d.x >= 0 && d.x < 65536); - assert (d.y >= 0 && d.y < 65536); - assert (d.z >= 0 && d.z < 65536); + DCP_ASSERT (d.x >= 0 && d.x < 65536); + DCP_ASSERT (d.y >= 0 && d.y < 65536); + DCP_ASSERT (d.z >= 0 && d.z < 65536); /* Out gamma LUT */ xyz->data(0)[jn] = lut_out[(int) d.x] * 4096; |