On Thu, Nov 19, 2015 at 8:36 AM, Ronald S. Bultje <rsbul...@gmail.com> wrote: > Hi, > > On Thu, Nov 19, 2015 at 8:14 AM, Ganesh Ajjanagadde <gajjanaga...@gmail.com> > wrote: >> >> See e.g >> https://stackoverflow.com/questions/1666353/are-typedef-and-define-the-same-in-c >> for rationale. >> >> Signed-off-by: Ganesh Ajjanagadde <gajjanaga...@gmail.com> >> --- >> tests/tiny_ssim.c | 5 ++--- >> 1 file changed, 2 insertions(+), 3 deletions(-) >> >> diff --git a/tests/tiny_ssim.c b/tests/tiny_ssim.c >> index 9f355a3..ebd0216 100644 >> --- a/tests/tiny_ssim.c >> +++ b/tests/tiny_ssim.c >> @@ -79,11 +79,11 @@ static float ssim_end1( int s1, int s2, int ss, int >> s12 ) >> * s1*s1, s2*s2, and s1*s2 also obtain this value for edge cases: >> ((2^10-1)*16*4)^2 = 4286582784. >> * Maximum value for 9-bit is: ss*64 = (2^9-1)^2*16*4*64 = 1069551616, >> which will not overflow. */ >> #if BIT_DEPTH > 9 >> -#define type float >> +typedef float type; >> static const float ssim_c1 = .01*.01*PIXEL_MAX*PIXEL_MAX*64; >> static const float ssim_c2 = .03*.03*PIXEL_MAX*PIXEL_MAX*64*63; >> #else >> -#define type int >> +typedef int type; >> static const int ssim_c1 = (int)(.01*.01*PIXEL_MAX*PIXEL_MAX*64 + >> .5); >> static const int ssim_c2 = (int)(.03*.03*PIXEL_MAX*PIXEL_MAX*64*63 + >> .5); >> #endif > > > Bad indentation?
I noticed it, suspect it was due to the macro earlier. I followed general philosophy of avoiding reindents in code changes, keeping them for a separate commit. > > Ronald _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
