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

Commit 24effa4e authored by Maria Yu's avatar Maria Yu Committed by Linux Build Service Account
Browse files

Revert "Freeing frame map"

This reverts commit 0c1eeb3c.
Change-Id: I535330edb636f9457beed0849147168eaa6ae2ec
Conflicts:
cmds/bootanimation/BootAnimation.cpp
parent 24b1ca82
Loading
Loading
Loading
Loading
+5 −8
Original line number Diff line number Diff line
@@ -207,12 +207,12 @@ status_t BootAnimation::initTexture(Texture* texture, AssetManager& assets,
    return NO_ERROR;
}

status_t BootAnimation::initTexture(const Animation::Frame& frame)
status_t BootAnimation::initTexture(void* buffer, size_t len)
{
    //StopWatch watch("blah");

    SkBitmap bitmap;
    SkMemoryStream  stream(frame.map->getDataPtr(), frame.map->getDataLength());
    SkMemoryStream  stream(buffer, len);
    SkImageDecoder* codec = SkImageDecoder::Factory(&stream);
    if (codec) {
        codec->setDitherImage(false);
@@ -222,11 +222,6 @@ status_t BootAnimation::initTexture(const Animation::Frame& frame)
        delete codec;
    }

    // FileMap memory is never released until application exit.
    // Release it now as the texture is already loaded and the memory used for
    // the packed resource can be released.
    frame.map->release();

    // ensure we can call getPixels(). No need to call unlock, since the
    // bitmap will go out of scope when we return from this method.
    bitmap.lockPixels();
@@ -672,7 +667,9 @@ bool BootAnimation::movie()
                        glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
                        glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
                    }
                    initTexture(frame);
                    initTexture(
                            frame.map->getDataPtr(),
                            frame.map->getDataLength());
                }

                if (!clearReg.isEmpty()) {
+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ private:
    };

    status_t initTexture(Texture* texture, AssetManager& asset, const char* name);
    status_t initTexture(const Animation::Frame& frame);
    status_t initTexture(void* buffer, size_t len);
    bool android();
    bool readFile(const char* name, String8& outString);
    bool movie();