Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8898c169 authored by Matt Sarett's avatar Matt Sarett Committed by Derek Sollenberger
Browse files

Remove references to SkImageDecoder (part 2) 

As of this CL, SkImageDecoder is no longer used in Android and
will be deleted by Skia.

(cherry picked from commit 097a6ea4b65046df3e3cbf93d1acfc4e6833e02f)

Change-Id: Ic754ab0dde7ad1b65ccf3b2bc23fcbc5ef44ed08
parent 79fc3b1f

cmds/bootanimation/BootAnimation.cpp

+9 −12
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ 
#pragma GCC diagnostic push

#pragma GCC diagnostic ignored "-Wunused-parameter"

#include <SkBitmap.h>

#include <SkImage.h>

#include <SkStream.h>

#include <SkImageDecoder.h>

#pragma GCC diagnostic pop



#include <GLES/gl.h>
@@ -117,8 +117,10 @@ status_t BootAnimation::initTexture(Texture* texture, AssetManager& assets, 
    if (asset == NULL)

        return NO_INIT;

    SkBitmap bitmap;

    SkImageDecoder::DecodeMemory(asset->getBuffer(false), asset->getLength(),

            &bitmap, kUnknown_SkColorType, SkImageDecoder::kDecodePixels_Mode);

    sk_sp<SkData> data = SkData::MakeWithoutCopy(asset->getBuffer(false),

            asset->getLength());

    sk_sp<SkImage> image = SkImage::MakeFromEncoded(data);

    image->asLegacyBitmap(&bitmap, SkImage::kRO_LegacyBitmapMode);

    asset->close();

    delete asset;
@@ -171,15 +173,10 @@ status_t BootAnimation::initTexture(const Animation::Frame& frame) 
    //StopWatch watch("blah");



    SkBitmap bitmap;

    SkMemoryStream  stream(frame.map->getDataPtr(), frame.map->getDataLength());

    SkImageDecoder* codec = SkImageDecoder::Factory(&stream);

    if (codec != NULL) {

        codec->setDitherImage(false);

        codec->decode(&stream, &bitmap,

                kN32_SkColorType,

                SkImageDecoder::kDecodePixels_Mode);

        delete codec;

    }

    sk_sp<SkData> data = SkData::MakeWithoutCopy(frame.map->getDataPtr(),

            frame.map->getDataLength());

    sk_sp<SkImage> image = SkImage::MakeFromEncoded(data);

    image->asLegacyBitmap(&bitmap, SkImage::kRO_LegacyBitmapMode);



    // FileMap memory is never released until application exit.

    // Release it now as the texture is already loaded and the memory used for

core/jni/android/graphics/GraphicsJNI.h

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include "SkMallocPixelRef.h"

#include "SkPoint.h"

#include "SkRect.h"

#include "SkImageDecoder.h"

#include <jni.h>

#include <hwui/Canvas.h>

core/jni/android/graphics/NinePatchPeeker.cpp

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include "NinePatchPeeker.h"



#include "SkBitmap.h"

#include "SkImageDecoder.h"



using namespace android;