diff options
author | Tor Norbye <tnorbye@google.com> | 2012-05-29 18:03:59 -0700 |
---|---|---|
committer | android code review <noreply-gerritcodereview@google.com> | 2012-05-29 18:03:59 -0700 |
commit | 6f2290e44b112695c9796de4ba7be887e7d64791 (patch) | |
tree | eeefc04badb3fa45785445cc06e1fbc33acf548c | |
parent | 18bde5c3eac6a0605a94b306192d6643a3100bd5 (diff) | |
parent | 95a2daa4980a35a30f25adc1d46b7cd8494b5e3b (diff) | |
download | sdk-6f2290e44b112695c9796de4ba7be887e7d64791.zip sdk-6f2290e44b112695c9796de4ba7be887e7d64791.tar.gz sdk-6f2290e44b112695c9796de4ba7be887e7d64791.tar.bz2 |
Merge "Fix typo"
2 files changed, 7 insertions, 7 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/CanvasTransform.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/CanvasTransform.java index 7cbb8f2..e367f9e 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/CanvasTransform.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/CanvasTransform.java @@ -104,7 +104,7 @@ public class CanvasTransform { * * @return The scaled image size in pixels. */ - public int getScalledImgSize() { + public int getScaledImgSize() { return (int) (mImgSize * mScale); } diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ImageOverlay.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ImageOverlay.java index c402b2b..d079ff4 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ImageOverlay.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/ImageOverlay.java @@ -205,9 +205,9 @@ public class ImageOverlay extends Overlay implements IImageFactory { BufferedImage awtImage = mAwtImage.get(); if (PRESCALE && awtImage != null) { if (mPreScaledImage == null || - mPreScaledImage.getImageData().width != hi.getScalledImgSize()) { - double xScale = hi.getScalledImgSize() / (double) awtImage.getWidth(); - double yScale = vi.getScalledImgSize() / (double) awtImage.getHeight(); + mPreScaledImage.getImageData().width != hi.getScaledImgSize()) { + double xScale = hi.getScaledImgSize() / (double) awtImage.getWidth(); + double yScale = vi.getScaledImgSize() / (double) awtImage.getHeight(); BufferedImage scaledAwtImage; // NOTE: == comparison on floating point numbers is okay @@ -221,7 +221,7 @@ public class ImageOverlay extends Overlay implements IImageFactory { } else { scaledAwtImage = ImageUtils.scale(awtImage, xScale, yScale); } - assert scaledAwtImage.getWidth() == hi.getScalledImgSize(); + assert scaledAwtImage.getWidth() == hi.getScaledImgSize(); if (mPreScaledImage != null && !mPreScaledImage.isDisposed()) { mPreScaledImage.dispose(); } @@ -251,8 +251,8 @@ public class ImageOverlay extends Overlay implements IImageFactory { vi.getImgSize(), // srcHeight hi.translate(0), // destX vi.translate(0), // destY - hi.getScalledImgSize(), // destWidth - vi.getScalledImgSize()); // destHeight + hi.getScaledImgSize(), // destWidth + vi.getScaledImgSize()); // destHeight if (oldAlias != -2) { gc_setAntialias(gc, oldAlias); |