use parens instead of brackets

2003-05-05 06:21:01 +00:00
parent d2f11ba37f
commit 3c6f768fd7
1 changed files with 5 additions and 4 deletions
@@ -108,11 +108,12 @@ int PixFmtMaskNo(GLenum fmt)
 static void GetResolutionFromFileName( CString sPath, int &Width, int &Height )
 {
 	/* Match:
-	 *  Foo [res 512x128].png
-	 * 
-	 * This leaves us room syntactically to do other things later, if we need to.
+	 *  Foo (res 512x128).png
+	 * Also allow, eg:
+	 *  Foo (dither, res 512x128).png
+	 *
 	 * Be careful that this doesn't get mixed up with frame dimensions. */
-	Regex re("\\[res ([0-9]+)x([0-9]+)\\]");
+	Regex re("\\([^\\)]*res ([0-9]+)x([0-9]+).*\\)");

 	vector<CString> matches;
 	if(!re.Compare(sPath, matches))