Cherry-pie topping: lint + resolve missed conflict

google · Dec 3, 2024 · 8c3e80e · 8c3e80e
1 parent 835e3ac
commit 8c3e80e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/.github/workflows/build_test_cross.yml b/.github/workflows/build_test_cross.yml
@@ -235,11 +235,7 @@ jobs:
 
     steps:
     - name: Harden Runner
-<<<<<<< HEAD
-      uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
-=======
       uses: step-security/harden-runner@f086349bfa2bd1361f7909c78558e816508cdc10 # v2.8.0
->>>>>>> d49cb87f (Bump step-security/harden-runner from 2.7.1 to 2.8.0 (#3608))
       with:
         egress-policy: audit
 

diff --git a/lib/extras/test_memory_manager.cc b/lib/extras/test_memory_manager.cc
@@ -5,10 +5,10 @@
 
 #include "lib/extras/test_memory_manager.h"
 
-#include "lib/base/memory_manager.h"
-
 #include <cstdlib>
 
+#include "lib/base/memory_manager.h"
+
 namespace jxl {
 namespace test {
 

diff --git a/lib/jpegli/adaptive_quantization.cc b/lib/jpegli/adaptive_quantization.cc
@@ -280,8 +280,8 @@ V GammaModulation(const D d, const size_t x, const size_t y,
   // ideally -1.0, but likely optimal correction adds some entropy, so slightly
   // less than that.
   // ln(2) constant folded in because we want std::log but have FastLog2f.
-  const auto kGam = Set(d, -0.15526878023684174f * 0.693147180559945f);
-  return MulAdd(kGam, FastLog2f(d, overall_ratio), out_val);
+  const auto kGamma = Set(d, -0.15526878023684174f * 0.693147180559945f);
+  return MulAdd(kGamma, FastLog2f(d, overall_ratio), out_val);
 }
 
 // Change precision in 8x8 blocks that have high frequency content.

diff --git a/tools/benchmark/benchmark_codec.h b/tools/benchmark/benchmark_codec.h
@@ -12,8 +12,8 @@
 #include <vector>
 
 #include "lib/base/data_parallel.h"
-#include "lib/base/span.h"
 #include "lib/base/memory_manager.h"
+#include "lib/base/span.h"
 #include "lib/base/status.h"
 #include "lib/extras/image.h"
 #include "lib/extras/packed_image.h"

diff --git a/tools/gauss_blur_test.cc b/tools/gauss_blur_test.cc
@@ -15,8 +15,8 @@
 #include "lib/base/random.h"
 #include "lib/base/testing.h"
 #include "lib/extras/image_ops.h"
-#include "lib/extras/test_utils.h"
 #include "lib/extras/test_memory_manager.h"
+#include "lib/extras/test_utils.h"
 
 namespace jxl {