From 3d29b6330dc65196d842ac44f8ea2305223ef39b Mon Sep 17 00:00:00 2001 From: "djsollen@google.com" Date: Wed, 28 Mar 2012 19:36:39 +0000 Subject: [PATCH] Remove unused classes from the build. Review URL: https://codereview.appspot.com/5938053 git-svn-id: http://skia.googlecode.com/svn/trunk@3529 2bbb7eff-a529-9590-31e7-b0007b416f81 --- gyp/images.gyp | 2 - src/images/SkBitmap_RLEPixels.h | 26 -------- src/images/SkCreateRLEPixelRef.cpp | 127 ------------------------------------- 3 files changed, 155 deletions(-) delete mode 100644 src/images/SkBitmap_RLEPixels.h delete mode 100644 src/images/SkCreateRLEPixelRef.cpp diff --git a/gyp/images.gyp b/gyp/images.gyp index f6efa49..a4bdcd0 100644 --- a/gyp/images.gyp +++ b/gyp/images.gyp @@ -24,8 +24,6 @@ '../src/images/bmpdecoderhelper.cpp', '../src/images/bmpdecoderhelper.h', - '../src/images/SkBitmap_RLEPixels.h', - '../src/images/SkCreateRLEPixelRef.cpp', '../src/images/SkFDStream.cpp', '../src/images/SkFlipPixelRef.cpp', '../src/images/SkImageDecoder.cpp', diff --git a/src/images/SkBitmap_RLEPixels.h b/src/images/SkBitmap_RLEPixels.h deleted file mode 100644 index dfe83a2..0000000 --- a/src/images/SkBitmap_RLEPixels.h +++ /dev/null @@ -1,26 +0,0 @@ - -/* - * Copyright 2011 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ -#ifndef SkBitmap_RLEPixels_DEFINED -#define SkBitmap_RLEPixels_DEFINED - -#include "SkChunkAlloc.h" - -class SkBitmap_RLEPixels { -public: - SkBitmap_RLEPixels(int width, int height); - ~SkBitmap_RLEPixels(); - - uint8_t* yptrs() const { return fYPtrs; } - uint8_t* allocChunk(size_t chunk); - -private: - SkChunkAlloc fChunk; - uint8_t** fYPtrs; -}; - -#endif diff --git a/src/images/SkCreateRLEPixelRef.cpp b/src/images/SkCreateRLEPixelRef.cpp deleted file mode 100644 index 44652be..0000000 --- a/src/images/SkCreateRLEPixelRef.cpp +++ /dev/null @@ -1,127 +0,0 @@ - -/* - * Copyright 2011 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ -#include "SkChunkAlloc.h" -#include "SkPackBits.h" -#include "SkBitmap.h" -#include "SkPixelRef.h" - -class RLEPixelRef : public SkPixelRef { -public: - RLEPixelRef(SkBitmap::RLEPixels* rlep, SkColorTable* ctable); - virtual ~RLEPixelRef(); - -protected: - // overrides from SkPixelRef - virtual void* onLockPixels(SkColorTable**); - virtual void onUnlockPixels(); - -private: - SkBitmap::RLEPixels* fRLEPixels; - SkColorTable* fCTable; -}; - -RLEPixelRef::RLEPixelRef(SkBitmap::RLEPixels* rlep, SkColorTable* ctable) - : SkPixelRef(NULL) { - fRLEPixels = rlep; // we now own this ptr - fCTable = ctable; - SkSafeRef(ctable); -} - -RLEPixelRef::~RLEPixelRef() { - SkDELETE(fRLEPixels); - SkSafeUnref(fCTable); -} - -void* RLEPixelRef::onLockPixels(SkColorTable** ct) { - *ct = fCTable; - return fRLEPixels; -} - -void RLEPixelRef::onUnlockPixels() { - // nothing to do -} - -///////////////////////////////////////////////////////////////////////////// - -class ChunkRLEPixels : public SkBitmap::RLEPixels { -public: - ChunkRLEPixels(int width, int height, size_t chunkSize) - : SkBitmap::RLEPixels(width, height), fStorage(chunkSize) { - } - - SkChunkAlloc fStorage; -}; - -SkPixelRef* SkCreateRLEPixelRef(const SkBitmap& src); -SkPixelRef* SkCreateRLEPixelRef(const SkBitmap& src) { - - if (SkBitmap::kIndex8_Config != src.config() && - SkBitmap::kA8_Config != src.config()) { - return NULL; - } - - size_t maxPacked = SkPackBits::ComputeMaxSize8(src.width()); - - // estimate the rle size based on the original size - size_t size = src.getSize() >> 3; - if (size < maxPacked) { - size = maxPacked; - } - - ChunkRLEPixels* rlePixels = SkNEW_ARGS(ChunkRLEPixels, - (src.width(), src.height(), size)); - - uint8_t* dstRow = NULL; - size_t free = 0; - size_t totalPacked = 0; - - for (int y = 0; y < src.height(); y++) { - const uint8_t* srcRow = src.getAddr8(0, y); - - if (free < maxPacked) { - dstRow = (uint8_t*)rlePixels->fStorage.allocThrow(size); - free = size; - } - size_t packedSize = SkPackBits::Pack8(srcRow, src.width(), dstRow); - SkASSERT(packedSize <= free); - rlePixels->setPackedAtY(y, dstRow); - - dstRow += packedSize; - free -= packedSize; - - totalPacked += packedSize; - } - -//#ifdef SK_DEBUG -#if 0 - // test - uint8_t* buffer = new uint8_t[src.width()]; - for (int y = 0; y < src.height(); y++) { - const uint8_t* srcRow = src.getAddr8(0, y); - SkPackBits::Unpack8(buffer, 0, src.width(), rlePixels->packedAtY(y)); - int n = memcmp(buffer, srcRow, src.width()); - if (n) { - SkDebugf("----- memcmp returned %d on line %d\n", n, y); - } - SkASSERT(n == 0); - } - delete[] buffer; - - size_t totalAlloc = src.height() * sizeof(uint8_t*) + totalPacked; - - SkDebugf("--- RLE: orig [%d %d] %d, rle %d %d savings %g\n", - src.width(), src.height(), src.getSize(), - src.height() * sizeof(uint8_t*), totalPacked, - (float)totalAlloc / src.getSize()); - -#endif - - // transfer ownership of rlePixels to our pixelref - return SkNEW_ARGS(RLEPixelRef, (rlePixels, src.getColorTable())); -} - -- 2.7.4