- Solved `ImportError: cannot import name 'convert_dict_qtables' from…

… 'PIL.JpegImagePlugin'` error (#72)

- Avoid clipping when importing RAW files (#86)
- Added Image Resampling tool (#88)
- Updated README.md

README.md

@@ -215,14 +215,8 @@ $ brew install libmagic
 
 ## [3/4] Install dependencies
 
-### Linux
 ```console
-$ pip install -r requirements.txt
-```
-
-### Windows
-```console
-C:\> pip install -r requirements_win.txt
+pip install -r requirements.txt
 ```
 
 ## [4/4] Launch program

gui/noiseprint/post_em.py

@@ -16,7 +16,7 @@
 import numpy as np
 import numpy.linalg as numpyl
 from scipy.ndimage.filters import uniform_filter, maximum_filter
-import skimage.morphology as ski
+import cv2 as cv
 
 from .feat_spam.spam_np_opt import getSpamRes
 from .utility.gaussianMixture import gm
@@ -61,7 +61,8 @@ def getWeights(img, res):
 
  th_White = 253.0 / 256
  rd_White = 3
- sat_mask = ski.binary_opening(img > th_White, ski.disk(rd_White))
+ kernel = cv.getStructuringElement(cv.MORPH_ELLIPSE, (rd_White, rd_White))
+ sat_mask = cv.morphologyEx((img > th_White).astype(np.uint8), cv.MORPH_OPEN, kernel)
  mm = np.logical_or(mm, sat_mask)
  mm = maximum_filter(mm, (win_z, win_z))
  weights = np.logical_not(mm)

gui/noiseprint/utility/utilityRead.py

@@ -10,7 +10,6 @@
 # http:https://www.grip.unina.it/download/LICENSE_OPEN.txt
 #
 
-from PIL.JpegImagePlugin import convert_dict_qtables
 from PIL import Image
 import numpy as np
 

gui/requirements.txt

@@ -8,7 +8,6 @@ pandas==1.5.0
 pyside6==6.4.0.1
 python-magic==0.4.27
 rawpy==0.17.3
-scikit-image==0.22.0
 scikit-learn==1.5.0
 sewar==0.4.5
 tensorflow==2.12.0

gui/sherloq.py

@@ -39,7 +39,7 @@
 from utility import modify_font, load_image
 from wavelets import WaveletWidget
 from ghostmmaps import GhostmapWidget
-from resammpling import ResamplingWidget
+from resampling import ResamplingWidget
 
 class MainWindow(QMainWindow):
  max_recent = 5

gui/utility.py

@@ -201,7 +201,7 @@ def load_image(parent, filename=None):
  ext = os.path.splitext(filename)[1][1:].lower()
  if ext in raw_exts:
  with rawpy.imread(filename) as raw:
- image = cv.cvtColor(raw.postprocess(use_auto_wb=True), cv.COLOR_RGB2BGR)
+ image = cv.cvtColor(raw.postprocess(use_auto_wb=True, auto_bright_thr=0), cv.COLOR_RGB2BGR)
  elif ext == "gif":
  capture = cv.VideoCapture(filename)
  frames = int(capture.get(cv.CAP_PROP_FRAME_COUNT))