Merge pull request #2023 from boubpopsyteam/patch-3

codeanticode · codeanticode · commit 13fbea2acfcd · 2013-08-16T16:11:45.000-07:00
Update Video.java to fix native gl to java argb conversion
diff --git a/java/libraries/video/src/processing/video/Video.java b/java/libraries/video/src/processing/video/Video.java
@@ -212,7 +212,7 @@ static protected void convertToARGB(int[] pixels, int width, int height) {
       for (int y = 0; y < height; y++) {
         for (int x = 0; x < width; x++) {
           int pixel = pixels[p++];
-          pixels[t++] = (pixel >> 8) | ((pixel << 24) & 0xFF000000);
+          pixels[t++] = (pixel >>> 8) | ((pixel << 24) & 0xFF000000);
         }
       }
 

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ static protected void convertToARGB(int[] pixels, int width, int height) {`
`212`	`212`	`for (int y = 0; y < height; y++) {`
`213`	`213`	`for (int x = 0; x < width; x++) {`
`214`	`214`	`int pixel = pixels[p++];`
`215`		`- pixels[t++] = (pixel >> 8) \| ((pixel << 24) & 0xFF000000);`
	`215`	`+ pixels[t++] = (pixel >>> 8) \| ((pixel << 24) & 0xFF000000);`
`216`	`216`	`}`
`217`	`217`	`}`
`218`	`218`