Update xdog.py

xdog.py

@@ -12,25 +12,17 @@ def dog(img,size=(0,0),k=1.6,sigma=0.5,gamma=1):
 # Threshold the dog image, with dog(sigma,k) > 0 ? 1(255):0(0)
 def edge_dog(img,sigma=0.5,k=200,gamma=0.98):
 	aux = dog(img,sigma=sigma,k=k,gamma=0.98)
-	for i in range(0,aux.shape[0]):
-		for j in range(0,aux.shape[1]):
-			if(aux[i,j] > 0):
-				aux[i,j] = 255
-			else:
-				aux[i,j] = 0
+	aux[aux>0] = 255
+	aux[aux<=0] = 0
 	return aux
 
 # garygrossi xdog version
 def xdog_garygrossi(img,sigma=0.5,k=200, gamma=0.98,epsilon=0.1,phi=10):
 	aux = dog(img,sigma=sigma,k=k,gamma=gamma)/255
-	for i in range(0,aux.shape[0]):
-		for j in range(0,aux.shape[1]):
-			if(aux[i,j] >= epsilon):
-				aux[i,j] = 1
-			else:
-				ht = np.tanh(phi*(aux[i][j] - epsilon))
-				aux[i][j] = 1 + ht
-	return aux*255
+	aux_copy = aux.copy()
+	aux_copy[aux >= epsilon] = 1
+	aux_copy[aux < epsilon] = 1 + np.tanh(phi*(aux[aux < epsilon] - epsilon))
+	return aux_copy*255
 
 def hatchBlend(image):
 	xdogImage = xdog(image,sigma=1,k=200, gamma=0.5,epsilon=-0.5,phi=10)
@@ -42,13 +34,10 @@ def hatchBlend(image):
 # version of xdog inspired by article
 def xdog(img,sigma=0.5,k=1.6, gamma=1,epsilon=1,phi=1):
 	aux = dog(img,sigma=sigma,k=k,gamma=gamma)/255
-	for i in range(0,aux.shape[0]):
-		for j in range(0,aux.shape[1]):
-			if(aux[i,j] < epsilon):
-				aux[i,j] = 1*255
-			else:
-				aux[i,j] = 255*(1 + np.tanh(phi*(aux[i,j])))
-	return aux
+	aux_copy = aux.copy()
+	aux_copy[aux >= epsilon] = 255*(1 + np.tanh(phi*(aux[aux>=epsilon])))
+	aux_copy[aux < epsilon] = 255
+	return aux_copy
 
 def to_sketch(img_orig, sigma=0.3, k=4.5, gamma=0.95, epsilon=-1, phi=10e15, area_min=2):
     img_cnts = []