@@ -100,12 +100,12 @@ FrameAandB createTestFrameData(const int bitDepth)
100100 constexpr auto NR_REMAINING_PIXELS = NR_PIXELS_IN_FRAME - 4 ;
101101 for (unsigned int i = 0 ; i < NR_REMAINING_PIXELS; ++i)
102102 {
103- testValuesA.push_back (rgba_t (distribution (randomNumberGenerator),
104- distribution (randomNumberGenerator),
105- distribution (randomNumberGenerator)));
106- testValuesB.push_back (rgba_t (distribution (randomNumberGenerator),
107- distribution (randomNumberGenerator),
108- distribution (randomNumberGenerator)));
103+ testValuesA.push_back (rgba_t ({ static_cast < int >( distribution (randomNumberGenerator) ),
104+ static_cast < int >( distribution (randomNumberGenerator) ),
105+ static_cast < int >( distribution (randomNumberGenerator))} ));
106+ testValuesB.push_back (rgba_t ({ static_cast < int >( distribution (randomNumberGenerator) ),
107+ static_cast < int >( distribution (randomNumberGenerator) ),
108+ static_cast < int >( distribution (randomNumberGenerator))} ));
109109 }
110110
111111 return {testValuesA, testValuesB};
@@ -122,28 +122,28 @@ FrameAandB createTestFrameDataRGB565()
122122 const auto midValueG = (1 << (6 - 1 ));
123123
124124 // Add some special values that we definitely want to test
125- testValuesA.push_back (rgba_t (0 , 0 , 0 ));
126- testValuesB.push_back (rgba_t (maxValueRB, maxValueG, maxValueRB));
127- testValuesA.push_back (rgba_t (maxValueRB, maxValueG, maxValueRB));
128- testValuesB.push_back (rgba_t (0 , 0 , 0 ));
129- testValuesA.push_back (rgba_t (maxValueRB, maxValueG, maxValueRB));
130- testValuesB.push_back (rgba_t (maxValueRB, maxValueG, maxValueRB));
131- testValuesA.push_back (rgba_t (0 , 0 , 0 ));
132- testValuesB.push_back (rgba_t (0 , 0 , 0 ));
133-
134- testValuesA.push_back (rgba_t (midValueRB, midValueG, midValueRB));
135- testValuesB.push_back (rgba_t (0 , 0 , 0 ));
136- testValuesA.push_back (rgba_t (0 , 0 , 0 ));
137- testValuesB.push_back (rgba_t (midValueRB, midValueG, midValueRB));
138- testValuesA.push_back (rgba_t (0 , 0 , 0 ));
139- testValuesB.push_back (rgba_t (midValueRB - 1 , midValueG - 1 , midValueRB - 1 ));
140- testValuesA.push_back (rgba_t (0 , 0 , 0 ));
141- testValuesB.push_back (rgba_t (midValueRB + 1 , midValueG + 1 , midValueRB + 1 ));
142-
143- testValuesA.push_back (rgba_t (midValueRB, midValueG, midValueRB));
144- testValuesB.push_back (rgba_t (maxValueRB, maxValueG, maxValueRB));
145- testValuesA.push_back (rgba_t (maxValueRB, maxValueG, maxValueRB));
146- testValuesB.push_back (rgba_t (midValueRB, midValueG, midValueRB));
125+ testValuesA.push_back (rgba_t ({ 0 , 0 , 0 } ));
126+ testValuesB.push_back (rgba_t ({ maxValueRB, maxValueG, maxValueRB} ));
127+ testValuesA.push_back (rgba_t ({ maxValueRB, maxValueG, maxValueRB} ));
128+ testValuesB.push_back (rgba_t ({ 0 , 0 , 0 } ));
129+ testValuesA.push_back (rgba_t ({ maxValueRB, maxValueG, maxValueRB} ));
130+ testValuesB.push_back (rgba_t ({ maxValueRB, maxValueG, maxValueRB} ));
131+ testValuesA.push_back (rgba_t ({ 0 , 0 , 0 } ));
132+ testValuesB.push_back (rgba_t ({ 0 , 0 , 0 } ));
133+
134+ testValuesA.push_back (rgba_t ({ midValueRB, midValueG, midValueRB} ));
135+ testValuesB.push_back (rgba_t ({ 0 , 0 , 0 } ));
136+ testValuesA.push_back (rgba_t ({ 0 , 0 , 0 } ));
137+ testValuesB.push_back (rgba_t ({ midValueRB, midValueG, midValueRB} ));
138+ testValuesA.push_back (rgba_t ({ 0 , 0 , 0 } ));
139+ testValuesB.push_back (rgba_t ({ midValueRB - 1 , midValueG - 1 , midValueRB - 1 } ));
140+ testValuesA.push_back (rgba_t ({ 0 , 0 , 0 } ));
141+ testValuesB.push_back (rgba_t ({ midValueRB + 1 , midValueG + 1 , midValueRB + 1 } ));
142+
143+ testValuesA.push_back (rgba_t ({ midValueRB, midValueG, midValueRB} ));
144+ testValuesB.push_back (rgba_t ({ maxValueRB, maxValueG, maxValueRB} ));
145+ testValuesA.push_back (rgba_t ({ maxValueRB, maxValueG, maxValueRB} ));
146+ testValuesB.push_back (rgba_t ({ midValueRB, midValueG, midValueRB} ));
147147
148148 // The rest of the values will be random
149149 std::random_device randomDevice;
@@ -154,12 +154,12 @@ FrameAandB createTestFrameDataRGB565()
154154 constexpr auto NR_REMAINING_PIXELS = NR_PIXELS_IN_FRAME - 10 ;
155155 for (unsigned int i = 0 ; i < NR_REMAINING_PIXELS; ++i)
156156 {
157- testValuesA.push_back (rgba_t (distributionRB (randomNumberGenerator),
158- distributionG (randomNumberGenerator),
159- distributionRB (randomNumberGenerator)));
160- testValuesB.push_back (rgba_t (distributionRB (randomNumberGenerator),
161- distributionG (randomNumberGenerator),
162- distributionRB (randomNumberGenerator)));
157+ testValuesA.push_back (rgba_t ({ static_cast < int >( distributionRB (randomNumberGenerator) ),
158+ static_cast < int >( distributionG (randomNumberGenerator) ),
159+ static_cast < int >( distributionRB (randomNumberGenerator))} ));
160+ testValuesB.push_back (rgba_t ({ static_cast < int >( distributionRB (randomNumberGenerator) ),
161+ static_cast < int >( distributionG (randomNumberGenerator) ),
162+ static_cast < int >( distributionRB (randomNumberGenerator))} ));
163163 }
164164
165165 return {testValuesA, testValuesB};
0 commit comments