Loading

Paste #pzrn5no1x

  1. [SRC] Linking openttd
  2. make[1]: Leaving directory '/home/lordaro/dev/openttd/objs/release'
  3. [11:08 lordaro@Apollo openttd] > git d
  4. diff --git a/src/fontcache.cpp b/src/fontcache.cpp
  5. index 7c358145b..b7df8df7f 100644
  6. --- a/src/fontcache.cpp
  7. +++ b/src/fontcache.cpp
  8. @@ -991,8 +991,8 @@ const Sprite *GetGlyph(FontSize size, WChar key)
  9.         aa = (slot->bitmap.pixel_mode == FT_PIXEL_MODE_GRAY);
  10.  
  11.         /* Add 1 pixel for the shadow on the medium font. Our sprite must be at least 1x1 pixel */
  12. -       width  = max(1, slot->bitmap.width + (size == FS_NORMAL));
  13. -       height = max(1, slot->bitmap.rows  + (size == FS_NORMAL));
  14. +       width  = max(1U, slot->bitmap.width + (size == FS_NORMAL));
  15. +       height = max(1U, slot->bitmap.rows  + (size == FS_NORMAL));
  16.  
  17.         /* FreeType has rendered the glyph, now we allocate a sprite and copy the image into it */
  18.         sprite.AllocateData(width * height);
  19. [11:08 lordaro@Apollo openttd] > git lg -5
  20. * 34b997aef - (HEAD) (svn r22728) -Codechange: add -Wno-narrowing to cxxflags in order to prevent many useless warnings with GCC 4.7 (61 seconds ago) <smatz>
  21. * 3e5a2bc97 - (svn r22719) -Fix: compilation with gcc 4.7 (14 minutes ago) <smatz>
  22. * b602bccd0 - (svn r22481) -Fix: compilation with recent GCC (16 minutes ago) <smatz>
  23. * 26f6431b2 - (svn r20001) -Update from WebTranslator v3.0: greek - 1 changes by fumantsu indonesian - 7 changes by prof norwegian_bokmal - 11 changes by mantaray norwegian_nynorsk - 11 changes by mantaray (7 years ago) <translators>
  24. * 62c44ca2d - (svn r19999) -Fix: then vs than mistakes (ln) (7 years ago) <rubidium>

Comments