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:
parent
481a325c45
commit
034f4c5cf5
@ -215,10 +215,6 @@ public final class XSSFPicture extends XSSFShape implements Picture {
|
|||||||
float w = 0;
|
float w = 0;
|
||||||
int col2 = anchor.getCol1();
|
int col2 = anchor.getCol1();
|
||||||
int dx2 = 0;
|
int dx2 = 0;
|
||||||
if(anchor.getDx1() > 0){
|
|
||||||
w += getColumnWidthInPixels(col2) - anchor.getDx1();
|
|
||||||
col2++;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (;;) {
|
for (;;) {
|
||||||
w += getColumnWidthInPixels(col2);
|
w += getColumnWidthInPixels(col2);
|
||||||
@ -227,7 +223,7 @@ public final class XSSFPicture extends XSSFShape implements Picture {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(w > scaledWidth) {
|
if(w > scaledWidth) {
|
||||||
double cw = getColumnWidthInPixels(col2 + 1);
|
double cw = getColumnWidthInPixels(col2 );
|
||||||
double delta = w - scaledWidth;
|
double delta = w - scaledWidth;
|
||||||
dx2 = (int)(EMU_PER_PIXEL*(cw-delta));
|
dx2 = (int)(EMU_PER_PIXEL*(cw-delta));
|
||||||
}
|
}
|
||||||
@ -238,11 +234,6 @@ public final class XSSFPicture extends XSSFShape implements Picture {
|
|||||||
int row2 = anchor.getRow1();
|
int row2 = anchor.getRow1();
|
||||||
int dy2 = 0;
|
int dy2 = 0;
|
||||||
|
|
||||||
if(anchor.getDy1() > 0){
|
|
||||||
h += getRowHeightInPixels(row2) - anchor.getDy1()/EMU_PER_PIXEL;
|
|
||||||
row2++;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (;;) {
|
for (;;) {
|
||||||
h += getRowHeightInPixels(row2);
|
h += getRowHeightInPixels(row2);
|
||||||
if(h > scaledHeight) break;
|
if(h > scaledHeight) break;
|
||||||
|
Loading…
Reference in New Issue
Block a user