| Index: trunk/extensions/UploadWizard/resources/mw.UploadWizard.js |
| — | — | @@ -358,11 +358,20 @@ |
| 359 | 359 | this.imageinfo.metadata.orientation = meta.tiff.Orientation.value; |
| 360 | 360 | } |
| 361 | 361 | if ( meta.general ) { |
| | 362 | + var pixelHeightDim = 'height'; |
| | 363 | + var pixelWidthDim = 'width'; |
| | 364 | + // this must be called after orientation is set above. If no orientation set, defaults to 0 |
| | 365 | + var degrees = this.getOrientationDegrees(); |
| | 366 | + // jpegmeta reports pixelHeight & width |
| | 367 | + if ( degrees == 90 || degrees == 270 ) { |
| | 368 | + pixelHeightDim = 'width'; |
| | 369 | + pixelWidthDim = 'height'; |
| | 370 | + } |
| 362 | 371 | if ( meta.general.pixelHeight ) { |
| 363 | | - this.imageinfo.height = meta.general.pixelHeight.value; |
| | 372 | + this.imageinfo[pixelHeightDim] = meta.general.pixelHeight.value; |
| 364 | 373 | } |
| 365 | 374 | if ( meta.general.pixelWidth ) { |
| 366 | | - this.imageinfo.width = meta.general.pixelWidth.value; |
| | 375 | + this.imageinfo[pixelWidthDim] = meta.general.pixelWidth.value; |
| 367 | 376 | } |
| 368 | 377 | } |
| 369 | 378 | } |