DrTrigon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/114467
Change subject: bugfix; deactivate (for now) pyexiv2 parts since the cause
segfaults
......................................................................
bugfix; deactivate (for now) pyexiv2 parts since the cause segfaults
Change-Id: I41dd3ae87293224caea92e62532097448fab1030
---
M catimages.py
1 file changed, 26 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat
refs/changes/67/114467/1
diff --git a/catimages.py b/catimages.py
index a488011..e95bd8a 100644
--- a/catimages.py
+++ b/catimages.py
@@ -305,20 +305,23 @@
return self._buffer_EXIF
res = {}
- enable_recovery() # enable recovery from hard crash
+ enable_recovery('exif') # enable recovery from hard crash
try:
if hasattr(pyexiv2, 'ImageMetadata'):
- metadata = pyexiv2.ImageMetadata(self.file_name)
- metadata.read()
-
- for key in metadata.exif_keys:
- res[key] = metadata[key]
-
- for key in metadata.iptc_keys:
- res[key] = metadata[key]
-
- for key in metadata.xmp_keys:
- res[key] = metadata[key]
+# TODO: find solution to avoid segfaults (error/exit code 139)
+# file pyexiv2 bug report
+# metadata = pyexiv2.ImageMetadata(self.file_name)
+# metadata.read()
+#
+# for key in metadata.exif_keys:
+# res[key] = metadata[key]
+#
+# for key in metadata.iptc_keys:
+# res[key] = metadata[key]
+#
+# for key in metadata.xmp_keys:
+# res[key] = metadata[key]
+ pass
else:
image = pyexiv2.Image(self.file_name)
image.readMetadata()
@@ -335,7 +338,7 @@
pass
except RuntimeError:
pass
- disable_recovery() # disable since everything worked out fine
+ disable_recovery() # disable since everything worked out fine
# http://www.sno.phy.queensu.ca/~phil/exiftool/
@@ -1043,9 +1046,9 @@
# groupThreshold (set groupThreshold to 0 to turn off the grouping
completely).
# detectMultiScale(img, hit_threshold=0, win_stride=Size(),
# padding=Size(), scale0=1.05, group_threshold=2)
- enable_recovery() # enable recovery from hard crash
+ enable_recovery('hog') # enable recovery from hard crash
ret = hog.detectMultiScale(img, 0.25, (8,8), (32,32), 1.05, 2)
- disable_recovery() # disable since everything worked out fine
+ disable_recovery() # disable since everything worked out fine
if cv2.__version__ == '$Rev: 4557 $': # TS
found = ret
else: #'2.4.5' or else (e.g. on fedora 18)
@@ -1545,10 +1548,10 @@
# sys.stdout handeled, but with freopen which could give issues
import jseg
# e.g. "segdist -i test3.jpg -t 6 -r9 test3.map.gif"
- enable_recovery() # enable recovery from hard crash
+ enable_recovery('jseg') # enable recovery from hard crash
jseg.segdist_cpp.main([item.encode('utf-8') for item in
("segdist -i %s -t 6 -r9 %s"%(tmpjpg,
tmpgif)).split(" ")])
- disable_recovery() # disable since everything worked out fine
+ disable_recovery() # disable since everything worked out fine
#out = open((tmpgif + ".stdout"), "r").read() # reading stdout
#print out
os.remove(tmpgif + ".stdout")
@@ -1780,9 +1783,9 @@
int(img.size[1] / scale)))
img = smallImg
- enable_recovery() # enable recovery from hard crash
+ enable_recovery('dmtx') # enable recovery from hard crash
#res = dm_read.decode(img.size[0], img.size[1], buffer(img.tostring()))
- disable_recovery() # disable since everything worked out fine
+ disable_recovery() # disable since everything worked out fine
#print res
result = []
@@ -2642,9 +2645,9 @@
#proc = Popen("pdftotext -layout %s %s" % (self.image_path,
self.image_path+'.txt'),
proc = Popen("pdftotext %s %s" % (self.image_path,
self.image_path+'.txt'),
shell=True, stderr=PIPE)#.stderr.readlines()
- enable_recovery() # enable recovery from hard crash
+ enable_recovery('pdftotext') # enable recovery from hard crash
proc.wait()
- disable_recovery() # disable since everything worked out fine
+ disable_recovery() # disable since everything worked out
fine
if proc.returncode:
raise ImportError("pdftotext not found!")
data = open(self.image_path+'.txt', 'r').readlines()
@@ -4560,9 +4563,9 @@
# for functions in C/C++ that might crash hard without any exception throwed
# e.g. an abort due to an assert or something else
-def enable_recovery():
+def enable_recovery(note=''):
recoveryfile = open(os.path.join(scriptdir, 'cache/catimages_recovery'),
"w")
- recoveryfile.write('')
+ recoveryfile.write(note)
recoveryfile.close()
--
To view, visit https://gerrit.wikimedia.org/r/114467
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I41dd3ae87293224caea92e62532097448fab1030
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: DrTrigon <dr.tri...@surfeu.ch>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
