Merge pull request #6417 from sturkmen72:patch-14

68b7323b · Alexander Alekhin · c02d89bf · 98239664 · 68b7323b
Commit 68b7323b authored Apr 18, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

grfmt_jpeg2000.cpp modules/imgcodecs/src/grfmt_jpeg2000.cpp +1 -1

No files found.
--- a/modules/imgcodecs/src/grfmt_jpeg2000.cpp
+++ b/modules/imgcodecs/src/grfmt_jpeg2000.cpp
@@ -525,7 +525,7 @@ bool  Jpeg2KEncoder::writeComponent16u( void *__img, const Mat& _img )

    for( int y = 0; y < h; y++ )
    {
-        const uchar* data = _img.ptr(y);
+        const ushort* data = _img.ptr<ushort>(y);
        for( int i = 0; i < ncmpts; i++ )
        {
            for( int x = 0; x < w; x++)