stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8048583: CustomMediaSizeName class matching to standard media is too loose

Browse Source 
Reviewed-by: bae, jgodinez
This commit is contained in:
Phil Race 2014-07-14 11:11:13 -07:00
parent c11f4a2edb
commit 698f4867ae
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jdk/src/share/classes/sun/print/CustomMediaSizeName.java
View File

@ -67,6 +67,22 @@ class CustomMediaSizeName extends MediaSizeName {
MediaSize.INCH); MediaSize.INCH);
} catch (IllegalArgumentException iae) { } catch (IllegalArgumentException iae) {
} }
// The public API method finds a closest match even if it not
// all that close. Here we want to be sure its *really* close.
if (mediaName != null) {
MediaSize sz = MediaSize.getMediaSizeForName(mediaName);
if (sz == null) {
mediaName = null;
} else {
float w = sz.getX(MediaSize.INCH);
float h = sz.getY(MediaSize.INCH);
float dw = Math.abs(w - width);
float dh = Math.abs(h - length);
if (dw > 0.1 || dh > 0.1) {
mediaName = null;
}
}
}
} }
/** /**