sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nohalo1.cpp and snohalo1.cpp cosmetic

Browse Source
This commit is contained in:
Nicolas Robidoux 2009-04-08 18:00:53 +00:00
parent 19e496a40b
commit 0623cc5302
2 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libsrc/resample/nohalo1.cpp
View File

@ -473,40 +473,40 @@ nohalo1( const double uno_two,
const int corner_reflection_shift = \
relative_x_is_rite * bands + relative_y_is_down * lskip; \
\
const int shift_back_1_pixel = sign_of_relative_x * bands; \
const int shift_back_1_row = sign_of_relative_y * lskip; \
const int shift_back_1_pix = sign_of_relative_x * bands; \
const int shift_back_1_row = sign_of_relative_y * lskip; \
\
const T* restrict in = ( (T *) pin ) + corner_reflection_shift; \
\
const int shift_forw_1_pixel = -shift_back_1_pixel; \
const int shift_forw_1_row = -shift_back_1_row; \
const int shift_forw_1_pix = -shift_back_1_pix; \
const int shift_forw_1_row = -shift_back_1_row; \
\
const double w = ( 2 * sign_of_relative_x ) * relative_x; \
const double z = ( 2 * sign_of_relative_y ) * relative_y; \
\
const int shift_forw_2_pixel = 2 * shift_forw_1_pixel; \
const int shift_forw_2_row = 2 * shift_forw_1_row; \
const int shift_forw_2_pix = 2 * shift_forw_1_pix; \
const int shift_forw_2_row = 2 * shift_forw_1_row; \
\
const int uno_two_shift = shift_back_1_row; \
const int uno_thr_shift = shift_forw_1_pixel + shift_back_1_row; \
const int uno_two_shift = shift_back_1_row; \
const int uno_thr_shift = shift_forw_1_pix + shift_back_1_row; \
\
const double x = 1. - w; \
const double w_times_z = w * z; \
\
const int dos_one_shift = shift_back_1_pixel; \
const int dos_one_shift = shift_back_1_pix; \
const int dos_two_shift = 0; \
const int dos_thr_shift = shift_forw_1_pixel; \
const int dos_fou_shift = shift_forw_2_pixel; \
const int dos_thr_shift = shift_forw_1_pix; \
const int dos_fou_shift = shift_forw_2_pix; \
\
const int tre_one_shift = shift_back_1_pixel + shift_forw_1_row; \
const int tre_two_shift = shift_forw_1_row; \
const int tre_thr_shift = shift_forw_1_pixel + shift_forw_1_row; \
const int tre_fou_shift = shift_forw_2_pixel + shift_forw_1_row; \
const int tre_one_shift = shift_back_1_pix + shift_forw_1_row; \
const int tre_two_shift = shift_forw_1_row; \
const int tre_thr_shift = shift_forw_1_pix + shift_forw_1_row; \
const int tre_fou_shift = shift_forw_2_pix + shift_forw_1_row; \
\
const double x_times_z = x * z; \
\
const int qua_two_shift = shift_forw_2_row; \
const int qua_thr_shift = shift_forw_1_pixel + shift_forw_2_row; \
const int qua_two_shift = shift_forw_2_row; \
const int qua_thr_shift = shift_forw_1_pix + shift_forw_2_row; \
\
const double w_times_y_over_4 = .25 * ( w - w_times_z ); \
const double x_times_z_over_4 = .25 * x_times_z; \

66
libsrc/resample/snohalo1.cpp
View File

@ -380,60 +380,60 @@ snohalo1( const double blur,
const int corner_reflection_shift = \
relative_x_is_rite * bands + relative_y_is_down * lskip; \
\
const int shift_back_1_pixel = sign_of_relative_x * bands; \
const int shift_back_1_row = sign_of_relative_y * lskip; \
const int shift_back_1_pix = sign_of_relative_x * bands; \
const int shift_back_1_row = sign_of_relative_y * lskip; \
\
const T* restrict in = ( (T *) pin ) + corner_reflection_shift; \
\
const int shift_forw_1_pixel = -shift_back_1_pixel; \
const int shift_forw_1_row = -shift_back_1_row; \
const int shift_forw_1_pix = -shift_back_1_pix; \
const int shift_forw_1_row = -shift_back_1_row; \
\
const int shift_back_2_pixel = 2 * shift_back_1_pixel; \
const int shift_back_2_row = 2 * shift_back_2_row; \
const int shift_back_2_pix = 2 * shift_back_1_pix; \
const int shift_back_2_row = 2 * shift_back_2_row; \
\
const double w = ( 2 * sign_of_relative_x ) * relative_x; \
const double z = ( 2 * sign_of_relative_y ) * relative_y; \
\
const int shift_forw_2_pixel = 2 * shift_forw_1_pixel; \
const int shift_forw_2_row = 2 * shift_forw_1_row; \
const int shift_forw_2_pix = 2 * shift_forw_1_pix; \
const int shift_forw_2_row = 2 * shift_forw_1_row; \
\
const int shift_forw_3_pixel = 3 * shift_forw_1_pixel; \
const int shift_forw_3_row = 3 * shift_forw_1_row; \
const int shift_forw_3_pix = 3 * shift_forw_1_pix; \
const int shift_forw_3_row = 3 * shift_forw_1_row; \
\
const int zer_two_shift = shift_back_2_row; \
const int zer_thr_shift = shift_forw_1_pixel + shift_back_2_row; \
const int zer_two_shift = shift_back_2_row; \
const int zer_thr_shift = shift_forw_1_pix + shift_back_2_row; \
\
const int uno_one_shift = shift_back_1_pixel + shift_back_1_row; \
const int uno_two_shift = shift_back_1_row; \
const int uno_thr_shift = shift_forw_1_pixel + shift_back_1_row; \
const int uno_fou_shift = shift_forw_2_pixel + shift_back_1_row; \
const int uno_one_shift = shift_back_1_pix + shift_back_1_row; \
const int uno_two_shift = shift_back_1_row; \
const int uno_thr_shift = shift_forw_1_pix + shift_back_1_row; \
const int uno_fou_shift = shift_forw_2_pix + shift_back_1_row; \
\
const double x = 1. - w; \
const double w_times_z = w * z; \
\
const int dos_zer_shift = shift_back_2_pixel; \
const int dos_one_shift = shift_back_1_pixel; \
const int dos_zer_shift = shift_back_2_pix; \
const int dos_one_shift = shift_back_1_pix; \
const int dos_two_shift = 0; \
const int dos_thr_shift = shift_forw_1_pixel; \
const int dos_fou_shift = shift_forw_2_pixel; \
const int dos_fiv_shift = shift_forw_3_pixel; \
const int dos_thr_shift = shift_forw_1_pix; \
const int dos_fou_shift = shift_forw_2_pix; \
const int dos_fiv_shift = shift_forw_3_pix; \
\
const int tre_zer_shift = shift_back_2_pixel + shift_forw_1_row; \
const int tre_one_shift = shift_back_1_pixel + shift_forw_1_row; \
const int tre_two_shift = shift_forw_1_row; \
const int tre_thr_shift = shift_forw_1_pixel + shift_forw_1_row; \
const int tre_fou_shift = shift_forw_2_pixel + shift_forw_1_row; \
const int tre_fiv_shift = shift_forw_3_pixel + shift_forw_1_row; \
const int tre_zer_shift = shift_back_2_pix + shift_forw_1_row; \
const int tre_one_shift = shift_back_1_pix + shift_forw_1_row; \
const int tre_two_shift = shift_forw_1_row; \
const int tre_thr_shift = shift_forw_1_pix + shift_forw_1_row; \
const int tre_fou_shift = shift_forw_2_pix + shift_forw_1_row; \
const int tre_fiv_shift = shift_forw_3_pix + shift_forw_1_row; \
\
const double x_times_z = x * z; \
\
const int qua_one_shift = shift_back_1_pixel + shift_forw_2_row; \
const int qua_two_shift = shift_forw_2_row; \
const int qua_thr_shift = shift_forw_1_pixel + shift_forw_2_row; \
const int qua_fou_shift = shift_forw_2_pixel + shift_forw_2_row; \
const int qua_one_shift = shift_back_1_pix + shift_forw_2_row; \
const int qua_two_shift = shift_forw_2_row; \
const int qua_thr_shift = shift_forw_1_pix + shift_forw_2_row; \
const int qua_fou_shift = shift_forw_2_pix + shift_forw_2_row; \
\
const int cin_two_shift = shift_forw_3_row; \
const int cin_thr_shift = shift_forw_1_pixel + shift_forw_3_row; \
const int cin_two_shift = shift_forw_3_row; \
const int cin_thr_shift = shift_forw_1_pix + shift_forw_3_row; \
\
const double w_times_y_over_4 = .25 * ( w - w_times_z ); \
const double x_times_z_over_4 = .25 * x_times_z; \