Wouldn't compile on linux due memset and strlen not members of std-namespace

Signed-off-by: James Turk <james.p.turk@gmail.com>
This commit is contained in:
PureW 2009-05-19 04:32:06 +08:00 committed by James Turk
parent ec14f0c1b5
commit 97a65f92d1

View File

@ -3,39 +3,41 @@
// Based on work by Marijn Haverbeke (http://marijn.haverbeke.nl) // Based on work by Marijn Haverbeke (http://marijn.haverbeke.nl)
// //
// Version 0.2.1 - Released 2 March 2008 - Updated contact information. // Version 0.2.1 - Released 2 March 2008 - Updated contact information.
// Version 0.2.0 - Released 18 July 2005 - Added beginDraw/endDraw, // Version 0.2.0 - Released 18 July 2005 - Added beginDraw/endDraw,
// Changed vsprintf to vsnprintf // Changed vsprintf to vsnprintf
// Version 0.1.0 - Released 1 July 2005 - Initial Release // Version 0.1.0 - Released 1 July 2005 - Initial Release
// //
// Copyright (c) 2005-2008, James Turk // Copyright (c) 2005-2008, James Turk
// All rights reserved. // All rights reserved.
// //
// Redistribution and use in source and binary forms, with or without // Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met: // modification, are permitted provided that the following conditions are met:
// //
// * Redistributions of source code must retain the above copyright notice, // * Redistributions of source code must retain the above copyright notice,
// this list of conditions and the following disclaimer. // this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright // * Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the // notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution. // documentation and/or other materials provided with the distribution.
// * Neither the name of the GLFT_Font nor the names of its contributors // * Neither the name of the GLFT_Font nor the names of its contributors
// may be used to endorse or promote products derived from this software // may be used to endorse or promote products derived from this software
// without specific prior written permission. // without specific prior written permission.
// //
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE // AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE // IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE // ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR // LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF // CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS // SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN // INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) // CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE. // POSSIBILITY OF SUCH DAMAGE.
#include "GLFT_Font.hpp" #include "GLFT_Font.hpp"
#include <cstring>
// static members // static members
FT_Library FTLibraryContainer::library_; FT_Library FTLibraryContainer::library_;
@ -91,7 +93,7 @@ GLFT_Font::~GLFT_Font()
void GLFT_Font::open(const std::string& filename, unsigned int size) void GLFT_Font::open(const std::string& filename, unsigned int size)
{ {
const size_t MARGIN = 3; const size_t MARGIN = 3;
// release the font if it already exists // release the font if it already exists
if(isValid()) if(isValid())
{ {
@ -162,7 +164,7 @@ void GLFT_Font::open(const std::string& filename, unsigned int size)
// create and zero the memory // create and zero the memory
unsigned char* image = new unsigned char[imageHeight * imageWidth]; unsigned char* image = new unsigned char[imageHeight * imageWidth];
std::memset(image, 0, imageHeight * imageWidth); memset(image, 0, imageHeight * imageWidth);
// These are the position at which to draw the next glyph // These are the position at which to draw the next glyph
size_t x = MARGIN; size_t x = MARGIN;
@ -273,7 +275,7 @@ void GLFT_Font::drawText(float x, float y, const char *str, ...) const
glBindTexture(GL_TEXTURE_2D, texID_); glBindTexture(GL_TEXTURE_2D, texID_);
glPushMatrix(); glPushMatrix();
glTranslated(x,y,0); glTranslated(x,y,0);
for(unsigned int i=0; i < std::strlen(buf); ++i) for(unsigned int i=0; i < strlen(buf); ++i)
{ {
unsigned char ch( buf[i] - SPACE ); // ch-SPACE = DisplayList offset unsigned char ch( buf[i] - SPACE ); // ch-SPACE = DisplayList offset
// replace characters outside the valid range with undrawable // replace characters outside the valid range with undrawable
@ -328,7 +330,7 @@ std::ostream& GLFT_Font::beginDraw(float x, float y)
return ss_; return ss_;
} }
StreamFlusher GLFT_Font::endDraw() StreamFlusher GLFT_Font::endDraw()
{ {
drawText(drawX_, drawY_, ss_.str()); // draw the string drawText(drawX_, drawY_, ss_.str()); // draw the string
ss_.str(""); // clear the buffer ss_.str(""); // clear the buffer