From: Carl Hetherington <cth@carlh.net>
Date: Sat, 30 Dec 2017 00:20:10 +0000 (+0000)
Subject: Make horizontal_factor look the same as vertical_factor.
X-Git-Tag: v2.11.31~4
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=e8d3e8b4057149b602029ec9a588ccb81a908d5c

Make horizontal_factor look the same as vertical_factor.
---

diff --git a/src/lib/image.cc b/src/lib/image.cc
index da1bb86ee..92c1ab9a2 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -68,15 +68,16 @@ Image::vertical_factor (int n) const
 int
 Image::horizontal_factor (int n) const
 {
-	int horizontal_factor = 1;
-	if (n > 0) {
-		AVPixFmtDescriptor const * d = av_pix_fmt_desc_get (_pixel_format);
-		if (!d) {
-			throw PixelFormatError ("sample_size()", _pixel_format);
-		}
-		horizontal_factor = pow (2.0f, d->log2_chroma_w);
+	if (n == 0) {
+		return 1;
+	}
+
+	AVPixFmtDescriptor const * d = av_pix_fmt_desc_get(_pixel_format);
+	if (!d) {
+		throw PixelFormatError ("sample_size()", _pixel_format);
 	}
-	return horizontal_factor;
+
+	return pow (2.0f, d->log2_chroma_w);
 }
 
 /** @param n Component index.