Merge "SkBitmap::Config is deprecated, use SkColorType" (6349a33d) · Commits · e / os / android_frameworks_base

cmds/bootanimation/BootAnimation.cpp

+10 −10

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@ status_t BootAnimation::initTexture(Texture* texture, AssetManager& assets,
		return NO_INIT;
		SkBitmap bitmap;
		SkImageDecoder::DecodeMemory(asset->getBuffer(false), asset->getLength(),
		&bitmap, SkBitmap::kNo_Config, SkImageDecoder::kDecodePixels_Mode);
		&bitmap, kUnknown_SkColorType, SkImageDecoder::kDecodePixels_Mode);
		asset->close();
		delete asset;

		@@ -127,20 +127,20 @@ status_t BootAnimation::initTexture(Texture* texture, AssetManager& assets,
		glGenTextures(1, &texture->name);
		glBindTexture(GL_TEXTURE_2D, texture->name);

		switch (bitmap.config()) {
		case SkBitmap::kA8_Config:
		switch (bitmap.colorType()) {
		case kAlpha_8_SkColorType:
		glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, w, h, 0, GL_ALPHA,
		GL_UNSIGNED_BYTE, p);
		break;
		case SkBitmap::kARGB_4444_Config:
		case kARGB_4444_SkColorType:
		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA,
		GL_UNSIGNED_SHORT_4_4_4_4, p);
		break;
		case SkBitmap::kARGB_8888_Config:
		case kN32_SkColorType:
		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, GL_RGBA,
		GL_UNSIGNED_BYTE, p);
		break;
		case SkBitmap::kRGB_565_Config:
		case kRGB_565_SkColorType:
		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, w, h, 0, GL_RGB,
		GL_UNSIGNED_SHORT_5_6_5, p);
		break;
		@@ -166,7 +166,7 @@ status_t BootAnimation::initTexture(const Animation::Frame& frame)
		if (codec) {
		codec->setDitherImage(false);
		codec->decode(&stream, &bitmap,
		SkBitmap::kARGB_8888_Config,
		kN32_SkColorType,
		SkImageDecoder::kDecodePixels_Mode);
		delete codec;
		}
		@@ -190,8 +190,8 @@ status_t BootAnimation::initTexture(const Animation::Frame& frame)
		if (tw < w) tw <<= 1;
		if (th < h) th <<= 1;

		switch (bitmap.config()) {
		case SkBitmap::kARGB_8888_Config:
		switch (bitmap.colorType()) {
		case kN32_SkColorType:
		if (tw != w \|\| th != h) {
		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tw, th, 0, GL_RGBA,
		GL_UNSIGNED_BYTE, 0);
		@@ -203,7 +203,7 @@ status_t BootAnimation::initTexture(const Animation::Frame& frame)
		}
		break;

		case SkBitmap::kRGB_565_Config:
		case kRGB_565_SkColorType:
		if (tw != w \|\| th != h) {
		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, tw, th, 0, GL_RGB,
		GL_UNSIGNED_SHORT_5_6_5, 0);

core/jni/android/graphics/BitmapFactory.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -201,7 +201,7 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding
		int sampleSize = 1;

		SkImageDecoder::Mode decodeMode = SkImageDecoder::kDecodePixels_Mode;
		SkBitmap::Config prefConfig = SkBitmap::kARGB_8888_Config;
		SkColorType prefColorType = kN32_SkColorType;

		bool doDither = true;
		bool isMutable = false;
		@@ -223,7 +223,7 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding
		env->SetObjectField(options, gOptions_mimeFieldID, 0);

		jobject jconfig = env->GetObjectField(options, gOptions_configFieldID);
		prefConfig = GraphicsJNI::getNativeBitmapConfig(env, jconfig);
		prefColorType = GraphicsJNI::getNativeBitmapColorType(env, jconfig);
		isMutable = env->GetBooleanField(options, gOptions_mutableFieldID);
		doDither = env->GetBooleanField(options, gOptions_ditherFieldID);
		preferQualityOverSpeed = env->GetBooleanField(options,
		@@ -305,7 +305,7 @@ static jobject doDecode(JNIEnv* env, SkStreamRewindable* stream, jobject padding
		}

		SkBitmap decodingBitmap;
		if (!decoder->decode(stream, &decodingBitmap, prefConfig, decodeMode)) {
		if (!decoder->decode(stream, &decodingBitmap, prefColorType, decodeMode)) {
		return nullObjectReturn("decoder->decode returned false");
		}

core/jni/android/graphics/BitmapRegionDecoder.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ public:
		}

		bool decodeRegion(SkBitmap* bitmap, const SkIRect& rect,
		SkBitmap::Config pref, int sampleSize) {
		SkColorType pref, int sampleSize) {
		fDecoder->setSampleSize(sampleSize);
		return fDecoder->decodeSubset(bitmap, rect, pref);
		}
		@@ -175,7 +175,7 @@ static jobject nativeDecodeRegion(JNIEnv* env, jobject, jlong brdHandle,
		jobject tileBitmap = NULL;
		SkImageDecoder *decoder = brd->getDecoder();
		int sampleSize = 1;
		SkBitmap::Config prefConfig = SkBitmap::kNo_Config;
		SkColorType prefColorType = kUnknown_SkColorType;
		bool doDither = true;
		bool preferQualityOverSpeed = false;
		bool requireUnpremultiplied = false;
		@@ -188,7 +188,7 @@ static jobject nativeDecodeRegion(JNIEnv* env, jobject, jlong brdHandle,
		env->SetObjectField(options, gOptions_mimeFieldID, 0);

		jobject jconfig = env->GetObjectField(options, gOptions_configFieldID);
		prefConfig = GraphicsJNI::getNativeBitmapConfig(env, jconfig);
		prefColorType = GraphicsJNI::getNativeBitmapColorType(env, jconfig);
		doDither = env->GetBooleanField(options, gOptions_ditherFieldID);
		preferQualityOverSpeed = env->GetBooleanField(options,
		gOptions_preferQualityOverSpeedFieldID);
		@@ -226,7 +226,7 @@ static jobject nativeDecodeRegion(JNIEnv* env, jobject, jlong brdHandle,
		adb.reset(bitmap);
		}

		if (!brd->decodeRegion(bitmap, region, prefConfig, sampleSize)) {
		if (!brd->decodeRegion(bitmap, region, prefColorType, sampleSize)) {
		return nullObjectReturn("decoder->decodeRegion returned false");
		}

core/jni/android/graphics/Graphics.cpp

+4 −5

Original line number	Diff line number	Diff line
		@@ -301,18 +301,17 @@ SkBitmap* GraphicsJNI::getNativeBitmap(JNIEnv* env, jobject bitmap) {
		return b;
		}

		SkBitmap::Config GraphicsJNI::getNativeBitmapConfig(JNIEnv* env,
		jobject jconfig) {
		SkColorType GraphicsJNI::getNativeBitmapColorType(JNIEnv* env, jobject jconfig) {
		SkASSERT(env);
		if (NULL == jconfig) {
		return SkBitmap::kNo_Config;
		return kUnknown_SkColorType;
		}
		SkASSERT(env->IsInstanceOf(jconfig, gBitmapConfig_class));
		int c = env->GetIntField(jconfig, gBitmapConfig_nativeInstanceID);
		if (c < 0 \|\| c >= SkBitmap::kConfigCount) {
		c = SkBitmap::kNo_Config;
		c = kUnknown_SkColorType;
		}
		return static_cast<SkBitmap::Config>(c);
		return SkBitmapConfigToColorType(static_cast<SkBitmap::Config>(c));
		}

		SkCanvas* GraphicsJNI::getNativeCanvas(JNIEnv* env, jobject canvas) {

core/jni/android/graphics/GraphicsJNI.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -58,10 +58,10 @@ public:
		// ref to its SkRasterizer* (or NULL).
		static SkRasterizer* refNativeRasterizer(jlong rasterizerHandle);

		/** Return the corresponding native config from the java Config enum,
		or kNo_Config if the java object is null.
		/** Return the corresponding native colorType from the java Config enum,
		or kUnknown_SkColorType if the java object is null.
		*/
		static SkBitmap::Config getNativeBitmapConfig(JNIEnv*, jobject jconfig);
		static SkColorType getNativeBitmapColorType(JNIEnv*, jobject jconfig);

		/** Create a java Bitmap object given the native bitmap (required) and optional
		storage array (may be null).