* Take into account Bitmap.getRowBytes() in `AndroidFrameConverter…

….convert(Bitmap)` (issue #1143)
bytedeco · Feb 27, 2019 · 531220d · 531220d
1 parent 736f342
commit 531220d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Take into account `Bitmap.getRowBytes()` in `AndroidFrameConverter.convert(Bitmap)` ([issue #1143](https://github.com/bytedeco/javacv/issues/1143))
  * Add `static { Loader.load(); }` in `LeptonicaFrameConverter` and `OpenCVFrameConverter` to prevent link errors ([issue #1128](https://github.com/bytedeco/javacv/issues/1128))
 
 ### January 11, 2019 version 1.4.4

diff --git a/src/main/java/org/bytedeco/javacv/AndroidFrameConverter.java b/src/main/java/org/bytedeco/javacv/AndroidFrameConverter.java
@@ -110,9 +110,10 @@ public Frame convert(byte[] data, int width, int height) {
             default: assert false;
         }
 
-        if (frame == null || frame.imageWidth != bitmap.getWidth()
+        if (frame == null || frame.imageWidth != bitmap.getWidth() || frame.imageStride != bitmap.getRowBytes()
                 || frame.imageHeight != bitmap.getHeight() || frame.imageChannels != channels) {
             frame = new Frame(bitmap.getWidth(), bitmap.getHeight(), Frame.DEPTH_UBYTE, channels);
+            frame.imageStride = bitmap.getRowBytes();
         }
 
         // assume matching strides