* Fix Mat.createFrom(BufferedImage) (issue #30)

bytedeco · Dec 6, 2014 · 5c50179 · 5c50179
1 parent 43a8113
commit 5c50179
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Fix `Mat.createFrom(BufferedImage)` ([issue #30](https://github.com/bytedeco/javacpp-presets/issues/30))
  * Add Speex and OpenSSL in the `cppbuild.sh` for FFmpeg to support common RTMPS streams, among other things ([issue #2](https://github.com/bytedeco/javacpp-presets/issues/2))
  * Deprecate slow `get()` and `put()` methods of `CvMat` in favor of the fast ones from `createIndexer()` ([issue javacv:317](http://code.google.com/p/javacv/issues/detail?id=317))
  * Include `operations.hpp` and `mat.hpp` in `opencv_core` to get a few important functions such as `read()` and `write()` for `FileStorage`

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/helper/opencv_core.java b/opencv/src/main/java/org/bytedeco/javacpp/helper/opencv_core.java
@@ -2574,7 +2574,7 @@ public static Mat createFrom(BufferedImage image, double gamma, boolean flipChan
                     default: assert false;
                 }
             }
-            create(image.getWidth(), image.getHeight(), CV_MAKETYPE(depth, numChannels));
+            create(image.getHeight(), image.getWidth(), CV_MAKETYPE(depth, numChannels));
             super.copyFrom(image, gamma, flipChannels, roi);
         }