From 2267a092356d17f6444502dc92491485ccf24341 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Mon, 9 Jul 2018 12:43:39 -0400 Subject: SkDEBUGF: use __VA_ARGS__ Change-Id: I42a47e821ff7a7f6cec65b38a8216cabbf0acfce Reviewed-on: https://skia-review.googlesource.com/139860 Reviewed-by: Mike Klein Commit-Queue: Hal Canary --- fuzz/FuzzCanvas.cpp | 2 +- fuzz/FuzzDrawFunctions.cpp | 18 +++++++++--------- fuzz/FuzzGradients.cpp | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'fuzz') diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp index 2cb9968d5b..93545f62ab 100644 --- a/fuzz/FuzzCanvas.cpp +++ b/fuzz/FuzzCanvas.cpp @@ -904,7 +904,7 @@ static SkBitmap make_fuzz_bitmap(Fuzz* fuzz) { fuzz->nextRange(&w, 1, 1024); fuzz->nextRange(&h, 1, 1024); if (!bitmap.tryAllocN32Pixels(w, h)) { - SkDEBUGF(("Could not allocate pixels %d x %d", w, h)); + SkDEBUGF("Could not allocate pixels %d x %d", w, h); return bitmap; } for (int y = 0; y < h; ++y) { diff --git a/fuzz/FuzzDrawFunctions.cpp b/fuzz/FuzzDrawFunctions.cpp index 15443fdd85..3eeed1c4a3 100644 --- a/fuzz/FuzzDrawFunctions.cpp +++ b/fuzz/FuzzDrawFunctions.cpp @@ -81,7 +81,7 @@ static void init_bitmap(Fuzz* fuzz, SkBitmap* bmp) { (SkColorType)colorType, b ? kOpaque_SkAlphaType : kPremul_SkAlphaType); if (!bmp->tryAllocPixels(info)) { - SkDEBUGF(("Bitmap not allocated\n")); + SkDEBUGF("Bitmap not allocated\n"); } SkColor c; fuzz->next(&c); @@ -318,36 +318,36 @@ DEF_FUZZ(DrawFunctions, fuzz) { SkDebugf("Could not initialize font.\n"); fuzz->signalBug(); } - SkDEBUGF(("Fuzz DrawText\n")); + SkDEBUGF("Fuzz DrawText\n"); fuzz_drawText(fuzz, f); return; } case 1: - SkDEBUGF(("Fuzz DrawRect\n")); + SkDEBUGF("Fuzz DrawRect\n"); fuzz_drawRect(fuzz); return; case 2: - SkDEBUGF(("Fuzz DrawCircle\n")); + SkDEBUGF("Fuzz DrawCircle\n"); fuzz_drawCircle(fuzz); return; case 3: - SkDEBUGF(("Fuzz DrawLine\n")); + SkDEBUGF("Fuzz DrawLine\n"); fuzz_drawLine(fuzz); return; case 4: - SkDEBUGF(("Fuzz DrawPath\n")); + SkDEBUGF("Fuzz DrawPath\n"); fuzz_drawPath(fuzz); return; case 5: - SkDEBUGF(("Fuzz DrawImage/DrawImageRect\n")); + SkDEBUGF("Fuzz DrawImage/DrawImageRect\n"); fuzz_drawImage(fuzz); return; case 6: - SkDEBUGF(("Fuzz DrawBitmap\n")); + SkDEBUGF("Fuzz DrawBitmap\n"); fuzz_drawBitmap(fuzz); return; case 7: - SkDEBUGF(("Fuzz DrawPaint\n")); + SkDEBUGF("Fuzz DrawPaint\n"); fuzz_drawPaint(fuzz); return; } diff --git a/fuzz/FuzzGradients.cpp b/fuzz/FuzzGradients.cpp index 1c06af52bf..f9d0742382 100644 --- a/fuzz/FuzzGradients.cpp +++ b/fuzz/FuzzGradients.cpp @@ -56,11 +56,11 @@ static void logOptionalMatrix(const char* label, const SkMatrix* m) { return; } - SkDEBUGF((" %s: [ ", label)); + SkDEBUGF(" %s: [ ", label); for (int i = 0; i < 9; ++i) { - SkDEBUGF(("%.9g ", m->get(i))); + SkDEBUGF("%.9g ", m->get(i)); } - SkDEBUGF(("]\n")); + SkDEBUGF("]\n"); } static void logLinearGradient(const SkPoint pts[2], @@ -256,19 +256,19 @@ DEF_FUZZ(Gradients, fuzz) { switch(i) { case 0: - SkDEBUGF(("LinearGradient\n")); + SkDEBUGF("LinearGradient\n"); fuzzLinearGradient(fuzz); return; case 1: - SkDEBUGF(("RadialGradient\n")); + SkDEBUGF("RadialGradient\n"); fuzzRadialGradient(fuzz); return; case 2: - SkDEBUGF(("TwoPointConicalGradient\n")); + SkDEBUGF("TwoPointConicalGradient\n"); fuzzTwoPointConicalGradient(fuzz); return; } - SkDEBUGF(("SweepGradient\n")); + SkDEBUGF("SweepGradient\n"); fuzzSweepGradient(fuzz); return; } -- cgit v1.2.3