Bug fix for #252, wrong Npix for PIL TIF importer; also make sure Imax is int for images with bool values

Author: briantoby

GSASII/GSASIIdataGUI.py

@@ -3736,8 +3736,8 @@ def OnImageSum(self,event):
                             newimagefile = dlg.GetPath()
                             newimagefile = G2IO.FileDlgFixExt(dlg,newimagefile)
                             G2IO.PutG2Image(newimagefile,Comments,Data,Npix,newImage)
-                            Imax = np.amax(newImage)
-                            Imin = np.amin(newImage)
+                            Imax = int(np.amax(newImage))
+                            Imin = int(np.amin(newImage))
                             newImage = []
                             self.GPXtree.SetItemPyData(Id,[imSize,newimagefile])
                             self.GPXtree.SetItemPyData(self.GPXtree.AppendItem(Id,text='Comments'),Comments)

GSASII/GSASIImiscGUI.py

@@ -266,7 +266,7 @@ def LoadImage2Tree(imagefile,G2frame,Comments,Data,Npix,Image):
     TreeName = G2obj.MakeUniqueLabel(TreeLbl,ImgNames)
     Id = G2frame.GPXtree.AppendItem(parent=G2frame.root,text=TreeName)
     G2frame.GPXtree.SetItemPyData(G2frame.GPXtree.AppendItem(Id,text='Comments'),Comments)
-    Imax = np.amax(Image)
+    Imax = int(np.amax(Image))
     if G2frame.imageDefault:
         Data.update(copy.deepcopy(G2frame.imageDefault))
         Data['showLines'] = True

GSASII/imports/G2img_PILTIF.py

@@ -63,7 +63,7 @@ def Reader(self,filename, ParentFrame=None, **unused):
         '''
         import PIL.Image as PI
         self.Image = PI.open(filename,mode='r')
-        self.Npix = self.Image.size
+        self.Npix = self.Image.width*self.Image.height
         if ParentFrame:
             self.SciPy = True
             self.Comments = ['no metadata']