file api refactorings and fixes

Author: Mikhail Bezoyan

flash/core/src/ru/mail/commands/ResizeFileCommand.as

@@ -130,7 +130,8 @@ package ru.mail.commands
 }
 else 
 {
-currentImageMap = fullImageMap.clone();
+//	currentImageMap = fullImageMap.clone();
+ currentImageMap = fullImageMap;
 }
 
 // ==============
@@ -140,7 +141,7 @@ package ru.mail.commands
 var angle:Number = imageTransform.deg*Math.PI/180;
 var maxScale:Number = Math.max(scaleX, scaleY);
 
-if (maxScale < 0.5) {
+if (imageTransform.multiPassResize && maxScale < 0.5) {
 
 trace ("multi-step ");
 

flash/core/src/ru/mail/commands/UploadCommand.as

@@ -137,7 +137,9 @@ package ru.mail.commands
 checkFilesPool();
 });
 
-imageFactory.createImage( trans? new ImageTransformVO(trans.sx, trans.sy, trans.sw, trans.sh, trans.dw, trans.dh, trans.deg, trans.type, trans.quality, (trans.overlay is Array)? trans.overlay : [trans.overlay]) : null );
+imageFactory.createImage( trans
+ ? new ImageTransformVO(trans.sx, trans.sy, trans.sw, trans.sh, trans.dw, trans.dh, trans.deg, trans.type, trans.quality, (trans.overlay is Array)? trans.overlay : [trans.overlay], trans.multipass)
+ : null );
 }
 }
 

flash/core/src/ru/mail/controller/AppController.as

@@ -582,7 +582,9 @@ package ru.mail.controller
 }
 });
 
-imageFactory.createImage( trans? new ImageTransformVO(trans.sx, trans.sy, trans.sw, trans.sh, trans.dw, trans.dh, trans.deg, trans.type, trans.quality, (trans.overlay is Array)? trans.overlay : [trans.overlay]) : null );
+imageFactory.createImage( trans
+ ? new ImageTransformVO(trans.sx, trans.sy, trans.sw, trans.sh, trans.dw, trans.dh, trans.deg, trans.type, trans.quality, (trans.overlay is Array)? trans.overlay : [trans.overlay], trans.multipass)
+ : null);
 }
 catch (e:Error){
 LoggerJS.log('imageFactory createImage error: '+e.toString());

flash/core/src/ru/mail/data/ImageFactory.as

@@ -202,10 +202,13 @@ package ru.mail.data
 trace ("bitmap created, isSuccess", event.isSuccess);
 LoggerJS.log('ImageFactory bitmap created, success '+ event.isSuccess);
 if (event.isSuccess) {
+ file.imageData = event.decodedBitmap.bitmapData;
+/*
 file.imageData = new BitmapData( event.decodedBitmap.width, event.decodedBitmap.height );
 file.imageData.copyPixels( event.decodedBitmap.bitmapData
 , new Rectangle( 0, 0, event.decodedBitmap.width, event.decodedBitmap.height ), new Point( 0, 0 ));
 event.decodedBitmap.bitmapData.dispose();
+*/
 
 createImageFromSource(imageTransform);
 }

flash/core/src/ru/mail/data/vo/FakeFileVO.as

@@ -45,12 +45,12 @@ package ru.mail.data.vo
  * @return 
  * 
  */
-public function get imageData():BitmapData 
+public function get imageData():BitmapData
 {
 return _imageData;
 }
 
-public function set imageData(bd:BitmapData):void 
+public function set imageData(bd:BitmapData):void
 {
 _imageData = bd;
 }

flash/core/src/ru/mail/data/vo/ImageTransformVO.as

@@ -21,9 +21,10 @@ package ru.mail.data.vo
 public var type:String = 'image/png'; // encoded image type. If type value is unknown, png is used
 public var quality:Number = 1; // encode quality (jpeg only)
 public var overlay:Array = []; // array of OverlayVO instances
+ public var multiPassResize: Boolean = true;
 
 public function ImageTransformVO(sx:Number = 0, sy:Number = 0, sw:Number = 0, sh:Number = 0, dw:Number = 0, dh:Number = 0, deg:Number = 0
- , type:String = null, quality:Number = 1, overlay:Array = null)
+ , type:String = null, quality:Number = 1, overlay:Array = null, multiPassResize:Boolean = true)
 {
 super();
 
@@ -45,6 +46,9 @@ package ru.mail.data.vo
 this.type = type;
 if ( !isNaN(quality) )
 this.quality = quality;
+
+ this.multiPassResize = multiPassResize;
+
 if ( overlay )
 setOverlay( overlay );
 }