wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-30 12:31:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #154 from cgohlke/patch-3

Browse Source 
Fix test_freeimage.test_metadata error on Python 3
This commit is contained in:
tonysyu
2012-02-26 07:30:39 -08:00
parent 7c8c661440 161e42e053
commit 2f9a7bd78a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/io/_plugins/freeimage_plugin.py
+3 -3
View File
@@ -3,7 +3,7 @@ import numpy
import sys
import os
import os.path
from numpy.compat import asbytes
from numpy.compat import asbytes, asstr
def _generate_candidate_libs():
@@ -505,13 +505,13 @@ def _read_metadata(bitmap):
if mdhandle:
more = True
while more:
tag_name = str(_FI.FreeImage_GetTagKey(tag))
tag_name = asstr(_FI.FreeImage_GetTagKey(tag))
tag_type = _FI.FreeImage_GetTagType(tag)
byte_size = _FI.FreeImage_GetTagLength(tag)
char_ptr = ctypes.c_char * byte_size
tag_str = char_ptr.from_address(_FI.FreeImage_GetTagValue(tag))
if tag_type == METADATA_DATATYPE.FIDT_ASCII:
tag_val = str(tag_str.value)
tag_val = asstr(tag_str.value)
else:
tag_val = numpy.fromstring(tag_str,
dtype=METADATA_DATATYPE.dtypes[tag_type])