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

Commit 736716af authored by Ben Wagner's avatar Ben Wagner Committed by Android (Google) Code Review
Browse files

Merge "Use unique_ptr instead of SkAutoTDelete."

parents 501b619e 60126efd

core/jni/android/graphics/BitmapFactory.cpp

+19 −19
Original line number Diff line number Diff line 
#define LOG_TAG "BitmapFactory"



#include "AutoDecodeCancel.h"

#include "BitmapFactory.h"

#include "CreateJavaOutputStreamAdaptor.h"

#include "GraphicsJNI.h"

#include "NinePatchPeeker.h"

#include "SkFrontBufferedStream.h"

#include "SkImageDecoder.h"

#include "SkMath.h"

#include "SkPixelRef.h"

#include "SkStream.h"

#include "SkTemplates.h"

#include "SkUtils.h"

#include "CreateJavaOutputStreamAdaptor.h"

#include "AutoDecodeCancel.h"

#include "Utils.h"

#include "JNIHelp.h"

#include "GraphicsJNI.h"



#include "core_jni_helpers.h"



#include <JNIHelp.h>

#include <androidfw/Asset.h>

#include <androidfw/ResourceTypes.h>

#include <cutils/compiler.h>

#include <memory>

#include <netinet/in.h>

#include <stdio.h>

#include <sys/mman.h>
@@ -291,7 +291,7 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding 
    // Only setup the decoder to be deleted after its stack-based, refcounted

    // components (allocators, peekers, etc) are declared. This prevents RefCnt

    // asserts from firing due to the order objects are deleted from the stack.

    SkAutoTDelete<SkImageDecoder> add(decoder);

    std::unique_ptr<SkImageDecoder> add(decoder);



    AutoDecoderCancel adc(options, decoder);
