Merge pull request #1128 from hugovk/noise

Fix ImagingEffectNoise
python-pillow · Mar 9, 2015 · 4566a4d · 4566a4d
2 parents 001772c + 9bd38bf
commit 4566a4d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Tests/test_image.py b/Tests/test_image.py
@@ -168,8 +168,6 @@ def test_effect_mandelbrot_bad_arguments(self):
             ValueError,
             lambda: Image.effect_mandelbrot(size, extent, quality))
 
-    @unittest.skipUnless(sys.platform.startswith('win32'),
-                         "Stalls on Travis CI, passes on Windows")
     def test_effect_noise(self):
         # Arrange
         size = (100, 100)
@@ -180,8 +178,8 @@ def test_effect_noise(self):
 
         # Assert
         self.assertEqual(im.size, (100, 100))
-        self.assertEqual(im.getpixel((0, 0)), 60)
-        self.assertEqual(im.getpixel((0, 1)), 28)
+        self.assertEqual(im.mode, "L")
+        self.assertNotEqual(im.getpixel((0, 0)), im.getpixel((0, 1)))
 
     def test_effect_spread(self):
         # Arrange

diff --git a/libImaging/Effects.c b/libImaging/Effects.c
@@ -98,8 +98,8 @@ ImagingEffectNoise(int xsize, int ysize, float sigma)
                 /* after numerical recipes */
                 double v1, v2, radius, factor;
                 do {
-                    v1 = rand()*(2.0/32767.0) - 1.0;
-                    v2 = rand()*(2.0/32767.0) - 1.0;
+                    v1 = rand()*(2.0/RAND_MAX) - 1.0;
+                    v2 = rand()*(2.0/RAND_MAX) - 1.0;
                     radius= v1*v1 + v2*v2;
                 } while (radius >= 1.0);
                 factor = sqrt(-2.0*log(radius)/radius);