mirror
/
sane-project-frontends
kopia lustrzana https://gitlab.com/sane-project/frontends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix segfault resize preview

merge-requests/14/head
Ordissimo 2023-02-13 21:57:46 +01:00
rodzic 52a56b6a5b
commit 504dcc8c7f
1 zmienionych plików z 6 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
src/preview.c
Wyświetl plik

@ -297,9 +297,13 @@ paint_image (Preview * p)
if (p->preview_row == NULL) if (p->preview_row == NULL)
p->preview_row = malloc (3 * gwidth); p->preview_row = malloc (3 * gwidth);
else
p->preview_row = realloc (p->preview_row, 3 * gwidth);
memset (p->preview_row, 0xff, 3 * gwidth); memset (p->preview_row, 0xff, 3 * gwidth);
if (p->preview_data == NULL) if (p->preview_data == NULL)
p->preview_data = malloc (3 * gwidth * gheight); p->preview_data = malloc (3 * gwidth * gheight);
else
p->preview_data = realloc (p->preview_data, 3 * gwidth * gheight);
memset (p->preview_data, 0xff, 3 * gwidth * gheight); memset (p->preview_data, 0xff, 3 * gwidth * gheight);
gtk_widget_queue_draw (p->window); gtk_widget_queue_draw (p->window);
@ -336,8 +340,8 @@ paint_image (Preview * p)
memcpy(p->preview_data + (size_t) dst_y * (size_t) gwidth * 3, p->preview_row, (size_t) gwidth * 3); memcpy(p->preview_data + (size_t) dst_y * (size_t) gwidth * 3, p->preview_row, (size_t) gwidth * 3);
src_x = 0.0; src_x = 0.0;
src_y += yscale; src_y += yscale;
gtk_widget_queue_draw (p->window);
} }
gtk_widget_queue_draw (p->window);
} }
static void static void
@ -456,7 +460,7 @@ preview_area_resize (GtkWidget * widget, GdkEventConfigure *event, gpointer data
update_selection (p); update_selection (p);
paint_image (p); paint_image (p);
gtk_widget_queue_draw (p->window); //gtk_widget_queue_draw (p->window);
} }
static void static void