Skip to content

fix reading and writing to non-ascii characters #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix reading and writing to non-ascii characters #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 35 additions & 27 deletions RealESRScaler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,11 @@ def find_by_relative_path(relative_path):
base_path = getattr(sys, '_MEIPASS', os.path.dirname(os.path.abspath(__file__)))
return os.path.join(base_path, relative_path)

def image_read(image_to_prepare, flags=cv2.IMREAD_COLOR):
return cv2.imdecode(np.fromfile(image_to_prepare, dtype=np.uint8), flags)

def adapt_image_to_show(image_to_prepare):
old_image = cv2.imread(image_to_prepare)
old_image = image_read(image_to_prepare)
actual_width = old_image.shape[1]
actual_height = old_image.shape[0]

Expand All @@ -378,15 +381,15 @@ def adapt_image_to_show(image_to_prepare):
resized_image = cv2.resize(old_image,
(new_width, new_height),
interpolation = interpolation_mode)
cv2.imwrite("temp.png", resized_image)
image_write("temp.png", resized_image)
return "temp.png"
else:
new_width = round(old_image.shape[1])
new_height = round(old_image.shape[0])
resized_image = cv2.resize(old_image,
(new_width, new_height),
interpolation = interpolation_mode)
cv2.imwrite("temp.png", resized_image)
image_write("temp.png", resized_image)
return "temp.png"

def prepare_output_filename(img, AI_model, target_file_extension):
Expand Down Expand Up @@ -414,16 +417,21 @@ def read_log_file():

# IMAGE

def image_write(path, image_data):
_, file_extension = os.path.splitext(path)
r, buff = cv2.imencode(file_extension, image_data)
buff.tofile(path)

def resize_image(image_path, resize_factor, target_file_extension):
new_image_path = (os.path.splitext(image_path)[0] + "_resized" + target_file_extension).strip()

old_image = cv2.imread(image_path.strip(), cv2.IMREAD_UNCHANGED)
old_image = image_read(image_path.strip(), cv2.IMREAD_UNCHANGED)
new_width = int(old_image.shape[1] * resize_factor)
new_height = int(old_image.shape[0] * resize_factor)

resized_image = cv2.resize(old_image, (new_width, new_height),
interpolation = interpolation_mode)
cv2.imwrite(new_image_path, resized_image)
image_write(new_image_path, resized_image)

