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

8186987: NullPointerException in RasterPrinterJob without PrinterResolution

Browse Source 
Reviewed-by: prr, pnarayanan
This commit is contained in:
Prasanta Sadhukhan 2017-09-21 16:21:14 +05:30
parent 34500e27fe
commit 1cb97b8378
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp
View File

@ -898,11 +898,25 @@ Java_sun_print_Win32PrintService_getDefaultSettings(JNIEnv *env,
defIndices[1] = pDevMode->dmMediaType;
}
if (pDevMode->dmFields & DM_YRESOLUTION) {
defIndices[2] = pDevMode->dmYResolution;
/*
* For some printer like Brother HL-2240D series
* pDevMode->dmYResolution is not set in pDevMode->dmFields
* even though pDevMode->dmYResolution is populated
* via ::DocumentProperties API, so for this case
* we populate the resolution index in default array
*/
if (pDevMode->dmFields & DM_YRESOLUTION || pDevMode->dmYResolution > 0) {
defIndices[2] = pDevMode->dmYResolution;
}
if (pDevMode->dmFields & DM_PRINTQUALITY) {
/*
* For some printer like Brother HL-2240D series
* pDevMode->dmPrintQuality is not set in pDevMode->dmFields
* even though pDevMode->dmPrintQuality is populated
* via ::DocumentProperties API, so for this case
* we populate the print quality index in default array
*/
if (pDevMode->dmFields & DM_PRINTQUALITY || pDevMode->dmPrintQuality != 0) {
defIndices[3] = pDevMode->dmPrintQuality;
}