Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 34829553: Merge "Fix the fix for 9patches." into honeycomb

Browse Source 
* commit '34829553a803d37ae3555579f4aa130e652644d9':
  Fix the fix for 9patches.
This commit is contained in:
Romain Guy
2011-01-19 12:01:20 -08:00
committed by Android Git Automerger
parent 4026ea7c25 34829553a8
commit cdc2f68a4a
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/hwui/Patch.cpp
View File

@@ -167,10 +167,6 @@ void Patch::updateVertices(const float bitmapWidth, const float bitmapHeight,
float v2 = fmax(0.0f, stepY - 0.5f) / bitmapHeight; float v2 = fmax(0.0f, stepY - 0.5f) / bitmapHeight;
if (stepY > 0.0f) { if (stepY > 0.0f) {
if (i == mYCount - 1 && mYDivs[i] == bitmapHeight) {
y2 = bottom - top;
v2 = 1.0f;
}
generateRow(vertex, y1, y2, v1, v2, stretchX, right - left, generateRow(vertex, y1, y2, v1, v2, stretchX, right - left,
bitmapWidth, quadCount); bitmapWidth, quadCount);
} }
@@ -222,10 +218,6 @@ void Patch::generateRow(TextureVertex*& vertex, float y1, float y2, float v1, fl
float u2 = fmax(0.0f, stepX - 0.5f) / bitmapWidth; float u2 = fmax(0.0f, stepX - 0.5f) / bitmapWidth;
if (stepX > 0.0f) { if (stepX > 0.0f) {
if (i == mXCount - 1 && mXDivs[i] == bitmapWidth) {
x2 = bitmapWidth;
u2 = 1.0f;
}
generateQuad(vertex, x1, y1, x2, y2, u1, v1, u2, v2, quadCount); generateQuad(vertex, x1, y1, x2, y2, u1, v1, u2, v2, quadCount);
} }