Merge "Adjust buffer position after copying" into jb-mr1-dev

marcone · Android (Google) Code Review · commit 437e9cc388da · 2012-10-10T08:06:58.000-07:00
diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java
@@ -413,6 +413,11 @@ public void copyPixelsFromBuffer(Buffer src) {
         }
 
         nativeCopyPixelsFromBuffer(mNativeBitmap, src);
+
+        // now update the buffer's position
+        int position = src.position();
+        position += bitmapBytes >> shift;
+        src.position(position);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -413,6 +413,11 @@ public void copyPixelsFromBuffer(Buffer src) {`
`413`	`413`	`}`
`414`	`414`
`415`	`415`	`nativeCopyPixelsFromBuffer(mNativeBitmap, src);`
	`416`	`+`
	`417`	`+ // now update the buffer's position`
	`418`	`+ int position = src.position();`
	`419`	`+ position += bitmapBytes >> shift;`
	`420`	`+ src.position(position);`
`416`	`421`	`}`
`417`	`422`
`418`	`423`	`/**`