X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=generate_dvd.cpp;h=d5185c2702e6fa88926800ac62c03429d6df6f86;hb=4d4e86ecf74f72c983806f6c63c5de0abe972d32;hp=45e9ca6d8a3f2d35583c88b763f26785baf3a6d1;hpb=fdb477d14a28e89299a66328bd0f4f723098c508;p=videolink.git

diff --git a/generate_dvd.cpp b/generate_dvd.cpp
index 45e9ca6..d5185c2 100644
--- a/generate_dvd.cpp
+++ b/generate_dvd.cpp
@@ -211,11 +211,15 @@ void dvd_generator::generate_menu_vob(unsigned index,
 		}
 	    }
 	}
+	// Pad vertically to even y coordinates since dvdauthor claims
+	// odd values may result in incorrect display.
+	// XXX This may cause overlappping where it wasn't previously
+	// a problem.
 	spumux_file << "      <button"
 	    " x0='" << this_entry.area.left << "'"
-	    " y0='" << this_entry.area.top << "'"
+	    " y0='" << (this_entry.area.top & ~1) << "'"
 	    " x1='" << this_entry.area.right << "'"
-	    " y1='" << this_entry.area.bottom << "'"
+	    " y1='" << ((this_entry.area.bottom + 1) & ~1) << "'"
 	    " left='" << (i == 0 ? button_count : i) << "'"
 	    " right='" << 1 + (i + 1) % button_count << "'"
 	    " up='" << 1 + up_button << "'"
@@ -372,8 +376,9 @@ void dvd_generator::generate(const std::string & output_dir) const
 	const unsigned menu_begin = titleset_num * dvdauthor_anonymous_menus_max;
 	const unsigned menu_end =
 	    have_real_menus
-	    ? std::min((titleset_num + 1) * dvdauthor_anonymous_menus_max,
-		       menus_.size())
+	    ? std::min<unsigned>(
+		(titleset_num + 1) * dvdauthor_anonymous_menus_max,
+		menus_.size())
 	    : menu_begin + 1;
 
 	for (unsigned menu_index = menu_begin;