[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine:[5503] VASSAL-src/trunk
Brought to you by:
rodneykinney,
uckelman
Menu
▾
▴
[vassalengine-svn-trunk] [vassalengine-svn] SF.net SVN: vassalengine:[5503] VASSAL-src/trunk
|
From: <uck...@us...> - 2009-04-14 21:29:49
|
Revision: 5503
http://vassalengine.svn.sourceforge.net/vassalengine/?rev=5503&view=rev
Author: uckelman
Date: 2009-04-14 21:29:42 +0000 (Tue, 14 Apr 2009)
Log Message:
-----------
Merged 3.1@5502.
Fixed Bug 2696618: ImageSaver fails when map has nonpositive dimensions
* Ensure that every saved image is at least 1x1.
Modified Paths:
--------------
VASSAL-src/trunk/src/VASSAL/build/module/map/ImageSaver.java
Property Changed:
----------------
VASSAL-src/trunk/
Property changes on: VASSAL-src/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /VASSAL-src/branches/3.1:4957,4960-4961,4984-4985,4988,4993,5004,5020,5041,5055,5059,5063-5065,5072-5073,5079,5084,5087,5098-5099,5133,5136,5138-5139,5156,5158,5161,5163,5166,5179-5181,5209,5260,5263,5274,5276,5280,5283-5290,5296,5298,5301-5450,5452-5456,5466-5467,5470,5473-5474,5479,5482,5488,5494-5495,5498
/VASSAL-src/branches/bsmith:4567-4756
/VASSAL-src/branches/bsmith/merge-3:5153
/VASSAL-src/branches/mkiefte:4821-4822,4867
/VASSAL-src/branches/mkiefte-3.1:5424
/VASSAL-src/branches/mkiefte-3.2:4991
/VASSAL-src/branches/rk-jabber:5293
/VASSAL-src/branches/swampwallaby-3.1:5134,5150-5151,5155,5165,5199,5257,5279,5294-5295,5303,5307-5308,5311,5319-5320,5329,5332,5352,5370,5425,5465,5468
/VASSAL-src/branches/swampwallaby-work:4458,4776,4806-4807,4819,4823-4825,4975,5067,5093
/VASSAL-src/branches/swampwallaby-work2:4840,4847,4883,4975,4980,4994,4996,4999-5000,5002-5003,5028
/VASSAL-src/branches/swampwallaby-work3:5086
/VASSAL-src/branches/swampwallaby-work5:4713
/VASSAL-src/branches/swampwallaby-work6:4727,4729-4730,4737,4742-4743,4747,4752,4776
/VASSAL-src/branches/uckelman-3.1:5389,5391,5400-5401,5403-5406,5411-5412,5415,5484-5487
/VASSAL-src/branches/uckelman-findbugs:4869-4915
/VASSAL-src/branches/uckelman-work:4285,4657-4708,4769-4775,4779,4790,4799,4808,4814-4815,4817,4826,4924,4928,4933,4940,4965,4967-4971,5326
+ /VASSAL-src/branches/3.1:4957,4960-4961,4984-4985,4988,4993,5004,5020,5041,5055,5059,5063-5065,5072-5073,5079,5084,5087,5098-5099,5133,5136,5138-5139,5156,5158,5161,5163,5166,5179-5181,5209,5260,5263,5274,5276,5280,5283-5290,5296,5298,5301-5450,5452-5456,5466-5467,5470,5473-5474,5479,5482,5488,5494-5495,5498,5502
/VASSAL-src/branches/bsmith:4567-4756
/VASSAL-src/branches/bsmith/merge-3:5153
/VASSAL-src/branches/mkiefte:4821-4822,4867
/VASSAL-src/branches/mkiefte-3.1:5424
/VASSAL-src/branches/mkiefte-3.2:4991
/VASSAL-src/branches/rk-jabber:5293
/VASSAL-src/branches/swampwallaby-3.1:5134,5150-5151,5155,5165,5199,5257,5279,5294-5295,5303,5307-5308,5311,5319-5320,5329,5332,5352,5370,5425,5465,5468
/VASSAL-src/branches/swampwallaby-work:4458,4776,4806-4807,4819,4823-4825,4975,5067,5093
/VASSAL-src/branches/swampwallaby-work2:4840,4847,4883,4975,4980,4994,4996,4999-5000,5002-5003,5028
/VASSAL-src/branches/swampwallaby-work3:5086
/VASSAL-src/branches/swampwallaby-work5:4713
/VASSAL-src/branches/swampwallaby-work6:4727,4729-4730,4737,4742-4743,4747,4752,4776
/VASSAL-src/branches/uckelman-3.1:5389,5391,5400-5401,5403-5406,5411-5412,5415,5484-5487
/VASSAL-src/branches/uckelman-findbugs:4869-4915
/VASSAL-src/branches/uckelman-work:4285,4657-4708,4769-4775,4779,4790,4799,4808,4814-4815,4817,4826,4924,4928,4933,4940,4965,4967-4971,5326
Modified: VASSAL-src/trunk/src/VASSAL/build/module/map/ImageSaver.java
===================================================================
--- VASSAL-src/trunk/src/VASSAL/build/module/map/ImageSaver.java 2009-04-14 21:18:45 UTC (rev 5502)
+++ VASSAL-src/trunk/src/VASSAL/build/module/map/ImageSaver.java 2009-04-14 21:29:42 UTC (rev 5503)
@@ -192,11 +192,29 @@
dialog.setIndeterminate(true);
dialog.setLocationRelativeTo(frame);
+ // get the dimensions of the image to write
final Dimension s = map.mapSize();
- s.width *= map.getZoom();
- s.height *= map.getZoom();
- writeMapRectAsImage(file, 0, 0, s.width, s.height);
+
+ if (s.width == 0) s.width = 1;
+ if (s.height == 0) s.height = 1;
+ int w = (int) Math.round(s.width * map.getZoom());
+ int h = (int) Math.round(s.height * map.getZoom());
+
+ // ensure that the resulting image is at least 1x1
+ if (w < 1 || h < 1) {
+ if (s.width < s.height) {
+ w = 1;
+ h = s.height/s.width;
+ }
+ else {
+ h = 1;
+ w = s.width/s.height;
+ }
+ }
+
+ writeMapRectAsImage(file, 0, 0, w, h);
+
dialog.setVisible(true);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
vassalengine-svn mailing list
vas...@li...
https://lists.sourceforge.net/lists/listinfo/vassalengine-svn
|