diff python/cvutils.py @ 959:4f32d82ca390

corrected error due to change in Hog (scikit image)
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Thu, 24 Aug 2017 17:22:24 -0400
parents 747a5c68bd3c
children 373e8ef6ee25
line wrap: on
line diff
--- a/python/cvutils.py	Fri Aug 18 18:00:11 2017 -0400
+++ b/python/cvutils.py	Thu Aug 24 17:22:24 2017 -0400
@@ -605,10 +605,10 @@
     from skimage.feature import hog
     from skimage import color, transform
     
-    def HOG(image, rescaleSize = (64, 64), orientations=9, pixelsPerCell=(8,8), cellsPerBlock=(2,2), blockNorm='L1', visualize=False, normalize=False):
+    def HOG(image, rescaleSize = (64, 64), orientations = 9, pixelsPerCell = (8,8), cellsPerBlock = (2,2), blockNorm = 'L1', visualize = False, transformSqrt = False):
         bwImg = color.rgb2gray(image)
         inputImg = transform.resize(bwImg, rescaleSize)
-        features = hog(inputImg, orientations, pixelsPerCell, cellsPerBlock, blockNorm, visualize, normalize, True)
+        features = hog(inputImg, orientations, pixelsPerCell, cellsPerBlock, blockNorm, visualize, transformSqrt, True)
         if visualize:
             from matplotlib.pyplot import imshow, figure, subplot
             hogViz = features[1]
@@ -620,11 +620,11 @@
             imshow(hogViz)
         return float32(features)
 
-    def createHOGTrainingSet(imageDirectory, classLabel, rescaleSize = (64,64), orientations=9, pixelsPerCell=(8,8), blockNorm='L1', cellsPerBlock=(2, 2), visualize=False, normalize=False):
+    def createHOGTrainingSet(imageDirectory, classLabel, rescaleSize = (64,64), orientations = 9, pixelsPerCell = (8,8), blockNorm = 'L1', cellsPerBlock = (2, 2), visualize = False, transformSqrt = False):
         inputData = []
         for filename in listdir(imageDirectory):
             img = imread(imageDirectory+filename)
-            features = HOG(img, rescaleSize, orientations, pixelsPerCell, cellsPerBlock, blockNorm, visualize, normalize)
+            features = HOG(img, rescaleSize, orientations, pixelsPerCell, cellsPerBlock, blockNorm, visualize, transformSqrt)
             inputData.append(features)
 
         nImages = len(inputData)