Merge branch 'this-n-that' into wxPy-4.0.x

(cherry picked from commit 2e5430d57f)
This commit is contained in:
Robin Dunn
2018-05-07 11:22:08 -07:00
parent e64deef9d2
commit 09de554e1b
6 changed files with 64 additions and 16 deletions

View File

@@ -136,12 +136,21 @@ class image_Tests(wtc.WidgetTestCase):
self.assertTrue(img.IsOk())
data = img.GetDataBuffer()
self.assertTrue(isinstance(data, memoryview))
data[0] = 1
data[1] = 2
data[2] = 3
self.assertEqual(1, img.GetRed(0,0))
self.assertEqual(2, img.GetGreen(0,0))
self.assertEqual(3, img.GetBlue(0,0))
if six.PY2:
data[0] = b'1'
data[1] = b'2'
data[2] = b'3'
self.assertEqual(ord('1'), img.GetRed(0,0))
self.assertEqual(ord('2'), img.GetGreen(0,0))
self.assertEqual(ord('3'), img.GetBlue(0,0))
else:
data[0] = 1
data[1] = 2
data[2] = 3
self.assertEqual(1, img.GetRed(0,0))
self.assertEqual(2, img.GetGreen(0,0))
self.assertEqual(3, img.GetBlue(0,0))
def test_imageGetAlphaDataBuffer(self):
w = h = 10
@@ -150,12 +159,20 @@ class image_Tests(wtc.WidgetTestCase):
self.assertTrue(img.IsOk())
data = img.GetAlphaBuffer()
self.assertTrue(isinstance(data, memoryview))
data[0] = 1
data[1] = 2
data[2] = 3
self.assertEqual(1, img.GetAlpha(0,0))
self.assertEqual(2, img.GetAlpha(1,0))
self.assertEqual(3, img.GetAlpha(2,0))
if six.PY2:
data[0] = b'1'
data[1] = b'2'
data[2] = b'3'
self.assertEqual(ord('1'), img.GetAlpha(0,0))
self.assertEqual(ord('2'), img.GetAlpha(1,0))
self.assertEqual(ord('3'), img.GetAlpha(2,0))
else:
data[0] = 1
data[1] = 2
data[2] = 3
self.assertEqual(1, img.GetAlpha(0,0))
self.assertEqual(2, img.GetAlpha(1,0))
self.assertEqual(3, img.GetAlpha(2,0))
def test_imageSetDataBuffer1(self):