Commit ed707bea authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

app/edit_selection.c app/gimpimage.c app/layer_select.c when computing a

2000-12-11  Sven Neumann  <sven@gimp.org>

	* app/edit_selection.c
	* app/gimpimage.c
	* app/layer_select.c
	* app/layers_dialog.c: when computing a preview, limit the scale ratio
	to a maximum of 1.0. By doing so we avoid to scale drawables up if the
	image (canvas) size becomes larger than the drawable. Fixes bug #31098.

	* app/gimppreviewcache.[ch]: indented
parent b55be14f
2000-12-11 Sven Neumann <sven@gimp.org>
* app/edit_selection.c
* app/gimpimage.c
* app/layer_select.c
* app/layers_dialog.c: when computing a preview, limit the scale ratio
to a maximum of 1.0. By doing so we avoid to scale drawables up if the
image (canvas) size becomes larger than the drawable. Fixes bug #31098.
* app/gimppreviewcache.[ch]: indented
2000-12-11 Michael Natterer <mitch@gimp.org> 2000-12-11 Michael Natterer <mitch@gimp.org>
   
* configure.in: forgot to bump gimp-print's version number and * configure.in: forgot to bump gimp-print's version number and
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
...@@ -3696,7 +3697,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage, ...@@ -3696,7 +3697,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL); g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
list = gimage->layers; list = gimage->layers;
ratio = (double) width / (double) gimage->width; ratio = MIN (1.0, (gdouble) width / (gdouble) gimage->width);
switch (gimp_image_base_type (gimage)) switch (gimp_image_base_type (gimage))
{ {
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
...@@ -3696,7 +3697,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage, ...@@ -3696,7 +3697,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL); g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
list = gimage->layers; list = gimage->layers;
ratio = (double) width / (double) gimage->width; ratio = MIN (1.0, (gdouble) width / (gdouble) gimage->width);
switch (gimp_image_base_type (gimage)) switch (gimp_image_base_type (gimage))
{ {
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
...@@ -3696,7 +3697,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage, ...@@ -3696,7 +3697,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL); g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
list = gimage->layers; list = gimage->layers;
ratio = (double) width / (double) gimage->width; ratio = MIN (1.0, (gdouble) width / (gdouble) gimage->width);
switch (gimp_image_base_type (gimage)) switch (gimp_image_base_type (gimage))
{ {
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
...@@ -3696,7 +3697,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage, ...@@ -3696,7 +3697,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL); g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
list = gimage->layers; list = gimage->layers;
ratio = (double) width / (double) gimage->width; ratio = MIN (1.0, (gdouble) width / (gdouble) gimage->width);
switch (gimp_image_base_type (gimage)) switch (gimp_image_base_type (gimage))
{ {
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
...@@ -3696,7 +3697,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage, ...@@ -3696,7 +3697,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL); g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
list = gimage->layers; list = gimage->layers;
ratio = (double) width / (double) gimage->width; ratio = MIN (1.0, (gdouble) width / (gdouble) gimage->width);
switch (gimp_image_base_type (gimage)) switch (gimp_image_base_type (gimage))
{ {
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include "config.h" #include "config.h"
#include <string.h> #include <string.h>
...@@ -3696,7 +3697,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage, ...@@ -3696,7 +3697,7 @@ gimp_image_construct_composite_preview (GimpImage *gimage,
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL); g_return_val_if_fail (GIMP_IS_IMAGE (gimage), NULL);
list = gimage->layers; list = gimage->layers;
ratio = (double) width / (double) gimage->width; ratio = MIN (1.0, (gdouble) width / (gdouble) gimage->width);
switch (gimp_image_base_type (gimage)) switch (gimp_image_base_type (gimage))
{ {
......
...@@ -16,40 +16,60 @@ ...@@ -16,40 +16,60 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#include <stdio.h> #include "config.h"
#include <stdlib.h>
#include <math.h> #include <glib.h>
#include <string.h>
#include "gimpdrawableP.h"
#include "gimage.h"
#include "temp_buf.h"
#include "gimppreviewcache.h" #include "gimppreviewcache.h"
#define MAX_CACHE_PREVIEWS 5
#undef PREVIEW_CACHE_DEBUG
typedef struct _PreviewCache
{
TempBuf *preview;
gint width;
gint height;
} PreviewCache;
typedef struct _PreviewNearest
{
PreviewCache *pc;
gint width;
gint height;
} PreviewNearest;
static gint static gint
preview_cache_compare(gconstpointer a, preview_cache_compare (gconstpointer a,
gconstpointer b) gconstpointer b)
{ {
PreviewCache *pc1 = (PreviewCache *)a; PreviewCache *pc1 = (PreviewCache *) a;
PreviewCache *pc2 = (PreviewCache *)b; PreviewCache *pc2 = (PreviewCache *) b;
if(pc1->width > pc2->width && pc1->height > pc2->height) if (pc1->width > pc2->width && pc1->height > pc2->height)
return -1; return -1;
return 1; return 1;
} }
static void static void
preview_cache_find_exact(gpointer data, gpointer udata) preview_cache_find_exact (gpointer data,
gpointer udata)
{ {
PreviewCache *pc = (PreviewCache *)data; PreviewCache *pc = (PreviewCache *) data;
PreviewNearest *pNearest = (PreviewNearest *)udata; PreviewNearest *pNearest = (PreviewNearest *) udata;
/* printf("this value w,h [%d,%d]\n",pc->width,pc->height); */ /* g_print ("this value w,h [%d,%d]\n",pc->width,pc->height); */
/* if(pNearest->pc) */ /* if (pNearest->pc) */
/* printf("current nearest value w,h [%d,%d]\n",pNearest->pc->width,pNearest->pc->height); */ /* g_print ("current nearest value w,h [%d,%d]\n",
pNearest->pc->width,pNearest->pc->height); */
if(pNearest->pc) if (pNearest->pc)
return; return;
if(pc->width == pNearest->width && if(pc->width == pNearest->width &&
...@@ -59,31 +79,34 @@ preview_cache_find_exact(gpointer data, gpointer udata) ...@@ -59,31 +79,34 @@ preview_cache_find_exact(gpointer data, gpointer udata)
* If we already have it are these bigger dimensions? * If we already have it are these bigger dimensions?
*/ */
pNearest->pc = pc; pNearest->pc = pc;
return; return;
} }
} }
static void static void
preview_cache_find_biggest(gpointer data, gpointer udata) preview_cache_find_biggest (gpointer data,
gpointer udata)
{ {
PreviewCache *pc = (PreviewCache *)data; PreviewCache *pc = (PreviewCache *) data;
PreviewNearest *pNearest = (PreviewNearest *)udata; PreviewNearest *pNearest = (PreviewNearest *) udata;
/* printf("this value w,h [%d,%d]\n",pc->width,pc->height); */ /* g_print ("this value w,h [%d,%d]\n",pc->width,pc->height); */
/* if(pNearest->pc) */ /* if (pNearest->pc) */
/* printf("current nearest value w,h [%d,%d]\n",pNearest->pc->width,pNearest->pc->height); */ /* g_print ("current nearest value w,h [%d,%d]\n",
pNearest->pc->width,pNearest->pc->height); */
if(pc->width >= pNearest->width && if (pc->width >= pNearest->width &&
pc->height >= pNearest->height) pc->height >= pNearest->height)
{ {
/* Ok we could make the preview out of this one... /* Ok we could make the preview out of this one...
* If we already have it are these bigger dimensions? * If we already have it are these bigger dimensions?
*/ */
if(pNearest->pc) if (pNearest->pc)
{ {
if(pNearest->pc->width > pc->width && if (pNearest->pc->width > pc->width &&
pNearest->pc->height > pc->height) pNearest->pc->height > pc->height)
return; return;
} }
pNearest->pc = pc; pNearest->pc = pc;
...@@ -91,82 +114,91 @@ preview_cache_find_biggest(gpointer data, gpointer udata) ...@@ -91,82 +114,91 @@ preview_cache_find_biggest(gpointer data, gpointer udata)
} }
static void static void
preview_cache_remove_smallest(GSList **plist) preview_cache_remove_smallest (GSList **plist)
{ {
GSList *cur = *plist; GSList *list;
PreviewCache *smallest = NULL; PreviewCache *smallest = NULL;
/* printf("Removing smallest\n"); */ /* g_print ("Removing smallest\n"); */
if(!cur)
return;
do for (list = *plist; list; list = g_slist_next (list))
{ {
if(!smallest) if (!smallest)
{ {
smallest = cur->data; smallest = list->data;
/* printf("init smallest %d,%d\n",smallest->width,smallest->height); */ /* g_print ("init smallest %d,%d\n",
smallest->width,smallest->height); */
} }
else else
{ {
PreviewCache *pcthis = cur->data; PreviewCache *pcthis = list->data;
/* printf("Checking %d,%d\n",pcthis->width,pcthis->height); */
if((smallest->height*smallest->width) >= /* g_print ("Checking %d,%d\n",pcthis->width,pcthis->height); */
(pcthis->height*pcthis->width)) if ((smallest->height * smallest->width) >=
(pcthis->height * pcthis->width))
{ {
smallest = pcthis; smallest = pcthis;
/* printf("smallest now %d,%d\n",smallest->width,smallest->height); */ /* g_print ("smallest now %d,%d\n",
smallest->width,smallest->height); */
} }
} }
} while((cur = g_slist_next(cur))); }
*plist = g_slist_remove(*plist,smallest); if (*plist && smallest)
/* printf("removed %d,%d\n",smallest->width,smallest->height); */ *plist = g_slist_remove (*plist, smallest);
/* printf("removed smallest\n"); */ /* g_print ("removed %d,%d\n",smallest->width,smallest->height); */
/* g_print ("removed smallest\n"); */
} }
static void static void
preview_cache_invalidate(gpointer data, gpointer udata) preview_cache_invalidate (gpointer data,
gpointer udata)
{ {
PreviewCache *pc = (PreviewCache *)data; PreviewCache *pc = (PreviewCache *) data;
temp_buf_free (pc->preview); temp_buf_free (pc->preview);
g_free(pc); g_free(pc);
} }
static void static void
preview_cache_print(gpointer data, gpointer udata) preview_cache_print (GSList *plist)
{ {
/* PreviewCache *pc = (PreviewCache *)data; */ #ifdef PREVIEW_CACHE_DEBUG
if(!data) GSList *list;
PreviewCache *pc;
g_print ("preview cache dump:\n");
for (list = plist; list; list = g_slist_next (list))
{ {
/* printf("\tNo Cache\n"); */ pc = (PreviewCache *) list->data;
return;
g_print ("\tvalue w,h [%d,%d] => %p\n",
pc->width, pc->height, pc->preview);
} }
/* printf("\tvalue w,h [%d,%d] => %p\n",pc->width,pc->height,pc->preview); */ #endif /* PREVIEW_CACHE_DEBUG */
} }
void void
gimp_preview_cache_invalidate(GSList **plist) gimp_preview_cache_invalidate (GSList **plist)
{ {
/* printf("gimp_preview_cache_invalidate\n"); */ /* g_print ("gimp_preview_cache_invalidate\n"); */
g_slist_foreach(*plist,preview_cache_print,NULL); preview_cache_print (*plist);
g_slist_foreach(*plist,preview_cache_invalidate,NULL); g_slist_foreach (*plist, preview_cache_invalidate, NULL);
*plist = NULL; *plist = NULL;
} }
void void
gimp_preview_cache_add(GSList **plist, gimp_preview_cache_add (GSList **plist,
TempBuf *buf) TempBuf *buf)
{ {
PreviewCache *pc; PreviewCache *pc;
/* printf("gimp_preview_cache_add %d %d\n",buf->width,buf->height); */ /* g_print ("gimp_preview_cache_add %d %d\n",buf->width,buf->height); */
g_slist_foreach(*plist,preview_cache_print,NULL); preview_cache_print (*plist);
if(g_slist_length(*plist) > MAX_CACHE_PREVIEWS) if (g_slist_length (*plist) > MAX_CACHE_PREVIEWS)
{ {
/* Remove the smallest */ /* Remove the smallest */
preview_cache_remove_smallest(plist); preview_cache_remove_smallest(plist);
...@@ -174,104 +206,116 @@ gimp_preview_cache_add(GSList **plist, ...@@ -174,104 +206,116 @@ gimp_preview_cache_add(GSList **plist,
pc = g_new0(PreviewCache,1); pc = g_new0(PreviewCache,1);
pc->preview = buf; pc->preview = buf;
pc->width = buf->width; pc->width = buf->width;
pc->height = buf->height; pc->height = buf->height;
*plist = g_slist_insert_sorted(*plist,pc,preview_cache_compare);
*plist = g_slist_insert_sorted (*plist, pc, preview_cache_compare);
} }
TempBuf * TempBuf *
gimp_preview_cache_get(GSList **plist, gimp_preview_cache_get (GSList **plist,
gint width, gint width,
gint height) gint height)
{ {
PreviewNearest pn; PreviewNearest pn;
PreviewCache *pc; PreviewCache *pc;
/* printf("gimp_preview_cache_get %d %d\n",width,height); */ /* g_print ("gimp_preview_cache_get %d %d\n",width,height); */
g_slist_foreach(*plist,preview_cache_print,NULL); preview_cache_print (*plist);
pn.pc = NULL; pn.pc = NULL;
pn.width = width; pn.width = width;
pn.height = height; pn.height = height;
g_slist_foreach(*plist,preview_cache_find_exact,&pn); g_slist_foreach (*plist, preview_cache_find_exact, &pn);
if(pn.pc && pn.pc->preview) if (pn.pc && pn.pc->preview)
{ {
/* printf("extact value w,h [%d,%d] => %p\n",pn.pc->width,pn.pc->height,pn.pc->preview); */ /* g_print ("extact value w,h [%d,%d] => %p\n",
pn.pc->width,pn.pc->height,pn.pc->preview); */
return pn.pc->preview; return pn.pc->preview;
} }
g_slist_foreach(*plist,preview_cache_find_biggest,&pn); g_slist_foreach (*plist, preview_cache_find_biggest, &pn);
if(pn.pc) if (pn.pc)
{ {
gint pwidth; gint pwidth;
gint pheight; gint pheight;
gdouble x_ratio; gdouble x_ratio;
gdouble y_ratio; gdouble y_ratio;
guchar *src_data; guchar *src_data;
guchar *dest_data; guchar *dest_data;
gint loop1,loop2; gint loop1;
gint loop2;
/* printf("nearest value w,h [%d,%d] => %p\n",pn.pc->width,pn.pc->height,pn.pc->preview); */
/* g_print ("nearest value w,h [%d,%d] => %p\n",
pn.pc->width,pn.pc->height,pn.pc->preview); */
/* if(pn.pc->width == width && */ /* if(pn.pc->width == width && */
/* pn.pc->height == height) */ /* pn.pc->height == height) */
/* return pn.pc->preview; */ /* return pn.pc->preview; */
if(!pn.pc->preview) if (!pn.pc->preview)
{ {
g_error("gimp_preview_cache_get:: Invalid cache item"); g_error ("gimp_preview_cache_get:: Invalid cache item");
return NULL; return NULL;
} }
/* Make up new preview from the large one... */ /* Make up new preview from the large one... */
pwidth = pn.pc->preview->width; pwidth = pn.pc->preview->width;
pheight = pn.pc->preview->height; pheight = pn.pc->preview->height;
/* Now get the real one and add to cache */ /* Now get the real one and add to cache */
/* printf("Must create from large preview\n"); */ /* g_print ("Must create from large preview\n"); */
pc = g_new0(PreviewCache,1); pc = g_new0 (PreviewCache, 1);