| Index: src/codec/SkCodecPriv.h
|
| diff --git a/src/codec/SkCodecPriv.h b/src/codec/SkCodecPriv.h
|
| index 2769cec1cd4025f15611d4c9e5d53e65cb2eb47b..726074195daf23d787c0187520baa9a4a97e1e86 100644
|
| --- a/src/codec/SkCodecPriv.h
|
| +++ b/src/codec/SkCodecPriv.h
|
| @@ -29,17 +29,6 @@
|
|
|
| #define COMPUTE_RESULT_ALPHA \
|
| SkSwizzler::GetResult(zeroAlpha, maxAlpha);
|
| -
|
| -/*
|
| - * returns a scaled dimension based on the original dimension and the sampleSize
|
| - * NOTE: we round down here for scaled dimension to match the behavior of SkImageDecoder
|
| - */
|
| -static int get_scaled_dimension(int srcDimension, int sampleSize) {
|
| - if (sampleSize > srcDimension) {
|
| - return 1;
|
| - }
|
| - return srcDimension / sampleSize;
|
| -}
|
|
|
| /*
|
| * Returns the first coordinate that we will keep during a scaled decode.
|
| @@ -148,7 +137,7 @@
|
| SkASSERT(nullptr != inputColorPtr);
|
| SkASSERT(nullptr != inputColorCount);
|
| SkASSERT(nullptr != colorTable);
|
| - memcpy(inputColorPtr, colorTable->readColors(), *inputColorCount * sizeof(SkPMColor));
|
| + memcpy(inputColorPtr, colorTable->readColors(), *inputColorCount * 4);
|
| }
|
| }
|
|
|
|
|