@@ -453,13 +453,13 @@ static jobject nativeDecodeStream(JNIEnv* env, jobject clazz, jobject is, jbyteA 
        jobject padding, jobject options) {



    jobject bitmap = NULL;

    SkAutoTDelete<SkStream> stream(CreateJavaInputStreamAdaptor(env, is, storage));

    std::unique_ptr<SkStream> stream(CreateJavaInputStreamAdaptor(env, is, storage));



    if (stream.get()) {

        SkAutoTDelete<SkStreamRewindable> bufferedStream(

                SkFrontBufferedStream::Create(stream.detach(), BYTES_TO_BUFFER));

        std::unique_ptr<SkStreamRewindable> bufferedStream(

                SkFrontBufferedStream::Create(stream.release(), BYTES_TO_BUFFER));

        SkASSERT(bufferedStream.get() != NULL);

        bitmap = doDecode(env, bufferedStream, padding, options);

        bitmap = doDecode(env, bufferedStream.get(), padding, options);

    }

    return bitmap;

}
@@ -496,16 +496,16 @@ static jobject nativeDecodeFileDescriptor(JNIEnv* env, jobject clazz, jobject fi 
        return nullObjectReturn("Could not open file");

    }



    SkAutoTDelete<SkFILEStream> fileStream(new SkFILEStream(file,

    std::unique_ptr<SkFILEStream> fileStream(new SkFILEStream(file,

            SkFILEStream::kCallerPasses_Ownership));



    // Use a buffered stream. Although an SkFILEStream can be rewound, this

    // ensures that SkImageDecoder::Factory never rewinds beyond the

    // current position of the file descriptor.

    SkAutoTDelete<SkStreamRewindable> stream(SkFrontBufferedStream::Create(fileStream.detach(),

    std::unique_ptr<SkStreamRewindable> stream(SkFrontBufferedStream::Create(fileStream.release(),

            BYTES_TO_BUFFER));



    return doDecode(env, stream, padding, bitmapFactoryOptions);

    return doDecode(env, stream.get(), padding, bitmapFactoryOptions);

}



static jobject nativeDecodeAsset(JNIEnv* env, jobject clazz, jlong native_asset,
@@ -514,16 +514,16 @@ static jobject nativeDecodeAsset(JNIEnv* env, jobject clazz, jlong native_asset, 
    Asset* asset = reinterpret_cast<Asset*>(native_asset);

    // since we know we'll be done with the asset when we return, we can

    // just use a simple wrapper

    SkAutoTDelete<SkStreamRewindable> stream(new AssetStreamAdaptor(asset));

    return doDecode(env, stream, padding, options);

    AssetStreamAdaptor stream(asset);

    return doDecode(env, &stream, padding, options);

}



static jobject nativeDecodeByteArray(JNIEnv* env, jobject, jbyteArray byteArray,

        jint offset, jint length, jobject options) {



    AutoJavaByteArray ar(env, byteArray);

    SkAutoTDelete<SkMemoryStream> stream(new SkMemoryStream(ar.ptr() + offset, length, false));

    return doDecode(env, stream, NULL, options);

    SkMemoryStream stream(ar.ptr() + offset, length, false);

    return doDecode(env, &stream, NULL, options);

}



static void nativeRequestCancel(JNIEnv*, jobject joptions) {

core/jni/android/graphics/BitmapRegionDecoder.cpp

+8 −11
Original line number Diff line number Diff line
@@ -16,28 +16,25 @@ 


#define LOG_TAG "BitmapRegionDecoder"



#include "AutoDecodeCancel.h"

#include "BitmapFactory.h"

#include "CreateJavaOutputStreamAdaptor.h"

#include "SkBitmap.h"

#include "SkData.h"

#include "SkImageEncoder.h"

#include "GraphicsJNI.h"

#include "SkImageEncoder.h"

#include "SkUtils.h"

#include "SkTemplates.h"

#include "SkPixelRef.h"

#include "SkStream.h"

#include "BitmapFactory.h"

#include "AutoDecodeCancel.h"

#include "CreateJavaOutputStreamAdaptor.h"

#include "Utils.h"

#include "JNIHelp.h"



#include "core_jni_helpers.h"

#include "android_util_Binder.h"

#include "android_nio_utils.h"

#include "CreateJavaOutputStreamAdaptor.h"

#include "android_util_Binder.h"

#include "core_jni_helpers.h"



#include <JNIHelp.h>

#include <androidfw/Asset.h>

#include <binder/Parcel.h>

#include <jni.h>

#include <androidfw/Asset.h>

#include <sys/stat.h>



using namespace android;

core/jni/android/graphics/CreateJavaOutputStreamAdaptor.cpp

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

#include "JNIHelp.h"

#include "SkData.h"

#include "SkRefCnt.h"

#include "SkStream.h"

#include "SkTypes.h"

#include "Utils.h"



#include <JNIHelp.h>

#include <memory>



static jmethodID    gInputStream_readMethodID;

static jmethodID    gInputStream_skipMethodID;
@@ -164,7 +166,7 @@ static SkMemoryStream* adaptor_to_mem_stream(SkStream* stream) { 


SkStreamRewindable* CopyJavaInputStream(JNIEnv* env, jobject stream,

                                        jbyteArray storage) {

    SkAutoTDelete<SkStream> adaptor(CreateJavaInputStreamAdaptor(env, stream, storage));

    std::unique_ptr<SkStream> adaptor(CreateJavaInputStreamAdaptor(env, stream, storage));

    if (NULL == adaptor.get()) {

        return NULL;

    }

core/jni/android/graphics/Interpolator.cpp

+3 −4
Original line number Diff line number Diff line 
#include "jni.h"

#include "core_jni_helpers.h"



#include "GraphicsJNI.h"

#include "SkInterpolator.h"

#include "SkTemplates.h"

#include "core_jni_helpers.h"



#include <jni.h>



static jlong Interpolator_constructor(JNIEnv* env, jobject clazz, jint valueCount, jint frameCount)

{

core/jni/android/graphics/Matrix.cpp

+3 −6
Original line number Diff line number Diff line
@@ -15,16 +15,13 @@ 
** limitations under the License.

*/



#include "jni.h"

#include "GraphicsJNI.h"

#include <core_jni_helpers.h>



#include "SkMatrix.h"

#include "SkTemplates.h"



#include "Matrix.h"

#include "SkMatrix.h"

#include "core_jni_helpers.h"



#include <Caches.h>

#include <jni.h>



namespace android {