2007-01-15 22:46:35 +00:00
|
|
|
/*
|
|
|
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
|
|
|
* contributor license agreements. See the NOTICE file distributed with
|
|
|
|
|
* this work for additional information regarding copyright ownership.
|
|
|
|
|
* The ASF licenses this file to You under the Apache License, Version 2.0
|
|
|
|
|
* (the "License"); you may not use this file except in compliance with
|
|
|
|
|
* the License. You may obtain a copy of the License at
|
|
|
|
|
*
|
|
|
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
*
|
|
|
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
|
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
|
* See the License for the specific language governing permissions and
|
|
|
|
|
* limitations under the License.
|
|
|
|
|
*/
|
2005-05-01 22:00:12 +00:00
|
|
|
package org.apache.poi.hssf.usermodel;
|
|
|
|
|
|
2007-10-01 18:07:32 +00:00
|
|
|
import org.apache.poi.ddf.EscherBSERecord;
|
|
|
|
|
import org.apache.poi.util.POILogFactory;
|
|
|
|
|
import org.apache.poi.util.POILogger;
|
|
|
|
|
import org.w3c.dom.Element;
|
|
|
|
|
import org.w3c.dom.NodeList;
|
|
|
|
|
|
|
|
|
|
import javax.imageio.ImageIO;
|
|
|
|
|
import javax.imageio.ImageReader;
|
|
|
|
|
import javax.imageio.stream.ImageInputStream;
|
|
|
|
|
import java.awt.image.BufferedImage;
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664671 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r664220 | josh | 2008-06-07 01:53:01 +0100 (Sat, 07 Jun 2008) | 1 line
Fix for bug 45091 - serialization of RefN~ tokens. Simplified Ptg class hierarchy
........
r664490 | yegor | 2008-06-08 13:30:25 +0100 (Sun, 08 Jun 2008) | 1 line
Correctly increment the reference count of a blip when a picture is inserted
........
r664491 | yegor | 2008-06-08 13:31:19 +0100 (Sun, 08 Jun 2008) | 1 line
Support custom image renderers
........
r664492 | yegor | 2008-06-08 13:32:10 +0100 (Sun, 08 Jun 2008) | 1 line
Fixed TextShape.resizeToFitText() to properly resize TextShape. See patch#45140
........
r664493 | yegor | 2008-06-08 13:37:39 +0100 (Sun, 08 Jun 2008) | 1 line
expose access to OEPlaceholderAtom so that users can determine whether a shape represents ppt placeholder (date/time, footer or slide number)
........
r664515 | yegor | 2008-06-08 16:31:05 +0100 (Sun, 08 Jun 2008) | 1 line
bug#44692 - Fixed HSSFPicture.resize() to properly resize pictures if the underlying columns/rows have modified size
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@664700 13f79535-47bb-0310-9956-ffa450edef68
2008-06-09 13:30:17 +00:00
|
|
|
import java.awt.*;
|
2007-10-01 18:07:32 +00:00
|
|
|
import java.io.ByteArrayInputStream;
|
|
|
|
|
import java.io.IOException;
|
|
|
|
|
import java.util.Iterator;
|
|
|
|
|
|
2005-05-01 22:00:12 +00:00
|
|
|
/**
|
|
|
|
|
* Represents a escher picture. Eg. A GIF, JPEG etc...
|
|
|
|
|
*
|
|
|
|
|
* @author Glen Stampoultzis
|
2007-10-01 18:07:32 +00:00
|
|
|
* @author Yegor Kozlov (yegor at apache.org)
|
2005-05-01 22:00:12 +00:00
|
|
|
*/
|
|
|
|
|
public class HSSFPicture
|
|
|
|
|
extends HSSFSimpleShape
|
|
|
|
|
{
|
2007-10-01 18:07:32 +00:00
|
|
|
public static final int PICTURE_TYPE_EMF = HSSFWorkbook.PICTURE_TYPE_EMF; // Windows Enhanced Metafile
|
|
|
|
|
public static final int PICTURE_TYPE_WMF = HSSFWorkbook.PICTURE_TYPE_WMF; // Windows Metafile
|
|
|
|
|
public static final int PICTURE_TYPE_PICT = HSSFWorkbook.PICTURE_TYPE_PICT; // Macintosh PICT
|
|
|
|
|
public static final int PICTURE_TYPE_JPEG = HSSFWorkbook.PICTURE_TYPE_JPEG; // JFIF
|
|
|
|
|
public static final int PICTURE_TYPE_PNG = HSSFWorkbook.PICTURE_TYPE_PNG; // PNG
|
|
|
|
|
public static final int PICTURE_TYPE_DIB = HSSFWorkbook.PICTURE_TYPE_DIB; // Windows DIB
|
2005-05-01 22:00:12 +00:00
|
|
|
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664671 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r664220 | josh | 2008-06-07 01:53:01 +0100 (Sat, 07 Jun 2008) | 1 line
Fix for bug 45091 - serialization of RefN~ tokens. Simplified Ptg class hierarchy
........
r664490 | yegor | 2008-06-08 13:30:25 +0100 (Sun, 08 Jun 2008) | 1 line
Correctly increment the reference count of a blip when a picture is inserted
........
r664491 | yegor | 2008-06-08 13:31:19 +0100 (Sun, 08 Jun 2008) | 1 line
Support custom image renderers
........
r664492 | yegor | 2008-06-08 13:32:10 +0100 (Sun, 08 Jun 2008) | 1 line
Fixed TextShape.resizeToFitText() to properly resize TextShape. See patch#45140
........
r664493 | yegor | 2008-06-08 13:37:39 +0100 (Sun, 08 Jun 2008) | 1 line
expose access to OEPlaceholderAtom so that users can determine whether a shape represents ppt placeholder (date/time, footer or slide number)
........
r664515 | yegor | 2008-06-08 16:31:05 +0100 (Sun, 08 Jun 2008) | 1 line
bug#44692 - Fixed HSSFPicture.resize() to properly resize pictures if the underlying columns/rows have modified size
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@664700 13f79535-47bb-0310-9956-ffa450edef68
2008-06-09 13:30:17 +00:00
|
|
|
/**
|
|
|
|
|
* width of 1px in columns with default width in units of 1/256 of a character width
|
|
|
|
|
*/
|
|
|
|
|
private static final float PX_DEFAULT = 32.00f;
|
|
|
|
|
/**
|
|
|
|
|
* width of 1px in columns with overridden width in units of 1/256 of a character width
|
|
|
|
|
*/
|
|
|
|
|
private static final float PX_MODIFIED = 36.56f;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Height of 1px of a row
|
|
|
|
|
*/
|
|
|
|
|
private static final int PX_ROW = 15;
|
|
|
|
|
|
2005-05-01 22:00:12 +00:00
|
|
|
int pictureIndex;
|
2007-10-01 18:07:32 +00:00
|
|
|
HSSFPatriarch patriarch;
|
|
|
|
|
|
|
|
|
|
private static final POILogger log = POILogFactory.getLogger(HSSFPicture.class);
|
2005-05-01 22:00:12 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Constructs a picture object.
|
|
|
|
|
*/
|
|
|
|
|
HSSFPicture( HSSFShape parent, HSSFAnchor anchor )
|
|
|
|
|
{
|
|
|
|
|
super( parent, anchor );
|
|
|
|
|
setShapeType(OBJECT_TYPE_PICTURE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public int getPictureIndex()
|
|
|
|
|
{
|
|
|
|
|
return pictureIndex;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public void setPictureIndex( int pictureIndex )
|
|
|
|
|
{
|
|
|
|
|
this.pictureIndex = pictureIndex;
|
|
|
|
|
}
|
2007-10-01 18:07:32 +00:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Reset the image to the original size.
|
|
|
|
|
*
|
|
|
|
|
* @since POI 3.0.2
|
|
|
|
|
*/
|
|
|
|
|
public void resize(){
|
|
|
|
|
HSSFClientAnchor anchor = (HSSFClientAnchor)getAnchor();
|
|
|
|
|
anchor.setAnchorType(2);
|
|
|
|
|
|
2007-11-03 19:50:40 +00:00
|
|
|
HSSFClientAnchor pref = getPreferredSize();
|
2007-10-01 18:07:32 +00:00
|
|
|
|
|
|
|
|
int row2 = anchor.getRow1() + (pref.getRow2() - pref.getRow1());
|
|
|
|
|
int col2 = anchor.getCol1() + (pref.getCol2() - pref.getCol1());
|
|
|
|
|
|
|
|
|
|
anchor.setCol2((short)col2);
|
|
|
|
|
anchor.setDx1(0);
|
|
|
|
|
anchor.setDx2(pref.getDx2());
|
|
|
|
|
|
|
|
|
|
anchor.setRow2(row2);
|
|
|
|
|
anchor.setDy1(0);
|
|
|
|
|
anchor.setDy2(pref.getDy2());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
2007-11-03 19:50:40 +00:00
|
|
|
* Calculate the preferred size for this picture.
|
2007-10-01 18:07:32 +00:00
|
|
|
*
|
2007-11-03 19:50:40 +00:00
|
|
|
* @return HSSFClientAnchor with the preferred size for this image
|
2007-10-01 18:07:32 +00:00
|
|
|
* @since POI 3.0.2
|
|
|
|
|
*/
|
2007-11-03 19:50:40 +00:00
|
|
|
public HSSFClientAnchor getPreferredSize(){
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664671 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r664220 | josh | 2008-06-07 01:53:01 +0100 (Sat, 07 Jun 2008) | 1 line
Fix for bug 45091 - serialization of RefN~ tokens. Simplified Ptg class hierarchy
........
r664490 | yegor | 2008-06-08 13:30:25 +0100 (Sun, 08 Jun 2008) | 1 line
Correctly increment the reference count of a blip when a picture is inserted
........
r664491 | yegor | 2008-06-08 13:31:19 +0100 (Sun, 08 Jun 2008) | 1 line
Support custom image renderers
........
r664492 | yegor | 2008-06-08 13:32:10 +0100 (Sun, 08 Jun 2008) | 1 line
Fixed TextShape.resizeToFitText() to properly resize TextShape. See patch#45140
........
r664493 | yegor | 2008-06-08 13:37:39 +0100 (Sun, 08 Jun 2008) | 1 line
expose access to OEPlaceholderAtom so that users can determine whether a shape represents ppt placeholder (date/time, footer or slide number)
........
r664515 | yegor | 2008-06-08 16:31:05 +0100 (Sun, 08 Jun 2008) | 1 line
bug#44692 - Fixed HSSFPicture.resize() to properly resize pictures if the underlying columns/rows have modified size
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@664700 13f79535-47bb-0310-9956-ffa450edef68
2008-06-09 13:30:17 +00:00
|
|
|
HSSFClientAnchor anchor = (HSSFClientAnchor)getAnchor();
|
2007-10-01 18:07:32 +00:00
|
|
|
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664671 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r664220 | josh | 2008-06-07 01:53:01 +0100 (Sat, 07 Jun 2008) | 1 line
Fix for bug 45091 - serialization of RefN~ tokens. Simplified Ptg class hierarchy
........
r664490 | yegor | 2008-06-08 13:30:25 +0100 (Sun, 08 Jun 2008) | 1 line
Correctly increment the reference count of a blip when a picture is inserted
........
r664491 | yegor | 2008-06-08 13:31:19 +0100 (Sun, 08 Jun 2008) | 1 line
Support custom image renderers
........
r664492 | yegor | 2008-06-08 13:32:10 +0100 (Sun, 08 Jun 2008) | 1 line
Fixed TextShape.resizeToFitText() to properly resize TextShape. See patch#45140
........
r664493 | yegor | 2008-06-08 13:37:39 +0100 (Sun, 08 Jun 2008) | 1 line
expose access to OEPlaceholderAtom so that users can determine whether a shape represents ppt placeholder (date/time, footer or slide number)
........
r664515 | yegor | 2008-06-08 16:31:05 +0100 (Sun, 08 Jun 2008) | 1 line
bug#44692 - Fixed HSSFPicture.resize() to properly resize pictures if the underlying columns/rows have modified size
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@664700 13f79535-47bb-0310-9956-ffa450edef68
2008-06-09 13:30:17 +00:00
|
|
|
Dimension size = getImageDimension();
|
2007-10-01 18:07:32 +00:00
|
|
|
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664671 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r664220 | josh | 2008-06-07 01:53:01 +0100 (Sat, 07 Jun 2008) | 1 line
Fix for bug 45091 - serialization of RefN~ tokens. Simplified Ptg class hierarchy
........
r664490 | yegor | 2008-06-08 13:30:25 +0100 (Sun, 08 Jun 2008) | 1 line
Correctly increment the reference count of a blip when a picture is inserted
........
r664491 | yegor | 2008-06-08 13:31:19 +0100 (Sun, 08 Jun 2008) | 1 line
Support custom image renderers
........
r664492 | yegor | 2008-06-08 13:32:10 +0100 (Sun, 08 Jun 2008) | 1 line
Fixed TextShape.resizeToFitText() to properly resize TextShape. See patch#45140
........
r664493 | yegor | 2008-06-08 13:37:39 +0100 (Sun, 08 Jun 2008) | 1 line
expose access to OEPlaceholderAtom so that users can determine whether a shape represents ppt placeholder (date/time, footer or slide number)
........
r664515 | yegor | 2008-06-08 16:31:05 +0100 (Sun, 08 Jun 2008) | 1 line
bug#44692 - Fixed HSSFPicture.resize() to properly resize pictures if the underlying columns/rows have modified size
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@664700 13f79535-47bb-0310-9956-ffa450edef68
2008-06-09 13:30:17 +00:00
|
|
|
float w = 0;
|
2007-10-01 18:07:32 +00:00
|
|
|
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664671 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r664220 | josh | 2008-06-07 01:53:01 +0100 (Sat, 07 Jun 2008) | 1 line
Fix for bug 45091 - serialization of RefN~ tokens. Simplified Ptg class hierarchy
........
r664490 | yegor | 2008-06-08 13:30:25 +0100 (Sun, 08 Jun 2008) | 1 line
Correctly increment the reference count of a blip when a picture is inserted
........
r664491 | yegor | 2008-06-08 13:31:19 +0100 (Sun, 08 Jun 2008) | 1 line
Support custom image renderers
........
r664492 | yegor | 2008-06-08 13:32:10 +0100 (Sun, 08 Jun 2008) | 1 line
Fixed TextShape.resizeToFitText() to properly resize TextShape. See patch#45140
........
r664493 | yegor | 2008-06-08 13:37:39 +0100 (Sun, 08 Jun 2008) | 1 line
expose access to OEPlaceholderAtom so that users can determine whether a shape represents ppt placeholder (date/time, footer or slide number)
........
r664515 | yegor | 2008-06-08 16:31:05 +0100 (Sun, 08 Jun 2008) | 1 line
bug#44692 - Fixed HSSFPicture.resize() to properly resize pictures if the underlying columns/rows have modified size
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@664700 13f79535-47bb-0310-9956-ffa450edef68
2008-06-09 13:30:17 +00:00
|
|
|
//space in the leftmost cell
|
|
|
|
|
w += getColumnWidthInPixels(anchor.col1)*(1 - anchor.dx1/1024);
|
|
|
|
|
short col2 = (short)(anchor.col1 + 1);
|
|
|
|
|
int dx2 = 0;
|
2007-10-01 18:07:32 +00:00
|
|
|
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664671 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r664220 | josh | 2008-06-07 01:53:01 +0100 (Sat, 07 Jun 2008) | 1 line
Fix for bug 45091 - serialization of RefN~ tokens. Simplified Ptg class hierarchy
........
r664490 | yegor | 2008-06-08 13:30:25 +0100 (Sun, 08 Jun 2008) | 1 line
Correctly increment the reference count of a blip when a picture is inserted
........
r664491 | yegor | 2008-06-08 13:31:19 +0100 (Sun, 08 Jun 2008) | 1 line
Support custom image renderers
........
r664492 | yegor | 2008-06-08 13:32:10 +0100 (Sun, 08 Jun 2008) | 1 line
Fixed TextShape.resizeToFitText() to properly resize TextShape. See patch#45140
........
r664493 | yegor | 2008-06-08 13:37:39 +0100 (Sun, 08 Jun 2008) | 1 line
expose access to OEPlaceholderAtom so that users can determine whether a shape represents ppt placeholder (date/time, footer or slide number)
........
r664515 | yegor | 2008-06-08 16:31:05 +0100 (Sun, 08 Jun 2008) | 1 line
bug#44692 - Fixed HSSFPicture.resize() to properly resize pictures if the underlying columns/rows have modified size
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@664700 13f79535-47bb-0310-9956-ffa450edef68
2008-06-09 13:30:17 +00:00
|
|
|
while(w < size.width){
|
|
|
|
|
w += getColumnWidthInPixels(col2++);
|
|
|
|
|
}
|
2007-10-01 18:07:32 +00:00
|
|
|
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664671 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r664220 | josh | 2008-06-07 01:53:01 +0100 (Sat, 07 Jun 2008) | 1 line
Fix for bug 45091 - serialization of RefN~ tokens. Simplified Ptg class hierarchy
........
r664490 | yegor | 2008-06-08 13:30:25 +0100 (Sun, 08 Jun 2008) | 1 line
Correctly increment the reference count of a blip when a picture is inserted
........
r664491 | yegor | 2008-06-08 13:31:19 +0100 (Sun, 08 Jun 2008) | 1 line
Support custom image renderers
........
r664492 | yegor | 2008-06-08 13:32:10 +0100 (Sun, 08 Jun 2008) | 1 line
Fixed TextShape.resizeToFitText() to properly resize TextShape. See patch#45140
........
r664493 | yegor | 2008-06-08 13:37:39 +0100 (Sun, 08 Jun 2008) | 1 line
expose access to OEPlaceholderAtom so that users can determine whether a shape represents ppt placeholder (date/time, footer or slide number)
........
r664515 | yegor | 2008-06-08 16:31:05 +0100 (Sun, 08 Jun 2008) | 1 line
bug#44692 - Fixed HSSFPicture.resize() to properly resize pictures if the underlying columns/rows have modified size
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@664700 13f79535-47bb-0310-9956-ffa450edef68
2008-06-09 13:30:17 +00:00
|
|
|
if(w > size.width) {
|
|
|
|
|
//calculate dx2, offset in the rightmost cell
|
|
|
|
|
col2--;
|
|
|
|
|
float cw = getColumnWidthInPixels(col2);
|
|
|
|
|
float delta = w - size.width;
|
|
|
|
|
dx2 = (int)((cw-delta)/cw*1024);
|
|
|
|
|
}
|
|
|
|
|
anchor.col2 = col2;
|
|
|
|
|
anchor.dx2 = dx2;
|
2007-10-01 18:07:32 +00:00
|
|
|
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664671 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r664220 | josh | 2008-06-07 01:53:01 +0100 (Sat, 07 Jun 2008) | 1 line
Fix for bug 45091 - serialization of RefN~ tokens. Simplified Ptg class hierarchy
........
r664490 | yegor | 2008-06-08 13:30:25 +0100 (Sun, 08 Jun 2008) | 1 line
Correctly increment the reference count of a blip when a picture is inserted
........
r664491 | yegor | 2008-06-08 13:31:19 +0100 (Sun, 08 Jun 2008) | 1 line
Support custom image renderers
........
r664492 | yegor | 2008-06-08 13:32:10 +0100 (Sun, 08 Jun 2008) | 1 line
Fixed TextShape.resizeToFitText() to properly resize TextShape. See patch#45140
........
r664493 | yegor | 2008-06-08 13:37:39 +0100 (Sun, 08 Jun 2008) | 1 line
expose access to OEPlaceholderAtom so that users can determine whether a shape represents ppt placeholder (date/time, footer or slide number)
........
r664515 | yegor | 2008-06-08 16:31:05 +0100 (Sun, 08 Jun 2008) | 1 line
bug#44692 - Fixed HSSFPicture.resize() to properly resize pictures if the underlying columns/rows have modified size
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@664700 13f79535-47bb-0310-9956-ffa450edef68
2008-06-09 13:30:17 +00:00
|
|
|
float h = 0;
|
|
|
|
|
h += (1 - anchor.dy1/256)* getRowHeightInPixels(anchor.row1);
|
|
|
|
|
int row2 = anchor.row1 + 1;
|
|
|
|
|
int dy2 = 0;
|
2007-10-01 18:07:32 +00:00
|
|
|
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664671 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r664220 | josh | 2008-06-07 01:53:01 +0100 (Sat, 07 Jun 2008) | 1 line
Fix for bug 45091 - serialization of RefN~ tokens. Simplified Ptg class hierarchy
........
r664490 | yegor | 2008-06-08 13:30:25 +0100 (Sun, 08 Jun 2008) | 1 line
Correctly increment the reference count of a blip when a picture is inserted
........
r664491 | yegor | 2008-06-08 13:31:19 +0100 (Sun, 08 Jun 2008) | 1 line
Support custom image renderers
........
r664492 | yegor | 2008-06-08 13:32:10 +0100 (Sun, 08 Jun 2008) | 1 line
Fixed TextShape.resizeToFitText() to properly resize TextShape. See patch#45140
........
r664493 | yegor | 2008-06-08 13:37:39 +0100 (Sun, 08 Jun 2008) | 1 line
expose access to OEPlaceholderAtom so that users can determine whether a shape represents ppt placeholder (date/time, footer or slide number)
........
r664515 | yegor | 2008-06-08 16:31:05 +0100 (Sun, 08 Jun 2008) | 1 line
bug#44692 - Fixed HSSFPicture.resize() to properly resize pictures if the underlying columns/rows have modified size
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@664700 13f79535-47bb-0310-9956-ffa450edef68
2008-06-09 13:30:17 +00:00
|
|
|
while(h < size.height){
|
|
|
|
|
h += getRowHeightInPixels(row2++);
|
|
|
|
|
}
|
|
|
|
|
if(h > size.height) {
|
|
|
|
|
row2--;
|
|
|
|
|
float ch = getRowHeightInPixels(row2);
|
|
|
|
|
float delta = h - size.height;
|
|
|
|
|
dy2 = (int)((ch-delta)/ch*256);
|
2007-10-01 18:07:32 +00:00
|
|
|
}
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664671 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r664220 | josh | 2008-06-07 01:53:01 +0100 (Sat, 07 Jun 2008) | 1 line
Fix for bug 45091 - serialization of RefN~ tokens. Simplified Ptg class hierarchy
........
r664490 | yegor | 2008-06-08 13:30:25 +0100 (Sun, 08 Jun 2008) | 1 line
Correctly increment the reference count of a blip when a picture is inserted
........
r664491 | yegor | 2008-06-08 13:31:19 +0100 (Sun, 08 Jun 2008) | 1 line
Support custom image renderers
........
r664492 | yegor | 2008-06-08 13:32:10 +0100 (Sun, 08 Jun 2008) | 1 line
Fixed TextShape.resizeToFitText() to properly resize TextShape. See patch#45140
........
r664493 | yegor | 2008-06-08 13:37:39 +0100 (Sun, 08 Jun 2008) | 1 line
expose access to OEPlaceholderAtom so that users can determine whether a shape represents ppt placeholder (date/time, footer or slide number)
........
r664515 | yegor | 2008-06-08 16:31:05 +0100 (Sun, 08 Jun 2008) | 1 line
bug#44692 - Fixed HSSFPicture.resize() to properly resize pictures if the underlying columns/rows have modified size
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@664700 13f79535-47bb-0310-9956-ffa450edef68
2008-06-09 13:30:17 +00:00
|
|
|
anchor.row2 = row2;
|
|
|
|
|
anchor.dy2 = dy2;
|
|
|
|
|
|
2007-10-01 18:07:32 +00:00
|
|
|
return anchor;
|
|
|
|
|
}
|
|
|
|
|
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664671 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r664220 | josh | 2008-06-07 01:53:01 +0100 (Sat, 07 Jun 2008) | 1 line
Fix for bug 45091 - serialization of RefN~ tokens. Simplified Ptg class hierarchy
........
r664490 | yegor | 2008-06-08 13:30:25 +0100 (Sun, 08 Jun 2008) | 1 line
Correctly increment the reference count of a blip when a picture is inserted
........
r664491 | yegor | 2008-06-08 13:31:19 +0100 (Sun, 08 Jun 2008) | 1 line
Support custom image renderers
........
r664492 | yegor | 2008-06-08 13:32:10 +0100 (Sun, 08 Jun 2008) | 1 line
Fixed TextShape.resizeToFitText() to properly resize TextShape. See patch#45140
........
r664493 | yegor | 2008-06-08 13:37:39 +0100 (Sun, 08 Jun 2008) | 1 line
expose access to OEPlaceholderAtom so that users can determine whether a shape represents ppt placeholder (date/time, footer or slide number)
........
r664515 | yegor | 2008-06-08 16:31:05 +0100 (Sun, 08 Jun 2008) | 1 line
bug#44692 - Fixed HSSFPicture.resize() to properly resize pictures if the underlying columns/rows have modified size
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@664700 13f79535-47bb-0310-9956-ffa450edef68
2008-06-09 13:30:17 +00:00
|
|
|
private float getColumnWidthInPixels(short column){
|
|
|
|
|
|
|
|
|
|
short cw = patriarch.sheet.getColumnWidth(column);
|
|
|
|
|
float px = getPixelWidth(column);
|
|
|
|
|
|
|
|
|
|
return cw/px;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private float getRowHeightInPixels(int i){
|
|
|
|
|
|
|
|
|
|
HSSFRow row = patriarch.sheet.getRow(i);
|
|
|
|
|
float height;
|
|
|
|
|
if(row != null) height = row.getHeight();
|
|
|
|
|
else height = patriarch.sheet.getDefaultRowHeight();
|
|
|
|
|
|
|
|
|
|
return height/PX_ROW;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private float getPixelWidth(short column){
|
|
|
|
|
|
|
|
|
|
int def = patriarch.sheet.getDefaultColumnWidth()*256;
|
|
|
|
|
short cw = patriarch.sheet.getColumnWidth(column);
|
|
|
|
|
|
|
|
|
|
return cw == def ? PX_DEFAULT : PX_MODIFIED;
|
|
|
|
|
}
|
|
|
|
|
|
2007-10-01 18:07:32 +00:00
|
|
|
/**
|
|
|
|
|
* The metadata of PNG and JPEG can contain the width of a pixel in millimeters.
|
|
|
|
|
* Return the the "effective" dpi calculated as <code>25.4/HorizontalPixelSize</code>
|
|
|
|
|
* and <code>25.4/VerticalPixelSize</code>. Where 25.4 is the number of mm in inch.
|
|
|
|
|
*
|
|
|
|
|
* @return array of two elements: <code>{horisontalPdi, verticalDpi}</code>.
|
|
|
|
|
* {96, 96} is the default.
|
|
|
|
|
*/
|
|
|
|
|
protected int[] getResolution(ImageReader r) throws IOException {
|
|
|
|
|
int hdpi=96, vdpi=96;
|
|
|
|
|
double mm2inch = 25.4;
|
|
|
|
|
|
|
|
|
|
NodeList lst;
|
|
|
|
|
Element node = (Element)r.getImageMetadata(0).getAsTree("javax_imageio_1.0");
|
|
|
|
|
lst = node.getElementsByTagName("HorizontalPixelSize");
|
|
|
|
|
if(lst != null && lst.getLength() == 1) hdpi = (int)(mm2inch/Float.parseFloat(((Element)lst.item(0)).getAttribute("value")));
|
|
|
|
|
|
|
|
|
|
lst = node.getElementsByTagName("VerticalPixelSize");
|
|
|
|
|
if(lst != null && lst.getLength() == 1) vdpi = (int)(mm2inch/Float.parseFloat(((Element)lst.item(0)).getAttribute("value")));
|
|
|
|
|
|
|
|
|
|
return new int[]{hdpi, vdpi};
|
|
|
|
|
}
|
|
|
|
|
|
Merged revisions 638786-638802,638805-638811,638813-638814,638816-639230,639233-639241,639243-639253,639255-639486,639488-639601,639603-639835,639837-639917,639919-640056,640058-640710,640712-641156,641158-641184,641186-641795,641797-641798,641800-641933,641935-641963,641965-641966,641968-641995,641997-642230,642232-642562,642564-642565,642568-642570,642572-642573,642576-642736,642739-642877,642879,642881-642890,642892-642903,642905-642945,642947-643624,643626-643653,643655-643669,643671,643673-643830,643832-643833,643835-644342,644344-644472,644474-644508,644510-645347,645349-645351,645353-645559,645561-645565,645568-645951,645953-646193,646195-646311,646313-646404,646406-646665,646667-646853,646855-646869,646871-647151,647153-647185,647187-647277,647279-647566,647568-647573,647575,647578-647711,647714-647737,647739-647823,647825-648155,648157-648202,648204-648273,648275,648277-648302,648304-648333,648335-648588,648590-648622,648625-648673,648675-649141,649144,649146-649556,649558-649795,649799,649801-649910,649912-649913,649915-650128,650131-650132,650134-650137,650140-650914,650916-651991,651993-652284,652286-652287,652289,652291,652293-652297,652299-652328,652330-652425,652427-652445,652447-652560,652562-652933,652935,652937-652993,652995-653116,653118-653124,653126-653483,653487-653519,653522-653550,653552-653607,653609-653667,653669-653674,653676-653814,653817-653830,653832-653891,653893-653944,653946-654055,654057-654355,654357-654365,654367-654648,654651-655215,655217-655277,655279-655281,655283-655911,655913-656212,656214,656216-656251,656253-656698,656700-656756,656758-656892,656894-657135,657137-657165,657168-657179,657181-657354,657356-657357,657359-657701,657703-657874,657876-658032,658034-658284,658286,658288-658301,658303-658307,658309-658321,658323-658335,658337-658348,658351,658353-658832,658834-658983,658985,658987-659066,659068-659402,659404-659428,659430-659451,659453-659454,659456-659461,659463-659477,659479-659524,659526-659571,659574,659576-660255,660257-660262,660264-660279,660281-660343,660345-660473,660475-660827,660829-660833,660835-660888,660890-663321,663323-663435,663437-663764,663766-663854,663856-664671 via svnmerge from
https://svn.apache.org:443/repos/asf/poi/trunk
........
r664220 | josh | 2008-06-07 01:53:01 +0100 (Sat, 07 Jun 2008) | 1 line
Fix for bug 45091 - serialization of RefN~ tokens. Simplified Ptg class hierarchy
........
r664490 | yegor | 2008-06-08 13:30:25 +0100 (Sun, 08 Jun 2008) | 1 line
Correctly increment the reference count of a blip when a picture is inserted
........
r664491 | yegor | 2008-06-08 13:31:19 +0100 (Sun, 08 Jun 2008) | 1 line
Support custom image renderers
........
r664492 | yegor | 2008-06-08 13:32:10 +0100 (Sun, 08 Jun 2008) | 1 line
Fixed TextShape.resizeToFitText() to properly resize TextShape. See patch#45140
........
r664493 | yegor | 2008-06-08 13:37:39 +0100 (Sun, 08 Jun 2008) | 1 line
expose access to OEPlaceholderAtom so that users can determine whether a shape represents ppt placeholder (date/time, footer or slide number)
........
r664515 | yegor | 2008-06-08 16:31:05 +0100 (Sun, 08 Jun 2008) | 1 line
bug#44692 - Fixed HSSFPicture.resize() to properly resize pictures if the underlying columns/rows have modified size
........
git-svn-id: https://svn.apache.org/repos/asf/poi/branches/ooxml@664700 13f79535-47bb-0310-9956-ffa450edef68
2008-06-09 13:30:17 +00:00
|
|
|
/**
|
|
|
|
|
* Return the dimension of this image
|
|
|
|
|
*
|
|
|
|
|
* @return image dimension
|
|
|
|
|
*/
|
|
|
|
|
public Dimension getImageDimension(){
|
|
|
|
|
EscherBSERecord bse = patriarch.sheet.book.getBSERecord(pictureIndex);
|
|
|
|
|
byte[] data = bse.getBlipRecord().getPicturedata();
|
|
|
|
|
int type = bse.getBlipTypeWin32();
|
|
|
|
|
Dimension size = new Dimension();
|
|
|
|
|
|
|
|
|
|
switch (type){
|
|
|
|
|
//we can calculate the preferred size only for JPEG and PNG
|
|
|
|
|
//other formats like WMF, EMF and PICT are not supported in Java
|
|
|
|
|
case HSSFWorkbook.PICTURE_TYPE_JPEG:
|
|
|
|
|
case HSSFWorkbook.PICTURE_TYPE_PNG:
|
|
|
|
|
case HSSFWorkbook.PICTURE_TYPE_DIB:
|
|
|
|
|
try {
|
|
|
|
|
//read the image using javax.imageio.*
|
|
|
|
|
ImageInputStream iis = ImageIO.createImageInputStream( new ByteArrayInputStream(data) );
|
|
|
|
|
Iterator i = ImageIO.getImageReaders( iis );
|
|
|
|
|
ImageReader r = (ImageReader) i.next();
|
|
|
|
|
r.setInput( iis );
|
|
|
|
|
BufferedImage img = r.read(0);
|
|
|
|
|
|
|
|
|
|
int[] dpi = getResolution(r);
|
|
|
|
|
size.width = img.getWidth()*96/dpi[0];
|
|
|
|
|
size.height = img.getHeight()*96/dpi[1];
|
|
|
|
|
|
|
|
|
|
} catch (IOException e){
|
|
|
|
|
//silently return if ImageIO failed to read the image
|
|
|
|
|
log.log(POILogger.WARN, e);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return size;
|
|
|
|
|
}
|
2005-05-01 22:00:12 +00:00
|
|
|
}
|