ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/utils/cfhq2xa.C
(Generate patch)

Comparing deliantra/server/utils/cfhq2xa.C (file contents):
Revision 1.14 by root, Wed Nov 16 23:42:03 2016 UTC vs.
Revision 1.15 by root, Fri Nov 18 05:53:42 2016 UTC

52 52
53# define trY 0x30 53# define trY 0x30
54# define trU 0x11 54# define trU 0x11
55# define trV 0x10 55# define trV 0x10
56# define trA 0x40 56# define trA 0x40
57
58static int32_t
59udiff (uint32_t a, uint32_t b)
60{
61 return a > b ? a - b : b - a;
62
63}
57 64
58static inline pixel lerp (pixel c1, int w1, pixel c2, int w2, pixel c3, int w3, int shift) 65static inline pixel lerp (pixel c1, int w1, pixel c2, int w2, pixel c3, int w3, int shift)
59{ 66{
60#if 0 67#if 0
61 if (!(c1 >> Ashift) & Cmask) w1 = 0; 68 if (!(c1 >> Ashift) & Cmask) w1 = 0;
180static inline bool Diff (pixel w1, pixel w2) 187static inline bool Diff (pixel w1, pixel w2)
181{ 188{
182 pixel YUV1 = RGBAtoYUVA (w1); 189 pixel YUV1 = RGBAtoYUVA (w1);
183 pixel YUV2 = RGBAtoYUVA (w2); 190 pixel YUV2 = RGBAtoYUVA (w2);
184 191
185 return ((abs (((YUV1 >> Rshift) & Cmask) - ((YUV2 >> Rshift) & Cmask)) > trY) || 192 return ((udiff ((YUV1 >> Rshift) & Cmask, (YUV2 >> Rshift) & Cmask) > trY) ||
186 (abs (((YUV1 >> Gshift) & Cmask) - ((YUV2 >> Gshift) & Cmask)) > trU) || 193 (udiff ((YUV1 >> Gshift) & Cmask, (YUV2 >> Gshift) & Cmask) > trU) ||
187 (abs (((YUV1 >> Bshift) & Cmask) - ((YUV2 >> Bshift) & Cmask)) > trV) || 194 (udiff ((YUV1 >> Bshift) & Cmask, (YUV2 >> Bshift) & Cmask) > trV) ||
188 (abs (((YUV1 >> Ashift) & Cmask) - ((YUV2 >> Ashift) & Cmask)) > trA) ); 195 (udiff ((YUV1 >> Ashift) & Cmask, (YUV2 >> Ashift) & Cmask) > trA) );
189} 196}
190 197
191static void 198static void
192hq2x_32 (unsigned char *pIn, unsigned char *pOut, int Xres, int Yres, int BpL, bool wrap) 199hq2x_32 (unsigned char *pIn, unsigned char *pOut, int Xres, int Yres, int BpL, bool wrap)
193{ 200{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines