mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-26 01:23:35 +02:00
Code Issues Projects Releases Wiki Activity

more vc++ warning fixes as well as disable an unused font renderer in windows

Browse Source
This commit is contained in:
Mark Vejvoda
2013-11-04 20:16:52 +00:00
parent b190968e6b
commit f4cbced3f4
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/shared_lib/sources/graphics/freetype-gl/texture-atlas.c
View File

@@ -45,8 +45,8 @@
#include <stdlib.h>
#include "texture-atlas.h"
#define max(a,b) (a)>(b)?(a):(b)
#define min(a,b) (a)<(b)?(a):(b)
//#define max(a,b) (a)>(b)?(a):(b)
//#define min(a,b) (a)<(b)?(a):(b)
typedef struct { int x, y, width; } Node;
@@ -254,7 +254,7 @@ texture_atlas_get_region( TextureAtlas *self,
if( y >= 0 )
{
node = (Node *) vector_get( self->nodes, i );
if( ( y + height < best_height ) ||
if( ( y + (int)height < best_height ) ||
( y + height == best_height && node->width < best_width) )
{
best_height = y + height;

8
source/shared_lib/sources/graphics/freetype-gl/texture-font.c
View File

@@ -54,8 +54,8 @@ const struct {
} FT_Errors[] =
#include FT_ERRORS_H
#define max(a,b) (a)>(b)?(a):(b)
#define min(a,b) (a)<(b)?(a):(b)
//#define max(a,b) (a)>(b)?(a):(b)
//#define min(a,b) (a)<(b)?(a):(b)
/* ------------------------------------------------------------------------- */
@@ -272,9 +272,9 @@ texture_font_cache_glyphs( TextureFont *self,
slot = face->glyph;
/* Gamma correction (sort of) */
for( x=0; x<slot->bitmap.width; ++x )
for( x=0; (int)x < slot->bitmap.width; ++x )
{
for( y=0; y<slot->bitmap.rows; ++y )
for( y=0; (int)y < slot->bitmap.rows; ++y )
{
c = *(unsigned char *)(slot->bitmap.buffer
+ y*slot->bitmap.pitch + x );