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

Commit 163c97a8 authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'skia_merge' 

* changes:
  Fix include to match Skia filename change
  Remove references to SkImageDecoder (part 2)
  Update SkiaCanvasProxy with SkSurface API change
  Return DNG mimeType for the case kDNG_SkEncodedFormat
  Remove use of SkFixed. Update code to use SkGlyph.fAdvance[XY] after https://codereview.chromium.org/1737693006.
  skia SkDocument - new MakePDF API, fix leak
parents 4e750e82 79ad7bed

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/BitmapFactory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ jstring encodedFormatToString(JNIEnv* env, SkEncodedFormat format) { 
        case SkEncodedFormat::kWBMP_SkEncodedFormat:

            mimeType = "image/vnd.wap.wbmp";

            break;

        case SkEncodedFormat::kRAW_SkEncodedFormat:

        case SkEncodedFormat::kDNG_SkEncodedFormat:

            mimeType = "image/x-adobe-dng";

            break;

        default:

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;

core/jni/android/graphics/YuvToJpegEncoder.cpp

+1 −1
Original line number Diff line number Diff line 
#include "CreateJavaOutputStreamAdaptor.h"

#include "SkJpegUtility.h"

#include "SkJPEGWriteUtility.h"

#include "YuvToJpegEncoder.h"

#include <ui/PixelFormat.h>

#include <hardware/hardware.h>