chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-09 20:50:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Increased windows pBuffer size

Browse Source
This commit is contained in:
Mark Watkins 2011-06-17 07:40:08 +10:00
parent 161d19c2bf
commit da1a6eaa72
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Projects/CodeBlocks/SleepyHead.depend
View File

@ -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
<wx/dcbuffer.h>
@ -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"
<wx/app.h>
@ -11071,7 +11071,7 @@
<GL/gl.h>
<GL/glx.h>
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"
<wx/utils.h>

2
src/SleepyHeadMain.cpp
View File

@ -1085,7 +1085,7 @@ void Daily::RefreshData(wxCommandEvent& event)
// html=html+wxT("<tr><td colspan=4>&nbsp;</td></tr>\n");
//html=html+wxT("<tr><td colspan=4>&nbsp;</td></tr>\n");
html=html+wxT("<tr><td colspan=4 align=center><i>")+_("Event Breakdown")+wxT("</i></td></tr>\n");
html=html+wxT("<tr><td colspan=4 align=left><img src=\"memory:ahi.png\"></td></tr>\n");
html=html+wxT("<tr><td colspan=4 align=center><img src=\"memory:ahi.png\"></td></tr>\n");
//html=html+wxT("<tr><td colspan=4>&nbsp;</td></tr>\n");
//html=html+wxT("<tr><td colspan=4 align=center><i>")+_("Other Information")+wxT("</i></td></tr>\n");

3
src/graphs/gl_pbuffer.cpp
View File

@ -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;

12
src/version.h
View File

@ -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;