From 5c5de0152394fd4516a2956ddd63dca0c837bb79 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Thu, 2 Feb 2012 16:56:54 -0800 Subject: [PATCH] STY: Whitespace cleanup freeimage patch. --- skimage/io/_plugins/freeimage_plugin.py | 100 ++++++++++++------------ skimage/io/_plugins/test_freeimage.py | 2 +- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/skimage/io/_plugins/freeimage_plugin.py b/skimage/io/_plugins/freeimage_plugin.py index 7f071595..664b32af 100644 --- a/skimage/io/_plugins/freeimage_plugin.py +++ b/skimage/io/_plugins/freeimage_plugin.py @@ -6,7 +6,7 @@ import os.path from numpy.compat import asbytes def _load_library(libname, libdir): - """Try to load a libray with the base name 'libname' from the + """Try to load a libray with the base name 'libname' from the directory 'libdir', checking for various common shared-lib file extensions. Uses windll to load libaries on windows machines, and cdll to load libraries on other platforms. @@ -14,7 +14,7 @@ def _load_library(libname, libdir): errors is a dict, potentially empty, mapping filenames to the ctypes errors raised trying to load those filenames. Non-extant paths are NOT added to the error dict.""" - + ext = os.path.splitext(libname)[1] if not ext: # Try to load library with platform-specific name, otherwise @@ -27,7 +27,7 @@ def _load_library(libname, libdir): libname_ext.insert(0, '%s.dylib' % libname) else: libname_ext = [libname] - + library = None errors = {} lib_paths = [os.path.join(libdir, ln) for ln in libname_ext] @@ -52,12 +52,12 @@ def load_freeimage(): os.path.join(sys.prefix, 'lib'), os.path.join(sys.prefix, 'DLLs') ] - + if 'HOME' in os.environ: lib_dirs.append(os.path.join(os.environ['HOME'], 'lib')) - + lib_dirs = [ld for ld in lib_dirs if os.path.exists(ld)] - + freeimage = None errors = {} for d in lib_dirs: @@ -81,14 +81,14 @@ def load_freeimage(): raise RuntimeError('FreeImage error: %s' % message) freeimage.FreeImage_SetOutputMessage(error_handler) - + elif errors: # No freeimage library found, but load-errors reported err_txt = ['%s:\n%s'%(pl, err.message) for pl, err in errors.items()] raise OSError('One or more FreeImage libraries were found, but could ' 'not be loaded due to the following errors:\n'+ '\n\n'.join(err_txt)) - + else: # No potential libraries found raise OSError('Could not find a FreeImage library in any of:\n'+ @@ -98,19 +98,19 @@ def load_freeimage(): _FI = load_freeimage() API = { - # All we're doing here is telling ctypes that some of the FreeImage + # All we're doing here is telling ctypes that some of the FreeImage # functions return pointers instead of integers. (On 64-bit systems, # without this information the pointers get truncated and crashes result). # There's no need to list functions that return ints, or the types of the # parameters to these or other functions -- that's fine to do implicitly. - + # Note that the ctypes immediately converts the returned void_p back to a - # python int again! This is really not helpful, because then passing it + # python int again! This is really not helpful, because then passing it # back to another library call will cause truncation-to-32-bits on 64-bit # systems. Thanks, ctypes! So after these calls one must immediately - # re-wrap the int as a c_void_p if it is to be passed back into FreeImage. + # re-wrap the int as a c_void_p if it is to be passed back into FreeImage. 'FreeImage_AllocateT': (ctypes.c_void_p, None), - 'FreeImage_FindFirstMetadata': (ctypes.c_void_p, None), + 'FreeImage_FindFirstMetadata': (ctypes.c_void_p, None), 'FreeImage_GetBits': (ctypes.c_void_p, None), 'FreeImage_GetPalette': (ctypes.c_void_p, None), 'FreeImage_GetTagKey': (ctypes.c_char_p, None), @@ -119,7 +119,7 @@ API = { 'FreeImage_LockPage': (ctypes.c_void_p, None), 'FreeImage_OpenMultiBitmap': (ctypes.c_void_p, None) } - + # Albert's ctypes pattern def register_api(lib,api): for f, (restype, argtypes) in api.items(): @@ -227,15 +227,15 @@ class IO_FLAGS(object): EXR_ZIP = 0x0004 # save with zlib compression, in blocks of 16 scan lines EXR_PIZ = 0x0008 # save with piz-based wavelet compression EXR_PXR24 = 0x0010 # save with lossy 24-bit float compression - EXR_B44 = 0x0020 # save with lossy 44% float compression + EXR_B44 = 0x0020 # save with lossy 44% float compression # - goes to 22% when combined with EXR_LC - EXR_LC = 0x0040 # save images with one luminance and two chroma channels, + EXR_LC = 0x0040 # save images with one luminance and two chroma channels, # rather than as RGB (lossy compression) FAXG3_DEFAULT = 0 GIF_DEFAULT = 0 - GIF_LOAD256 = 1 # Load the image as a 256 color image with ununsed + GIF_LOAD256 = 1 # Load the image as a 256 color image with ununsed # palette entries, if it's 16 or 2 color - GIF_PLAYBACK = 2 # 'Play' the GIF to generate each frame (as 32bpp) + GIF_PLAYBACK = 2 # 'Play' the GIF to generate each frame (as 32bpp) # instead of returning raw frame data when loading HDR_DEFAULT = 0 ICO_DEFAULT = 0 @@ -244,15 +244,15 @@ class IO_FLAGS(object): IFF_DEFAULT = 0 J2K_DEFAULT = 0 # save with a 16:1 rate JP2_DEFAULT = 0 # save with a 16:1 rate - JPEG_DEFAULT = 0 # loading (see JPEG_FAST); + JPEG_DEFAULT = 0 # loading (see JPEG_FAST); # saving (see JPEG_QUALITYGOOD|JPEG_SUBSAMPLING_420) - JPEG_FAST = 0x0001 # load the file as fast as possible, + JPEG_FAST = 0x0001 # load the file as fast as possible, # sacrificing some quality JPEG_ACCURATE = 0x0002 # load the file with the best quality, # sacrificing some speed - JPEG_CMYK = 0x0004 # load separated CMYK "as is" + JPEG_CMYK = 0x0004 # load separated CMYK "as is" # (use | to combine with other load flags) - JPEG_EXIFROTATE = 0x0008 # load and rotate according to + JPEG_EXIFROTATE = 0x0008 # load and rotate according to # Exif 'Orientation' tag if available JPEG_QUALITYSUPERB = 0x80 # save with superb quality (100:1) JPEG_QUALITYGOOD = 0x0100 # save with good quality (75:1) @@ -261,11 +261,11 @@ class IO_FLAGS(object): JPEG_QUALITYBAD = 0x0800 # save with bad quality (10:1) JPEG_PROGRESSIVE = 0x2000 # save as a progressive-JPEG # (use | to combine with other save flags) - JPEG_SUBSAMPLING_411 = 0x1000 # save with high 4x1 chroma - # subsampling (4:1:1) + JPEG_SUBSAMPLING_411 = 0x1000 # save with high 4x1 chroma + # subsampling (4:1:1) JPEG_SUBSAMPLING_420 = 0x4000 # save with medium 2x2 medium chroma # subsampling (4:2:0) - default value - JPEG_SUBSAMPLING_422 = 0x8000 # save with low 2x1 chroma subsampling (4:2:2) + JPEG_SUBSAMPLING_422 = 0x8000 # save with low 2x1 chroma subsampling (4:2:2) JPEG_SUBSAMPLING_444 = 0x10000 # save with no chroma subsampling (4:4:4) JPEG_OPTIMIZE = 0x20000 # on saving, compute optimal Huffman coding tables # (can reduce a few percent of file size) @@ -289,7 +289,7 @@ class IO_FLAGS(object): PNG_Z_BEST_COMPRESSION = 0x0009 # save using ZLib level 9 compression flag # (default value is 6) PNG_Z_NO_COMPRESSION = 0x0100 # save without ZLib compression - PNG_INTERLACED = 0x0200 # save using Adam7 interlacing (use | to combine + PNG_INTERLACED = 0x0200 # save using Adam7 interlacing (use | to combine # with other save flags) PNM_DEFAULT = 0 PNM_SAVE_RAW = 0 # Writer saves in RAW format (i.e. P4, P5 or P6) @@ -299,7 +299,7 @@ class IO_FLAGS(object): PSD_LAB = 2 # reads tags for CIELab (default is conversion to RGB) RAS_DEFAULT = 0 RAW_DEFAULT = 0 # load the file as linear RGB 48-bit - RAW_PREVIEW = 1 # try to load the embedded JPEG preview with included + RAW_PREVIEW = 1 # try to load the embedded JPEG preview with included # Exif Data or default to RGB 24-bit RAW_DISPLAY = 2 # load the file as RGB 24-bit SGI_DEFAULT = 0 @@ -310,7 +310,7 @@ class IO_FLAGS(object): TIFF_CMYK = 0x0001 # reads/stores tags for separated CMYK # (use | to combine with compression flags) TIFF_PACKBITS = 0x0100 # save using PACKBITS compression - TIFF_DEFLATE = 0x0200 # save using DEFLATE (a.k.a. ZLIB) compression + TIFF_DEFLATE = 0x0200 # save using DEFLATE (a.k.a. ZLIB) compression TIFF_ADOBE_DEFLATE = 0x0400 # save using ADOBE DEFLATE compression TIFF_NONE = 0x0800 # save without any compression TIFF_CCITTFAX3 = 0x1000 # save using CCITT Group 3 fax encoding @@ -322,7 +322,7 @@ class IO_FLAGS(object): XBM_DEFAULT = 0 XPM_DEFAULT = 0 - + class METADATA_MODELS(object): FIMD_COMMENTS = 0 FIMD_EXIF_MAIN = 1 @@ -337,26 +337,26 @@ class METADATA_MODELS(object): class METADATA_DATATYPE(object): - FIDT_BYTE = 1 # 8-bit unsigned integer - FIDT_ASCII = 2 # 8-bit bytes w/ last byte null - FIDT_SHORT = 3 # 16-bit unsigned integer - FIDT_LONG = 4 # 32-bit unsigned integer - FIDT_RATIONAL = 5 # 64-bit unsigned fraction - FIDT_SBYTE = 6 # 8-bit signed integer - FIDT_UNDEFINED = 7 # 8-bit untyped data - FIDT_SSHORT = 8 # 16-bit signed integer - FIDT_SLONG = 9 # 32-bit signed integer - FIDT_SRATIONAL = 10 # 64-bit signed fraction - FIDT_FLOAT = 11 # 32-bit IEEE floating point - FIDT_DOUBLE = 12 # 64-bit IEEE floating point - FIDT_IFD = 13 # 32-bit unsigned integer (offset) - FIDT_PALETTE = 14 # 32-bit RGBQUAD + FIDT_BYTE = 1 # 8-bit unsigned integer + FIDT_ASCII = 2 # 8-bit bytes w/ last byte null + FIDT_SHORT = 3 # 16-bit unsigned integer + FIDT_LONG = 4 # 32-bit unsigned integer + FIDT_RATIONAL = 5 # 64-bit unsigned fraction + FIDT_SBYTE = 6 # 8-bit signed integer + FIDT_UNDEFINED = 7 # 8-bit untyped data + FIDT_SSHORT = 8 # 16-bit signed integer + FIDT_SLONG = 9 # 32-bit signed integer + FIDT_SRATIONAL = 10 # 64-bit signed fraction + FIDT_FLOAT = 11 # 32-bit IEEE floating point + FIDT_DOUBLE = 12 # 64-bit IEEE floating point + FIDT_IFD = 13 # 32-bit unsigned integer (offset) + FIDT_PALETTE = 14 # 32-bit RGBQUAD dtypes = { FIDT_BYTE: numpy.uint8, FIDT_SHORT: numpy.uint16, FIDT_LONG: numpy.uint32, - FIDT_RATIONAL: [('numerator', numpy.uint32), + FIDT_RATIONAL: [('numerator', numpy.uint32), ('denominator', numpy.uint32)], FIDT_SBYTE: numpy.int8, FIDT_UNDEFINED: numpy.uint8, @@ -367,7 +367,7 @@ class METADATA_DATATYPE(object): FIDT_FLOAT: numpy.float32, FIDT_DOUBLE: numpy.float64, FIDT_IFD: numpy.uint32, - FIDT_PALETTE: [('R', numpy.uint8), ('G', numpy.uint8), + FIDT_PALETTE: [('R', numpy.uint8), ('G', numpy.uint8), ('B', numpy.uint8), ('A', numpy.uint8)] } @@ -398,7 +398,7 @@ def read(filename, flags=0): def read_metadata(filename): """Return a dict containing all image metadata. - + Returned dict maps (metadata_model, tag_name) keys to tag values, where metadata_model is a string name based on the FreeImage "metadata models" defined in the class METADATA_MODELS. @@ -427,7 +427,7 @@ def _process_multipage(filename, flags, process_func): bitmap = _FI.FreeImage_LockPage(multibitmap, i) bitmap = ctypes.c_void_p(bitmap) if not bitmap: - raise ValueError('Could not open %s as a multi-page image.' + raise ValueError('Could not open %s as a multi-page image.' % filename) try: out.append(process_func(bitmap)) @@ -477,7 +477,7 @@ def _wrap_bitmap_bits_in_array(bitmap, shape, dtype): def _array_from_bitmap(bitmap): """Convert a FreeImage bitmap pointer to a numpy array. - + """ dtype, shape = FI_TYPES.get_type_and_shape(bitmap) array = _wrap_bitmap_bits_in_array(bitmap, shape, dtype) @@ -505,9 +505,9 @@ def _array_from_bitmap(bitmap): def _read_metadata(bitmap): metadata = {} - models = [(name[5:], number) for name, number in + models = [(name[5:], number) for name, number in METADATA_MODELS.__dict__.items() if name.startswith('FIMD_')] - + tag = ctypes.c_void_p() for model_name, number in models: mdhandle = _FI.FreeImage_FindFirstMetadata(number, bitmap, diff --git a/skimage/io/_plugins/test_freeimage.py b/skimage/io/_plugins/test_freeimage.py index d33163ee..8ecf0aa9 100644 --- a/skimage/io/_plugins/test_freeimage.py +++ b/skimage/io/_plugins/test_freeimage.py @@ -22,6 +22,6 @@ def test_metadata(): assert meta[0][('EXIF_MAIN', 'BitsPerSample')] == 8 assert meta[1][('EXIF_MAIN', 'Software')].startswith('ImageMagick') - + if __name__ == "__main__": run_module_suite()