#define OP put
-DEFFUNC(put, rnd,o,8,OP_C,avg2)
-DEFFUNC(put, rnd,x,8,OP_X,avg2)
-DEFFUNC(put,no_rnd,x,8,OP_X,avg2)
-DEFFUNC(put, rnd,y,8,OP_Y,avg2)
-DEFFUNC(put,no_rnd,y,8,OP_Y,avg2)
+DEFFUNC(put, rnd,o,8,OP_C,avg32)
+DEFFUNC(put, rnd,x,8,OP_X,avg32)
+DEFFUNC(put,no_rnd,x,8,OP_X,avg32)
+DEFFUNC(put, rnd,y,8,OP_Y,avg32)
+DEFFUNC(put,no_rnd,y,8,OP_Y,avg32)
DEFFUNC(put, rnd,xy,8,OP_XY,PACK)
DEFFUNC(put,no_rnd,xy,8,OP_XY,PACK)
-DEFFUNC(put, rnd,o,16,OP_C,avg2)
-DEFFUNC(put, rnd,x,16,OP_X,avg2)
-DEFFUNC(put,no_rnd,x,16,OP_X,avg2)
-DEFFUNC(put, rnd,y,16,OP_Y,avg2)
-DEFFUNC(put,no_rnd,y,16,OP_Y,avg2)
+DEFFUNC(put, rnd,o,16,OP_C,avg32)
+DEFFUNC(put, rnd,x,16,OP_X,avg32)
+DEFFUNC(put,no_rnd,x,16,OP_X,avg32)
+DEFFUNC(put, rnd,y,16,OP_Y,avg32)
+DEFFUNC(put,no_rnd,y,16,OP_Y,avg32)
DEFFUNC(put, rnd,xy,16,OP_XY,PACK)
DEFFUNC(put,no_rnd,xy,16,OP_XY,PACK)
#undef OP
#define OP avg
-DEFFUNC(avg, rnd,o,8,OP_C,avg2)
-DEFFUNC(avg, rnd,x,8,OP_X,avg2)
-DEFFUNC(avg,no_rnd,x,8,OP_X,avg2)
-DEFFUNC(avg, rnd,y,8,OP_Y,avg2)
-DEFFUNC(avg,no_rnd,y,8,OP_Y,avg2)
+DEFFUNC(avg, rnd,o,8,OP_C,avg32)
+DEFFUNC(avg, rnd,x,8,OP_X,avg32)
+DEFFUNC(avg,no_rnd,x,8,OP_X,avg32)
+DEFFUNC(avg, rnd,y,8,OP_Y,avg32)
+DEFFUNC(avg,no_rnd,y,8,OP_Y,avg32)
DEFFUNC(avg, rnd,xy,8,OP_XY,PACK)
DEFFUNC(avg,no_rnd,xy,8,OP_XY,PACK)
-DEFFUNC(avg, rnd,o,16,OP_C,avg2)
-DEFFUNC(avg, rnd,x,16,OP_X,avg2)
-DEFFUNC(avg,no_rnd,x,16,OP_X,avg2)
-DEFFUNC(avg, rnd,y,16,OP_Y,avg2)
-DEFFUNC(avg,no_rnd,y,16,OP_Y,avg2)
+DEFFUNC(avg, rnd,o,16,OP_C,avg32)
+DEFFUNC(avg, rnd,x,16,OP_X,avg32)
+DEFFUNC(avg,no_rnd,x,16,OP_X,avg32)
+DEFFUNC(avg, rnd,y,16,OP_Y,avg32)
+DEFFUNC(avg,no_rnd,y,16,OP_Y,avg32)
DEFFUNC(avg, rnd,xy,16,OP_XY,PACK)
DEFFUNC(avg,no_rnd,xy,16,OP_XY,PACK)