diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-06-15 09:50:44 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-06-15 09:53:51 +0200 |
| commit | d7763d97fe836c013f2026a79f33e49a6b507efc (patch) | |
| tree | c2c70169559c79318975c49f07b2e2637395f5a9 | |
| parent | 0f1976988a69fd91100a73331d12f21aa9861e83 (diff) | |
Assume that nDPI should never be zero in ImplLogicToPixel
...(same as is already done in ImplPixelToLogic), and that
eacbead4f5a4dc7c8db3d60c948e28c199aa2b10 "vcl: handle nDPI == 0 in
ImplPixelToLogic()" was a misguided attempt at fixing symptoms of the problem
fixed with 670100fcfbb39d3dbe4afdb27fbced26d7b14283 "Remove FastLoader
optimization."
Change-Id: Ia42c6c7c7026f3a0b71e79938b33c140fec0afa6
| -rw-r--r-- | vcl/source/outdev/map.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx index c330f19ee6bc..37db1018a90f 100644 --- a/vcl/source/outdev/map.cxx +++ b/vcl/source/outdev/map.cxx @@ -400,9 +400,10 @@ static long ImplLogicToPixel( long n, long nDPI, long nMapNum, long nMapDenom, static long ImplPixelToLogic( long n, long nDPI, long nMapNum, long nMapDenom, long nThres ) { + assert(nDPI > 0); // To "use" it... (void) nThres; - if (nMapNum == 0 || nDPI == 0) + if (nMapNum == 0) { return 0; } |