From 91e27f4573d41eaef38b80b36075d3352c132b42 Mon Sep 17 00:00:00 2001 From: Pascal Massimino Date: Thu, 8 Dec 2011 06:42:53 -0800 Subject: [PATCH] better fitting names for upsampling functions Change-Id: I816e81586c9e1a74ebc5516598dbd4ae0ddf48d8 --- src/dsp/upsampling.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/dsp/upsampling.c b/src/dsp/upsampling.c index 98168642..b44b6441 100644 --- a/src/dsp/upsampling.c +++ b/src/dsp/upsampling.c @@ -102,8 +102,8 @@ UPSAMPLE_FUNC(UpsampleArgbLinePair, VP8YuvToArgb, 4) UPSAMPLE_FUNC(UpsampleRgba4444LinePair, VP8YuvToRgba4444, 2) UPSAMPLE_FUNC(UpsampleRgb565LinePair, VP8YuvToRgb565, 2) // These variants don't erase the alpha value -UPSAMPLE_FUNC(UpsampleRgbKeepAlphaLinePair, VP8YuvToRgb, 4) -UPSAMPLE_FUNC(UpsampleBgrKeepAlphaLinePair, VP8YuvToBgr, 4) +UPSAMPLE_FUNC(UpsampleRgbaKeepAlphaLinePair, VP8YuvToRgb, 4) +UPSAMPLE_FUNC(UpsampleBgraKeepAlphaLinePair, VP8YuvToBgr, 4) UPSAMPLE_FUNC(UpsampleArgbKeepAlphaLinePair, VP8YuvToArgbKeepA, 4) UPSAMPLE_FUNC(UpsampleRgba4444KeepAlphaLinePair, VP8YuvToRgba4444KeepA, 2) @@ -147,8 +147,8 @@ SAMPLE_FUNC(SampleArgbLinePair, VP8YuvToArgb, 4) SAMPLE_FUNC(SampleRgba4444LinePair, VP8YuvToRgba4444, 2) SAMPLE_FUNC(SampleRgb565LinePair, VP8YuvToRgb565, 2) // These variants don't erase the alpha value -SAMPLE_FUNC(SampleRgbKeepAlphaLinePair, VP8YuvToRgb, 4) -SAMPLE_FUNC(SampleBgrKeepAlphaLinePair, VP8YuvToBgr, 4) +SAMPLE_FUNC(SampleRgbaKeepAlphaLinePair, VP8YuvToRgb, 4) +SAMPLE_FUNC(SampleBgraKeepAlphaLinePair, VP8YuvToBgr, 4) SAMPLE_FUNC(SampleArgbKeepAlphaLinePair, VP8YuvToArgbKeepA, 4) SAMPLE_FUNC(SampleRgba4444KeepAlphaLinePair, VP8YuvToRgba4444KeepA, 2) @@ -166,9 +166,9 @@ const WebPSampleLinePairFunc WebPSamplers[MODE_LAST] = { const WebPSampleLinePairFunc WebPSamplersKeepAlpha[MODE_LAST] = { SampleRgbLinePair, // MODE_RGB - SampleRgbKeepAlphaLinePair, // MODE_RGBA + SampleRgbaKeepAlphaLinePair, // MODE_RGBA SampleBgrLinePair, // MODE_BGR - SampleBgrKeepAlphaLinePair, // MODE_BGRA + SampleBgraKeepAlphaLinePair, // MODE_BGRA SampleArgbKeepAlphaLinePair, // MODE_ARGB SampleRgba4444KeepAlphaLinePair, // MODE_RGBA_4444 SampleRgb565LinePair // MODE_RGB_565 @@ -218,9 +218,9 @@ void WebPInitUpsamplers(void) { WebPUpsamplers[MODE_RGB_565] = UpsampleRgb565LinePair; WebPUpsamplersKeepAlpha[MODE_RGB] = UpsampleRgbLinePair; - WebPUpsamplersKeepAlpha[MODE_RGBA] = UpsampleRgbKeepAlphaLinePair; + WebPUpsamplersKeepAlpha[MODE_RGBA] = UpsampleRgbaKeepAlphaLinePair; WebPUpsamplersKeepAlpha[MODE_BGR] = UpsampleBgrLinePair; - WebPUpsamplersKeepAlpha[MODE_BGRA] = UpsampleBgrKeepAlphaLinePair; + WebPUpsamplersKeepAlpha[MODE_BGRA] = UpsampleBgraKeepAlphaLinePair; WebPUpsamplersKeepAlpha[MODE_ARGB] = UpsampleArgbKeepAlphaLinePair; WebPUpsamplersKeepAlpha[MODE_RGBA_4444] = UpsampleRgba4444KeepAlphaLinePair; WebPUpsamplersKeepAlpha[MODE_RGB_565] = UpsampleRgb565LinePair;