From 3dffe40cc4329636b5a59d5586cfd8e883b3fa2d Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Sun, 6 Mar 2005 17:05:41 +0000 Subject: [PATCH] MFH: Fixed bug #29424 (width and height inverted for JPEG2000 files). --- NEWS | 1 + ext/standard/image.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 2381b834fa..587ded7c85 100644 --- 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 52e3b2fc55..6a015cb326 100644 --- 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 */ -- 2.50.1