Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
8d6e7b2e
Commit
8d6e7b2e
authored
Sep 02, 2016
by
Sergey Luzyanin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix Bug 13578
parent
4a836625
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
common/apiCommon.js
common/apiCommon.js
+3
-3
slide/api.js
slide/api.js
+3
-3
word/api.js
word/api.js
+6
-6
No files found.
common/apiCommon.js
View file @
8d6e7b2e
...
...
@@ -2076,8 +2076,8 @@
var
bIsCorrect
=
false
;
if
(
_image
.
Image
!=
null
)
{
var
__w
=
Math
.
max
(
parseInt
(
_image
.
Image
.
width
*
AscCommon
.
g_dKoef_pix_to_mm
),
1
);
var
__h
=
Math
.
max
(
parseInt
(
_image
.
Image
.
height
*
AscCommon
.
g_dKoef_pix_to_mm
),
1
);
var
__w
=
Math
.
max
((
_image
.
Image
.
width
*
AscCommon
.
g_dKoef_pix_to_mm
),
1
);
var
__h
=
Math
.
max
((
_image
.
Image
.
height
*
AscCommon
.
g_dKoef_pix_to_mm
),
1
);
var
dKoef
=
Math
.
max
(
__w
/
_w
,
__h
/
_h
);
if
(
dKoef
>
1
)
{
...
...
@@ -2091,7 +2091,7 @@
}
}
return
new
asc_CImageSize
(
parseInt
(
_w
),
parseInt
(
_h
)
,
bIsCorrect
);
return
new
asc_CImageSize
(
_w
,
_h
,
bIsCorrect
);
}
return
new
asc_CImageSize
(
50
,
50
,
false
);
},
...
...
slide/api.js
View file @
8d6e7b2e
...
...
@@ -3822,10 +3822,10 @@ background-repeat: no-repeat;\
var
_h
=
AscCommon
.
Page_Height
-
(
AscCommon
.
Y_Top_Margin
+
AscCommon
.
Y_Bottom_Margin
);
if
(
_image
.
Image
!=
null
)
{
var
__w
=
Math
.
max
((
_image
.
Image
.
width
*
AscCommon
.
g_dKoef_pix_to_mm
)
>>
0
,
1
);
var
__h
=
Math
.
max
((
_image
.
Image
.
height
*
AscCommon
.
g_dKoef_pix_to_mm
)
>>
0
,
1
);
var
__w
=
Math
.
max
((
_image
.
Image
.
width
*
AscCommon
.
g_dKoef_pix_to_mm
),
1
);
var
__h
=
Math
.
max
((
_image
.
Image
.
height
*
AscCommon
.
g_dKoef_pix_to_mm
),
1
);
_w
=
Math
.
max
(
5
,
Math
.
min
(
_w
,
__w
));
_h
=
Math
.
max
(
5
,
Math
.
min
((
_w
*
__h
/
__w
)
>>
0
));
_h
=
Math
.
max
(
5
,
Math
.
min
((
_w
*
__h
/
__w
)));
}
var
src
=
_image
.
src
;
...
...
word/api.js
View file @
8d6e7b2e
...
...
@@ -5048,10 +5048,10 @@ background-repeat: no-repeat;\
var
_h
=
Math
.
max
(
1
,
ColumnSize
.
H
);
if
(
_image
.
Image
!=
null
)
{
var
__w
=
Math
.
max
(
parseInt
(
_image
.
Image
.
width
*
AscCommon
.
g_dKoef_pix_to_mm
),
1
);
var
__h
=
Math
.
max
(
parseInt
(
_image
.
Image
.
height
*
AscCommon
.
g_dKoef_pix_to_mm
),
1
);
var
__w
=
Math
.
max
((
_image
.
Image
.
width
*
AscCommon
.
g_dKoef_pix_to_mm
),
1
);
var
__h
=
Math
.
max
((
_image
.
Image
.
height
*
AscCommon
.
g_dKoef_pix_to_mm
),
1
);
_w
=
Math
.
max
(
5
,
Math
.
min
(
_w
,
__w
));
_h
=
Math
.
max
(
5
,
Math
.
min
(
parseInt
(
_w
*
__h
/
__w
)));
_h
=
Math
.
max
(
5
,
Math
.
min
((
_w
*
__h
/
__w
)));
}
var
src
=
_image
.
src
;
...
...
@@ -5101,10 +5101,10 @@ background-repeat: no-repeat;\
var
_h
=
Math
.
max
(
1
,
ColumnSize
.
H
);
if
(
_image
.
Image
!=
null
)
{
var
__w
=
Math
.
max
(
parseInt
(
_image
.
Image
.
width
*
AscCommon
.
g_dKoef_pix_to_mm
),
1
);
var
__h
=
Math
.
max
(
parseInt
(
_image
.
Image
.
height
*
AscCommon
.
g_dKoef_pix_to_mm
),
1
);
var
__w
=
Math
.
max
((
_image
.
Image
.
width
*
AscCommon
.
g_dKoef_pix_to_mm
),
1
);
var
__h
=
Math
.
max
((
_image
.
Image
.
height
*
AscCommon
.
g_dKoef_pix_to_mm
),
1
);
_w
=
Math
.
max
(
5
,
Math
.
min
(
_w
,
__w
));
_h
=
Math
.
max
(
5
,
Math
.
min
(
parseInt
(
_w
*
__h
/
__w
)));
_h
=
Math
.
max
(
5
,
Math
.
min
((
_w
*
__h
/
__w
)));
}
var
src
=
_image
.
src
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment