[Bepdf-commits] CVS: BePDF/bepdf/beos History.h, 1.4, 1.5 PDFView.cpp, 1.43, 1.44

[Michael P. <la...@us...>]

Update of /cvsroot/bepdf/BePDF/bepdf/beos
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv25680/bepdf/beos

Modified Files:
	History.h PDFView.cpp 
Log Message:
GCC 4 warnings fixed or disabled in xpdf and BePDF by Dan Pidcock.
Thanks a lot!


Index: History.h
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/bepdf/BePDF/bepdf/beos/History.h
===================================================================
RCS file: /cvsroot/bepdf/BePDF/bepdf/beos/History.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- History.h	16 Oct 2003 17:36:24 -0000	1.4
+++ History.h	6 Jun 2010 07:59:53 -0000	1.5
@@ -86,7 +86,7 @@
 	void SetFile(entry_ref ref, const char* ownerPassword, const char* userPassword);
 	HistoryEntry* GetTop();
 	int GetElements() { return mList.CountItems(); }
-	bool CanGoBack()    { return mCurrent > 0 || mCurrent == 0 && GetElements() == 1; }
+	bool CanGoBack()    { return mCurrent > 0 || (mCurrent == 0 && GetElements() == 1); }
 	bool CanGoForward() { return mCurrent < GetElements() - 1; }
 
 private:

Index: PDFView.cpp
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/bepdf/BePDF/bepdf/beos/PDFView.cpp
===================================================================
RCS file: /cvsroot/bepdf/BePDF/bepdf/beos/PDFView.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- PDFView.cpp	1 Feb 2009 11:18:24 -0000	1.43
+++ PDFView.cpp	6 Jun 2010 07:59:53 -0000	1.44
@@ -857,7 +857,7 @@
 	mDragStarted = true;
 	SetMouseEventMask(B_POINTER_EVENTS);
 	mResizeVertOnly = false;
-	if (fixedSize || !annotInserted && !OnAnnotResizeRect(point, mResizeVertOnly)) {
+	if (fixedSize || (!annotInserted && !OnAnnotResizeRect(point, mResizeVertOnly))) {
 		// move
   		PDFPoint p = CvtDevToUser(CorrectMousePos(point)) - mAnnotation->LeftTop();
 		if (fixedSize) {
@@ -1671,7 +1671,7 @@
 	
 	BPoint p = CorrectMousePos(point);
 	// over selection?
-	if ((mSelected == SELECTED) && mSelection.Contains(p) ||
+	if (((mSelected == SELECTED) && mSelection.Contains(p)) ||
 		p.x < 0 || p.y < 0 || p.x >= mWidth || p.y >= mHeight) {
 		SetViewCursor((BCursor*)B_CURSOR_SYSTEM_DEFAULT);
 		return;