Merge pull request opencv#10537 from pnemonic78:master_false

alalek · alalek · commit ee35263e488f · 2018-01-07T12:53:22.000Z
diff --git a/modules/java/generator/src/java/android+AsyncServiceHelper.java b/modules/java/generator/src/java/android+AsyncServiceHelper.java
@@ -351,7 +351,7 @@ private boolean loadLibrary(String AbsPath)
         {
             Log.d(TAG, "Cannot load library \"" + AbsPath + "\"");
             e.printStackTrace();
-            result &= false;
+            result = false;
         }
 
         return result;
@@ -377,7 +377,7 @@ private boolean initOpenCVLibs(String Path, String Libs)
             {
                 // If the dependencies list is not defined or empty.
                 String AbsLibraryPath = Path + File.separator + "libopencv_java3.so";
-                result &= loadLibrary(AbsLibraryPath);
+                result = loadLibrary(AbsLibraryPath);
             }
 
             return result;
diff --git a/modules/java/generator/src/java/android+StaticHelper.java b/modules/java/generator/src/java/android+StaticHelper.java
@@ -68,7 +68,7 @@ private static boolean loadLibrary(String Name)
         {
             Log.d(TAG, "Cannot load library \"" + Name + "\"");
             e.printStackTrace();
-            result &= false;
+            result = false;
         }
 
         return result;
@@ -92,7 +92,7 @@ private static boolean initOpenCVLibs(String Libs)
         else
         {
             // If dependencies list is not defined or empty.
-            result &= loadLibrary("opencv_java3");
+            result = loadLibrary("opencv_java3");
         }
 
         return result;

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ private boolean loadLibrary(String AbsPath)`
`351`	`351`	`{`
`352`	`352`	`Log.d(TAG, "Cannot load library \"" + AbsPath + "\"");`
`353`	`353`	`e.printStackTrace();`
`354`		`- result &= false;`
	`354`	`+ result = false;`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`return result;`
`@@ -377,7 +377,7 @@ private boolean initOpenCVLibs(String Path, String Libs)`
`377`	`377`	`{`
`378`	`378`	`// If the dependencies list is not defined or empty.`
`379`	`379`	`String AbsLibraryPath = Path + File.separator + "libopencv_java3.so";`
`380`		`- result &= loadLibrary(AbsLibraryPath);`
	`380`	`+ result = loadLibrary(AbsLibraryPath);`
`381`	`381`	`}`
`382`	`382`
`383`	`383`	`return result;`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private static boolean loadLibrary(String Name)`
`68`	`68`	`{`
`69`	`69`	`Log.d(TAG, "Cannot load library \"" + Name + "\"");`
`70`	`70`	`e.printStackTrace();`
`71`		`- result &= false;`
	`71`	`+ result = false;`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`return result;`
`@@ -92,7 +92,7 @@ private static boolean initOpenCVLibs(String Libs)`
`92`	`92`	`else`
`93`	`93`	`{`
`94`	`94`	`// If dependencies list is not defined or empty.`
`95`		`- result &= loadLibrary("opencv_java3");`
	`95`	`+ result = loadLibrary("opencv_java3");`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`return result;`