diff options
author | Steve Block <steveblock@google.com> | 2012-01-06 19:20:56 +0000 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2012-01-08 13:19:13 +0000 |
commit | 3762c311729fe9f3af085c14c5c1fb471d994c03 (patch) | |
tree | 7d4caccad80ac7327c7bff96dafc857d5f4631ad /libs/hwui | |
parent | 7a939077bd14521c7d351af98df7ed75a8ec9c15 (diff) | |
download | frameworks_base-3762c311729fe9f3af085c14c5c1fb471d994c03.zip frameworks_base-3762c311729fe9f3af085c14c5c1fb471d994c03.tar.gz frameworks_base-3762c311729fe9f3af085c14c5c1fb471d994c03.tar.bz2 |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
Diffstat (limited to 'libs/hwui')
-rw-r--r-- | libs/hwui/FontRenderer.cpp | 8 | ||||
-rw-r--r-- | libs/hwui/GradientCache.cpp | 2 | ||||
-rw-r--r-- | libs/hwui/OpenGLRenderer.cpp | 6 | ||||
-rw-r--r-- | libs/hwui/Program.cpp | 6 | ||||
-rw-r--r-- | libs/hwui/ShapeCache.h | 2 | ||||
-rw-r--r-- | libs/hwui/TextureCache.cpp | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/libs/hwui/FontRenderer.cpp b/libs/hwui/FontRenderer.cpp index 8462307..790c143 100644 --- a/libs/hwui/FontRenderer.cpp +++ b/libs/hwui/FontRenderer.cpp @@ -150,7 +150,7 @@ void Font::drawCachedGlyph(CachedGlyphInfo* glyph, int x, int y, for (cacheX = glyph->mStartX, bX = nPenX; cacheX < endX; cacheX++, bX++) { for (cacheY = glyph->mStartY, bY = nPenY; cacheY < endY; cacheY++, bY++) { if (bX < 0 || bY < 0 || bX >= (int32_t) bitmapW || bY >= (int32_t) bitmapH) { - LOGE("Skipping invalid index"); + ALOGE("Skipping invalid index"); continue; } uint8_t tempCol = cacheBuffer[cacheY * cacheWidth + cacheX]; @@ -191,7 +191,7 @@ void Font::render(SkPaint* paint, const char* text, uint32_t start, uint32_t len void Font::measure(SkPaint* paint, const char* text, uint32_t start, uint32_t len, int numGlyphs, Rect *bounds) { if (bounds == NULL) { - LOGE("No return rectangle provided to measure text"); + ALOGE("No return rectangle provided to measure text"); return; } bounds->set(1e6, -1e6, -1e6, 1e6); @@ -475,7 +475,7 @@ void FontRenderer::cacheBitmap(const SkGlyph& glyph, CachedGlyphInfo* cachedGlyp cachedGlyph->mIsValid = false; // If the glyph is too tall, don't cache it if (glyph.fHeight + TEXTURE_BORDER_SIZE > mCacheLines[mCacheLines.size() - 1]->mMaxHeight) { - LOGE("Font size to large to fit in cache. width, height = %i, %i", + ALOGE("Font size to large to fit in cache. width, height = %i, %i", (int) glyph.fWidth, (int) glyph.fHeight); return; } @@ -871,7 +871,7 @@ bool FontRenderer::renderText(SkPaint* paint, const Rect* clip, const char *text checkInit(); if (!mCurrentFont) { - LOGE("No font set"); + ALOGE("No font set"); return false; } diff --git a/libs/hwui/GradientCache.cpp b/libs/hwui/GradientCache.cpp index a88a59a..3678788 100644 --- a/libs/hwui/GradientCache.cpp +++ b/libs/hwui/GradientCache.cpp @@ -154,7 +154,7 @@ Texture* GradientCache::addLinearGradient(GradientCacheEntry& gradient, void GradientCache::generateTexture(SkBitmap* bitmap, Texture* texture) { SkAutoLockPixels autoLock(*bitmap); if (!bitmap->readyToDraw()) { - LOGE("Cannot generate texture from shader"); + ALOGE("Cannot generate texture from shader"); return; } diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 9101953..12ed205 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -172,7 +172,7 @@ void OpenGLRenderer::finish() { ALOGD("GL error from OpenGLRenderer: 0x%x", status); switch (status) { case GL_OUT_OF_MEMORY: - LOGE(" OpenGLRenderer is out of memory!"); + ALOGE(" OpenGLRenderer is out of memory!"); break; } } @@ -538,7 +538,7 @@ bool OpenGLRenderer::createFboLayer(Layer* layer, Rect& bounds, sp<Snapshot> sna #if DEBUG_LAYERS_AS_REGIONS GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER); if (status != GL_FRAMEBUFFER_COMPLETE) { - LOGE("Framebuffer incomplete (GL error code 0x%x)", status); + ALOGE("Framebuffer incomplete (GL error code 0x%x)", status); glBindFramebuffer(GL_FRAMEBUFFER, previousFbo); layer->deleteTexture(); @@ -569,7 +569,7 @@ bool OpenGLRenderer::createFboLayer(Layer* layer, Rect& bounds, sp<Snapshot> sna */ void OpenGLRenderer::composeLayer(sp<Snapshot> current, sp<Snapshot> previous) { if (!current->layer) { - LOGE("Attempting to compose a layer that does not exist"); + ALOGE("Attempting to compose a layer that does not exist"); return; } diff --git a/libs/hwui/Program.cpp b/libs/hwui/Program.cpp index 701314d..984461c 100644 --- a/libs/hwui/Program.cpp +++ b/libs/hwui/Program.cpp @@ -55,13 +55,13 @@ Program::Program(const ProgramDescription& description, const char* vertex, cons GLint status; glGetProgramiv(mProgramId, GL_LINK_STATUS, &status); if (status != GL_TRUE) { - LOGE("Error while linking shaders:"); + ALOGE("Error while linking shaders:"); GLint infoLen = 0; glGetProgramiv(mProgramId, GL_INFO_LOG_LENGTH, &infoLen); if (infoLen > 1) { GLchar log[infoLen]; glGetProgramInfoLog(mProgramId, infoLen, 0, &log[0]); - LOGE("%s", log); + ALOGE("%s", log); } glDetachShader(mProgramId, mVertexShader); @@ -142,7 +142,7 @@ GLuint Program::buildShader(const char* source, GLenum type) { // use a fixed size instead GLchar log[512]; glGetShaderInfoLog(shader, sizeof(log), 0, &log[0]); - LOGE("Error while compiling shader: %s", log); + ALOGE("Error while compiling shader: %s", log); glDeleteShader(shader); return 0; } diff --git a/libs/hwui/ShapeCache.h b/libs/hwui/ShapeCache.h index b60ef4c..30ce690 100644 --- a/libs/hwui/ShapeCache.h +++ b/libs/hwui/ShapeCache.h @@ -571,7 +571,7 @@ template<class Entry> void ShapeCache<Entry>::generateTexture(SkBitmap& bitmap, Texture* texture) { SkAutoLockPixels alp(bitmap); if (!bitmap.readyToDraw()) { - LOGE("Cannot generate texture from bitmap"); + ALOGE("Cannot generate texture from bitmap"); return; } diff --git a/libs/hwui/TextureCache.cpp b/libs/hwui/TextureCache.cpp index 3f46a30..cc09aae 100644 --- a/libs/hwui/TextureCache.cpp +++ b/libs/hwui/TextureCache.cpp @@ -202,7 +202,7 @@ void TextureCache::generateTexture(SkBitmap* bitmap, Texture* texture, bool rege SkAutoLockPixels alp(*bitmap); if (!bitmap->readyToDraw()) { - LOGE("Cannot generate texture from bitmap"); + ALOGE("Cannot generate texture from bitmap"); return; } |