summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPirama Arumuga Nainar <pirama@google.com>2019-01-17 14:58:12 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-17 14:58:12 -0800
commit669451b86ba80da55d9ce2c2450fa6fcd5237362 (patch)
treec864ee4d828656ce93b2714d32218f8f94172627
parent2b0b0d0050051839cc4c65b56359a6080e9ccab8 (diff)
parentccb70374b5fefb578207841488b5b727e087918d (diff)
downloaddng_sdk-669451b86ba80da55d9ce2c2450fa6fcd5237362.tar.gz
Fix occurrences of Wextra-semi-stmt am: c3dd9e5e06 am: a1d97c6536
am: ccb70374b5 Change-Id: Id87415670fe084f32e1c5decd7ac2af00828cd98
-rw-r--r--source/dng_assertions.h2
-rw-r--r--source/dng_mosaic_info.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/dng_assertions.h b/source/dng_assertions.h
index dc998fa..0377350 100644
--- a/source/dng_assertions.h
+++ b/source/dng_assertions.h
@@ -59,7 +59,7 @@ void dng_show_message_f (const char *fmt, ...);
/// \param x Predicate which must be true.
/// \param y String to display if x is not true.
-#define DNG_ASSERT(x,y)
+#define DNG_ASSERT(x,y) do { } while(false)
#endif
#endif
diff --git a/source/dng_mosaic_info.cpp b/source/dng_mosaic_info.cpp
index 0a51d9b..dde2e31 100644
--- a/source/dng_mosaic_info.cpp
+++ b/source/dng_mosaic_info.cpp
@@ -104,7 +104,7 @@ void dng_bilinear_kernel::Add (const dng_point &delta,
// Add element to list.
- DNG_ASSERT (fCount < kMaxCount, "Too many kernel entries")
+ DNG_ASSERT (fCount < kMaxCount, "Too many kernel entries");
fDelta [fCount] = delta;
fWeight32 [fCount] = weight;