Rename guess_crop -> guess_crop_by_brightness.

4 files changed, 10 insertions, 10 deletions

diff --git a/src/lib/guess_crop.cc b/src/lib/guess_crop.cc
index 5eb7e66e8..14ef9a9ed 100644
--- a/src/lib/guess_crop.cc
+++ b/src/lib/guess_crop.cc
@@ -32,7 +32,7 @@ using namespace dcpomatic;
 
 
 Crop
-guess_crop (shared_ptr<const Image> image, double threshold)
+guess_crop_by_brightness(shared_ptr<const Image> image, double threshold)
 {
 	auto const width = image->size().width;
 	auto const height = image->size().height;
@@ -73,7 +73,7 @@ guess_crop (shared_ptr<const Image> image, double threshold)
 			break;
 		}
 		default:
-			throw PixelFormatError("guess_crop()", image->pixel_format());
+			throw PixelFormatError("guess_crop_by_brightness()", image->pixel_format());
 		}
 
 		return brightest > threshold;
@@ -115,7 +115,7 @@ guess_crop (shared_ptr<const Image> image, double threshold)
 
 /** @param position Time within the content to get a video frame from when guessing the crop */
 Crop
-guess_crop (shared_ptr<const Film> film, shared_ptr<const Content> content, double threshold, ContentTime position)
+guess_crop_by_brightness(shared_ptr<const Film> film, shared_ptr<const Content> content, double threshold, ContentTime position)
 {
 	DCPOMATIC_ASSERT (content->video);
 
@@ -126,7 +126,7 @@ guess_crop (shared_ptr<const Film> film, shared_ptr<const Content> content, doub
 	auto crop = Crop{};
 
 	auto handle_video = [&done, &crop, threshold](ContentVideo video) {
-		crop = guess_crop(video.image->image(Image::Alignment::COMPACT).image, threshold);
+		crop = guess_crop_by_brightness(video.image->image(Image::Alignment::COMPACT).image, threshold);
 		done = true;
 	};
 
diff --git a/src/lib/guess_crop.h b/src/lib/guess_crop.h
index f18c2db5e..9585ed92a 100644
--- a/src/lib/guess_crop.h
+++ b/src/lib/guess_crop.h
@@ -29,6 +29,6 @@ class Film;
 class Image;
 
 
-Crop guess_crop (std::shared_ptr<const Image> image, double threshold);
-Crop guess_crop (std::shared_ptr<const Film> fillm, std::shared_ptr<const Content> content, double threshold, dcpomatic::ContentTime position);
+Crop guess_crop_by_brightness(std::shared_ptr<const Image> image, double threshold);
+Crop guess_crop_by_brightness(std::shared_ptr<const Film> fillm, std::shared_ptr<const Content> content, double threshold, dcpomatic::ContentTime position);
 
diff --git a/src/wx/content_menu.cc b/src/wx/content_menu.cc
index ef4e87a80..30abe7416 100644
--- a/src/wx/content_menu.cc
+++ b/src/wx/content_menu.cc
@@ -562,7 +562,7 @@ ContentMenu::auto_crop ()
 		auto position = _viewer.position_in_content(_content.front()).get_value_or(
 			ContentTime::from_frames(_content.front()->video->length(), _content.front()->video_frame_rate().get_value_or(24))
 			);
-		return guess_crop(film, _content.front(), Config::instance()->auto_crop_threshold(), position);
+		return guess_crop_by_brightness(film, _content.front(), Config::instance()->auto_crop_threshold(), position);
 	};
 
 	/* Make an initial guess in the view and open the dialog */
diff --git a/test/guess_crop_test.cc b/test/guess_crop_test.cc
index c58432382..b62042d1a 100644
--- a/test/guess_crop_test.cc
+++ b/test/guess_crop_test.cc
@@ -37,7 +37,7 @@ BOOST_AUTO_TEST_CASE (guess_crop_image_test1)
 	auto content = content_factory(TestPaths::private_data() / "arrietty_724.tiff");
 	auto film = new_test_film("guess_crop_image_test1", content);
 
-	BOOST_CHECK (guess_crop(film, content[0], 0.1, {}) == Crop(0, 0, 11, 11));
+	BOOST_CHECK(guess_crop_by_brightness(film, content[0], 0.1, {}) == Crop(0, 0, 11, 11));
 }
 
 
@@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE (guess_crop_image_test2)
 	auto content = content_factory(TestPaths::private_data() / "prophet_frame.tiff");
 	auto film = new_test_film("guess_crop_image_test2", content);
 
-	BOOST_CHECK(guess_crop(film, content[0], 0.1, {}) == Crop(0, 0, 22, 22));
+	BOOST_CHECK(guess_crop_by_brightness(film, content[0], 0.1, {}) == Crop(0, 0, 22, 22));
 }
 
 
@@ -55,5 +55,5 @@ BOOST_AUTO_TEST_CASE (guess_crop_image_test3)
 	auto content = content_factory(TestPaths::private_data() / "pillarbox.png");
 	auto film = new_test_film("guess_crop_image_test3", content);
 
-	BOOST_CHECK(guess_crop(film, content[0], 0.1, {}) == Crop(113, 262, 0, 0));
+	BOOST_CHECK(guess_crop_by_brightness(film, content[0], 0.1, {}) == Crop(113, 262, 0, 0));
 }