Read via QImageReader (#650)

* Now read via QImageReader * Remove comment-out unused lines
2020-09-27 03:03:04 +09:00
parent 08db03a36d
commit 058d7a7e80
2 changed files with 17 additions and 7 deletions
@@ -43,8 +43,11 @@ class LabelFile(object):
        #imgFileNameWithoutExt = os.path.splitext(imgFileName)[0]
        # Read from file path because self.imageData might be empty if saving to
        # Pascal format
-        image = QImage()
-        image.load(imagePath)
+        if isinstance(imageData, QImage):
+            image = imageData
+        else:
+            image = QImage()
+            image.load(imagePath)
        imageShape = [image.height(), image.width(),
                      1 if image.isGrayscale() else 3]
        writer = PascalVocWriter(imgFolderName, imgFileName,
@@ -70,8 +73,11 @@ class LabelFile(object):
        #imgFileNameWithoutExt = os.path.splitext(imgFileName)[0]
        # Read from file path because self.imageData might be empty if saving to
        # Pascal format
-        image = QImage()
-        image.load(imagePath)
+        if isinstance(imageData, QImage):
+            image = imageData
+        else:
+            image = QImage()
+            image.load(imagePath)
        imageShape = [image.height(), image.width(),
                      1 if image.isGrayscale() else 3]
        writer = YOLOWriter(imgFolderName, imgFileName,