Mathis/sharp
1
0
Fork 0
mirror of https://github.com/lovell/sharp.git synced 2026-02-04 21:56:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tighten C++ linting rules

Browse Source 
Bump benchmark dependencies
Update leak test suppressions
Update future branch details
This commit is contained in:
Lovell Fuller
2016-03-31 20:30:40 +01:00
parent 24fb0c33c2
commit c66495b66c
7 changed files with 36 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/common.cc
View File

@@ -8,16 +8,16 @@
// Verify platform and compiler compatibility
#if (VIPS_MAJOR_VERSION < 8 || (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 2))
#error libvips version 8.2.0+ required - see http://sharp.dimens.io/page/install
#error libvips version 8.2.0+ required - see sharp.dimens.io/page/install
#endif
#if ((!defined(__clang__)) && defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)))
#error GCC version 4.6+ is required for C++11 features - see http://sharp.dimens.io/page/install#prerequisites
#error GCC version 4.6+ is required for C++11 features - see sharp.dimens.io/page/install#prerequisites
#endif
#if (defined(__clang__) && defined(__has_feature))
#if (!__has_feature(cxx_range_for))
#error clang version 3.0+ is required for C++11 features - see http://sharp.dimens.io/page/install#prerequisites
#error clang version 3.0+ is required for C++11 features - see sharp.dimens.io/page/install#prerequisites
#endif
#endif
@@ -219,35 +219,44 @@ namespace sharp {
int left = 0;
int top = 0;
switch (gravity) {
case 1: // North
case 1:
// North
left = (inWidth - outWidth + 1) / 2;
break;
case 2: // East
case 2:
// East
left = inWidth - outWidth;
top = (inHeight - outHeight + 1) / 2;
break;
case 3: // South
case 3:
// South
left = (inWidth - outWidth + 1) / 2;
top = inHeight - outHeight;
break;
case 4: // West
case 4:
// West
top = (inHeight - outHeight + 1) / 2;
break;
case 5: // Northeast
case 5:
// Northeast
left = inWidth - outWidth;
break;
case 6: // Southeast
case 6:
// Southeast
left = inWidth - outWidth;
top = inHeight - outHeight;
case 7: // Southwest
case 7:
// Southwest
top = inHeight - outHeight;
case 8: // Northwest
case 8:
// Northwest
break;
default: // Centre
default:
// Centre
left = (inWidth - outWidth + 1) / 2;
top = (inHeight - outHeight + 1) / 2;
}
return std::make_tuple(left, top);
}
} // namespace sharp
} // namespace sharp