moparisthebest
/
poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Bug 51098 - Error in calculating image width/height, if image fits into one cell 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1128422 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yegor Kozlov 2011-05-27 18:46:04 +00:00
parent 481a325c45
commit 034f4c5cf5
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFPicture.java
View File

@ -215,10 +215,6 @@ public final class XSSFPicture extends XSSFShape implements Picture {
float w = 0;
int col2 = anchor.getCol1();
int dx2 = 0;
if(anchor.getDx1() > 0){
w += getColumnWidthInPixels(col2) - anchor.getDx1();
col2++;
}
for (;;) {
w += getColumnWidthInPixels(col2);
@ -227,7 +223,7 @@ public final class XSSFPicture extends XSSFShape implements Picture {
}
if(w > scaledWidth) {
double cw = getColumnWidthInPixels(col2 + 1);
double cw = getColumnWidthInPixels(col2 );
double delta = w - scaledWidth;
dx2 = (int)(EMU_PER_PIXEL*(cw-delta));
}
@ -238,11 +234,6 @@ public final class XSSFPicture extends XSSFShape implements Picture {
int row2 = anchor.getRow1();
int dy2 = 0;
if(anchor.getDy1() > 0){
h += getRowHeightInPixels(row2) - anchor.getDy1()/EMU_PER_PIXEL;
row2++;
}
for (;;) {
h += getRowHeightInPixels(row2);
if(h > scaledHeight) break;