2007-08-26 Pierre-Luc Paour <gallery@paour.com> (1.5.1-b34)

	* Fixed NPE while drawing the cropped area when using golden section

ChangeLog

@@ -1,3 +1,7 @@
+2007-08-26  Pierre-Luc Paour <gallery@paour.com> (1.5.1-b34)
+
+	* Fixed NPE while drawing the cropped area when using golden section.
+
 2007-08-08  Pierre-Luc Paour <gallery@paour.com> (1.5.1-b33)
 
 	* Added horizontal scrollbar for albums list (thanks Brian Egge).

com/gallery/GalleryRemote/PreviewFrame.java

@@ -272,14 +272,14 @@ private void drawThirds(Graphics g, Rectangle r) {
 				double p = 1.6180339887499;
 				double gw = r.width * p / (2 * p + 1);
 				double gh = r.height * p / (2 * p + 1);
-				g.drawLine((int) (oldRect.x + gw), oldRect.y,
-						(int) (oldRect.x + gw), oldRect.y + oldRect.height);
-				g.drawLine((int) (oldRect.x + oldRect.width - gw), oldRect.y,
-						(int) (oldRect.x + oldRect.width - gw), oldRect.y + oldRect.height);
-				g.drawLine(oldRect.x, (int) (oldRect.y + gh),
-						oldRect.x + oldRect.width, (int) (oldRect.y + gh));
-				g.drawLine(oldRect.x, (int) (oldRect.y + oldRect.height - gh),
-						oldRect.x + oldRect.width, (int) (oldRect.y + oldRect.height -gh));
+				g.drawLine((int) (r.x + gw), r.y,
+						(int) (r.x + gw), r.y + r.height);
+				g.drawLine((int) (r.x + r.width - gw), r.y,
+						(int) (r.x + r.width - gw), r.y + r.height);
+				g.drawLine(r.x, (int) (r.y + gh),
+						r.x + r.width, (int) (r.y + gh));
+				g.drawLine(r.x, (int) (r.y + r.height - gh),
+						r.x + r.width, (int) (r.y + r.height -gh));
 			}
 		}
 

defaults.properties

@@ -86,7 +86,7 @@ previewCacheSize=10
 
 # Draw rule of thirds guidelines during crop
 # (true or thirds for rule of thirds, golden for golden section)
-previewDrawThirds=golden
+previewDrawThirds=false
 
 # display the image path in the list
 showPath=true
@@ -320,6 +320,6 @@ updateUrlBeta=http://gallery.sourceforge.net/gallery_remote_version_check_beta.p
 #
 # --- Do not edit below this line ---
 #
-version=1.5.1-b33
-releaseDate=2007/08/08
+version=1.5.1-b34
+releaseDate=2007/08/26
 aboutText=Gallery Remote\n \n \nA part of the Gallery Open-Source Project\nhttp://gallery.sourceforge.net\n \n \nMaintained by:\n \nPierre-Luc Paour\n \n \nInitial version by Chris Smith\n \n \nContributors:\n \nTim Miller\nDolan Halbrook\nMarkus Cozowicz\nScott Gartner\nAmedeo Paglione\nChris Schwerdt\nSeth Ladd\n \n \nArtwork by Ross A. Reyman\n \n \nBundled software:\n \nImageMagick\nJava look and feel Graphics Repository icons\njpegtran, Guido Vollbeding's version\nMetadataExtractor\nSaverBeans