]> git.mxchange.org Git - flightgear.git/commitdiff
Fix compiler warning
authorThorstenB <brehmt@gmail.com>
Fri, 6 Jul 2012 06:28:45 +0000 (08:28 +0200)
committerThorstenB <brehmt@gmail.com>
Tue, 17 Jul 2012 17:32:05 +0000 (19:32 +0200)
(access beyond array bounds)

src/GUI/FGFontCache.cxx
utils/fgpanel/FGFontCache.cxx

index 3a9ca2c7912a8f78af726efb82f292663418b332..937eaeb78936480d186383a4fd31e387260b7c99 100644 (file)
@@ -66,10 +66,11 @@ const GuiFont guifonts[] = {
     { "HELVETICA_12", &FONT_HELVETICA_12 },
     { "HELVETICA_14", &FONT_HELVETICA_14 },
     { "HELVETICA_18", &PUFONT_HELVETICA_18 },
-    { "SANS_12B",     &FONT_SANS_12B }
+    { "SANS_12B",     &FONT_SANS_12B },
+    { 0 }
 };
 
-const GuiFont* guifontsEnd = &guifonts[sizeof(guifonts)/ sizeof(guifonts[0])];
+const GuiFont* guifontsEnd = &guifonts[sizeof(guifonts)/ sizeof(guifonts[0])-1];
 }
 
 FGFontCache::FGFontCache() :
index b3bbdd6b9239fa5e23718ac9e4c18f9c577ec4f2..c362bfe73de8ec6fa19543d3f7cb20e4d72e25d3 100644 (file)
@@ -66,11 +66,12 @@ const GuiFont guifonts[] = {
     { "HELVETICA_10", &PUFONT_HELVETICA_10 },
     { "HELVETICA_12", &PUFONT_HELVETICA_12 },
 //    { "HELVETICA_14", &FONT_HELVETICA_14 },
-    { "HELVETICA_18", &PUFONT_HELVETICA_18 }
-//    { "SANS_12B",     &FONT_SANS_12B }
+    { "HELVETICA_18", &PUFONT_HELVETICA_18 },
+//    { "SANS_12B",     &FONT_SANS_12B },
+    { 0 }
 };
 
-const GuiFont* guifontsEnd = &guifonts[sizeof(guifonts)/ sizeof(guifonts[0])];
+const GuiFont* guifontsEnd = &guifonts[sizeof(guifonts)/ sizeof(guifonts[0])-1];
 }
 
 FGFontCache::fnt::~fnt()