Merge pull request BVLC#21 from lionleaf/camera-casting-fix

Compatibility fixes for newer numpy version
mindcont · Feb 22, 2016 · c64939f · c64939f
2 parents ae8e7d4 + 79c686b
commit c64939f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core.py b/core.py
@@ -526,8 +526,8 @@ def display_frame(self, frame):
         self.panes['input'].data[:] = frame_disp
 
     def draw_help(self):
-        self.help_buffer[:] *= .7
-        self.help_pane.data *= .7
+        self.help_buffer[:] = self.help_buffer[:] * .7
+        self.help_pane.data[:] = self.help_pane.data[:] * .7
 
         #pane.data[:] = to_255(self.settings.window_background)
         defaults = {'face': getattr(cv2, self.settings.caffevis_help_face),

diff --git a/image_misc.py b/image_misc.py
@@ -58,7 +58,7 @@ def read_cam_frame(cap, saveto = None):
     frame = cv2_read_cap_rgb(cap, saveto = saveto)
     frame = frame[:,::-1,:]  # flip L-R for display
     frame -= frame.min()
-    frame *= (255.0 / (frame.max() + 1e-6))
+    frame = frame * (255.0 / (frame.max() + 1e-6))
     return frame
 
 def crop_to_square(frame):