MFH: Fixed bug #29424 (width and height inverted for JPEG2000 files).

diff --git a/NEWS b/NEWS
index 2381b834fa4061fac11394513ef5312aad7bc6f9..587ded7c854e5b727629d67c31ba4d4ecd596d40 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -85,6 +85,7 @@ PHP 4                                                                      NEWS
   parameters). (Jani)
 - Fixed bug #29733 (printf() handles repeated placeholders wrong).  
   (bugs dot php dot net at bluetwanger dot de, Ilia)
+- Fixed bug #29424 (width and height inverted for JPEG2000 files). (Ilia)
 - Fixed bug #28976 (mail(): use "From:" from headers if sendmail_from is empty).
   (Jani)
 - Fixed bug #28930 (PHP sources pick wrong header files generated by bison).

diff --git a/ext/standard/image.c b/ext/standard/image.c
index 52e3b2fc557e723399c77fc6b439d0e13da71fce..6a015cb326638feb383f5b5949c2398bc97cbe37 100644 (file)
--- a/ext/standard/image.c
+++ b/ext/standard/image.c
@@ -628,8 +628,8 @@ static struct gfxinfo *php_handle_jpc(php_stream * stream TSRMLS_DC)
 
        dummy_short = php_read2(stream TSRMLS_CC); /* Lsiz */
        dummy_short = php_read2(stream TSRMLS_CC); /* Rsiz */
-       result->height = php_read4(stream TSRMLS_CC); /* Xsiz */
        result->width = php_read4(stream TSRMLS_CC); /* Ysiz */
+       result->height = php_read4(stream TSRMLS_CC); /* Xsiz */
 
 #if MBO_0
        dummy_int = php_read4(stream TSRMLS_CC); /* XOsiz */