diff --git a/quicktex/_bindings.cpp b/quicktex/_bindings.cpp index 1852e95..8c8bef5 100644 --- a/quicktex/_bindings.cpp +++ b/quicktex/_bindings.cpp @@ -66,7 +66,7 @@ template <> struct type_caster { return !PyErr_Occurred(); } - static handle cast(Color src, return_value_policy policy, handle parent) { + static handle cast(Color src, return_value_policy, handle) { PyObject *val = PyTuple_New(4); for (int i = 0; i < 4; i++) { diff --git a/quicktex/s3tc/bc1/BC1Encoder.cpp b/quicktex/s3tc/bc1/BC1Encoder.cpp index 698de1b..cf993b0 100644 --- a/quicktex/s3tc/bc1/BC1Encoder.cpp +++ b/quicktex/s3tc/bc1/BC1Encoder.cpp @@ -341,7 +341,7 @@ BC1Block BC1Encoder::EncodeBlock(const ColorBlock<4, 4> &pixels) const { // refine endpoints by searching for nearby colors if (result.error > 0 && _search_rounds > 0) { EndpointSearch(result, pixels); } - WriteBlock(result); + return WriteBlock(result); } // Private methods @@ -451,6 +451,7 @@ BC1Block BC1Encoder::WriteBlock(EncodeResults &result) const { block.SetLowColor(color0); block.SetHighColor(color1); block.PackSelectors(selectors); + return block; } void BC1Encoder::FindEndpointsSingleColor(EncodeResults &result, Color color, bool is_3color) const { diff --git a/tools/CompilerWarnings.cmake b/tools/CompilerWarnings.cmake index 0ca02cb..e43d50a 100644 --- a/tools/CompilerWarnings.cmake +++ b/tools/CompilerWarnings.cmake @@ -53,8 +53,13 @@ function(set_project_warnings project_name) -Woverloaded-virtual # warn if you overload (not override) a virtual # function -Wpedantic # warn if non-standard C++ is used - -Wconversion # warn on type conversions that may lose data + #-Wconversion # warn on type conversions that may lose data #-Wsign-conversion # warn on sign conversions + -Wstring-conversion + -Wshorten-64-to-32 + -Wenum-conversion + -Wbitfield-enum-conversion + -Wnull-conversion -Wnull-dereference # warn if a null dereference is detected -Wdouble-promotion # warn if float is implicit promoted to double -Wformat=2 # warn on security issues around functions that format output