Commit 9866f587 authored by Daniel Kamil Kozar's avatar Daniel Kamil Kozar

Fix compilation with --enable-debug with GCC 5.1

GCC 5.1.0 features stricter warnings about comparing boolean variables
with integer values, and thus compilation with --enable-debug failed
with "comparison of constant 12 with boolean expression is always true".
The leftover pieces of old code which treated integers as booleans are
now fixed, and the test suite is now compilable and runs correctly.
parent 61fd7518
......@@ -7,7 +7,7 @@
<integer name="i_frame_rate_code" bitcount="4" default="0" />
<insert>
<begin>
s_decoded.b_mpeg2 = 0;</begin>
s_decoded.b_mpeg2 = false;</begin>
</insert>
<boolean name="b_constrained_parameter" default="0" />
<boolean name="b_still_picture" default="0" />
......@@ -18,7 +18,7 @@
<integer name="i_frame_rate_code" bitcount="4" default="0" />
<insert>
<begin>
s_decoded.b_mpeg2 = 12;</begin>
s_decoded.b_mpeg2 = true;</begin>
</insert>
<boolean name="b_constrained_parameter" default="0" />
<boolean name="b_still_picture" default="0" />
......
......@@ -100,7 +100,7 @@ static int main_vstream_2(void)
/* check b_multiple_frame_rate */
BOZO_init_boolean(b_multiple_frame_rate, 0);
BOZO_init_integer(i_frame_rate_code, 0);
s_decoded.b_mpeg2 = 12;
s_decoded.b_mpeg2 = true;
BOZO_init_boolean(b_constrained_parameter, 0);
BOZO_init_boolean(b_still_picture, 0);
BOZO_init_integer(i_profile_level_indication, 0);
......@@ -115,7 +115,7 @@ static int main_vstream_2(void)
/* check i_frame_rate_code */
BOZO_init_boolean(b_multiple_frame_rate, 0);
BOZO_init_integer(i_frame_rate_code, 0);
s_decoded.b_mpeg2 = 12;
s_decoded.b_mpeg2 = true;
BOZO_init_boolean(b_constrained_parameter, 0);
BOZO_init_boolean(b_still_picture, 0);
BOZO_init_integer(i_profile_level_indication, 0);
......@@ -130,7 +130,7 @@ static int main_vstream_2(void)
/* check b_constrained_parameter */
BOZO_init_boolean(b_multiple_frame_rate, 0);
BOZO_init_integer(i_frame_rate_code, 0);
s_decoded.b_mpeg2 = 12;
s_decoded.b_mpeg2 = true;
BOZO_init_boolean(b_constrained_parameter, 0);
BOZO_init_boolean(b_still_picture, 0);
BOZO_init_integer(i_profile_level_indication, 0);
......@@ -145,7 +145,7 @@ static int main_vstream_2(void)
/* check b_still_picture */
BOZO_init_boolean(b_multiple_frame_rate, 0);
BOZO_init_integer(i_frame_rate_code, 0);
s_decoded.b_mpeg2 = 12;
s_decoded.b_mpeg2 = true;
BOZO_init_boolean(b_constrained_parameter, 0);
BOZO_init_boolean(b_still_picture, 0);
BOZO_init_integer(i_profile_level_indication, 0);
......@@ -160,7 +160,7 @@ static int main_vstream_2(void)
/* check i_profile_level_indication */
BOZO_init_boolean(b_multiple_frame_rate, 0);
BOZO_init_integer(i_frame_rate_code, 0);
s_decoded.b_mpeg2 = 12;
s_decoded.b_mpeg2 = true;
BOZO_init_boolean(b_constrained_parameter, 0);
BOZO_init_boolean(b_still_picture, 0);
BOZO_init_integer(i_profile_level_indication, 0);
......@@ -175,7 +175,7 @@ static int main_vstream_2(void)
/* check i_chroma_format */
BOZO_init_boolean(b_multiple_frame_rate, 0);
BOZO_init_integer(i_frame_rate_code, 0);
s_decoded.b_mpeg2 = 12;
s_decoded.b_mpeg2 = true;
BOZO_init_boolean(b_constrained_parameter, 0);
BOZO_init_boolean(b_still_picture, 0);
BOZO_init_integer(i_profile_level_indication, 0);
......@@ -190,7 +190,7 @@ static int main_vstream_2(void)
/* check b_frame_rate_extension */
BOZO_init_boolean(b_multiple_frame_rate, 0);
BOZO_init_integer(i_frame_rate_code, 0);
s_decoded.b_mpeg2 = 12;
s_decoded.b_mpeg2 = true;
BOZO_init_boolean(b_constrained_parameter, 0);
BOZO_init_boolean(b_still_picture, 0);
BOZO_init_integer(i_profile_level_indication, 0);
......
......@@ -97,13 +97,13 @@
{ \
fprintf(stdout, " \"%s\" boolean check\n", #name); \
i_loop_count = 0; \
s_decoded.name = 0; \
s_decoded.name = false; \
do \
{
#define BOZO_end_boolean(name) \
s_decoded.name += 12; \
} while(!i_err && (s_decoded.name <= 12)); \
s_decoded.name ^= true; \
} while(!i_err && s_decoded.name); \
fprintf(stdout, "\r iteration count: %22"PRI64d, i_loop_count); \
if(i_err) \
fprintf(stdout, " FAILED !!!\n"); \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment