[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine:[8262] VASSAL-src/trunk
Brought to you by:
rodneykinney,
uckelman
From: <uck...@us...> - 2012-08-01 12:33:36
|
Revision: 8262 http://vassalengine.svn.sourceforge.net/vassalengine/?rev=8262&view=rev Author: uckelman Date: 2012-08-01 12:33:29 +0000 (Wed, 01 Aug 2012) Log Message: ----------- Merged 3.1@8260,8261. Fixed Bug 2573: Negative scale factor passed to RotateScaleOpBitmapImpl Fixed Bug 2719: RotateScaleOpBitmapImpl created with scale == 0 Ensure that Zoomer never has a nonpositive scale factor. This is a kludge, in that Zoomer.setZoom() should nerver be passed a nonpositive scale factor in the first place, but prevents exceptions from being thrown. Modified Paths: -------------- VASSAL-src/trunk/src/VASSAL/build/module/map/Zoomer.java Property Changed: ---------------- VASSAL-src/trunk/ Property changes on: VASSAL-src/trunk ___________________________________________________________________ Modified: svn:mergeinfo - /VASSAL-src/branches/3.1:7756,7764,7810,7812-7813,7872,7876,7879,7909,7913,7964,7966,7968,7998,8097,8111-8112,8159-8162,8172,8181-8182,8233,8235-8238,8241,8244,8246 /VASSAL-src/branches/Brent-3.2:8206,8216-8217,8219-8220,8222,8225,8227,8248,8252 /VASSAL-src/branches/brent-3.2:7824-7825,7862-7865,7875,7878,7882,7884,7886,7896,7903,7911,7917,7929,7942,7988,7995 /VASSAL-src/branches/george973-bugs:7800,7806,7962-7963 /VASSAL-src/branches/george973-bugs-3.2:8081 /VASSAL-src/branches/george973-ocs:8167-8169 /VASSAL-src/branches/lance-3.2 8085:8127 /VASSAL-src/branches/lancel-3.1:7680 /VASSAL-src/branches/pgeerkens-3.2:7836-7837,7839,7841-7842,7849,7893,7899,7902,7904,7906,7922,7930 /VASSAL-src/branches/uckelman-integration:7971-8007 /VASSAL-src/branches/uckelman-working2:7194-7700 /VASSAL-src/branches/viewport-3.2:7992 + /VASSAL-src/branches/3.1:7756,7764,7810,7812-7813,7872,7876,7879,7909,7913,7964,7966,7968,7998,8097,8111-8112,8159-8162,8172,8181-8182,8233,8235-8238,8241,8244,8246,8260-8261 /VASSAL-src/branches/Brent-3.2:8206,8216-8217,8219-8220,8222,8225,8227,8248,8252 /VASSAL-src/branches/brent-3.2:7824-7825,7862-7865,7875,7878,7882,7884,7886,7896,7903,7911,7917,7929,7942,7988,7995 /VASSAL-src/branches/george973-bugs:7800,7806,7962-7963 /VASSAL-src/branches/george973-bugs-3.2:8081 /VASSAL-src/branches/george973-ocs:8167-8169 /VASSAL-src/branches/lance-3.2 8085:8127 /VASSAL-src/branches/lancel-3.1:7680 /VASSAL-src/branches/pgeerkens-3.2:7836-7837,7839,7841-7842,7849,7893,7899,7902,7904,7906,7922,7930 /VASSAL-src/branches/uckelman-integration:7971-8007 /VASSAL-src/branches/uckelman-working2:7194-7700 /VASSAL-src/branches/viewport-3.2:7992 Modified: VASSAL-src/trunk/src/VASSAL/build/module/map/Zoomer.java =================================================================== --- VASSAL-src/trunk/src/VASSAL/build/module/map/Zoomer.java 2012-08-01 12:30:47 UTC (rev 8261) +++ VASSAL-src/trunk/src/VASSAL/build/module/map/Zoomer.java 2012-08-01 12:33:29 UTC (rev 8262) @@ -160,6 +160,12 @@ } public void setZoom(double z) { + if (z <= 0.0) { + // This should never happen, it's just a kludge to make sure that + // we continue having valid data even if our caller is wrong. + z = Double.MIN_VALUE; + } + cur = Arrays.binarySearch(levels, z); if (cur < 0) { // if z is not a level, set cur to the next level > z This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ vassalengine-svn mailing list vas...@li... https://lists.sourceforge.net/lists/listinfo/vassalengine-svn |