Skip to content

Commit 279c53b

Browse files
committed
#199 #265 flash fix 2015 error with BitmapData
1 parent 36c27bd commit 279c53b

5 files changed

Lines changed: 6 additions & 10 deletions

File tree

dist/FileAPI.flash.swf

-4.36 KB
Binary file not shown.

flash/core/src/net/inspirit/MultipartURLLoader.as

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,7 @@
481481

482482
private function removeListener(): void
483483
{
484+
if (!_loader) return;
484485
_loader.removeEventListener( Event.COMPLETE, onComplete );
485486
_loader.removeEventListener( ProgressEvent.PROGRESS, onProgress );
486487
_loader.removeEventListener( IOErrorEvent.IO_ERROR, onIOError );
@@ -562,16 +563,17 @@
562563

563564
}
564565
}
566+
import flash.utils.ByteArray;
565567

566568
internal class FilePart
567569
{
568570

569-
public var fileContent:flash.utils.ByteArray;
571+
public var fileContent:ByteArray;
570572
public var fileName:String;
571573
public var dataField:String;
572574
public var contentType:String;
573575

574-
public function FilePart(fileContent:flash.utils.ByteArray, fileName:String, dataField:String = 'Filedata', contentType:String = 'application/octet-stream')
576+
public function FilePart(fileContent:ByteArray, fileName:String, dataField:String = 'Filedata', contentType:String = 'application/octet-stream')
575577
{
576578
this.fileContent = fileContent;
577579
this.fileName = fileName;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ package ru.mail.commands
130130
}
131131
else
132132
{
133-
// currentImageMap = fullImageMap.clone();
134-
currentImageMap = fullImageMap;
133+
currentImageMap = fullImageMap.clone();
134+
// currentImageMap = fullImageMap; // #199 #265 вернул обратно clone(), т.к. ниже есть currentImageMap.dispose()
135135
}
136136

137137
// ==============

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -514,19 +514,16 @@ package ru.mail.controller
514514
*/
515515
public function getFileInfo(fileID:String, callback:String):void
516516
{
517-
trace ("getFileInfo");
518517
LoggerJS.log('getFileInfo, fileID: '+fileID+', callback: '+callback );
519518
var file:BaseFileVO = _model.filesBuilder.getFileByID(fileID);
520519
if (!file) {
521-
trace ("file with id "+ fileID +" doen't exist");
522520
LoggerJS.log("getFileInfo, file with id "+ fileID +" doen't exist" );
523521
return;
524522
}
525523

526524
var imageFactory:IImageFactory = file.imageFactory;
527525
(imageFactory as EventDispatcher).addEventListener(ImageTransformCompleteEvent.TYPE,function (event:ImageTransformCompleteEvent):void {
528526
event.currentTarget.removeEventListener(event.type, arguments.callee);
529-
trace("getfileinfo complete", event.isSuccess);
530527
LoggerJS.log("getFileInfo complete, success = "+ event.isSuccess );
531528
if (event.isSuccess && (file as IFileVO).imageData)
532529
{

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,13 +202,10 @@ package ru.mail.data
202202
trace ("bitmap created, isSuccess", event.isSuccess);
203203
LoggerJS.log('ImageFactory bitmap created, success '+ event.isSuccess);
204204
if (event.isSuccess) {
205-
file.imageData = event.decodedBitmap.bitmapData;
206-
/*
207205
file.imageData = new BitmapData( event.decodedBitmap.width, event.decodedBitmap.height );
208206
file.imageData.copyPixels( event.decodedBitmap.bitmapData
209207
, new Rectangle( 0, 0, event.decodedBitmap.width, event.decodedBitmap.height ), new Point( 0, 0 ));
210208
event.decodedBitmap.bitmapData.dispose();
211-
*/
212209

213210
createImageFromSource(imageTransform);
214211
}

0 commit comments

Comments
 (0)