From 06629864cf3eda98d874313049c7cfe151c2d025 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Tue, 14 Jun 2011 15:17:26 +1000 Subject: [PATCH] Real mac pow fix --- Projects/CodeBlocks/SleepyHead.depend | 4 ++-- src/graphs/graph.cpp | 2 +- src/libs/freetype-gl/texture-font.cpp | 2 +- src/version.h | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Projects/CodeBlocks/SleepyHead.depend b/Projects/CodeBlocks/SleepyHead.depend index 2ab3e59e..1c4074e3 100644 --- a/Projects/CodeBlocks/SleepyHead.depend +++ b/Projects/CodeBlocks/SleepyHead.depend @@ -8306,7 +8306,7 @@ -1308026543 /home/mark/projects/git/sleepyhead/src/version.h +1308028613 /home/mark/projects/git/sleepyhead/src/version.h 1307627540 /home/mark/projects/git/sleepyhead/src/libs/sleeplib/prs1_loader.h "machine.h" @@ -8344,7 +8344,7 @@ "sleeplib/profiles.h" "sleeplib/machine_loader.h" -1308010945 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp +1308028182 source:/home/mark/projects/git/sleepyhead/src/graphs/graph.cpp diff --git a/src/graphs/graph.cpp b/src/graphs/graph.cpp index c68e39da..2feb48d7 100644 --- a/src/graphs/graph.cpp +++ b/src/graphs/graph.cpp @@ -1716,7 +1716,7 @@ void gCandleStick::Plot(gGraphWindow & w,float scrx,float scry) if (m_direction==wxVERTICAL) { DrawText(str,start_px+barwidth+2+y,j,270.0,*wxBLACK); } else { - DrawText(str,j,start_py+(barwidth/2)-(y/2)+4); //0,*wxBLACK,texfont); + DrawText(str,j,start_py+(barwidth/2)-(y/2)+1); } } diff --git a/src/libs/freetype-gl/texture-font.cpp b/src/libs/freetype-gl/texture-font.cpp index 8ffb0a74..af575bb8 100644 --- a/src/libs/freetype-gl/texture-font.cpp +++ b/src/libs/freetype-gl/texture-font.cpp @@ -145,7 +145,7 @@ int TextureFont::CacheGlyphs(wchar_t * charcodes) for( x=0; xbitmap.width; ++x ) { for( y=0; ybitmap.rows; ++y ){ c = *(unsigned char *)(slot->bitmap.buffer + y*slot->bitmap.pitch + x ); - c = (unsigned char) ( pow((float)c/255.0, (float)m_gamma) * 255); + c = (unsigned char) ( pow(float(c)/255.0, float(m_gamma) * 255.0)); *(unsigned char *)(slot->bitmap.buffer + y*slot->bitmap.pitch + x ) = c; } } diff --git a/src/version.h b/src/version.h index 01715a0d..2d37ea20 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 = 5641; - static const long REVISION = 14124; + static const long BUILD = 5642; + static const long REVISION = 14132; //Miscellaneous Version Types - static const long BUILDS_COUNT = 5845; - #define RC_FILEVERSION 0,7,5641,14124 - #define RC_FILEVERSION_STRING "0, 7, 5641, 14124\0" - static const char FULLVERSION_STRING[] = "0.7.5641.14124"; + static const long BUILDS_COUNT = 5853; + #define RC_FILEVERSION 0,7,5642,14132 + #define RC_FILEVERSION_STRING "0, 7, 5642, 14132\0" + static const char FULLVERSION_STRING[] = "0.7.5642.14132"; //These values are to keep track of your versioning state, don't modify them. static const long BUILD_HISTORY = 0;