litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 5379

Browse source
This commit is contained in:
jeb228 2010-07-22 14:20:43 +00:00
parent 50cc897669
commit 724aa4d326
1 changed files with 8 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadHelper.java
View file

@ -204,8 +204,8 @@ public class ImageUploadHelper {
source); source);
RenderedOp image = JAI.create("stream", stream); RenderedOp image = JAI.create("stream", stream);
Dimensions size = new Dimensions(image.getWidth(), image Dimensions size = new Dimensions(image.getWidth(),
.getHeight()); image.getHeight());
log.debug("new image size is " + size); log.debug("new image size is " + size);
if ((size.height < THUMBNAIL_HEIGHT) if ((size.height < THUMBNAIL_HEIGHT)
@ -471,33 +471,20 @@ public class ImageUploadHelper {
} }
/** /**
* If the source image was too big to fit in the page, then it was displayed * The bounds of the cropping rectangle should be limited to the bounds of
* at a reduced scale, and needs to be unscaled. * the image.
*
* The bounds should be limited to the bounds of the image.
*/ */
private CropRectangle adjustCropRectangle(CropRectangle crop, private CropRectangle adjustCropRectangle(CropRectangle crop,
int imageWidth, int imageHeight) { int imageWidth, int imageHeight) {
log.debug("Generating a thumbnail, initial crop info: " + crop); log.debug("Generating a thumbnail, initial crop info: " + crop);
CropRectangle adjusted;
if (imageWidth <= MAXIMUM_IMAGE_DISPLAY_WIDTH) {
adjusted = crop;
} else {
float displayScale = ((float) MAXIMUM_IMAGE_DISPLAY_WIDTH)
/ ((float) imageWidth);
adjusted = crop.unscale(displayScale);
log.debug("Generating a thumbnail, unscaled crop info: " + adjusted
+ ", displayScale=" + displayScale);
}
// Insure that x and y fall within the image dimensions. // Insure that x and y fall within the image dimensions.
int x = Math.max(0, Math.min(imageWidth, Math.abs(adjusted.x))); int x = Math.max(0, Math.min(imageWidth, Math.abs(crop.x)));
int y = Math.max(0, Math.min(imageHeight, Math.abs(adjusted.y))); int y = Math.max(0, Math.min(imageHeight, Math.abs(crop.y)));
// Insure that width and height are reasonable. // Insure that width and height are reasonable.
int w = Math.max(5, Math.min(imageWidth - x, adjusted.width)); int w = Math.max(5, Math.min(imageWidth - x, crop.width));
int h = Math.max(5, Math.min(imageHeight - y, adjusted.height)); int h = Math.max(5, Math.min(imageHeight - y, crop.height));
CropRectangle bounded = new CropRectangle(x, y, h, w); CropRectangle bounded = new CropRectangle(x, y, h, w);
log.debug("Generating a thumbnail, bounded crop info: " + bounded); log.debug("Generating a thumbnail, bounded crop info: " + bounded);