HarfBuzz: fix unused parameter / variable warnings
authorMarc Mutz <marc.mutz@kdab.com>
Tue, 21 Aug 2012 08:29:40 +0000 (10:29 +0200)
committerQt by Nokia <qt-info@nokia.com>
Sat, 25 Aug 2012 21:21:55 +0000 (23:21 +0200)
Change-Id: I362c80081ac4e4d0b9126385bab5a77826810926
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
src/3rdparty/harfbuzz/src/harfbuzz-gpos.c

index ecf647e..21ffe84 100644 (file)
@@ -1120,16 +1120,16 @@ static HB_Error  Load_PairSet ( HB_PairSet*  ps,
   HB_Error  error;
 
   HB_UShort             n, m, count;
-  HB_UInt              base_offset;
 
 #ifdef HB_USE_FLEXIBLE_VALUE_RECORD
   HB_UInt record_size = 0;
   HB_Short *vr;
 #else
+  HB_UInt              base_offset;
   HB_PairValueRecord*  pvr;
-#endif
 
   base_offset = FILE_Pos();
+#endif
 
   if ( ACCESS_Frame( 2L ) )
     return error;
@@ -1245,6 +1245,9 @@ static void  Free_PairSet( HB_PairSet*  ps,
     FREE( pvr );
   }
 #else
+  (void)format1; // unused
+  (void)format2; // unused
+
   if ( ps->ValueRecords )
   {
       FREE( ps->ValueRecords );