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

Revert "Real mac pow fix"

Browse Source 
This reverts commit 06629864cf.
This commit is contained in:
Mark Watkins 2011-06-14 15:45:25 +10:00
parent 367a345ef9
commit 28c96e45df
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Projects/CodeBlocks/SleepyHead.depend
View File

@ -8306,7 +8306,7 @@
<sleeplib/machine.h> <sleeplib/machine.h>
<list> <list>
1308028613 /home/mark/projects/git/sleepyhead/src/version.h 1308026543 /home/mark/projects/git/sleepyhead/src/version.h
1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h 1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h
"machine.h" "machine.h"
@ -8344,7 +8344,7 @@
"sleeplib/profiles.h" "sleeplib/profiles.h"
"sleeplib/machine_loader.h" "sleeplib/machine_loader.h"
1308028182 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp 1308010945 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp
<OpenGL/gl.h> <OpenGL/gl.h>
<AGL/agl.h> <AGL/agl.h>
<GL/glew.h> <GL/glew.h>

2
src/graphs/graph.cpp
View File

@ -1716,7 +1716,7 @@ void gCandleStick::Plot(gGraphWindow & w,float scrx,float scry)
if (m_direction==wxVERTICAL) { if (m_direction==wxVERTICAL) {
DrawText(str,start_px+barwidth+2+y,j,270.0,*wxBLACK); DrawText(str,start_px+barwidth+2+y,j,270.0,*wxBLACK);
} else { } else {
DrawText(str,j,start_py+(barwidth/2)-(y/2)+1); DrawText(str,j,start_py+(barwidth/2)-(y/2)+4); //0,*wxBLACK,texfont);
} }
} }

2
src/libs/freetype-gl/texture-font.cpp
View File

@ -145,7 +145,7 @@ int TextureFont::CacheGlyphs(wchar_t * charcodes)
for( x=0; x<slot->bitmap.width; ++x ) { for( x=0; x<slot->bitmap.width; ++x ) {
for( y=0; y<slot->bitmap.rows; ++y ){ for( y=0; y<slot->bitmap.rows; ++y ){
c = *(unsigned char *)(slot->bitmap.buffer + y*slot->bitmap.pitch + x ); c = *(unsigned char *)(slot->bitmap.buffer + y*slot->bitmap.pitch + x );
c = (unsigned char) ( pow(float(c)/255.0, float(m_gamma) * 255.0)); c = (unsigned char) ( pow((float)c/255.0, (float)m_gamma) * 255);
*(unsigned char *)(slot->bitmap.buffer + y*slot->bitmap.pitch + x ) = c; *(unsigned char *)(slot->bitmap.buffer + y*slot->bitmap.pitch + x ) = c;
} }
} }

12
src/version.h
View File

@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type //Standard Version Type
static const long MAJOR = 0; static const long MAJOR = 0;
static const long MINOR = 7; static const long MINOR = 7;
static const long BUILD = 5642; static const long BUILD = 5641;
static const long REVISION = 14132; static const long REVISION = 14124;
//Miscellaneous Version Types //Miscellaneous Version Types
static const long BUILDS_COUNT = 5853; static const long BUILDS_COUNT = 5845;
#define RC_FILEVERSION 0,7,5642,14132 #define RC_FILEVERSION 0,7,5641,14124
#define RC_FILEVERSION_STRING "0, 7, 5642, 14132\0" #define RC_FILEVERSION_STRING "0, 7, 5641, 14124\0"
static const char FULLVERSION_STRING[] = "0.7.5642.14132"; static const char FULLVERSION_STRING[] = "0.7.5641.14124";
//These values are to keep track of your versioning state, don't modify them. //These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0; static const long BUILD_HISTORY = 0;