callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't scale images that are small enough to fit. Avoid using incompatibly

Browse Source 
2004-03-02  Morten Welinder  <terra@gnome.org>

	* tests/testfilechooser.c (size_prepared_cb): Don't scale images
	that are small enough to fit.  Avoid using incompatibly typed data
	pointer.
This commit is contained in:
Morten Welinder
2004-03-02 17:03:04 +00:00
committed by Morten Welinder
parent c0b55fe0d8
commit e4cec76b6d
6 changed files with 35 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2004-03-02 Morten Welinder <terra@gnome.org>
* tests/testfilechooser.c (size_prepared_cb): Don't scale images
that are small enough to fit. Avoid using incompatibly typed data
pointer.
* gtk/gtkfilechooserdefault.c
(gtk_file_chooser_default_get_resizable_hints): Test the
resize_horizontally pointer, not the deferenced pointer.

4
ChangeLog.pre-2-10
View File

@ -1,5 +1,9 @@
2004-03-02 Morten Welinder <terra@gnome.org>
* tests/testfilechooser.c (size_prepared_cb): Don't scale images
that are small enough to fit. Avoid using incompatibly typed data
pointer.
* gtk/gtkfilechooserdefault.c
(gtk_file_chooser_default_get_resizable_hints): Test the
resize_horizontally pointer, not the deferenced pointer.

4
ChangeLog.pre-2-4
View File

@ -1,5 +1,9 @@
2004-03-02 Morten Welinder <terra@gnome.org>
* tests/testfilechooser.c (size_prepared_cb): Don't scale images
that are small enough to fit. Avoid using incompatibly typed data
pointer.
* gtk/gtkfilechooserdefault.c
(gtk_file_chooser_default_get_resizable_hints): Test the
resize_horizontally pointer, not the deferenced pointer.

4
ChangeLog.pre-2-6
View File

@ -1,5 +1,9 @@
2004-03-02 Morten Welinder <terra@gnome.org>
* tests/testfilechooser.c (size_prepared_cb): Don't scale images
that are small enough to fit. Avoid using incompatibly typed data
pointer.
* gtk/gtkfilechooserdefault.c
(gtk_file_chooser_default_get_resizable_hints): Test the
resize_horizontally pointer, not the deferenced pointer.

4
ChangeLog.pre-2-8
View File

@ -1,5 +1,9 @@
2004-03-02 Morten Welinder <terra@gnome.org>
* tests/testfilechooser.c (size_prepared_cb): Don't scale images
that are small enough to fit. Avoid using incompatibly typed data
pointer.
* gtk/gtkfilechooserdefault.c
(gtk_file_chooser_default_get_resizable_hints): Test the
resize_horizontally pointer, not the deferenced pointer.

34
tests/testfilechooser.c
View File

@ -82,7 +82,7 @@ response_cb (GtkDialog *dialog,
}
else
g_print ("Dialog was closed\n");
gtk_main_quit ();
}
@ -138,20 +138,19 @@ static void
size_prepared_cb (GdkPixbufLoader *loader,
int width,
int height,
gpointer data)
int *data)
{
struct {
int width;
int height;
} *info = data;
int des_width = data[0];
int des_height = data[1];
if ((double)height * (double)info->width >
(double)width * (double)info->height) {
width = 0.5 + (double)width * (double)info->height / (double)height;
height = info->height;
if (des_height >= height && des_width >= width) {
/* Nothing */
} else if ((double)height * des_width > (double)width * des_height) {
width = 0.5 + (double)width * des_height / (double)height;
height = des_height;
} else {
height = 0.5 + (double)height * (double)info->width / (double)width;
width = info->width;
height = 0.5 + (double)height * des_width / (double)width;
width = des_width;
}
gdk_pixbuf_loader_set_size (loader, width, height);
@ -165,10 +164,7 @@ my_new_from_file_at_size (const char *filename,
{
GdkPixbufLoader *loader;
GdkPixbuf *pixbuf;
struct {
int width;
int height;
} info;
int info[2];
struct stat st;
guchar buffer [4096];
@ -204,9 +200,9 @@ my_new_from_file_at_size (const char *filename,
#ifdef DONT_PRESERVE_ASPECT
gdk_pixbuf_loader_set_size (loader, width, height);
#else
info.width = width;
info.height = height;
g_signal_connect (loader, "size-prepared", G_CALLBACK (&size_prepared_cb), &info);
info[0] = width;
info[1] = height;
g_signal_connect (loader, "size-prepared", G_CALLBACK (size_prepared_cb), info);
#endif
while (!feof (f)) {