mirror of
https://github.com/webmproject/libwebp.git
synced 2024-11-20 04:18:26 +01:00
Merge changes I452d2485,Ic6d75475 into main
* changes: SharpYuvComputeConversionMatrix: quiet int->float warnings Makefile.vc: add sharpyuv_csp.obj to SHARPYUV_OBJS
This commit is contained in:
commit
ed643f619d
@ -176,6 +176,7 @@ CFLAGS = $(CFLAGS) /D_UNICODE /DUNICODE
|
||||
|
||||
SHARPYUV_OBJS = \
|
||||
$(DIROBJ)\sharpyuv\sharpyuv.obj \
|
||||
$(DIROBJ)\sharpyuv\sharpyuv_csp.obj \
|
||||
$(DIROBJ)\sharpyuv\sharpyuv_dsp.obj \
|
||||
$(DIROBJ)\sharpyuv\sharpyuv_neon.obj \
|
||||
$(DIROBJ)\sharpyuv\sharpyuv_sse2.obj \
|
||||
|
@ -32,7 +32,7 @@ void SharpYuvComputeConversionMatrix(const SharpYuvColorSpace* yuv_color_space,
|
||||
float addY = 0.0f;
|
||||
float scaleU = cr;
|
||||
float scaleV = cb;
|
||||
float addUV = (128 << shift);
|
||||
float addUV = (float)(128 << shift);
|
||||
|
||||
assert(yuv_color_space->bits >= 8);
|
||||
|
||||
@ -40,7 +40,7 @@ void SharpYuvComputeConversionMatrix(const SharpYuvColorSpace* yuv_color_space,
|
||||
scaleY *= (219 << shift) / denom;
|
||||
scaleU *= (224 << shift) / denom;
|
||||
scaleV *= (224 << shift) / denom;
|
||||
addY = (16 << shift);
|
||||
addY = (float)(16 << shift);
|
||||
}
|
||||
|
||||
matrix->rgb_to_y[0] = ToFixed16(kr * scaleY);
|
||||
|
Loading…
Reference in New Issue
Block a user