From da1a6eaa72cb56dc70cbea1788d5c24a99f89988 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 17 Jun 2011 07:40:08 +1000 Subject: [PATCH] Increased windows pBuffer size --- Projects/CodeBlocks/SleepyHead.depend | 6 +++--- src/SleepyHeadMain.cpp | 2 +- src/graphs/gl_pbuffer.cpp | 3 ++- src/version.h | 12 ++++++------ 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index af9aa565..2e2e9b3e 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8309,7 +8309,7 @@ 1308026543 D -1308259082 /home/mark/projects/git/sleepyhead/src/version.h +1308260097 /home/mark/projects/git/sleepyhead/src/version.h 1308003040 ent of cb2ab33... Linux wx2.8 & wx2.9 builds fixed @@ -8341,7 +8341,7 @@ "preferences.h" "tinyxml/tinyxml.h" -1308258772 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp +1308259685 source:/home/mark/projects/git/sleepyhead/src/SleepyHeadMain.cpp "wx_pch.h" "version.h" @@ -11071,7 +11071,7 @@ -1308153312 source:/home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.cpp +1308260282 source:/home/mark/projects/git/sleepyhead/src/graphs/gl_pbuffer.cpp "gl_pbuffer.h" diff --git a/src/SleepyHeadMain.cpp b/src/SleepyHeadMain.cpp index 27005738..422871ff 100644 --- a/src/SleepyHeadMain.cpp +++ b/src/SleepyHeadMain.cpp @@ -1085,7 +1085,7 @@ void Daily::RefreshData(wxCommandEvent& event) // html=html+wxT(" \n"); //html=html+wxT(" \n"); html=html+wxT("")+_("Event Breakdown")+wxT("\n"); - html=html+wxT("\n"); + html=html+wxT("\n"); //html=html+wxT(" \n"); //html=html+wxT("")+_("Other Information")+wxT("\n"); diff --git a/src/graphs/gl_pbuffer.cpp b/src/graphs/gl_pbuffer.cpp index ec05fc52..48c17f45 100644 --- a/src/graphs/gl_pbuffer.cpp +++ b/src/graphs/gl_pbuffer.cpp @@ -55,7 +55,8 @@ pBufferWGL::pBufferWGL(int width, int height) j=1 << i; if (j >= ms) break; } - assert (j>=ms); // I seriously doubt this will ever happen ;) + j <<= 2; + //assert (j>=ms); // I seriously doubt this will ever happen ;) // WGL only supports square pBuffers m_width=j; diff --git a/src/version.h b/src/version.h index 83ed32dc..c2ee6f9f 100644 --- a/src/version.h +++ b/src/version.h @@ -16,14 +16,14 @@ namespace AutoVersion{ //Standard Version Type static const long _MAJOR = 0; static const long _MINOR = 7; - static const long _BUILD = 6456; - static const long _REVISION = 18527; + static const long _BUILD = 6458; + static const long _REVISION = 18537; //Miscellaneous Version Types - static const long _BUILDS_COUNT = 7594; - #define _RC_FILEVERSION 0,7,6456,18527 - #define _RC_FILEVERSION_STRING "0, 7, 6456, 18527\0" - static const char _FULLVERSION_STRING[] = "0.7.6456.18527"; + static const long _BUILDS_COUNT = 7602; + #define _RC_FILEVERSION 0,7,6458,18537 + #define _RC_FILEVERSION_STRING "0, 7, 6458, 18537\0" + static const char _FULLVERSION_STRING[] = "0.7.6458.18537"; //These values are to keep track of your versioning state, don't modify them. static const long _BUILD_HISTORY = 0;