Merge pull request #1021 from tst-twilk/1011-warning-fix

#1011 Remove unused variable warning
google · Sep 26, 2018 · 5c2517b · 5c2517b
2 parents 88fcca0 + a1173a5
commit 5c2517b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/earth_enterprise/src/fusion/gst/maprender/SGLHelps.cpp b/earth_enterprise/src/fusion/gst/maprender/SGLHelps.cpp
@@ -24,9 +24,6 @@
 #include "fusion/autoingest/.idl/storage/MapSubLayerConfig.h"
 
 
-__SK_FORCE_IMAGE_DECODER_LINKING;
-
-
 SkColor SkColorFromQColor(const QColor &color) {
   QRgb rgb = color.rgb();
   return SkColorSetARGB(qAlpha(rgb), qRed(rgb), qGreen(rgb), qBlue(rgb));
@@ -156,3 +153,7 @@ bool FontInfo::CheckTextStyleSanity(MapTextStyleConfig* config,
 
 }  // namespace maprender
 
+// Always leave these two lines last, otherwise it will
+// silence unused variables from the code below.
+#pragma GCC diagnostic ignored "-Wunused-variable"
+__SK_FORCE_IMAGE_DECODER_LINKING;