Fix getCorrectedImageSize method

Author: dk981234

src/helper_survey.ts

@@ -703,8 +703,8 @@ export class SurveyHelper {
                 }
             }
             else if(imageSize && imageSize.height && imageSize.width) {
-                heightPt = SurveyHelper.parseWidth(imageSize.height.toString(), SurveyHelper.getPageAvailableWidth(controller), 1, 'px');
-                widthPt = SurveyHelper.parseWidth(imageSize.width.toString(), SurveyHelper.getPageAvailableWidth(controller), 1, 'px');
+                heightPt = Math.min(imageSize.height, SurveyHelper.getPageAvailableWidth(controller));
+                widthPt = Math.min(imageSize.width, SurveyHelper.getPageAvailableWidth(controller));
             }
         }
         return { width: widthPt || defaultWidthPt || 0, height: heightPt || defaultHeightPt || 0 };

tests/flat_file.test.ts

@@ -164,9 +164,9 @@ test('Check one image 16x16px file', async () => {
     controller.margins.left += controller.unitWidth;
     const assumeFile: IRect = {
         xLeft: controller.leftTopPoint.xLeft,
-        xRight: controller.leftTopPoint.xLeft + SurveyHelper.pxToPt(imageSize.width),
+        xRight: controller.leftTopPoint.xLeft + imageSize.width,
         yTop: controller.leftTopPoint.yTop,
-        yBot: controller.leftTopPoint.yTop + SurveyHelper.pxToPt(imageSize.height) +
+        yBot: controller.leftTopPoint.yTop + imageSize.height +
             controller.unitHeight * (1.0 + FlatFile.IMAGE_GAP_SCALE)
     };
     TestHelper.equalRect(expect, flats[0][0], assumeFile);
@@ -204,7 +204,7 @@ test('Check one image 16x16px file shorter than text', async () => {
         xLeft: controller.leftTopPoint.xLeft,
         xRight: controller.leftTopPoint.xLeft + controller.measureText(json.elements[0].defaultValue[0].name).width,
         yTop: controller.leftTopPoint.yTop,
-        yBot: controller.leftTopPoint.yTop + SurveyHelper.pxToPt(imageSize.height) +
+        yBot: controller.leftTopPoint.yTop + imageSize.height +
             controller.unitHeight * (1.0 + FlatFile.IMAGE_GAP_SCALE)
     };
     TestHelper.equalRect(expect, flats[0][0], assumeFile);