http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97650
Revision: 97650
Author: neilk
Date: 2011-09-20 19:13:36 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
swap reported width and height for jpegmeta, if rotated 90 or 270 degrees
Modified Paths:
--------------
trunk/extensions/UploadWizard/resources/mw.UploadWizard.js
Modified: trunk/extensions/UploadWizard/resources/mw.UploadWizard.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.UploadWizard.js 2011-09-20
18:56:06 UTC (rev 97649)
+++ trunk/extensions/UploadWizard/resources/mw.UploadWizard.js 2011-09-20
19:13:36 UTC (rev 97650)
@@ -358,11 +358,20 @@
this.imageinfo.metadata.orientation =
meta.tiff.Orientation.value;
}
if ( meta.general ) {
+ var pixelHeightDim = 'height';
+ var pixelWidthDim = 'width';
+ // this must be called after orientation is set
above. If no orientation set, defaults to 0
+ var degrees = this.getOrientationDegrees();
+ // jpegmeta reports pixelHeight & width
+ if ( degrees == 90 || degrees == 270 ) {
+ pixelHeightDim = 'width';
+ pixelWidthDim = 'height';
+ }
if ( meta.general.pixelHeight ) {
- this.imageinfo.height =
meta.general.pixelHeight.value;
+ this.imageinfo[pixelHeightDim] =
meta.general.pixelHeight.value;
}
if ( meta.general.pixelWidth ) {
- this.imageinfo.width =
meta.general.pixelWidth.value;
+ this.imageinfo[pixelWidthDim] =
meta.general.pixelWidth.value;
}
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
