OpenCV Manager crashes with exception (Bug #2660)
String checking and range cheching added.
This commit is contained in:
parent
014a500f79
commit
064bf167ad
@ -402,10 +402,16 @@ public class ManagerActivity extends Activity
|
|||||||
|
|
||||||
protected String NormalizeVersion(String OpenCVersion, String PackageVersion)
|
protected String NormalizeVersion(String OpenCVersion, String PackageVersion)
|
||||||
{
|
{
|
||||||
|
if (OpenCVersion == null || PackageVersion == null)
|
||||||
|
return "unknown";
|
||||||
|
|
||||||
int dot = PackageVersion.indexOf(".");
|
int dot = PackageVersion.indexOf(".");
|
||||||
return OpenCVersion.substring(0, OpenCVersion.length()-1) + "." +
|
if (dot == -1 || OpenCVersion.length() == 0)
|
||||||
OpenCVersion.toCharArray()[OpenCVersion.length()-1] + "." +
|
return "unknown";
|
||||||
PackageVersion.substring(0, dot) + " rev " + PackageVersion.substring(dot+1);
|
else
|
||||||
|
return OpenCVersion.substring(0, OpenCVersion.length()-1) + "." +
|
||||||
|
OpenCVersion.toCharArray()[OpenCVersion.length()-1] + "." +
|
||||||
|
PackageVersion.substring(0, dot) + " rev " + PackageVersion.substring(dot+1);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected String ConvertPackageName(String Name, String Version)
|
protected String ConvertPackageName(String Name, String Version)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user