Commit
49c1f7b234ac5d266515c86e589ea7dd959a1a93
Authored by
tfmoraes
Exists in
master
and in
65 other branches
3d_inter_style, MIPs, brush_pix, canvas_reeng, canvas_text, casmoothing_cython, clean, command-line, cython_threshold, debian_cython, editor_improvements, encoding, ff_mask, ff_mask_improv, ffill_gui, ffill_segmentation, fill_holes_auto, fixes_pre_beta5, floodfill, get_pixel, import_mesh, interactor_style, inv3.0.1, mactoolbar, mactoolbar_bkp, manual_v3.1, mask_boolean_op, mask_boolean_op_bkp, mask_copy, mask_greatest_component, measure, measure_canvas, measure_improvements, measure_placement_test, measure_spacing, orientation, phoenix, region_growing_confidence, remote, remove_local_wxpython, rmatsuda-fix_ref_MTC, rmatsuda-fix_remove_marker_bug, rmatsuda-trigger_bug_fix, rotvol, segmentation_menu, select_part, smoothing_bin, smoothing_bin_pll, surface_area, threshold_history, user_guide_en, usp-navegador, vti, vtk6, watershed, watershed_improvements, watershed_improvements_bkp, watershed_merge, workdir, wwwlgui, wx2.9_mac, wxgtk3, wxgtk3_b5, wxgtk3_bkp, xmartlabs-command-line
FIX: problem with encoding on importing dicom, reported by the user p passant in InVesalius forum
| @@ -1486,6 +1486,8 @@ class Parser(): |
| @@ -1486,6 +1486,8 @@ class Parser(): |
1486
| try: |
1486
| try: |
1487
| data = self.data_image[str(0x0008)][str(0x1030)] |
1487
| data = self.data_image[str(0x0008)][str(0x1030)] |
1488
| if (data): |
1488
| if (data): |
| |
1489
| + if isinstance(data, unicode): |
| |
1490
| + return data |
1489
| encoding = self.GetEncoding() |
1491
| encoding = self.GetEncoding() |
1490
| return data.decode(encoding) |
1492
| return data.decode(encoding) |
1491
| except(KeyError): |
1493
| except(KeyError): |