Changeset 8316 in orxonox.OLD for trunk/src/lib/graphics/text_engine

Timestamp:

Jun 11, 2006, 1:57:27 PM (19 years ago)

Author:

bensch

Message:

trunk: fixed most -Wall warnings… but there are still many missing :/

File:

• trunk/src/lib/graphics/text_engine/font.cc (modified) (11 diffs)

trunk/src/lib/graphics/text_engine/font.cc

@@ -220 +220 @@
 
 /**
- *  sets a specific renderStyle
+ * @brief sets a specific renderStyle
  * @param renderStyle the Style to render: a string (char-array) containing:
  *   i: italic, b: bold, u, underline
@@ -228 +228 @@
   this->renderStyle = TTF_STYLE_NORMAL;
 
-  for (int i = 0; i < renderStyle.size(); i++)
+  for (unsigned int i = 0; i < renderStyle.size(); i++)
   {
     if (renderStyle[i] == 'b')
@@ -246 +246 @@
 
 /**
- * creates and exports an Image, that has all the characters
+ * @brief creates and exports an Image, that has all the characters
  * stored in a Array (as an image)
  * @param fileName the File to write the image into.
@@ -257 +257 @@
 
   //
-  SDL_Color tmpColor = {0, 0, 0};
   // Surface definition.
   SDL_Rect tmpRect; // this represents a Rectangle for blitting.
@@ -277 +276 @@
   tmpRect.x = 0; tmpRect.y = 0; tmpRect.w = tmpSurf->w; tmpRect.h = tmpSurf->h;
   SDL_SetClipRect(tmpSurf, &tmpRect);
-  int maxLineHeight = 0;
 
   int posX, posY;
@@ -339 +337 @@
 /**
  * @returns the maximum ascent of the Font, if the font was initialized, 0 otherwise
-
-   the ascent is the pixels of the font above the baseline
+ *
+ * the ascent is the pixels of the font above the baseline
  */
 int Font::getMaxAscent() const
@@ -352 +350 @@
 /**
  * @returns the maximum descent of the Font, if the font was initialized, 0 otherwise
-
-   the descent is the pixels of the font below the baseline
+ *
+ * the descent is the pixels of the font below the baseline
  */
 int Font::getMaxDescent() const
@@ -404 +402 @@
 
 /**
- * creates a Fast-Texture of this Font
+ * @brief creates a Fast-Texture of this Font
  */
 bool Font::createFastTexture()
@@ -497 +495 @@
   if (this->setSurface(tmpSurf))
     (this->setTexture(Texture::loadTexToGL(tmpSurf)));
+  return true;
 }
 
@@ -547 +546 @@
     return 0;
 
-  int i;
-  int x,y; // the counters
+  unsigned int i;
+  unsigned int x,y; // the counters
   int maxLineHeight = this->getMaxHeight();
   unsigned int size = 32;  // starting Value, we have to start somewhere 32 seems reasonable. (take any small enough 2^i number)
@@ -587 +586 @@
 
 /**
- *  a simple function to get some interesting information about this class
+ * @brief a simple function to get some interesting information about this class
  */
 void Font::debug()
 {
   // print the loaded font's style
-  int style;
+  int style = TTF_STYLE_NORMAL;
   if (likely(this->fontTTF != NULL))
     style = TTF_GetFontStyle(this->fontTTF);