def resize_image_list(image_list, resize_factor, target_file_extension):
files_to_delete = []
Expand Down Expand Up @@ -492,11 +500,11 @@ def video_reconstruction_by_frames(input_video_path, frames_upscaled_list, AI_mo
def resize_frame(image_path, new_width, new_height, target_file_extension):
new_image_path = image_path.replace('.jpg', "" + target_file_extension)

old_image = cv2.imread(image_path.strip(), cv2.IMREAD_UNCHANGED)
old_image = image_read(image_path.strip(), cv2.IMREAD_UNCHANGED)

resized_image = cv2.resize(old_image, (new_width, new_height),
interpolation = interpolation_mode)
cv2.imwrite(new_image_path, resized_image)
image_write(new_image_path, resized_image)

def resize_frame_list(image_list, resize_factor, target_file_extension, cpu_number):
downscaled_images = []
Expand Down Expand Up @@ -1045,7 +1053,7 @@ def prepare_model(AI_model, device, half_precision):

def reverse_split_multiple_frames(list_of_tiles_list, frames_upscaled_list):
for index in range(len(frames_upscaled_list)):
cv2.imwrite(frames_upscaled_list[index], reunion_image(list_of_tiles_list[index]))
image_write(frames_upscaled_list[index], reunion_image(list_of_tiles_list[index]))

def upscale_frame_and_save(frame, model, result_path,
tiles_resolution, device,
Expand All @@ -1054,15 +1062,15 @@ def upscale_frame_and_save(frame, model, result_path,
used_tiles = False
backend = torch.device(torch_directml.device(device))

img_tmp = cv2.imread(frame)
img_tmp = image_read(frame)
image_resolution = max(img_tmp.shape[1], img_tmp.shape[0])
num_tiles = image_resolution/tiles_resolution

if num_tiles <= 1:
with torch.no_grad():
img_adapted = cv2.imread(frame, cv2.IMREAD_UNCHANGED)
img_adapted = image_read(frame, cv2.IMREAD_UNCHANGED)
img_upscaled, _ = enhance(model, img_adapted, backend, half_precision)
cv2.imwrite(result_path, img_upscaled)
image_write(result_path, img_upscaled)
else:
used_tiles = True

Expand All @@ -1073,9 +1081,9 @@ def upscale_frame_and_save(frame, model, result_path,
tiles = img_cutter(frame, num_tiles)
with torch.no_grad():
for tile in tiles:
tile_adapted = cv2.imread(tile.filename, cv2.IMREAD_UNCHANGED)
tile_adapted = image_read(tile.filename, cv2.IMREAD_UNCHANGED)
tile_upscaled, _ = enhance(model, tile_adapted, backend, half_precision)
cv2.imwrite(tile.filename, tile_upscaled)
image_write(tile.filename, tile_upscaled)
tile.image = Image.open(tile.filename)
tile.coords = (tile.coords[0] * 4,
tile.coords[1] * 4)
Expand Down Expand Up @@ -1155,16 +1163,16 @@ def upscale_image_and_save(img, model, result_path,
tiles_resolution,
upscale_factor,
device, half_precision):
img_tmp = cv2.imread(img)
img_tmp = image_read(img)
image_resolution = max(img_tmp.shape[1], img_tmp.shape[0])
num_tiles = image_resolution/tiles_resolution
backend = torch.device(torch_directml.device(device))

if num_tiles <= 1:
with torch.no_grad():
img_adapted = cv2.imread(img, cv2.IMREAD_UNCHANGED)
img_adapted = image_read(img, cv2.IMREAD_UNCHANGED)
img_upscaled, _ = enhance(model, img_adapted, backend, half_precision)
cv2.imwrite(result_path, img_upscaled)
image_write(result_path, img_upscaled)
else:
num_tiles = round(num_tiles)
if (num_tiles % 2) != 0: num_tiles += 1
Expand All @@ -1173,14 +1181,14 @@ def upscale_image_and_save(img, model, result_path,
tiles = img_cutter(img, num_tiles)
with torch.no_grad():
for tile in tiles:
tile_adapted = cv2.imread(tile.filename, cv2.IMREAD_UNCHANGED)
tile_adapted = image_read(tile.filename, cv2.IMREAD_UNCHANGED)
tile_upscaled, _ = enhance(model, tile_adapted, backend, half_precision)
cv2.imwrite(tile.filename, tile_upscaled)
image_write(tile.filename, tile_upscaled)
tile.image = Image.open(tile.filename)
tile.coords = (tile.coords[0] * upscale_factor,
tile.coords[1] * upscale_factor)

cv2.imwrite(result_path, reunion_image(tiles))
image_write(result_path, reunion_image(tiles))

to_delete = []
for tile in tiles: to_delete.append(tile.filename)
Expand Down Expand Up @@ -1512,16 +1520,16 @@ def show_video_in_GUI(video_path):
while(cap.isOpened()):
ret, frame = cap.read()
if ret == False: break
cv2.imwrite(fist_frame, frame)
image_write(fist_frame, frame)
break
cap.release()

resized_image_to_show = adapt_image_to_show(fist_frame)

global image
image = tk.PhotoImage(file = resized_image_to_show)
resized_image_to_show_width = round(cv2.imread(resized_image_to_show).shape[1])
resized_image_to_show_height = round(cv2.imread(resized_image_to_show).shape[0])
resized_image_to_show_width = round(image_read(resized_image_to_show).shape[1])
resized_image_to_show_height = round(image_read(resized_image_to_show).shape[0])
image_x_center = 30 + left_bar_width + drag_drop_width/2 - resized_image_to_show_width/2
image_y_center = drag_drop_height/2 - resized_image_to_show_height/2

Expand Down Expand Up @@ -1598,7 +1606,7 @@ def show_list_images_in_GUI(image_list):
for elem in image_list:
counter_img += 1
if counter_img <= 8:
img = cv2.imread(elem.strip())
img = image_read(elem.strip())
width = round(img.shape[1])
height = round(img.shape[0])
img_name = str(elem.split("/")[-1])
Expand Down Expand Up @@ -1646,8 +1654,8 @@ def show_image_in_GUI(original_image):

global image
image = tk.PhotoImage(file = resized_image_to_show)
resized_image_to_show_width = round(cv2.imread(resized_image_to_show).shape[1])
resized_image_to_show_height = round(cv2.imread(resized_image_to_show).shape[0])
resized_image_to_show_width = round(image_read(resized_image_to_show).shape[1])
resized_image_to_show_height = round(image_read(resized_image_to_show).shape[0])
image_x_center = 30 + left_bar_width + drag_drop_width/2 - resized_image_to_show_width/2
image_y_center = drag_drop_height/2 - resized_image_to_show_height/2

Expand All @@ -1672,8 +1680,8 @@ def show_image_in_GUI(original_image):
height = resized_image_to_show_height)

img_name = str(original_image.split("/")[-1])
width = round(cv2.imread(original_image).shape[1])
height = round(cv2.imread(original_image).shape[0])
width = round(image_read(original_image).shape[1])
height = round(image_read(original_image).shape[0])

image_info_label = ttk.Label(root,
font = bold11,
Expand Down