Pre Merge pull request !448 from zgf/master

Signed-off-by: zgf <zenggaofeng2@h-partners.com>

library/src/main/ets/ImageKnifeDispatcher.ets

@@ -475,7 +475,7 @@ export class ImageKnifeDispatcher {
             }
             this.assembleImageKnifeData(callBackData,requestJobResult.imageKnifeData,requestWithSource.request)
             LogUtil.log('getAndShowImage cancel:' + requestWithSource.request.componentId  + ',srcType:' + requestSource + ',version:' + requestWithSource.request.componentVersion)
-            requestWithSource.request.imageKnifeOption.onLoadListener.onLoadCancel('component has destroyed', requestWithSource.request)
+            requestWithSource.request.imageKnifeOption.onLoadListener.onLoadCancel('component has destroyed from load', requestWithSource.request)
           }
         }
       });
@@ -522,7 +522,7 @@ export class ImageKnifeDispatcher {
           callBackData.errorInfo = errorInfo;
         }
         LogUtil.log('dispatchNextJob cancel:' + request.componentId  + ',version:' + request.componentVersion)
-        request.imageKnifeOption.onLoadListener.onLoadCancel('component has destroyed', request)
+        request.imageKnifeOption.onLoadListener.onLoadCancel('component has destroyed from queue', request)
       }
     }
   }

library/src/main/ets/ImageKnifeLoader.ets

@@ -631,8 +631,8 @@ export class ImageKnifeLoader {
   static getDownsamplerDecodingOptions(typeValue: string, request: RequestJobRequest, size: Size,
     SRC?: ImageKnifeRequestSource):image.DecodingOptions {
     let reqSize =
-      new Downsampler().calculateScaling(typeValue, size.width, size.height, vp2px(request.targetWidth), vp2px(request.targetHeight),
+      new Downsampler().calculateScaling(typeValue, size.width, size.height,
-        request.downsampType)
+        vp2px(request.targetWidth), vp2px(request.targetHeight), request.downsampType)
     if (typeValue == 'svg') {
       return {
         editable: true,