Fix unused variable warnings in libgdiplus (mono#514)

* Fix unused variable warnings * Remove blocking warnings from src makefile * Remove unecessary -Wall in src makefile Already defined in `GDIPLUS_CFLAGS="$GDIPLUS_CFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare -std=gnu99"`

Author: hughbe

src/Makefile.am

@@ -129,6 +129,6 @@ endif
 
 libgdiplus_la_LIBADD = $(GDIPLUS_LIBS)
 
-AM_CPPFLAGS = $(GDIPLUS_CFLAGS) -Wall -Wno-unused -Wno-format
+AM_CPPFLAGS = $(GDIPLUS_CFLAGS)
 
 EXTRA_DIST = libgdiplus.vcxproj packages.config

src/bitmap.c

@@ -2001,16 +2001,6 @@ GdipBitmapUnlockBits (GpBitmap *bitmap, BitmapData *lockedBitmapData)
 return status;
 }
 
-static void gdip_setpixel_32bppARGB (BYTE *scan, INT x, BYTE a, BYTE r, BYTE g, BYTE b)
-{
-set_pixel_bgra (scan, x, a, r, g, b);
-}
-
-static void gdip_setpixel_32bppRGB (BYTE *scan, INT x, BYTE a, BYTE r, BYTE g, BYTE b)
-{
-set_pixel_bgra (scan, x, a, r, g, b);
-}
-
 GpStatus WINGDIPAPI
 GdipBitmapSetPixel (GpBitmap *bitmap, INT x, INT y, ARGB color)
 {

src/emfcodec.c

@@ -137,6 +137,8 @@ PolyBezier (MetafilePlayContext *context, BYTE *data, int len, BOOL compact)
 #ifdef DEBUG_EMF
 printf ("PolyBezier%s bounds [%d, %d, %d, %d] with %d points", (compact ? "16" : ""), 
 bounds.left, bounds.top, bounds.right, bounds.bottom, num);
+#else
+(void) bounds; // Avoid an unused variable warning.
 #endif
 
 /* we need to supply the current x,y position */
@@ -215,6 +217,8 @@ Polygon (MetafilePlayContext *context, BYTE *data, int len, BOOL compact)
 #ifdef DEBUG_EMF
 printf ("Polygon%s bounds [%d, %d, %d, %d] with %d points", (compact ? "16" : ""), 
 bounds.left, bounds.top, bounds.right, bounds.bottom, num);
+#else
+(void) bounds; // Avoid an unused variable warning.
 #endif
 
 points = (GpPointF*) GdipAlloc (num * sizeof (GpPointF));
@@ -277,7 +281,10 @@ PolyPolygon (MetafilePlayContext *context, BYTE *data, BOOL compact)
 #ifdef DEBUG_EMF
 printf ("PolyPolygon%s bounds [%d, %d, %d, %d] with %d polygons", (compact ? "16" : ""), 
 bounds.left, bounds.top, bounds.right, bounds.bottom, poly_num);
+#else
+(void) bounds; // Avoid an unused variable warning.
 #endif
+
 /* read size of each polygon and allocate the required memory */
 for (i = 0; i < poly_num; i++) {
 current->num = GETDW(DWP(n));

src/general-private.h

@@ -60,6 +60,16 @@
 #define max(a,b)	(a > b ? a : b)
 #endif
 
+#if !defined(__has_attribute)
+#define __has_attribute(x) 0
+#endif
+
+#if __has_attribute(used) || defined(__GNUC__)
+#define ATTRIBUTE_USED __attribute__((used))
+#else
+#define ATTRIBUTE_USED
+#endif
+
 /* avoid direct floating point comparison */
 #define gdip_near_zero(value)	((value >= -0.00059604645f) && (value <= 0.00059604645f))
 #define gdip_near_one(value)	gdip_near_zero (value - 1.0f)

src/graphics-cairo.c

@@ -621,28 +621,6 @@ make_polygon (GpGraphics *graphics, GDIPCONST GpPointF *points, int count, BOOL
 cairo_close_path (graphics->ct);
 }
 
-static void
-make_polygon_from_integers (GpGraphics *graphics, GDIPCONST GpPoint *points, int count, BOOL antialiasing)
-{
-int i;
-
-gdip_cairo_move_to (graphics, points [0].X, points [0].Y, TRUE, antialiasing);
-
-for (i = 0; i < count; i++) {
-gdip_cairo_line_to (graphics, points [i].X, points [i].Y, TRUE, antialiasing);
-}
-
-/*
-* Draw a line from the last point back to the first point if
-* they're not the same
-*/
-if (points [0].X != points [count-1].X && points [0].Y != points [count-1].Y) {
-gdip_cairo_line_to (graphics, points [0].X, points [0].Y, TRUE, antialiasing);
-}
-
-cairo_close_path (graphics->ct);
-}
-
 GpStatus
 cairo_DrawPolygon (GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, int count)
 {
@@ -731,7 +709,6 @@ cairo_FillRegion (GpGraphics *graphics, GpBrush *brush, GpRegion *region)
 if (region->type == RegionTypePath) {
 GpStatus status;
 cairo_surface_t *mask_surface;
-GpBitmap *bitmap = NULL;
 
 /* (optimization) if if the path is empty, return immediately */
 if (!region->tree)

src/graphics-metafile.c

@@ -33,19 +33,19 @@
 #define EMFPLUS_FLAGS_USE_INT160x4000
 #define EMFPLUS_FLAGS_USE_ARGB0x8000
 
-static BOOL
+ATTRIBUTE_USED static BOOL
 RectFitInInt16 (int x, int y, int width, int height)
 {
 return (FIT_IN_INT16(x) && FIT_IN_INT16(y) && FIT_IN_INT16(width) && FIT_IN_INT16(height));
 }
 
-static BOOL
+ATTRIBUTE_USED static BOOL
 GpRectFitInInt16 (GDIPCONST GpRect *rect)
 {
 return (FIT_IN_INT16(rect->X) && FIT_IN_INT16(rect->Y) && FIT_IN_INT16(rect->Width) && FIT_IN_INT16(rect->Height));
 }
 
-static BOOL
+ATTRIBUTE_USED static BOOL
 GpRectArrayFitInInt16 (GDIPCONST GpRect *rects, int count)
 {
 GpRect *r = (GpRect*) rects;

src/graphics-path.c

@@ -362,9 +362,6 @@ GpStatus WINGDIPAPI
 GdipClonePath (GpPath *path, GpPath **clonePath)
 {
 GpPath *result;
-int i;
-BYTE type;
-GpPointF point;
 
 if (!path || !clonePath)
 return InvalidParameter;
@@ -599,8 +596,7 @@ GdipClearPathMarkers (GpPath *path)
 static void
 reverse_subpath_adjust_flags (int start, int end, BYTE *types, BOOL *prev_had_marker)
 {
-BYTE t, prev_last;
-int i;
+BYTE prev_last;
 
 /* Copy all but PathPointTypeStart */
 if (end != start)
@@ -629,7 +625,6 @@ GpStatus WINGDIPAPI
 GdipReversePath (GpPath *path)
 {
 int length, i;
-GByteArray *types;
 int start = 0;
 BOOL prev_had_marker = FALSE;
 
@@ -1188,11 +1183,6 @@ GdipAddPathPolygon (GpPath *path, const GpPointF *points, int count)
 GpStatus WINGDIPAPI
 GdipAddPathPath (GpPath *path, GDIPCONST GpPath *addingPath, BOOL connect)
 {
-int i, length;
-PathPointType first;
-GpPointF *pts;
-BYTE *types;
-
 if (!path || !addingPath)
 return InvalidParameter;
 
@@ -1672,10 +1662,6 @@ static BOOL
 gdip_convert_bezier_to_lines (GpPath *path, int index, float flatness, GpPath *flat_path)
 {
 GpPointF start, first, second, end;
-GpPointF pt;
-BYTE type;
-int i;
-int points_len = 0;
 int saved_count;
 
 if ((index <= 0) || (index + 2 >= path->count))
@@ -1704,8 +1690,6 @@ GdipFlattenPath (GpPath *path, GpMatrix *matrix, float flatness)
 {
 GpStatus status = Ok;
 GpPath *flat_path;
-GArray *points;
-GByteArray *types;
 int i;
 
 if (!path)
@@ -1735,7 +1719,6 @@ GdipFlattenPath (GpPath *path, GpMatrix *matrix, float flatness)
 if ((type & PathPointTypeBezier) == PathPointTypeBezier) {
 if (!gdip_convert_bezier_to_lines (path, i, fabs (flatness), flat_path)) {
 /* uho, too much recursion - do not pass go, do not collect 200$ */
-GpPointF pt;
 
 /* free the the partial flat */
 GdipResetPath (flat_path);

src/graphics-pathiterator.c

@@ -124,8 +124,6 @@ GdipDeletePathIter (GpPathIterator *iterator)
 GpStatus
 GdipPathIterCopyData (GpPathIterator *iterator, int *resultCount, GpPointF *points, BYTE *types, int startIndex, int endIndex)
 {
-int i, j;
-
 if (!iterator || !resultCount || !points || !types)
 return InvalidParameter;
 

src/graphics.c

@@ -646,7 +646,6 @@ GdipResetWorldTransform (GpGraphics *graphics)
 GpStatus WINGDIPAPI
 GdipSetWorldTransform (GpGraphics *graphics, GpMatrix *matrix)
 {
-GpStatus status;
 BOOL invertible;
 
 if (!graphics)
@@ -2128,8 +2127,6 @@ GdipSetClipRegion (GpGraphics *graphics, GpRegion *region, CombineMode combineMo
 GpStatus WINGDIPAPI
 GdipSetClipHrgn (GpGraphics *graphics, void *hRgn, CombineMode combineMode)
 {
-GpStatus status;
-
 if (!graphics)
 return InvalidParameter;
 if (graphics->state == GraphicsStateBusy)

src/metafile.c

@@ -1356,9 +1356,6 @@ gdip_read_emf_header_optionals (ENHMETAHEADER3 *header, void *pointer, ImageSour
 const int HeaderRecordSize = sizeof (ENHMETAHEADER3);
 const int HeaderExtension1Size = sizeof (ENHMETAHEADER3) + sizeof (HeaderExtension1);
 
-int originalHeaderSize = header->nSize;
-DWORD key;
-
 /* Initialize header size to minimum. */
 int headerSize = HeaderRecordSize;