Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed error in KeyError. Thanks Helge privat

Browse Source 
svn: r17876
This commit is contained in:
Rob G. Healey 2011-07-01 01:59:47 +00:00
parent ce076e98c7
commit f57c89c3c0
1 changed files with 20 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/gramplet/EditExifMetadata.py
View File

@ -39,7 +39,10 @@ from decimal import Decimal, getcontext
getcontext().prec = 4
from fractions import Fraction
from PIL import Image
try:
from PIL import Image
except ImportError:
from python.PIL import Image
# ------------------------------------------------------------------------
# GTK modules
@ -529,7 +532,6 @@ class EditExifMetadata(Gramplet):
"""
# Convert and delete original file...
if EXIV2_FOUND_:
OptionDialog(_("Edit Image Exif Metadata"), _("WARNING: You are "
"about to convert this image into an .tiff image. Tiff "
"images are the industry standard for lossless compression.\n\n"
@ -1159,15 +1161,13 @@ class EditExifMetadata(Gramplet):
if not mediadatatags_:
return
if EXIV2_FOUND_:
try:
erase = subprocess.check_call( [EXIV2_FOUND_, "delete", self.image_path] )
erase_results = str(erase)
except subprocess.CalledProcessError:
erase_results = False
else:
if mediadatatags_:
if not erase_results:
for keytag_ in mediadatatags_:
del self.plugin_image[keytag_]
erase_results = True
@ -1189,27 +1189,6 @@ class EditExifMetadata(Gramplet):
self.exif_widgets["Message:Area"].set_text(_("There was an error "
"in stripping the Exif metadata from this image..."))
def __reinitialize_jpeg(self):
"""
*** -purejpg -- Delete all JPEG sections that aren't necessary for
rendering the image. Strips any metadata that various applications
may have left in the image...
"""
# re- initialize the image...
try:
reinit = subprocess.check_call( ["jhead", "-purejpg", self.image_path] )
reinit_results = str(reinit)
except subprocess.CalledProcessError:
reinit_results = False
if reinit_results:
self.exif_widgets["Message:Area"].set_text(_("Image has "
"been re- initialized for Exif metadata..."))
else:
self.exif_widgets["Message:Area"].set_text(_("There was an error "
"in re- initializing your jpeg Exif metadata..."))
def select_date(self, object):
"""
will allow you to choose a date from the calendar widget