diff options
| author | George Mount <mount@google.com> | 2013-01-08 10:22:16 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-08 10:22:17 -0800 |
| commit | fd091d5c1cbb635f26823efa6295bf0563a2e2a4 (patch) | |
| tree | 9bce27c430427633b9de1a924cb8e4b36b13c120 /src/com/android/gallery3d/glrenderer/UploadedTexture.java | |
| parent | a4205e4eab691b402e7a6dc1e913a611b7fdc45f (diff) | |
| parent | e4673b2650ffc642afa872458dbf51e1a24b00c8 (diff) | |
| download | android_packages_apps_Snap-fd091d5c1cbb635f26823efa6295bf0563a2e2a4.tar.gz android_packages_apps_Snap-fd091d5c1cbb635f26823efa6295bf0563a2e2a4.tar.bz2 android_packages_apps_Snap-fd091d5c1cbb635f26823efa6295bf0563a2e2a4.zip | |
Merge "Instantiate GLCanvas rather than reinitialize current GLCanvas." into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/gallery3d/glrenderer/UploadedTexture.java')
| -rw-r--r-- | src/com/android/gallery3d/glrenderer/UploadedTexture.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/glrenderer/UploadedTexture.java b/src/com/android/gallery3d/glrenderer/UploadedTexture.java index ee55736bb..f41a979b7 100644 --- a/src/com/android/gallery3d/glrenderer/UploadedTexture.java +++ b/src/com/android/gallery3d/glrenderer/UploadedTexture.java @@ -222,7 +222,7 @@ public abstract class UploadedTexture extends BasicTexture { Assert.assertTrue(bWidth <= texWidth && bHeight <= texHeight); // Upload the bitmap to a new texture. - mId = GLCanvas.getGLId().generateTexture(); + mId = canvas.getGLId().generateTexture(); canvas.setTextureParameters(this); if (bWidth == texWidth && bHeight == texHeight) { |